From 4fe25c8e18e3569d3807771ed3d06b05557ef0af Mon Sep 17 00:00:00 2001
From: George Macon <george.macon@gtri.gatech.edu>
Date: Fri, 16 Feb 2024 10:25:58 -0500
Subject: [PATCH 001/241] ikos: 3.1 -> 3.2

---
 .../tools/analysis/ikos/default.nix           | 46 ++++++++++++++-----
 .../tools/analysis/ikos/formatter-wrap.patch  | 13 ++++++
 2 files changed, 47 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/development/tools/analysis/ikos/formatter-wrap.patch

diff --git a/pkgs/development/tools/analysis/ikos/default.nix b/pkgs/development/tools/analysis/ikos/default.nix
index 50f4f552e0ff..40f9a9e40b33 100644
--- a/pkgs/development/tools/analysis/ikos/default.nix
+++ b/pkgs/development/tools/analysis/ikos/default.nix
@@ -4,26 +4,28 @@
 }:
 
 let
-  python = python3.withPackages (ps: with ps; [
+  inherit (python3.pkgs)
+    setuptools
+    wheel
+    build
+    installer
+    wrapPython
     pygments
-  ]);
+  ;
 in
 
 stdenv.mkDerivation rec {
   pname = "ikos";
-  version = "3.1";
+  version = "3.2";
 
   src = fetchFromGitHub {
     owner = "NASA-SW-VnV";
     repo = "ikos";
     rev = "v${version}";
-    hash = "sha256-scaFkUhCkIi41iR6CGPbEndzXkgqTKMb3PDNvhgVbCE=";
+    hash = "sha256-zWWfmjYgqhAztGivAJwZ4+yRrAHxgU1CF1Y7vVr95UA=";
   };
 
-  patches = [ (fetchpatch {
-    url = "https://github.com/NASA-SW-VnV/ikos/commit/2e647432427b3f0dbb639e0371d976ab6406f290.patch";
-    hash = "sha256-ffzjlqEp4qp76Kwl5zpyQlg/xUMt8aLDSSP4XA4ndS8=";
-  })
+  patches = [
   # Fix build with GCC 13
   # https://github.com/NASA-SW-VnV/ikos/pull/262
   (fetchpatch {
@@ -31,15 +33,35 @@ stdenv.mkDerivation rec {
     url = "https://github.com/NASA-SW-VnV/ikos/commit/73c816641fb9780f0d3b5e448510363a3cf21ce2.patch";
     hash = "sha256-bkeSAtxrL+z+6QNiGOWSg7kN8XiZqMxlJiu5Dquhca0=";
   })
+  # Fix an error in ikos-view; Pygments>=2.12 no longer passes outfile to wrap.
+  ./formatter-wrap.patch
   ];
 
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [ boost tbb gmp clang llvm sqlite python
+  nativeBuildInputs = [ cmake setuptools wheel build installer wrapPython ];
+  buildInputs = [ boost tbb gmp clang llvm sqlite python3
                   ocamlPackages.apron mpfr ppl doxygen graphviz ];
+  propagatedBuildInputs = [
+    pygments
+  ];
 
-  cmakeFlags = [ "-DAPRON_ROOT=${ocamlPackages.apron}" ];
+  cmakeFlags = [
+    "-DAPRON_ROOT=${ocamlPackages.apron}"
+    "-DINSTALL_PYTHON_VIRTUALENV=off"
+    "-DPYTHON_VENV_EXECUTABLE=${python3}/bin/python"
+  ];
 
-  postBuild = "make doc";
+  postBuild = ''
+    make doc
+    ${python3}/bin/python -m build --no-isolation --outdir dist/ --wheel analyzer/python
+  '';
+
+  postInstall = ''
+    ${python3}/bin/python -m installer --prefix "$out" dist/*.whl
+  '';
+
+  postFixup = ''
+    wrapPythonPrograms
+  '';
 
   meta = with lib; {
     homepage = "https://github.com/NASA-SW-VnV/ikos";
diff --git a/pkgs/development/tools/analysis/ikos/formatter-wrap.patch b/pkgs/development/tools/analysis/ikos/formatter-wrap.patch
new file mode 100644
index 000000000000..ee4edec70eba
--- /dev/null
+++ b/pkgs/development/tools/analysis/ikos/formatter-wrap.patch
@@ -0,0 +1,13 @@
+diff --git a/analyzer/python/ikos/view.py b/analyzer/python/ikos/view.py
+index 4e9ed5d..6643db8 100644
+--- a/analyzer/python/ikos/view.py
++++ b/analyzer/python/ikos/view.py
+@@ -422,7 +422,7 @@ class Formatter(HtmlFormatter):
+         self.call_contexts = {}
+         self.checks = {}
+ 
+-    def wrap(self, source, outfile):
++    def wrap(self, source):
+         return self._wrap_code(source)
+ 
+     def _wrap_code(self, source):

From cbdd1eaf88040e9da1db708e87e6bb54648158c1 Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Sat, 17 Feb 2024 21:54:59 +0200
Subject: [PATCH 002/241] kramdown-asciidoc: 1.0.1 -> 2.1.0

---
 .../kramdown-asciidoc/Gemfile.lock            | 14 ++++++---
 .../typesetting/kramdown-asciidoc/gemset.nix  | 30 ++++++++++++++++---
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/typesetting/kramdown-asciidoc/Gemfile.lock b/pkgs/tools/typesetting/kramdown-asciidoc/Gemfile.lock
index c975e23f323c..50c1f5ffddba 100644
--- a/pkgs/tools/typesetting/kramdown-asciidoc/Gemfile.lock
+++ b/pkgs/tools/typesetting/kramdown-asciidoc/Gemfile.lock
@@ -1,9 +1,15 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    kramdown (1.17.0)
-    kramdown-asciidoc (1.0.1)
-      kramdown (~> 1.17.0)
+    kramdown (2.4.0)
+      rexml
+    kramdown-asciidoc (2.1.0)
+      kramdown (~> 2.4.0)
+      kramdown-parser-gfm (~> 1.1.0)
+      rexml (~> 3.2.0)
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    rexml (3.2.6)
 
 PLATFORMS
   ruby
@@ -12,4 +18,4 @@ DEPENDENCIES
   kramdown-asciidoc
 
 BUNDLED WITH
-   2.1.4
+   2.4.22
diff --git a/pkgs/tools/typesetting/kramdown-asciidoc/gemset.nix b/pkgs/tools/typesetting/kramdown-asciidoc/gemset.nix
index 0ade973304d1..e750dd6655ac 100644
--- a/pkgs/tools/typesetting/kramdown-asciidoc/gemset.nix
+++ b/pkgs/tools/typesetting/kramdown-asciidoc/gemset.nix
@@ -1,23 +1,45 @@
 {
   kramdown = {
+    dependencies = ["rexml"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq";
+      sha256 = "1ic14hdcqxn821dvzki99zhmcy130yhv5fqfffkcf87asv5mnbmn";
       type = "gem";
     };
-    version = "1.17.0";
+    version = "2.4.0";
   };
   kramdown-asciidoc = {
+    dependencies = ["kramdown" "kramdown-parser-gfm" "rexml"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1j7qbpq6zhgcf9ykhz5r1wlr3r8fls6hvhdisxzz4v35rni5kwp9";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
+  kramdown-parser-gfm = {
     dependencies = ["kramdown"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nr4hss1byhchwkqy2w0dgc7s83n0s5xm0pjms2cmckc4sbrryxi";
+      sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv";
       type = "gem";
     };
-    version = "1.0.1";
+    version = "1.1.0";
+  };
+  rexml = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
+      type = "gem";
+    };
+    version = "3.2.6";
   };
 }

From 75222b1674de180a074864115f2fc2821118f068 Mon Sep 17 00:00:00 2001
From: Rokas Urbelis <rokas.urbelis@protonmail.com>
Date: Thu, 7 Mar 2024 00:16:41 +0200
Subject: [PATCH 003/241] mpd-notification: add systemd to buildInputs

---
 pkgs/tools/audio/mpd-notification/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/audio/mpd-notification/default.nix b/pkgs/tools/audio/mpd-notification/default.nix
index 845056c61414..c25adf8483ff 100644
--- a/pkgs/tools/audio/mpd-notification/default.nix
+++ b/pkgs/tools/audio/mpd-notification/default.nix
@@ -8,6 +8,7 @@
 , libnotify
 , libmpdclient
 , discount
+, systemd
 }:
 
 stdenv.mkDerivation rec {
@@ -32,6 +33,7 @@ stdenv.mkDerivation rec {
     ffmpeg
     libmpdclient
     discount
+    systemd
   ];
 
   installPhase = ''

From e40e703411690d4072bba2afb9eba892b126f67a Mon Sep 17 00:00:00 2001
From: vieta <tng@bode.bio>
Date: Fri, 24 May 2024 22:28:05 +0200
Subject: [PATCH 004/241] dwarf-fortress-packages.themes: set license to unfree

---
 pkgs/games/dwarf-fortress/themes/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/dwarf-fortress/themes/default.nix b/pkgs/games/dwarf-fortress/themes/default.nix
index ad033b043a46..279c816211ee 100644
--- a/pkgs/games/dwarf-fortress/themes/default.nix
+++ b/pkgs/games/dwarf-fortress/themes/default.nix
@@ -23,7 +23,7 @@ listToAttrs (map
       meta = {
         platforms = platforms.all;
         maintainers = [ maintainers.matthewbauer maintainers.shazow ];
-        license = licenses.free;
+        license = licenses.unfree;
       };
     };
   })

From 4098898ff6d545ae0827620f8e749a0bf229446c Mon Sep 17 00:00:00 2001
From: dansbandit <4530687+dansbandit@users.noreply.github.com>
Date: Tue, 11 Jun 2024 23:45:48 +0200
Subject: [PATCH 005/241] tocpdf: init at 0.3.3

---
 pkgs/by-name/to/tocpdf/package.nix | 42 ++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 pkgs/by-name/to/tocpdf/package.nix

diff --git a/pkgs/by-name/to/tocpdf/package.nix b/pkgs/by-name/to/tocpdf/package.nix
new file mode 100644
index 000000000000..ac830f7d1c9f
--- /dev/null
+++ b/pkgs/by-name/to/tocpdf/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  python3Packages,
+  fetchPypi,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "tocpdf";
+  version = "0.3.3";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "tocPDF";
+    inherit version;
+    hash = "sha256-B+UcvyjWceVErf1uDyGGTGwKBCGHmSOF19Vbk15cPp8=";
+  };
+
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
+    click
+    pdfplumber
+    pypdf
+    tika
+    tqdm
+  ];
+
+  # no test
+  doCheck = false;
+
+  pythonImportsCheck = [ "tocPDF" ];
+
+  meta = {
+    description = "Automatic CLI tool for generating outline of PDFs based on the table of contents";
+    homepage = "https://github.com/kszenes/tocPDF";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dansbandit ];
+    mainProgram = "tocPDF";
+  };
+}

From 609f8e0590dfe0114ad2139cc331c3e870fefaa9 Mon Sep 17 00:00:00 2001
From: Alex Hamilton <1622250+Aehmlo@users.noreply.github.com>
Date: Fri, 21 Jun 2024 11:10:14 -0400
Subject: [PATCH 006/241] muscle: compile with GCC for Darwin

This revision updates pkgs.muscle to compile with GCC (gccStdenv instead
of stdenv). This works around issues with OpenMP in the Darwin version
of LLVM.

The upstream Makefile assumes that we're compiling with Homebrew or
similar and uses g++-11 instead of g++, so this revision also introduces
a patch to remove this behavior, allowing the package to compile on
Darwin without issue.
---
 .../science/biology/muscle/default.nix        | 28 +++++++++++++------
 .../biology/muscle/muscle-darwin-g++.patch    | 15 ++++++++++
 2 files changed, 34 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/applications/science/biology/muscle/muscle-darwin-g++.patch

diff --git a/pkgs/applications/science/biology/muscle/default.nix b/pkgs/applications/science/biology/muscle/default.nix
index cdcf6c7b50aa..86067538b13c 100644
--- a/pkgs/applications/science/biology/muscle/default.nix
+++ b/pkgs/applications/science/biology/muscle/default.nix
@@ -1,10 +1,9 @@
-{ lib, stdenv, fetchFromGitHub }:
+{ lib, gccStdenv, fetchFromGitHub }:
 
-stdenv.mkDerivation rec {
-  pname   = "muscle";
+gccStdenv.mkDerivation rec {
+  pname = "muscle";
   version = "5.1.0";
 
-
   src = fetchFromGitHub {
     owner = "rcedgar";
     repo = pname;
@@ -14,15 +13,26 @@ stdenv.mkDerivation rec {
 
   sourceRoot = "${src.name}/src";
 
-  installPhase = ''
-    install -m755 -D Linux/muscle $out/bin/muscle
-  '';
+  patches = [
+    ./muscle-darwin-g++.patch
+  ];
+
+  installPhase =
+    let
+      target =
+        if gccStdenv.isDarwin
+        then "Darwin"
+        else "Linux";
+    in
+    ''
+      install -m755 -D ${target}/muscle $out/bin/muscle
+    '';
 
   meta = with lib; {
     description = "Multiple sequence alignment with top benchmark scores scalable to thousands of sequences";
     mainProgram = "muscle";
-    license     = licenses.gpl3Plus;
-    homepage    = "https://www.drive5.com/muscle/";
+    license = licenses.gpl3Plus;
+    homepage = "https://www.drive5.com/muscle/";
     maintainers = with maintainers; [ unode thyol ];
   };
 }
diff --git a/pkgs/applications/science/biology/muscle/muscle-darwin-g++.patch b/pkgs/applications/science/biology/muscle/muscle-darwin-g++.patch
new file mode 100644
index 000000000000..41e5fc7ae476
--- /dev/null
+++ b/pkgs/applications/science/biology/muscle/muscle-darwin-g++.patch
@@ -0,0 +1,15 @@
+
+diff --git a/Makefile b/Makefile
+index df16673..be3bd0d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -20,9 +20,6 @@ OS := $(shell uname)
+ CPPFLAGS := $(CPPFLAGS) -DNDEBUG -pthread
+ 
+ CXX := g++
+-ifeq ($(OS),Darwin)
+-	CXX := g++-11
+-endif
+ 
+ CXXFLAGS := $(CXXFLAGS) -O3 -fopenmp -ffast-math
+ 

From caa9cf136bcd9043641e24b3a571cac3a3988186 Mon Sep 17 00:00:00 2001
From: Victor Engmark <victor@engmark.name>
Date: Wed, 26 Jun 2024 18:02:38 +0200
Subject: [PATCH 007/241] jekyll: Join `set` commands

---
 pkgs/applications/misc/jekyll/update.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/jekyll/update.sh b/pkgs/applications/misc/jekyll/update.sh
index 650f3993f51e..5eb20a042b3c 100755
--- a/pkgs/applications/misc/jekyll/update.sh
+++ b/pkgs/applications/misc/jekyll/update.sh
@@ -1,8 +1,7 @@
 #!/usr/bin/env nix-shell
 #!nix-shell -i bash -p bundix zlib libyaml
 
-set -o errexit
-set -o nounset
+set -o errexit -o nounset
 
 readonly BASEDIR="$(dirname $(readlink -f $0))"
 

From 9b78c3760a564141e9f8d836748db9db3975cad2 Mon Sep 17 00:00:00 2001
From: Victor Engmark <victor@engmark.name>
Date: Wed, 26 Jun 2024 18:09:13 +0200
Subject: [PATCH 008/241] jekyll: Quote variable dereferencing

As per `shellcheck`:

> SC2086 (info): Double quote to prevent globbing and word splitting.
---
 pkgs/applications/misc/jekyll/update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/jekyll/update.sh b/pkgs/applications/misc/jekyll/update.sh
index 5eb20a042b3c..146d3888bdf3 100755
--- a/pkgs/applications/misc/jekyll/update.sh
+++ b/pkgs/applications/misc/jekyll/update.sh
@@ -3,7 +3,7 @@
 
 set -o errexit -o nounset
 
-readonly BASEDIR="$(dirname $(readlink -f $0))"
+readonly BASEDIR="$(dirname "$(readlink -f "$0")")"
 
 for directory in "basic" "full"; do
   pushd "$BASEDIR/$directory"

From 235bacee2e99f2fea9ee9576bef76cec062038b3 Mon Sep 17 00:00:00 2001
From: Victor Engmark <victor@engmark.name>
Date: Wed, 26 Jun 2024 18:10:11 +0200
Subject: [PATCH 009/241] jekyll: Remove unnecessary `readonly`

This was hiding the assignment exit code, as reported by `shellcheck`:

> SC2155 (warning): Declare and assign separately to avoid masking return
> values.
---
 pkgs/applications/misc/jekyll/update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/jekyll/update.sh b/pkgs/applications/misc/jekyll/update.sh
index 146d3888bdf3..798c7c9c37c4 100755
--- a/pkgs/applications/misc/jekyll/update.sh
+++ b/pkgs/applications/misc/jekyll/update.sh
@@ -3,7 +3,7 @@
 
 set -o errexit -o nounset
 
-readonly BASEDIR="$(dirname "$(readlink -f "$0")")"
+BASEDIR="$(dirname "$(readlink -f $0)")"
 
 for directory in "basic" "full"; do
   pushd "$BASEDIR/$directory"

From 27312ae230117c8525fc602d2f854d352664a46f Mon Sep 17 00:00:00 2001
From: Victor Engmark <victor@engmark.name>
Date: Wed, 26 Jun 2024 18:12:54 +0200
Subject: [PATCH 010/241] jekyll: Use an idiomatic way to get script directory

See elsewhere in the repo and <https://stackoverflow.com/a/246128/96588>.
---
 pkgs/applications/misc/jekyll/update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/jekyll/update.sh b/pkgs/applications/misc/jekyll/update.sh
index 798c7c9c37c4..d4fc200e1789 100755
--- a/pkgs/applications/misc/jekyll/update.sh
+++ b/pkgs/applications/misc/jekyll/update.sh
@@ -3,7 +3,7 @@
 
 set -o errexit -o nounset
 
-BASEDIR="$(dirname "$(readlink -f $0)")"
+BASEDIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
 
 for directory in "basic" "full"; do
   pushd "$BASEDIR/$directory"

From df7a3621699f3c29c658d0a9fc098b115b6b6d4f Mon Sep 17 00:00:00 2001
From: Victor Engmark <victor@engmark.name>
Date: Wed, 26 Jun 2024 18:14:32 +0200
Subject: [PATCH 011/241] jekyll: Use idiomatic lowercase un-exported variable

---
 pkgs/applications/misc/jekyll/update.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/jekyll/update.sh b/pkgs/applications/misc/jekyll/update.sh
index d4fc200e1789..6d97872e2bf6 100755
--- a/pkgs/applications/misc/jekyll/update.sh
+++ b/pkgs/applications/misc/jekyll/update.sh
@@ -3,10 +3,10 @@
 
 set -o errexit -o nounset
 
-BASEDIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
+script_dir=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
 
 for directory in "basic" "full"; do
-  pushd "$BASEDIR/$directory"
+  pushd "$script_dir/$directory"
   rm -f Gemfile.lock gemset.nix
   BUNDLE_FORCE_RUBY_PLATFORM=true bundix --magic
   rm -rf .bundle vendor

From 544ae25b98ec349360f9f2c2015bd658985c8c3e Mon Sep 17 00:00:00 2001
From: Victor Engmark <victor@engmark.name>
Date: Wed, 26 Jun 2024 18:55:41 +0200
Subject: [PATCH 012/241] jekyll: Re-lock dependencies

---
 .../misc/jekyll/basic/Gemfile.lock            | 43 ++++----
 .../applications/misc/jekyll/basic/gemset.nix | 81 ++++++++-------
 .../misc/jekyll/full/Gemfile.lock             | 53 +++++-----
 pkgs/applications/misc/jekyll/full/gemset.nix | 99 ++++++++++---------
 4 files changed, 152 insertions(+), 124 deletions(-)

diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
index 2c7a76e29991..4957ce226173 100644
--- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.3.2)
+    activesupport (7.1.3.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -11,28 +11,29 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     base64 (0.2.0)
-    bigdecimal (3.1.7)
+    bigdecimal (3.1.8)
     colorator (1.1.0)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
     drb (2.2.1)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    ffi (1.16.3)
+    ffi (1.17.0)
     forwardable-extended (2.6.0)
     gemoji (4.1.0)
-    google-protobuf (4.26.1)
+    google-protobuf (4.27.2)
+      bigdecimal
       rake (>= 13)
     html-pipeline (2.14.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.8.0)
-    i18n (1.14.4)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     jekyll (4.3.3)
       addressable (~> 2.4)
@@ -76,26 +77,28 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
-    mini_portile2 (2.8.5)
-    minitest (5.22.3)
+    mini_portile2 (2.8.7)
+    minitest (5.24.0)
     mutex_m (0.2.0)
-    nokogiri (1.16.3)
+    nokogiri (1.16.6)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (5.0.4)
-    racc (1.7.3)
-    rake (13.1.0)
+    public_suffix (6.0.0)
+    racc (1.8.0)
+    rake (13.2.1)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rexml (3.2.6)
-    rouge (4.2.1)
+    rexml (3.3.1)
+      strscan
+    rouge (4.3.0)
     safe_yaml (1.0.5)
-    sass-embedded (1.72.0)
+    sass-embedded (1.77.5)
       google-protobuf (>= 3.25, < 5.0)
-      rake (>= 13.0.0)
+      rake (>= 13)
+    strscan (3.1.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     tzinfo (2.0.6)
@@ -115,4 +118,4 @@ DEPENDENCIES
   jemoji
 
 BUNDLED WITH
-   2.5.6
+   2.5.11
diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix
index fc049e314e54..f135bf6ccdef 100644
--- a/pkgs/applications/misc/jekyll/basic/gemset.nix
+++ b/pkgs/applications/misc/jekyll/basic/gemset.nix
@@ -5,10 +5,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0blbbf2x7dn7ar4g9aij403582zb6zscbj48bz63lvaamsvlb15d";
+      sha256 = "0283wk1zxb76lg79dk501kcf5xy9h25qiw15m86s4nrfv11vqns5";
       type = "gem";
     };
-    version = "7.1.3.2";
+    version = "7.1.3.4";
   };
   addressable = {
     dependencies = ["public_suffix"];
@@ -16,10 +16,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr";
+      sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
       type = "gem";
     };
-    version = "2.8.6";
+    version = "2.8.7";
   };
   base64 = {
     groups = ["default"];
@@ -36,10 +36,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0cq1c29zbkcxgdihqisirhcw76xc768z2zpd5vbccpq0l1lv76g7";
+      sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558";
       type = "gem";
     };
-    version = "3.1.7";
+    version = "3.1.8";
   };
   colorator = {
     groups = ["default"];
@@ -56,10 +56,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2";
+      sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g";
       type = "gem";
     };
-    version = "1.2.3";
+    version = "1.3.3";
   };
   connection_pool = {
     groups = ["default"];
@@ -107,10 +107,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd";
+      sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi";
       type = "gem";
     };
-    version = "1.16.3";
+    version = "1.17.0";
   };
   forwardable-extended = {
     groups = ["default"];
@@ -133,15 +133,15 @@
     version = "4.1.0";
   };
   google-protobuf = {
-    dependencies = ["rake"];
+    dependencies = ["bigdecimal" "rake"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "14s40yxj35vixx9pvpnbrkz9z7ga3m7vcy72yll1flnn3cirl1aj";
+      sha256 = "0vwnr6fmxig4pkag86yzbznpxk8ii7rhjz0rrprkqvnymhhfnscz";
       type = "gem";
     };
-    version = "4.26.1";
+    version = "4.27.2";
   };
   html-pipeline = {
     dependencies = ["activesupport" "nokogiri"];
@@ -170,10 +170,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0lbm33fpb3w06wd2231sg58dwlwgjsvym93m548ajvl6s3mfvpn7";
+      sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16";
       type = "gem";
     };
-    version = "1.14.4";
+    version = "1.14.5";
   };
   jekyll = {
     dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table" "webrick"];
@@ -321,20 +321,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs";
+      sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk";
       type = "gem";
     };
-    version = "2.8.5";
+    version = "2.8.7";
   };
   minitest = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "07lq26b86giy3ha3fhrywk9r1ajhc2pm2mzj657jnpnbj1i6g17a";
+      sha256 = "0zgq31wa0ygqnmpqh3plsig32xc8k4l99r49ncmidfg91kfagymg";
       type = "gem";
     };
-    version = "5.22.3";
+    version = "5.24.0";
   };
   mutex_m = {
     groups = ["default"];
@@ -352,10 +352,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0j72sg8n8834vbw2x8glcp46y5r2dls2pj64ll7rmf6mri9s52j9";
+      sha256 = "1vz1ychq2fhfqjgqdrx8bqkaxg5dzcgwnah00m57ydylczfy8pwk";
       type = "gem";
     };
-    version = "1.16.3";
+    version = "1.16.6";
   };
   pathutil = {
     dependencies = ["forwardable-extended"];
@@ -373,30 +373,30 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m";
+      sha256 = "17m8q2dzm7a74amnab5rf3f3m466i300awihl3ygh4v80wpf3j6j";
       type = "gem";
     };
-    version = "5.0.4";
+    version = "6.0.0";
   };
   racc = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp";
+      sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09";
       type = "gem";
     };
-    version = "1.7.3";
+    version = "1.8.0";
   };
   rake = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy";
+      sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6";
       type = "gem";
     };
-    version = "13.1.0";
+    version = "13.2.1";
   };
   rb-fsevent = {
     groups = ["default"];
@@ -414,30 +414,31 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005";
+      sha256 = "0vmy8xgahixcz6hzwy4zdcyn2y6d6ri8dqv5xccgzc1r292019x0";
       type = "gem";
     };
-    version = "0.10.1";
+    version = "0.11.1";
   };
   rexml = {
+    dependencies = ["strscan"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
+      sha256 = "09f3sw7f846fpcpwdm362ylqldwqxpym6z0qpld4av7zisrrzbrl";
       type = "gem";
     };
-    version = "3.2.6";
+    version = "3.3.1";
   };
   rouge = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zd1pdldi6h8x27dqim7cy8m69xr01aw5c8k1zhkz497n4np6wgk";
+      sha256 = "072qvvrcqj0yfr3b0j932mlhvn41i38bq37z7z07i3ikagndkqwy";
       type = "gem";
     };
-    version = "4.2.1";
+    version = "4.3.0";
   };
   safe_yaml = {
     groups = ["default"];
@@ -455,10 +456,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0bixk8c02dhflvhi4s5hxzjg8akzgicvjxjvxx74nah2j8qfblq5";
+      sha256 = "1nmy052pm46781s7ca6x3l4yb5p3glh8sf201xwcwpk9rv2av9m2";
       type = "gem";
     };
-    version = "1.72.0";
+    version = "1.77.5";
+  };
+  strscan = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01";
+      type = "gem";
+    };
+    version = "3.1.0";
   };
   terminal-table = {
     dependencies = ["unicode-display_width"];
diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock
index c9cae601691a..45489feba251 100644
--- a/pkgs/applications/misc/jekyll/full/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.3.2)
+    activesupport (7.1.3.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -11,10 +11,10 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     base64 (0.2.0)
-    bigdecimal (3.1.7)
+    bigdecimal (3.1.8)
     classifier-reborn (2.3.0)
       fast-stemmer (~> 1.0)
       matrix (~> 0.4)
@@ -24,7 +24,7 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     colorator (1.1.0)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
     drb (2.2.1)
     em-websocket (0.5.3)
@@ -32,21 +32,22 @@ GEM
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
     execjs (2.9.1)
-    faraday (2.9.0)
+    faraday (2.9.2)
       faraday-net_http (>= 2.0, < 3.2)
     faraday-net_http (3.1.0)
       net-http
     fast-stemmer (1.0.2)
-    ffi (1.16.3)
+    ffi (1.17.0)
     forwardable-extended (2.6.0)
     gemoji (4.1.0)
-    google-protobuf (4.26.1)
+    google-protobuf (4.27.2)
+      bigdecimal
       rake (>= 13)
     html-pipeline (2.14.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.8.0)
-    i18n (1.14.4)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     jekyll (4.3.3)
       addressable (~> 2.4)
@@ -114,14 +115,14 @@ GEM
     mercenary (0.4.0)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0305)
-    mini_magick (4.12.0)
-    mini_portile2 (2.8.5)
-    minitest (5.22.3)
+    mime-types-data (3.2024.0604)
+    mini_magick (4.13.1)
+    mini_portile2 (2.8.7)
+    minitest (5.24.0)
     mutex_m (0.2.0)
     net-http (0.4.1)
       uri
-    nokogiri (1.16.3)
+    nokogiri (1.16.6)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     octokit (4.25.1)
@@ -131,24 +132,26 @@ GEM
       forwardable-extended (~> 2.6)
     psych (5.1.2)
       stringio
-    public_suffix (5.0.4)
-    racc (1.7.3)
-    rake (13.1.0)
+    public_suffix (6.0.0)
+    racc (1.8.0)
+    rake (13.2.1)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rdoc (6.6.3.1)
+    rdoc (6.7.0)
       psych (>= 4.0.0)
-    rexml (3.2.6)
-    rouge (4.2.1)
+    rexml (3.3.1)
+      strscan
+    rouge (4.3.0)
     safe_yaml (1.0.5)
-    sass-embedded (1.72.0)
+    sass-embedded (1.77.5)
       google-protobuf (>= 3.25, < 5.0)
-      rake (>= 13.0.0)
+      rake (>= 13)
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
-    stringio (3.1.0)
+    stringio (3.1.1)
+    strscan (3.1.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     tomlrb (1.3.0)
@@ -185,4 +188,4 @@ DEPENDENCIES
   yajl-ruby (~> 1.4)
 
 BUNDLED WITH
-   2.5.6
+   2.5.11
diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix
index d81dee1136a0..eea427ee5c1d 100644
--- a/pkgs/applications/misc/jekyll/full/gemset.nix
+++ b/pkgs/applications/misc/jekyll/full/gemset.nix
@@ -5,10 +5,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0blbbf2x7dn7ar4g9aij403582zb6zscbj48bz63lvaamsvlb15d";
+      sha256 = "0283wk1zxb76lg79dk501kcf5xy9h25qiw15m86s4nrfv11vqns5";
       type = "gem";
     };
-    version = "7.1.3.2";
+    version = "7.1.3.4";
   };
   addressable = {
     dependencies = ["public_suffix"];
@@ -16,10 +16,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr";
+      sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
       type = "gem";
     };
-    version = "2.8.6";
+    version = "2.8.7";
   };
   base64 = {
     groups = ["default"];
@@ -36,10 +36,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0cq1c29zbkcxgdihqisirhcw76xc768z2zpd5vbccpq0l1lv76g7";
+      sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558";
       type = "gem";
     };
-    version = "3.1.7";
+    version = "3.1.8";
   };
   classifier-reborn = {
     dependencies = ["fast-stemmer" "matrix"];
@@ -110,10 +110,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2";
+      sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g";
       type = "gem";
     };
-    version = "1.2.3";
+    version = "1.3.3";
   };
   connection_pool = {
     groups = ["default"];
@@ -172,10 +172,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1qqb1rmk0f9m82iijjlqadh5yby1bhnr6svjk9vxdvh6f181988s";
+      sha256 = "1913fk7szy3bj8mf1dxs4waym5ya5fzzc5d3a8z24qs67fzfv5b5";
       type = "gem";
     };
-    version = "2.9.0";
+    version = "2.9.2";
   };
   faraday-net_http = {
     dependencies = ["net-http"];
@@ -215,10 +215,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd";
+      sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi";
       type = "gem";
     };
-    version = "1.16.3";
+    version = "1.17.0";
   };
   forwardable-extended = {
     groups = ["default"];
@@ -241,15 +241,15 @@
     version = "4.1.0";
   };
   google-protobuf = {
-    dependencies = ["rake"];
+    dependencies = ["bigdecimal" "rake"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "14s40yxj35vixx9pvpnbrkz9z7ga3m7vcy72yll1flnn3cirl1aj";
+      sha256 = "0vwnr6fmxig4pkag86yzbznpxk8ii7rhjz0rrprkqvnymhhfnscz";
       type = "gem";
     };
-    version = "4.26.1";
+    version = "4.27.2";
   };
   html-pipeline = {
     dependencies = ["activesupport" "nokogiri"];
@@ -278,10 +278,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0lbm33fpb3w06wd2231sg58dwlwgjsvym93m548ajvl6s3mfvpn7";
+      sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16";
       type = "gem";
     };
-    version = "1.14.4";
+    version = "1.14.5";
   };
   jekyll = {
     dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table" "webrick"];
@@ -584,40 +584,40 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "00x7w5xqsj9m33v3vkmy23wipkkysafksib53ypzn27p5g81w455";
+      sha256 = "0rri45lldyk3bsg4yqpxcl1xrnxnqasnw94x03w5arq3yy7kff65";
       type = "gem";
     };
-    version = "3.2024.0305";
+    version = "3.2024.0604";
   };
   mini_magick = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0slh78f9z6n0l1i2km7m48yz7l4fjrk88sj1f4mh1wb39sl2yc37";
+      sha256 = "1zbfldqc3dp9fiyz9d4hkkabkvsmx5649bs78j5008i5gzr0x6zg";
       type = "gem";
     };
-    version = "4.12.0";
+    version = "4.13.1";
   };
   mini_portile2 = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs";
+      sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk";
       type = "gem";
     };
-    version = "2.8.5";
+    version = "2.8.7";
   };
   minitest = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "07lq26b86giy3ha3fhrywk9r1ajhc2pm2mzj657jnpnbj1i6g17a";
+      sha256 = "0zgq31wa0ygqnmpqh3plsig32xc8k4l99r49ncmidfg91kfagymg";
       type = "gem";
     };
-    version = "5.22.3";
+    version = "5.24.0";
   };
   mutex_m = {
     groups = ["default"];
@@ -646,10 +646,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0j72sg8n8834vbw2x8glcp46y5r2dls2pj64ll7rmf6mri9s52j9";
+      sha256 = "1vz1ychq2fhfqjgqdrx8bqkaxg5dzcgwnah00m57ydylczfy8pwk";
       type = "gem";
     };
-    version = "1.16.3";
+    version = "1.16.6";
   };
   octokit = {
     dependencies = ["faraday" "sawyer"];
@@ -689,30 +689,30 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m";
+      sha256 = "17m8q2dzm7a74amnab5rf3f3m466i300awihl3ygh4v80wpf3j6j";
       type = "gem";
     };
-    version = "5.0.4";
+    version = "6.0.0";
   };
   racc = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp";
+      sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09";
       type = "gem";
     };
-    version = "1.7.3";
+    version = "1.8.0";
   };
   rake = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy";
+      sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6";
       type = "gem";
     };
-    version = "13.1.0";
+    version = "13.2.1";
   };
   rb-fsevent = {
     groups = ["default"];
@@ -730,10 +730,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005";
+      sha256 = "0vmy8xgahixcz6hzwy4zdcyn2y6d6ri8dqv5xccgzc1r292019x0";
       type = "gem";
     };
-    version = "0.10.1";
+    version = "0.11.1";
   };
   rdoc = {
     dependencies = ["psych"];
@@ -741,30 +741,31 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ib3cnf4yllvw070gr4bz94sbmqx3haqc5f846fsvdcs494vgxrr";
+      sha256 = "0ygk2zk0ky3d88v3ll7qh6xqvbvw5jin0hqdi1xkv1dhaw7myzdi";
       type = "gem";
     };
-    version = "6.6.3.1";
+    version = "6.7.0";
   };
   rexml = {
+    dependencies = ["strscan"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
+      sha256 = "09f3sw7f846fpcpwdm362ylqldwqxpym6z0qpld4av7zisrrzbrl";
       type = "gem";
     };
-    version = "3.2.6";
+    version = "3.3.1";
   };
   rouge = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zd1pdldi6h8x27dqim7cy8m69xr01aw5c8k1zhkz497n4np6wgk";
+      sha256 = "072qvvrcqj0yfr3b0j932mlhvn41i38bq37z7z07i3ikagndkqwy";
       type = "gem";
     };
-    version = "4.2.1";
+    version = "4.3.0";
   };
   safe_yaml = {
     groups = ["default"];
@@ -782,10 +783,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0bixk8c02dhflvhi4s5hxzjg8akzgicvjxjvxx74nah2j8qfblq5";
+      sha256 = "1nmy052pm46781s7ca6x3l4yb5p3glh8sf201xwcwpk9rv2av9m2";
       type = "gem";
     };
-    version = "1.72.0";
+    version = "1.77.5";
   };
   sawyer = {
     dependencies = ["addressable" "faraday"];
@@ -803,7 +804,17 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "063psvsn1aq6digpznxfranhcpmi0sdv2jhra5g0459sw0x2dxn1";
+      sha256 = "07mfqb40b2wh53k33h91zva78f9zwcdnl85jiq74wnaw2wa6wiak";
+      type = "gem";
+    };
+    version = "3.1.1";
+  };
+  strscan = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01";
       type = "gem";
     };
     version = "3.1.0";

From cf9e5835e92c6fa6a57215207c62e1908b5b2103 Mon Sep 17 00:00:00 2001
From: Victor Engmark <victor@engmark.name>
Date: Wed, 26 Jun 2024 19:05:51 +0200
Subject: [PATCH 013/241] jekyll: Add jekyll-compose to full dependencies

---
 pkgs/applications/misc/jekyll/full/Gemfile      |  1 +
 pkgs/applications/misc/jekyll/full/Gemfile.lock |  3 +++
 pkgs/applications/misc/jekyll/full/gemset.nix   | 11 +++++++++++
 3 files changed, 15 insertions(+)

diff --git a/pkgs/applications/misc/jekyll/full/Gemfile b/pkgs/applications/misc/jekyll/full/Gemfile
index 5e7e2d9032a3..5f095debe6d6 100644
--- a/pkgs/applications/misc/jekyll/full/Gemfile
+++ b/pkgs/applications/misc/jekyll/full/Gemfile
@@ -10,6 +10,7 @@ gem "jemoji"
 
 # Optional dependencies:
 gem "jekyll-coffeescript"
+gem "jekyll-compose"
 #gem "jekyll-docs"
 gem "jekyll-favicon"
 gem "jekyll-feed", "~> 0.9"
diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock
index 45489feba251..de800bfeb75d 100644
--- a/pkgs/applications/misc/jekyll/full/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock
@@ -70,6 +70,8 @@ GEM
     jekyll-coffeescript (2.0.0)
       coffee-script (~> 2.2)
       coffee-script-source (~> 1.12)
+    jekyll-compose (0.12.0)
+      jekyll (>= 3.7, < 5.0)
     jekyll-favicon (1.1.0)
       jekyll (>= 3.0, < 5.0)
       mini_magick (~> 4.11)
@@ -170,6 +172,7 @@ DEPENDENCIES
   jekyll
   jekyll-avatar
   jekyll-coffeescript
+  jekyll-compose
   jekyll-favicon
   jekyll-feed (~> 0.9)
   jekyll-gist
diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix
index eea427ee5c1d..4260c081f19c 100644
--- a/pkgs/applications/misc/jekyll/full/gemset.nix
+++ b/pkgs/applications/misc/jekyll/full/gemset.nix
@@ -316,6 +316,17 @@
     };
     version = "2.0.0";
   };
+  jekyll-compose = {
+    dependencies = ["jekyll"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ny8xps0mrmx2w0xxc9rwa15ch1wkxvdrzxiwnqramqwja566y04";
+      type = "gem";
+    };
+    version = "0.12.0";
+  };
   jekyll-favicon = {
     dependencies = ["jekyll" "mini_magick" "rexml"];
     groups = ["default"];

From 73b12e75e7b4e34ba1a77dd6dca1663465665bc6 Mon Sep 17 00:00:00 2001
From: Andrew Kvalheim <andrew@kvalhe.im>
Date: Wed, 26 Jun 2024 10:31:16 -0700
Subject: [PATCH 014/241] yubikey-touch-detector: correct license

Continues #285882
---
 pkgs/tools/security/yubikey-touch-detector/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/yubikey-touch-detector/default.nix b/pkgs/tools/security/yubikey-touch-detector/default.nix
index 1cb16d1ca712..8c247fa6a270 100644
--- a/pkgs/tools/security/yubikey-touch-detector/default.nix
+++ b/pkgs/tools/security/yubikey-touch-detector/default.nix
@@ -33,7 +33,7 @@ buildGoModule rec {
     description = "Tool to detect when your YubiKey is waiting for a touch";
     homepage = "https://github.com/maximbaz/yubikey-touch-detector";
     maintainers = with maintainers; [ sumnerevans ];
-    license = with licenses; [ bsd2 isc ];
+    license = licenses.isc;
     platforms = platforms.linux;
     mainProgram = "yubikey-touch-detector";
   };

From 121127d295eee0acdb99e7fe9c8d4f6ec63ed9e3 Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Fri, 5 Jul 2024 14:28:25 +0200
Subject: [PATCH 015/241] gomplate: 3.11.8 -> 4.0.1

Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
---
 pkgs/development/tools/gomplate/default.nix | 29 ++++++++++-----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/tools/gomplate/default.nix b/pkgs/development/tools/gomplate/default.nix
index c8deb9292d46..e048c572c582 100644
--- a/pkgs/development/tools/gomplate/default.nix
+++ b/pkgs/development/tools/gomplate/default.nix
@@ -5,38 +5,37 @@
 
 buildGoModule rec {
   pname = "gomplate";
-  version = "3.11.8";
+  version = "4.0.1";
 
   src = fetchFromGitHub {
     owner = "hairyhenderson";
-    repo = pname;
+    repo = "gomplate";
     rev = "refs/tags/v${version}";
-    hash = "sha256-pE9TLEBY1KQvgMFwVJfn5kojESqZURcbCwRt4jrexhk=";
+    hash = "sha256-+oc7/CFqLA1xvA1c5opKBUa+6AJ2SK7SwFeaNqw3x08=";
   };
 
-  vendorHash = "sha256-09QUEudbWnO11iwJafF9zoYqbTr7SVBUiPWTHGnZ06Q=";
+  vendorHash = "sha256-xifJNyw8BCRoQVyBvyRRA1S03e3x5/ORwjpmGlKcA0g=";
 
-  postPatch = ''
+  ldflags = [
+    "-s"
+    "-X github.com/${src.owner}/${pname}/v4/version.Version=${version}"
+  ];
+
+  preCheck = ''
     # some tests require network access
     rm net/net_test.go \
       internal/tests/integration/datasources_blob_test.go \
-      internal/tests/integration/datasources_git_test.go
+      internal/tests/integration/datasources_git_test.go \
+      render_test.go
     # some tests rely on external tools we'd rather not depend on
     rm internal/tests/integration/datasources_consul_test.go \
       internal/tests/integration/datasources_vault*_test.go
   '';
 
-  # TestInputDir_RespectsUlimit
-  preCheck = ''
-    ulimit -n 1024
+  postInstall = ''
+    rm $out/bin/gen
   '';
 
-  ldflags = [
-    "-s"
-    "-w"
-    "-X github.com/${src.owner}/${pname}/v3/version.Version=${version}"
-  ];
-
   meta = with lib; {
     description = "Flexible commandline tool for template rendering";
     mainProgram = "gomplate";

From 798a82495277766b3f4a52067a7c4f9975f5f8d6 Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Tue, 9 Jul 2024 11:10:27 +0200
Subject: [PATCH 016/241] gomplate: 4.0.1 -> 4.1.0

Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
---
 pkgs/development/tools/gomplate/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/gomplate/default.nix b/pkgs/development/tools/gomplate/default.nix
index e048c572c582..40532ac9dd0a 100644
--- a/pkgs/development/tools/gomplate/default.nix
+++ b/pkgs/development/tools/gomplate/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "gomplate";
-  version = "4.0.1";
+  version = "4.1.0";
 
   src = fetchFromGitHub {
     owner = "hairyhenderson";
     repo = "gomplate";
     rev = "refs/tags/v${version}";
-    hash = "sha256-+oc7/CFqLA1xvA1c5opKBUa+6AJ2SK7SwFeaNqw3x08=";
+    hash = "sha256-shbG0q86wlSjoCK2K7hNdUCwNPiQp94GWQJ1e71A1T0=";
   };
 
-  vendorHash = "sha256-xifJNyw8BCRoQVyBvyRRA1S03e3x5/ORwjpmGlKcA0g=";
+  vendorHash = "sha256-UKqSKypAm6gt2JUCZh/DyfWo8uJeMp0M+4FiqwzzHIA=";
 
   ldflags = [
     "-s"

From ab9d8b8a7c651c63c1dcd023839c31c7091f4ad0 Mon Sep 17 00:00:00 2001
From: Keenan Weaver <keenanweaver@protonmail.com>
Date: Tue, 9 Jul 2024 20:38:16 -0500
Subject: [PATCH 017/241] bottles: 51.11 -> 51.13

---
 pkgs/applications/misc/bottles/default.nix    | 129 +++++------
 pkgs/applications/misc/bottles/fhsenv.nix     | 209 ++++++++++--------
 .../misc/bottles/vulkan_icd.patch             |   2 +-
 3 files changed, 184 insertions(+), 156 deletions(-)

diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix
index 495a945d32d3..bc9d3cb2e444 100644
--- a/pkgs/applications/misc/bottles/default.nix
+++ b/pkgs/applications/misc/bottles/default.nix
@@ -1,45 +1,44 @@
-{ lib
-, fetchFromGitHub
-, gitUpdater
-, python3Packages
-, blueprint-compiler
-, meson
-, ninja
-, pkg-config
-, wrapGAppsHook4
-, appstream-glib
-, desktop-file-utils
-, librsvg
-, gtk4
-, gtksourceview5
-, libadwaita
-, cabextract
-, p7zip
-, xdpyinfo
-, imagemagick
-, lsb-release
-, pciutils
-, procps
-, gamescope
-, mangohud
-, vkbasalt-cli
-, vmtouch
+{
+  lib,
+  fetchFromGitHub,
+  gitUpdater,
+  python3Packages,
+  blueprint-compiler,
+  meson,
+  ninja,
+  pkg-config,
+  wrapGAppsHook4,
+  appstream-glib,
+  desktop-file-utils,
+  librsvg,
+  gtk4,
+  gtksourceview5,
+  libadwaita,
+  cabextract,
+  p7zip,
+  xdpyinfo,
+  imagemagick,
+  lsb-release,
+  pciutils,
+  procps,
+  gamescope,
+  mangohud,
+  vkbasalt-cli,
+  vmtouch,
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "bottles-unwrapped";
-  version = "51.11";
+  version = "51.13";
 
   src = fetchFromGitHub {
     owner = "bottlesdevs";
     repo = "bottles";
     rev = version;
-    sha256 = "sha256-uS3xmTu+LrVFX93bYcJvYjl6179d3IjpxLKrOXn8Z8Y=";
+    hash = "sha256-ZcUevGY81H3ATTk390ojBp/4zBE2Lui7Qa+Qe8B0XL4=";
   };
 
-  patches = [
-    ./vulkan_icd.patch
-  ];
+  patches = [ ./vulkan_icd.patch ];
 
   # https://github.com/bottlesdevs/Bottles/wiki/Packaging
   nativeBuildInputs = [
@@ -60,38 +59,41 @@ python3Packages.buildPythonApplication rec {
     libadwaita
   ];
 
-  propagatedBuildInputs = with python3Packages; [
-    pathvalidate
-    pycurl
-    pyyaml
-    requests
-    pygobject3
-    patool
-    markdown
-    fvs
-    pefile
-    urllib3
-    chardet
-    certifi
-    idna
-    orjson
-    icoextract
-  ] ++ [
-    cabextract
-    p7zip
-    xdpyinfo
-    imagemagick
-    vkbasalt-cli
+  propagatedBuildInputs =
+    with python3Packages;
+    [
+      pathvalidate
+      pycurl
+      pyyaml
+      requests
+      pygobject3
+      patool
+      markdown
+      fvs
+      pefile
+      urllib3
+      chardet
+      certifi
+      idna
+      orjson
+      icoextract
+    ]
+    ++ [
+      cabextract
+      p7zip
+      xdpyinfo
+      imagemagick
+      vkbasalt-cli
 
-    gamescope
-    mangohud
-    vmtouch
+      gamescope
+      mangohud
+      vmtouch
 
-    # Undocumented (subprocess.Popen())
-    lsb-release
-    pciutils
-    procps
-  ];
+      # Undocumented (subprocess.Popen())
+      lsb-release
+      pciutils
+      procps
+    ];
 
   format = "other";
   dontWrapGApps = true; # prevent double wrapping
@@ -107,7 +109,10 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://usebottles.com/";
     downloadPage = "https://github.com/bottlesdevs/Bottles/releases";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ psydvl shamilton ];
+    maintainers = with maintainers; [
+      psydvl
+      shamilton
+    ];
     platforms = platforms.linux;
     mainProgram = "bottles";
   };
diff --git a/pkgs/applications/misc/bottles/fhsenv.nix b/pkgs/applications/misc/bottles/fhsenv.nix
index fd0d38f69892..1bd476a136c6 100644
--- a/pkgs/applications/misc/bottles/fhsenv.nix
+++ b/pkgs/applications/misc/bottles/fhsenv.nix
@@ -1,106 +1,129 @@
-{ buildFHSEnv
-, symlinkJoin
-, bottles-unwrapped
-, extraPkgs ? pkgs: [ ]
-, extraLibraries ? pkgs: [ ]
+{
+  buildFHSEnv,
+  symlinkJoin,
+  bottles-unwrapped,
+  extraPkgs ? pkgs: [ ],
+  extraLibraries ? pkgs: [ ],
 }:
 
-let fhsEnv = {
-  # Many WINE games need 32bit
-  multiArch = true;
+let
+  fhsEnv = {
+    # Many WINE games need 32bit
+    multiArch = true;
 
-  targetPkgs = pkgs: with pkgs; [
-    bottles-unwrapped
-    # This only allows to enable the toggle, vkBasalt won't work if not installed with environment.systemPackages (or nix-env)
-    # See https://github.com/bottlesdevs/Bottles/issues/2401
-    vkbasalt
-  ] ++ extraPkgs pkgs;
+    targetPkgs =
+      pkgs:
+      with pkgs;
+      [
+        bottles-unwrapped
+        # This only allows to enable the toggle, vkBasalt won't work if not installed with environment.systemPackages (or nix-env)
+        # See https://github.com/bottlesdevs/Bottles/issues/2401
+        vkbasalt
+      ]
+      ++ extraPkgs pkgs;
 
-  multiPkgs =
-    let
-      xorgDeps = pkgs: with pkgs.xorg; [
-        libpthreadstubs
-        libSM
-        libX11
-        libXaw
-        libxcb
-        libXcomposite
-        libXcursor
-        libXdmcp
-        libXext
-        libXi
-        libXinerama
-        libXmu
-        libXrandr
-        libXrender
-        libXv
-        libXxf86vm
-      ];
-      gstreamerDeps = pkgs: with pkgs.gst_all_1; [
-        gstreamer
-        gst-plugins-base
-        gst-plugins-good
-        gst-plugins-ugly
-        gst-plugins-bad
-        gst-libav
-      ];
-    in
-    pkgs: with pkgs; [
-      # https://wiki.winehq.org/Building_Wine
-      alsa-lib
-      cups
-      dbus
-      fontconfig
-      freetype
-      glib
-      gnutls
-      libglvnd
-      gsm
-      libgphoto2
-      libjpeg_turbo
-      libkrb5
-      libpcap
-      libpng
-      libpulseaudio
-      libtiff
-      libunwind
-      libusb1
-      libv4l
-      libxml2
-      mpg123
-      ocl-icd
-      openldap
-      samba4
-      sane-backends
-      SDL2
-      udev
-      vulkan-loader
+    multiPkgs =
+      let
+        xorgDeps =
+          pkgs: with pkgs.xorg; [
+            libpthreadstubs
+            libSM
+            libX11
+            libXaw
+            libxcb
+            libXcomposite
+            libXcursor
+            libXdmcp
+            libXext
+            libXi
+            libXinerama
+            libXmu
+            libXrandr
+            libXrender
+            libXv
+            libXxf86vm
+          ];
+        gstreamerDeps =
+          pkgs: with pkgs.gst_all_1; [
+            gstreamer
+            gst-plugins-base
+            gst-plugins-good
+            gst-plugins-ugly
+            gst-plugins-bad
+            gst-libav
+          ];
+      in
+      pkgs:
+      with pkgs;
+      [
+        # https://wiki.winehq.org/Building_Wine
+        alsa-lib
+        cups
+        dbus
+        fontconfig
+        freetype
+        glib
+        gnutls
+        libglvnd
+        gsm
+        libgphoto2
+        libjpeg_turbo
+        libkrb5
+        libpcap
+        libpng
+        libpulseaudio
+        libtiff
+        libunwind
+        libusb1
+        libv4l
+        libxml2
+        mpg123
+        ocl-icd
+        openldap
+        samba4
+        sane-backends
+        SDL2
+        udev
+        vulkan-loader
 
-      # https://www.gloriouseggroll.tv/how-to-get-out-of-wine-dependency-hell/
-      alsa-plugins
-      dosbox
-      giflib
-      gtk3
-      libva
-      libxslt
-      ncurses
-      openal
+        # https://www.gloriouseggroll.tv/how-to-get-out-of-wine-dependency-hell/
+        alsa-plugins
+        dosbox
+        giflib
+        gtk3
+        libva
+        libxslt
+        ncurses
+        openal
 
-      # Steam runtime
-      libgcrypt
-      libgpg-error
-      p11-kit
-      zlib # Freetype
-    ] ++ xorgDeps pkgs
-    ++ gstreamerDeps pkgs
-    ++ extraLibraries pkgs;
-};
+        # Steam runtime
+        libgcrypt
+        libgpg-error
+        p11-kit
+        zlib # Freetype
+      ]
+      ++ xorgDeps pkgs
+      ++ gstreamerDeps pkgs
+      ++ extraLibraries pkgs;
+  };
 in
 symlinkJoin {
   name = "bottles";
   paths = [
-    (buildFHSEnv (fhsEnv // { name = "bottles"; runScript = "bottles"; }))
-    (buildFHSEnv (fhsEnv // { name = "bottles-cli"; runScript = "bottles-cli"; }))
+    (buildFHSEnv (
+      fhsEnv
+      // {
+        name = "bottles";
+        runScript = "bottles";
+      }
+    ))
+    (buildFHSEnv (
+      fhsEnv
+      // {
+        name = "bottles-cli";
+        runScript = "bottles-cli";
+      }
+    ))
   ];
   postBuild = ''
     mkdir -p $out/share
diff --git a/pkgs/applications/misc/bottles/vulkan_icd.patch b/pkgs/applications/misc/bottles/vulkan_icd.patch
index ff376e136bb2..e1c402727d89 100644
--- a/pkgs/applications/misc/bottles/vulkan_icd.patch
+++ b/pkgs/applications/misc/bottles/vulkan_icd.patch
@@ -6,7 +6,7 @@ index 6673493..9191004 100644
          "/usr/share/vulkan",
          "/etc/vulkan",
          "/usr/local/share/vulkan",
--        "/usr/local/etc/vulkan"
+-        "/usr/local/etc/vulkan",
 +        "/usr/local/etc/vulkan",
 +        "/run/opengl-driver/share/vulkan",
 +        "/run/opengl-driver-32/share/vulkan",

From d8008dee9f9cc9faffda122bf17cbb7531021889 Mon Sep 17 00:00:00 2001
From: Tomo <68489118+Tomodachi94@users.noreply.github.com>
Date: Sat, 25 May 2024 14:32:31 -0700
Subject: [PATCH 018/241] sanjuuni: add run-on-nixos-artwork test

Tests the program by running it on a handful of entries from the
`nixos-artwork` attrset, and then test that the resulting Lua files can
be evaluated with `loadfile` in standard Lua.
---
 pkgs/by-name/sa/sanjuuni/package.nix          |  5 +++
 .../sanjuuni/tests/run-on-nixos-artwork.nix   | 34 +++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/by-name/sa/sanjuuni/tests/run-on-nixos-artwork.nix

diff --git a/pkgs/by-name/sa/sanjuuni/package.nix b/pkgs/by-name/sa/sanjuuni/package.nix
index e43efa771b57..a3806052f900 100644
--- a/pkgs/by-name/sa/sanjuuni/package.nix
+++ b/pkgs/by-name/sa/sanjuuni/package.nix
@@ -8,6 +8,7 @@
   poco,
   ocl-icd,
   opencl-clhpp,
+  callPackage,
 }:
 
 stdenv.mkDerivation rec {
@@ -38,6 +39,10 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
+  passthru.tests = {
+    run-on-nixos-artwork = callPackage ./tests/run-on-nixos-artwork.nix { };
+  };
+
   meta = with lib; {
     homepage = "https://github.com/MCJack123/sanjuuni";
     description = "Command-line tool that converts images and videos into a format that can be displayed in ComputerCraft";
diff --git a/pkgs/by-name/sa/sanjuuni/tests/run-on-nixos-artwork.nix b/pkgs/by-name/sa/sanjuuni/tests/run-on-nixos-artwork.nix
new file mode 100644
index 000000000000..e64c6c563df4
--- /dev/null
+++ b/pkgs/by-name/sa/sanjuuni/tests/run-on-nixos-artwork.nix
@@ -0,0 +1,34 @@
+{
+  runCommand,
+  sanjuuni,
+  nixos-artwork,
+  lua5_2,
+}:
+let
+  makeCommand = derivation: baseFilename: ''
+    echo "sanjuuni-test-run-on-nixos-artwork: Running Sanjuuni on ${derivation}/share/backgrounds/nixos/${baseFilename}.png"
+    sanjuuni --lua --disable-opencl \
+      --input ${derivation}/share/backgrounds/nixos/${baseFilename}.png \
+      --output $out/${baseFilename}.lua
+    echo "sanjuuni-test-run-on-nixos-artwork: Checking syntax on $out/${baseFilename}.lua"
+    lua -e "loadfile(\"$out/${baseFilename}.lua\")"
+  '';
+in
+runCommand "sanjuuni-test-run-on-nixos-artwork"
+  {
+    nativeBuildInputs = [
+      sanjuuni
+      lua5_2
+      nixos-artwork.wallpapers.simple-blue
+      nixos-artwork.wallpapers.simple-red
+      nixos-artwork.wallpapers.simple-dark-gray
+      nixos-artwork.wallpapers.stripes
+    ];
+  }
+  ''
+    mkdir -p $out
+    ${makeCommand nixos-artwork.wallpapers.simple-blue "nix-wallpaper-simple-blue"}
+    ${makeCommand nixos-artwork.wallpapers.simple-red "nix-wallpaper-simple-red"}
+    ${makeCommand nixos-artwork.wallpapers.simple-dark-gray "nix-wallpaper-simple-dark-gray"}
+    ${makeCommand nixos-artwork.wallpapers.stripes "nix-wallpaper-stripes"}
+  ''

From af58c6c6210263a23a4f9d3bcae68f6263545fb4 Mon Sep 17 00:00:00 2001
From: techknowlogick <techknowlogick@gitea.com>
Date: Mon, 29 Jul 2024 00:49:16 -0400
Subject: [PATCH 019/241] nomad-driver-containerd: init at 0.9.4

---
 .../no/nomad-driver-containerd/package.nix    | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 pkgs/by-name/no/nomad-driver-containerd/package.nix

diff --git a/pkgs/by-name/no/nomad-driver-containerd/package.nix b/pkgs/by-name/no/nomad-driver-containerd/package.nix
new file mode 100644
index 000000000000..bf50bd1aeb62
--- /dev/null
+++ b/pkgs/by-name/no/nomad-driver-containerd/package.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  fetchpatch,
+  containerd,
+}:
+
+buildGoModule rec {
+  pname = "nomad-driver-containerd";
+  version = "0.9.4";
+
+  src = fetchFromGitHub {
+    owner = "Roblox";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-11K1ACk2hhEi+sAlI932eKpyy82Md7j1edRWH2JJ8sI=";
+  };
+
+  # bump deps to fix CVE that isn't in a tagged release yet
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/Roblox/nomad-driver-containerd/commit/80b9be1353f701b9d47d874923a9e8ffed4dbd98.patch";
+      hash = "sha256-d4C/YwemmZQAt0fTAnQkJVKn8cK4kmxB+wQEHycdn9U=";
+    })
+    (fetchpatch {
+      url = "https://github.com/Roblox/nomad-driver-containerd/commit/cc0da224669a8f85a8b695288fe5ea748fb270c2.patch";
+      hash = "sha256-W8ZOKMkv1814cPNyqTaXUGhh44WfMizZNL4cNX+FOqg=";
+    })
+  ];
+
+  # replace version in file as it's defined using const, and thus cannot be overriden by ldflags
+  postPatch = ''
+    substituteInPlace containerd/driver.go --replace-warn 'PluginVersion = "v0.9.3"' 'PluginVersion = "v${version}"'
+  '';
+
+  CGO_ENABLED = "1";
+
+  vendorHash = "sha256-OO+a5AqhB0tf6lyodhYl9HUSaWvtXWwevRHYy1Q6VoU=";
+  subPackages = [ "." ];
+
+  buildInputs = [ containerd ];
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  meta = with lib; {
+    homepage = "https://www.github.com/Roblox/nomad-driver-containerd";
+    description = "Containerd task driver for Nomad";
+    mainProgram = "nomad-driver-containerd";
+    platforms = platforms.linux;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ techknowlogick ];
+  };
+}

From f772ed2cace0b1e47ea510a4e0c34639548af68a Mon Sep 17 00:00:00 2001
From: Alexander Sieg <alex@xanderio.de>
Date: Tue, 30 Jul 2024 12:32:25 +0200
Subject: [PATCH 020/241] maintainers/team-list: add cyberus team

---
 maintainers/team-list.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 8ce7e4273feb..5715cfcb0bc6 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -183,6 +183,16 @@ with lib.maintainers;
     githubTeams = [ "cuda-maintainers" ];
   };
 
+  cyberus = {
+    # Verify additions by approval of an already existing member of the team.
+    members = [
+      xanderio
+      blitz
+    ];
+    scope = "Team for Cyberus Technology employees who collectively maintain packages.";
+    shortName = "Cyberus Technology employees";
+  };
+
   darwin = {
     members = [ toonn ];
     githubTeams = [ "darwin-maintainers" ];

From 7237f14f6cd2ef389d3c0d9f570c66201f94af33 Mon Sep 17 00:00:00 2001
From: Alexander Sieg <alex@xanderio.de>
Date: Tue, 30 Jul 2024 12:34:13 +0200
Subject: [PATCH 021/241] cyclonedx-python: add cyberus team as maintainer

---
 pkgs/tools/misc/cyclonedx-python/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/cyclonedx-python/default.nix b/pkgs/tools/misc/cyclonedx-python/default.nix
index b3439723aaff..102151e2d70f 100644
--- a/pkgs/tools/misc/cyclonedx-python/default.nix
+++ b/pkgs/tools/misc/cyclonedx-python/default.nix
@@ -34,7 +34,7 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://github.com/CycloneDX/cyclonedx-python";
     changelog = "https://github.com/CycloneDX/cyclonedx-python/releases/tag/v${version}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ xanderio ];
+    maintainers = lib.teams.cyberus.members;
     mainProgram = "cyclonedx-py";
   };
 }

From 31b9891df87c10fb16972ad2a4c8d5134eb2a4ca Mon Sep 17 00:00:00 2001
From: Alexander Sieg <alex@xanderio.de>
Date: Tue, 30 Jul 2024 12:35:01 +0200
Subject: [PATCH 022/241] tailscale-gitops-pusher: add cyberus team as
 maintainer

---
 pkgs/by-name/ta/tailscale-gitops-pusher/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix b/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix
index f0ddde526f0b..a927ec609fb2 100644
--- a/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix
+++ b/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix
@@ -23,6 +23,6 @@ buildGoModule {
     description = "Allows users to use a GitOps flow for managing Tailscale ACLs";
     license = licenses.bsd3;
     mainProgram = "gitops-pusher";
-    maintainers = with maintainers; [ xanderio ];
+    maintainers = teams.cyberus.members;
   };
 }

From 38c7d204e63f07d86b43a020404faaecb201af4f Mon Sep 17 00:00:00 2001
From: Alexander Sieg <alex@xanderio.de>
Date: Tue, 30 Jul 2024 12:35:47 +0200
Subject: [PATCH 023/241] gitlab-container-registry: add cyberus team as
 maintainer

---
 .../gitlab/gitlab-container-registry/default.nix                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix
index b13c9a12706d..87f77c74d393 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix
@@ -28,7 +28,7 @@ buildGoModule rec {
   meta = with lib; {
     description = "GitLab Docker toolset to pack, ship, store, and deliver content";
     license = licenses.asl20;
-    maintainers = with maintainers; [ yayayayaka xanderio ];
+    maintainers = with maintainers; [ yayayayaka ] ++ teams.cyberus.members;
     platforms = platforms.unix;
   };
 }

From 682bee28da45bfc3f441673e3060ba55b4e7f723 Mon Sep 17 00:00:00 2001
From: Alexander Sieg <alex@xanderio.de>
Date: Tue, 30 Jul 2024 12:36:34 +0200
Subject: [PATCH 024/241] gitlab-elasticsearch-indexer: add cyberus team as
 maintainer

---
 .../gitlab/gitlab-elasticsearch-indexer/default.nix             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix b/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix
index 463231b67fd0..e04809a59a83 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix
@@ -21,6 +21,6 @@ buildGoModule rec {
     description = "Indexes Git repositories into Elasticsearch for GitLab";
     mainProgram = "gitlab-elasticsearch-indexer";
     license = licenses.mit;
-    maintainers = with maintainers; [ xanderio yayayayaka ];
+    maintainers = with maintainers; [ yayayayaka ] ++ teams.cyberus.members;
   };
 }

From 20b3a5458d7d1edcd39ff14c90400a11e3f37f76 Mon Sep 17 00:00:00 2001
From: Alexander Sieg <alex@xanderio.de>
Date: Tue, 30 Jul 2024 12:37:45 +0200
Subject: [PATCH 025/241] nixos/outline: add cyberus team as maintainer

---
 nixos/modules/services/web-apps/plausible.nix | 2 +-
 nixos/tests/outline.nix                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-apps/plausible.nix b/nixos/modules/services/web-apps/plausible.nix
index 1f909bbd67a3..188b80ca43a1 100644
--- a/nixos/modules/services/web-apps/plausible.nix
+++ b/nixos/modules/services/web-apps/plausible.nix
@@ -329,6 +329,6 @@ in {
     ];
   };
 
-  meta.maintainers = with maintainers; [ xanderio ];
+  meta.maintainers = teams.cyberus.members;
   meta.doc = ./plausible.md;
 }
diff --git a/nixos/tests/outline.nix b/nixos/tests/outline.nix
index e45be37f5d3b..c7a34c5d6f85 100644
--- a/nixos/tests/outline.nix
+++ b/nixos/tests/outline.nix
@@ -13,7 +13,7 @@ in
 {
   name = "outline";
 
-  meta.maintainers = with lib.maintainers; [ xanderio ];
+  meta.maintainers = lib.teams.cyberus.members;
 
   nodes = {
     outline = { pkgs, config, ... }: {

From 06b7e94988f32fbb31594d56ed612a6400a6bba1 Mon Sep 17 00:00:00 2001
From: Alexander Sieg <alex@xanderio.de>
Date: Tue, 30 Jul 2024 12:38:21 +0200
Subject: [PATCH 026/241] outline: add cyberus team as maintainer

---
 pkgs/servers/web-apps/outline/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix
index fa66487758f8..b0fd1b399314 100644
--- a/pkgs/servers/web-apps/outline/default.nix
+++ b/pkgs/servers/web-apps/outline/default.nix
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.getoutline.com/";
     changelog = "https://github.com/outline/outline/releases";
     license = licenses.bsl11;
-    maintainers = with maintainers; [ cab404 yrd xanderio ];
+    maintainers = with maintainers; [ cab404 yrd ] ++ teams.cyberus.members;
     platforms = platforms.linux;
   };
 }

From 6b129e29421627031526bbf068a888f6c0620d46 Mon Sep 17 00:00:00 2001
From: Alexander Sieg <alex@xanderio.de>
Date: Tue, 30 Jul 2024 12:38:59 +0200
Subject: [PATCH 027/241] plausible: add cyberus team as maintainer

---
 pkgs/servers/web-apps/plausible/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/servers/web-apps/plausible/default.nix
index 257fb6818e26..5a5918c6f815 100644
--- a/pkgs/servers/web-apps/plausible/default.nix
+++ b/pkgs/servers/web-apps/plausible/default.nix
@@ -89,7 +89,7 @@ beamPackages.mixRelease {
     changelog = "https://github.com/plausible/analytics/blob/${src.rev}/CHANGELOG.md";
     description = " Simple, open-source, lightweight (< 1 KB) and privacy-friendly web analytics alternative to Google Analytics";
     mainProgram = "plausible";
-    maintainers = with maintainers; [ xanderio ];
+    maintainers = teams.cyberus.members;
     platforms = platforms.unix;
   };
 }

From 9132a2c6bd628dcb07067767731a988b49876304 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Fri, 12 Jul 2024 22:22:12 +0200
Subject: [PATCH 028/241] gns3-gui: 2.2.47 -> 2.2.49

https://github.com/GNS3/gns3-gui/releases/tag/v2.2.49
https://github.com/GNS3/gns3-gui/compare/v2.2.47...v2.2.49
---
 pkgs/applications/networking/gns3/default.nix | 12 ++++++------
 pkgs/applications/networking/gns3/gui.nix     | 19 ++++++++++++-------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index 8048b87409c1..579ae91d9cd1 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -1,12 +1,12 @@
 { callPackage
 , libsForQt5
-, python311
+, python311Packages
 }:
 
 let
   mkGui = args: callPackage (import ./gui.nix (args)) {
     inherit (libsForQt5) wrapQtAppsHook;
-    python3 = python311;
+    python3Packages = python311Packages;
   };
 
   mkServer = args: callPackage (import ./server.nix (args)) { };
@@ -14,14 +14,14 @@ in {
 
   guiStable = mkGui {
     channel = "stable";
-    version = "2.2.47";
-    hash = "sha256-6UXQTPkRHbtNX6RzWMakCsO9YpkFlWliNnm+mZ4wuZA=";
+    version = "2.2.49";
+    hash = "sha256-hvLJ4VilcgtpxHeboeSUuGAco9LEnUB8J6vy/ZPajbU=";
   };
 
   guiPreview = mkGui {
     channel = "stable";
-    version = "2.2.47";
-    hash = "sha256-6UXQTPkRHbtNX6RzWMakCsO9YpkFlWliNnm+mZ4wuZA=";
+    version = "2.2.49";
+    hash = "sha256-hvLJ4VilcgtpxHeboeSUuGAco9LEnUB8J6vy/ZPajbU=";
   };
 
   serverStable = mkServer {
diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix
index dfa92a444e0f..e7a3640c59ef 100644
--- a/pkgs/applications/networking/gns3/gui.nix
+++ b/pkgs/applications/networking/gns3/gui.nix
@@ -4,7 +4,7 @@
 }:
 
 { lib
-, python3
+, python3Packages
 , fetchFromGitHub
 , qt5
 , wrapQtAppsHook
@@ -12,22 +12,28 @@
 , gns3-gui
 }:
 
-python3.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "gns3-gui";
   inherit version;
 
   src = fetchFromGitHub {
     inherit hash;
     owner = "GNS3";
-    repo = pname;
+    repo = "gns3-gui";
     rev = "refs/tags/v${version}";
   };
 
-  nativeBuildInputs = with python3.pkgs; [
+  nativeBuildInputs = with python3Packages; [
     wrapQtAppsHook
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3Packages; [ setuptools ];
+
+  propagatedBuildInputs = [
+    qt5.qtwayland
+  ];
+
+  dependencies = with python3Packages; [
     distro
     jsonschema
     psutil
@@ -36,7 +42,6 @@ python3.pkgs.buildPythonApplication rec {
     sip
     (pyqt5.override { withWebSockets = true; })
     truststore
-    qt5.qtwayland
   ] ++ lib.optionals (pythonOlder "3.9") [
     importlib-resources
   ];
@@ -49,7 +54,7 @@ python3.pkgs.buildPythonApplication rec {
 
   doCheck = true;
 
-  checkInputs = with python3.pkgs; [
+  checkInputs = with python3Packages; [
     pytestCheckHook
   ];
 

From 8fac7d922ec14b6f7136f5d92a38d8e6e471155b Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Fri, 12 Jul 2024 22:24:34 +0200
Subject: [PATCH 029/241] gns3-server: 2.2.47 -> 2.2.49

https://github.com/GNS3/gns3-server/releases/tag/v2.2.49
https://github.com/GNS3/gns3-server/compare/v2.2.47...v2.2.49
---
 pkgs/applications/networking/gns3/default.nix | 8 ++++----
 pkgs/applications/networking/gns3/server.nix  | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index 579ae91d9cd1..10f230603b1b 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -26,13 +26,13 @@ in {
 
   serverStable = mkServer {
     channel = "stable";
-    version = "2.2.47";
-    hash = "sha256-iZ/1qACPLe7r1cZMhJbFRjVt/FlVgadBgp9tJwvYSi0=";
+    version = "2.2.49";
+    hash = "sha256-fI49MxA6b2kPkUihLl32a6jo8oHcEwDEjmvSVDj8/So=";
   };
 
   serverPreview = mkServer {
     channel = "stable";
-    version = "2.2.47";
-    hash = "sha256-iZ/1qACPLe7r1cZMhJbFRjVt/FlVgadBgp9tJwvYSi0=";
+    version = "2.2.49";
+    hash = "sha256-fI49MxA6b2kPkUihLl32a6jo8oHcEwDEjmvSVDj8/So=";
   };
 }
diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix
index c6ba5fe2b93e..4aa46a76e5c3 100644
--- a/pkgs/applications/networking/gns3/server.nix
+++ b/pkgs/applications/networking/gns3/server.nix
@@ -30,7 +30,9 @@ python3Packages.buildPythonApplication {
     cp ${pkgsStatic.busybox}/bin/busybox gns3server/compute/docker/resources/bin/busybox
   '';
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [
     aiofiles
     aiohttp
     aiohttp-cors
@@ -44,7 +46,6 @@ python3Packages.buildPythonApplication {
     psutil
     py-cpuinfo
     sentry-sdk
-    setuptools
     truststore
     yarl
   ] ++ lib.optionals (pythonOlder "3.9") [
@@ -69,7 +70,7 @@ python3Packages.buildPythonApplication {
   checkInputs = with python3Packages; [
     pytest-aiohttp
     pytest-rerunfailures
-    (pytestCheckHook.override { pytest = pytest_7; })
+    pytestCheckHook
   ];
 
   pytestFlagsArray = [

From a3c8723d2b63450414935297992be420e208fc58 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Fri, 12 Jul 2024 22:51:27 +0200
Subject: [PATCH 030/241] gns3-gui,gns3-server: format with nixfmt-rfc-style

---
 pkgs/applications/networking/gns3/default.nix |  4 +--
 pkgs/applications/networking/gns3/gui.nix     | 34 ++++++++-----------
 pkgs/applications/networking/gns3/server.nix  | 26 +++++++-------
 3 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index 10f230603b1b..c34309258fc9 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -10,8 +10,8 @@ let
   };
 
   mkServer = args: callPackage (import ./server.nix (args)) { };
-in {
-
+in
+{
   guiStable = mkGui {
     channel = "stable";
     version = "2.2.49";
diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix
index e7a3640c59ef..291fdfcf7b0b 100644
--- a/pkgs/applications/networking/gns3/gui.nix
+++ b/pkgs/applications/networking/gns3/gui.nix
@@ -1,15 +1,17 @@
-{ channel
-, version
-, hash
+{
+  channel,
+  version,
+  hash,
 }:
 
-{ lib
-, python3Packages
-, fetchFromGitHub
-, qt5
-, wrapQtAppsHook
-, testers
-, gns3-gui
+{
+  fetchFromGitHub,
+  gns3-gui,
+  lib,
+  python3Packages,
+  qt5,
+  testers,
+  wrapQtAppsHook,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -23,15 +25,11 @@ python3Packages.buildPythonApplication rec {
     rev = "refs/tags/v${version}";
   };
 
-  nativeBuildInputs = with python3Packages; [
-    wrapQtAppsHook
-  ];
+  nativeBuildInputs = with python3Packages; [ wrapQtAppsHook ];
 
   build-system = with python3Packages; [ setuptools ];
 
-  propagatedBuildInputs = [
-    qt5.qtwayland
-  ];
+  propagatedBuildInputs = [ qt5.qtwayland ];
 
   dependencies = with python3Packages; [
     distro
@@ -54,9 +52,7 @@ python3Packages.buildPythonApplication rec {
 
   doCheck = true;
 
-  checkInputs = with python3Packages; [
-    pytestCheckHook
-  ];
+  checkInputs = with python3Packages; [ pytestCheckHook ];
 
   preCheck = ''
     export HOME=$(mktemp -d)
diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix
index 4aa46a76e5c3..aea637ae2528 100644
--- a/pkgs/applications/networking/gns3/server.nix
+++ b/pkgs/applications/networking/gns3/server.nix
@@ -1,17 +1,19 @@
-{ channel
-, version
-, hash
+{
+  channel,
+  version,
+  hash,
 }:
 
-{ lib
-, python3Packages
-, fetchFromGitHub
-, pkgsStatic
-, stdenv
-, nixosTests
-, testers
-, util-linux
-, gns3-server
+{
+  fetchFromGitHub,
+  gns3-server,
+  lib,
+  nixosTests,
+  pkgsStatic,
+  python3Packages,
+  stdenv,
+  testers,
+  util-linux,
 }:
 
 python3Packages.buildPythonApplication {

From 7694000762c2b64ebdeea157ce533a9a11c7e925 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Fri, 12 Jul 2024 22:52:31 +0200
Subject: [PATCH 031/241] gns3-gui,gns3-server: remove `with lib;` notation

---
 pkgs/applications/networking/gns3/gui.nix    | 8 ++++----
 pkgs/applications/networking/gns3/server.nix | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix
index 291fdfcf7b0b..e01380bc286a 100644
--- a/pkgs/applications/networking/gns3/gui.nix
+++ b/pkgs/applications/networking/gns3/gui.nix
@@ -66,7 +66,7 @@ python3Packages.buildPythonApplication rec {
     command = "${lib.getExe gns3-gui} --version";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Graphical Network Simulator 3 GUI (${channel} release)";
     longDescription = ''
       Graphical user interface for controlling the GNS3 network simulator. This
@@ -75,9 +75,9 @@ python3Packages.buildPythonApplication rec {
     '';
     homepage = "https://www.gns3.com/";
     changelog = "https://github.com/GNS3/gns3-gui/releases/tag/v${version}";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ anthonyroussel ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ anthonyroussel ];
     mainProgram = "gns3";
   };
 }
diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix
index aea637ae2528..dec90b620f70 100644
--- a/pkgs/applications/networking/gns3/server.nix
+++ b/pkgs/applications/networking/gns3/server.nix
@@ -90,7 +90,7 @@ python3Packages.buildPythonApplication {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Graphical Network Simulator 3 server (${channel} release)";
     longDescription = ''
       The GNS3 server manages emulators such as Dynamips, VirtualBox or
@@ -99,9 +99,9 @@ python3Packages.buildPythonApplication {
     '';
     homepage = "https://www.gns3.com/";
     changelog = "https://github.com/GNS3/gns3-server/releases/tag/v${version}";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ anthonyroussel ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ anthonyroussel ];
     mainProgram = "gns3server";
   };
 }

From 3876bf529f9fa6c0a9e0c4ad294c635da195eb97 Mon Sep 17 00:00:00 2001
From: Pierre Allix <pierre.allix.work@gmail.com>
Date: Fri, 16 Aug 2024 13:03:23 +0200
Subject: [PATCH 032/241] cassandra: fix cqlsh not working

Fixes #329864
---
 pkgs/servers/nosql/cassandra/generic.nix | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix
index 51ab6ac13326..4b44bdf2a697 100644
--- a/pkgs/servers/nosql/cassandra/generic.nix
+++ b/pkgs/servers/nosql/cassandra/generic.nix
@@ -1,7 +1,7 @@
 { lib
 , stdenv
 , fetchurl
-, python
+, python3Packages
 , makeWrapper
 , gawk
 , bash
@@ -40,7 +40,11 @@ stdenv.mkDerivation rec {
     url = "mirror://apache/cassandra/${version}/apache-cassandra-${version}-bin.tar.gz";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  pythonPath = with python3Packages; [ cassandra-driver ];
+
+  nativeBuildInputs = [ python3Packages.wrapPython ];
+
+  buildInputs = [ python3Packages.python ] ++ pythonPath;
 
   installPhase = ''
     runHook preInstall
@@ -98,11 +102,18 @@ stdenv.mkDerivation rec {
       fi
     done
 
-    wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin
-
     runHook postInstall
   '';
 
+  postFixup = ''
+    # Remove cassandra bash script wrapper.
+    # The wrapper searches for a suitable python version and is not necessary with Nix.
+    rm $out/bin/cqlsh
+    # Make "cqlsh.py" accessible by invoking "cqlsh"
+    ln -s $out/bin/cqlsh.py $out/bin/cqlsh
+    wrapPythonPrograms
+  '';
+
   passthru = {
     tests =
       let

From 76c3e5c1abf316d941e92dc050e3629e8346f16d Mon Sep 17 00:00:00 2001
From: Vincent Bernat <vincent@bernat.ch>
Date: Tue, 20 Aug 2024 18:41:08 +0200
Subject: [PATCH 033/241] =?UTF-8?q?thunderbird-bin-unwrapped:=20115.13.0?=
 =?UTF-8?q?=20=E2=86=92=20128.1.0esr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Thunderbird now has an ESR release. Therefore, update to this one (same
version as the non-binary version). Also tweak the update script to
accept a version prefix and follow ESR this way.
---
 .../browsers/firefox-bin/update.nix           |   3 +-
 .../mailreaders/thunderbird-bin/default.nix   |   1 +
 .../thunderbird-bin/release_sources.nix       | 530 +++++++++---------
 3 files changed, 268 insertions(+), 266 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix
index 593a642c8652..0e1c6241aae4 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/update.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix
@@ -12,6 +12,7 @@
 , baseName ? "firefox"
 , basePath ? "pkgs/applications/networking/browsers/firefox-bin"
 , baseUrl
+, versionSuffix ? ""
 }:
 
 let
@@ -47,7 +48,7 @@ in writeScript "update-${pname}" ''
            grep "^[0-9]" | \
            sort --version-sort | \
            grep -v "funnelcake" | \
-           grep -e "${lib.optionalString isBeta "b"}\([[:digit:]]\|[[:digit:]][[:digit:]]\)$" | ${lib.optionalString (!isBeta) "grep -v \"b\" |"} \
+           grep -e "${lib.optionalString isBeta "b"}\([[:digit:]]\|[[:digit:]][[:digit:]]\)${versionSuffix}$" | ${lib.optionalString (!isBeta) "grep -v \"b\" |"} \
            tail -1`
 
   curl --silent -o $HOME/shasums "$url$version/SHA256SUMS"
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index 5026afeaea0b..c85560a75b5e 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -203,6 +203,7 @@ stdenv.mkDerivation {
     channel = "release";
     basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin";
     baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
+    versionSuffix = "esr";
   };
 
   passthru = {
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 608e6bf1d7e9..75f82b2118fe 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,665 +1,665 @@
 {
-  version = "115.13.0";
+  version = "128.1.0esr";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/af/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/af/thunderbird-128.1.0esr.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "73600c9de1e75f0a2baf7e13d9ecded491e93f7fb4d5aa63e8e4ec2f5c95ab2d";
+      sha256 = "f7caede50674b6714f95a267ee31cb8a31d60a3820b8ea516b5c88f82730e1a6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/ar/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/ar/thunderbird-128.1.0esr.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "8eee06c6f5d347d23fa2401862bc733065162415e15a8decba31d7f71afaf8f5";
+      sha256 = "75deca12178b9f7c474b57b37a027ebed6a4bb10d6eb8b608c89674cf857b7c1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/ast/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/ast/thunderbird-128.1.0esr.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "6ebcc36fc7306e49513ce6ba9090817acbfcc65eefacac552d4c1fbb3d2ee452";
+      sha256 = "6c9d1834a477ae2a072fe210515209cf542ac5899226f431a401b4987b2e827b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/be/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/be/thunderbird-128.1.0esr.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "386cd002e1986c4ae5e3d05e3279713994b610453745b25199906427db3874ee";
+      sha256 = "d3ef3a02f45fd5629dde08063a723ae422a484be87d57bdda8c3cc9d7bec00b6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/bg/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/bg/thunderbird-128.1.0esr.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "c909a752e7f09c37ce67cd7995562eaa30cdb5f604bda70a222e376eacdab8b2";
+      sha256 = "fd0257f2d3167a55b5577942cc72e251ff9f856be0a7dcbcfe7c2128cb87213f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/br/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/br/thunderbird-128.1.0esr.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "511f1af492da3cd5a6aea641a8cc67f5f779196cbd81a940f3b0390dc0c1809f";
+      sha256 = "cac04ec5e0635a38e568d306c2b47158b893b6c8e54b4a533cf51d351b76242f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/ca/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/ca/thunderbird-128.1.0esr.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "c7f087af3ed5b3fa60b94cd5380aabf019397479591be08b60d23ca782ac144d";
+      sha256 = "9fd607242f7d568e6ad3b49e87b4b6a71b9a807f6aa4fc96b84ea4e42e29d896";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/cak/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/cak/thunderbird-128.1.0esr.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "fe7c6fe3e99f0d4d8d6e2561e1fb2e5e8ce6def6caa119d4bb73c55605c3222d";
+      sha256 = "e81b6472ab864af62b4c4090013c7f3615c9594bc84bdfb3b7fb36f78f394e6c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/cs/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/cs/thunderbird-128.1.0esr.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "222a9a0898375e5edfe09ff67a6db89a340eab4c7b195f895dbe891b5157846c";
+      sha256 = "f672b08496915f71c00cf9df0b214aea30b9db7f396340dc98ef5402780ee997";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/cy/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/cy/thunderbird-128.1.0esr.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "19e3060fb67039a6fd70bbbce712aeab7def908528a3d54cc77387cac8c58d83";
+      sha256 = "6c002ffcc742fd0a01ec160ae8729a05d11267e17d32269c3fc6c03b3bf37d64";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/da/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/da/thunderbird-128.1.0esr.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "a2462934c90fb2433692b8ccf342c1669770a20be0c3703ecc54f65e5aaa2487";
+      sha256 = "dee1fe8dfff06a276e4cb3018cd1a60ede76ee5baf09e34cf715912bc26c52a4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/de/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/de/thunderbird-128.1.0esr.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "d45733c83c65abc1a3df8f6fc0cb2880c55405a4b2a798a5062304dc93f4ac43";
+      sha256 = "d7fa4df3f309a06e53c8d3336d337e14c7e19f9b64d6b4b424eb6212d2d511e0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/dsb/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/dsb/thunderbird-128.1.0esr.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "e91883128422d834b7713f1ffc0d8095882e4f4e594940c5adf825f38ca8c1e7";
+      sha256 = "796db274ba2945d2212cf0015d0100465a754322fff4dd80d3d660b655bc64ab";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/el/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/el/thunderbird-128.1.0esr.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "f54b76e5ae958ad3eb5bf651f892fbfef460732dee8364df70ed5f8b24a77a5c";
+      sha256 = "2bbfef60b2c46da6d338ce7f0822e4261ed6a85253eaa3073a0ae94e88a53565";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/en-CA/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/en-CA/thunderbird-128.1.0esr.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "fff09666b871aff621cc513aa8fab7843cb1d019e1914c9b654e8af797edfc04";
+      sha256 = "0b589335683709ec57c272f2cfa1caae530718c8a6e57aafec1ed7933a8896e1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/en-GB/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/en-GB/thunderbird-128.1.0esr.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "2762b9c0c2da7b1d35b51231f395b34d6e7ed8a8c34c56a3c36fd1af40152d57";
+      sha256 = "a02fe116c48a0afcceab7a40b70c3537037bd28fda6f5d1c649486d3307fdb8b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/en-US/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/en-US/thunderbird-128.1.0esr.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "b70d487213fca89aaed8c2a1da07e179597cf70c6bc56e5fcc93855afdf66365";
+      sha256 = "f6f383c86f60c96b0bf2e338ab363d0d72f6e53e972429203c1920939fd8509a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/es-AR/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/es-AR/thunderbird-128.1.0esr.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "37341713a27b90cd8324585cbe2b4413ed0ce3415366b27f1cbfb97f91595e22";
+      sha256 = "752e6409c562de5cd25f73c519f016a4602df937f317b91028512a4a9ead4c77";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/es-ES/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/es-ES/thunderbird-128.1.0esr.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "c2412ebe923dfcdc464bd6d7576c0fdfde748d26b5684b75618b21fa3396d69a";
+      sha256 = "aaa9b5e1ef3f642675c5804ba62a11e387762edc9b0dff9c8204e32b6cc9fe19";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/es-MX/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/es-MX/thunderbird-128.1.0esr.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "6a1e03cdf4605b768feb802502dc00b9cf7567804c8c2cc7eebf7855c10e555c";
+      sha256 = "5812b135c2655d72e099de4a2fdf72293e3f89bf8cd1fa7b96a5dca40157ea6f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/et/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/et/thunderbird-128.1.0esr.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "e8d92ff29455577680ea1c24f5025387ec502ae5ce65a528c3d526dc2b0e23d5";
+      sha256 = "ee02e5e31281fd38f62d6e48fffbfe9435779089613d98d738eebf0288bc96cb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/eu/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/eu/thunderbird-128.1.0esr.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "0added0bc1846f7231a8806bbf5d4478743fb9dab3ba12270a540cb298ce2e12";
+      sha256 = "6a9988e9b67d8582fb4b9c456afd383c8b464c7cfb2a14e065baa38fb774ca94";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/fi/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/fi/thunderbird-128.1.0esr.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "08ecb359ec9f1bb79271fae375f4094f32232ca17ba516b4dc68d33a49fe26a4";
+      sha256 = "55aa8e6f0782fdc8a41cb26288d84bfbdd6b88661d4e398b0b121ba6539b586c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/fr/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/fr/thunderbird-128.1.0esr.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "5cbb360a2f824a63a06996d8d7bd11184f04a154acca6d11f9d9ad149add7211";
+      sha256 = "ace271f70d85aef98649e72d230417821ac7b457a985000851c6a2def90b7199";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/fy-NL/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/fy-NL/thunderbird-128.1.0esr.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "8c489d2e33c2c0d0d1ecb7c8d8766fce2498ee1256cd37e12f4c975b5533a98d";
+      sha256 = "404d0c3e9bd086ed00209f40ec31ddd2f65ce8f05c246099f67ac1cfd4ccf18f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/ga-IE/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/ga-IE/thunderbird-128.1.0esr.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "5841ef91f177e47ff8a272e76cb57968863c341531b45a42c14bac80979b3187";
+      sha256 = "c787eb2ad7490b18537a5dbf18c05a77479d9a38e46697f40db0b325c89197ac";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/gd/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/gd/thunderbird-128.1.0esr.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "a07eacd6df3834980886517a9eb1f5d4a6c05d087bb6aac024456b1867079ab6";
+      sha256 = "11c0bbfe4c0ee4c29e00755659cd3eec2c89fd002c35ca9dcf9a36d8e36637e4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/gl/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/gl/thunderbird-128.1.0esr.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "d5359822c6817dc8937a3d24e3e50efa27d450c1f9d48d5b79c63b7ffce54439";
+      sha256 = "f3dc0ba2f53249baa82a85f47370e7d2d33144549099c58685c8e2b629fbd188";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/he/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/he/thunderbird-128.1.0esr.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "5320ef08555bf368c4e09a80524429482f2b23fb27b8b2850ef4a1f60eaf34b0";
+      sha256 = "0fc4eb9da6f9b1fb833662aeeb6e3bc68ee111ec4b95a249b697f43e3b6bfd0d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/hr/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/hr/thunderbird-128.1.0esr.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "dd6a69a320ed40b662814da28af7165ac499cbcdca1371bba86ef4c84f0d0949";
+      sha256 = "4c19e84f14610515371c00e4bfdf0d1a9c6d93326767d2a049e18a3286ac4f86";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/hsb/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/hsb/thunderbird-128.1.0esr.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "fdc547651aa09c3874366180d4e3fcca407fc8efba5745344cfca1f5c4597003";
+      sha256 = "f908d18d7ce4997d46ad05e61b54c002f6039cdda67a4b06df1b2e21b9b01994";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/hu/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/hu/thunderbird-128.1.0esr.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "85b1b6f9b3f52258ddae7fd03dcd12dc87564d5d797cf7dd8c9fa6f1278da233";
+      sha256 = "1ef3b469e5cc01b78d0f9b0397cbfdb08a115b040d5ff5b93f6b7ef22e53ce7c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/hy-AM/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/hy-AM/thunderbird-128.1.0esr.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "13c0f0e3b112ac7d4ec0c794458b81057f9965ca718b10bf2b7880be4f4a85fd";
+      sha256 = "ee4072bb5bc8ef35d4a95d8e0f00b7ece382246b3343da889022da71961f56a5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/id/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/id/thunderbird-128.1.0esr.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "700393b3b121a6398e3f809d035e5b90fd8f3879f0a751a4ed362fb973b3ccfd";
+      sha256 = "3267e6e36c93ed79c2cd4171d037d2b5016d9b66d0da60e078d980930c7ee872";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/is/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/is/thunderbird-128.1.0esr.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "8eb368b9ffc00aa06238af03c16c3b183858aff829d5741100e515498bee065a";
+      sha256 = "8807acfc9b004d6010087424bb7742de208625b177ba340eabf395a35c5dc5f1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/it/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/it/thunderbird-128.1.0esr.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "c3d8d2136e3a0096c07413c0c591cc60e322ee1b929b5f6cd99708413014913c";
+      sha256 = "7a65820f86686e1a8f3176533839a41fa361eb8d5ae7d25eb3ba25552469303e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/ja/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/ja/thunderbird-128.1.0esr.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "af6109dade0343a3354e5b8c82df8505ecca189bb9eae0037a578db4fcf99f1b";
+      sha256 = "3715455a068e1917905080d346e684237f15ea98cd3aef4b8cca4cb1f1a66beb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/ka/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/ka/thunderbird-128.1.0esr.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "ad7c22e31b575f28268794b390d75021bcf67cb2a4d7ecbdfc3a5bce8f547160";
+      sha256 = "a4920bd4c5013bd4e8574515f6064358c85036a666620bc15bb23ed891b309bf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/kab/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/kab/thunderbird-128.1.0esr.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "0356017444c3a046c85599f7188d012f1a8260a5a76d42e8bddb3e937ff1d0db";
+      sha256 = "0b9879b77e8efc4a40b1e11b93a0c45be7c4d195a523bc202261f33dbd138d1d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/kk/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/kk/thunderbird-128.1.0esr.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "d278f53f92f4514b1a1b0cc87a6329e1cfe53d82c815557d2d1038b192fb0a03";
+      sha256 = "4da60f136c95c915eeb6047d647d1aad066e9194620ccfa6b0d2d649a2bc539b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/ko/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/ko/thunderbird-128.1.0esr.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "0cda6697ab6041f0983447e5594158e185905d34a7b3ec70022f258403dba6d5";
+      sha256 = "9d497d4e26bddc96a7f4b2cd7b21a54a7c159ae4245e7f10e0534cb73ee9d0db";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/lt/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/lt/thunderbird-128.1.0esr.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "f783e465629993c2e5d7c5f71fa421b289ca1051ab461ea4e128a9facf370e21";
+      sha256 = "25e2f903fb2d894eeada038728f43e2e195e0997e13d7e961bb8429a442041e7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/lv/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/lv/thunderbird-128.1.0esr.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "b64684c99509c9b2751d4afaced2a2f6067251345f672eb84d2337f9082fee67";
+      sha256 = "3a85ba4e1b15d9d2400d1000b1215356c4b6674e21cd8abe6957860cff108c77";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/ms/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/ms/thunderbird-128.1.0esr.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "a001272f61877db602f26aa80c485f0ad7be82acc26343fbf18a95040aeed429";
+      sha256 = "e136424aec855ff15f43fb4082cf3270928d3de5cfd65af25cacfbb7c1fd2262";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/nb-NO/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/nb-NO/thunderbird-128.1.0esr.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "6d9b817608399d59a20d34da172529eacb950e19ddb3cb3966f8acb2704099e1";
+      sha256 = "3332ae00538d48b2842a66ad4a7383c021bd0f4d4f01845229e8a3d10330f0c3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/nl/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/nl/thunderbird-128.1.0esr.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "259e8b433b7c757c507f8deb5ae9453f593f353a7544ec6d8e4b798b3c9958e1";
+      sha256 = "4278329ed3b2fb58f15def543c27cc6bbe67e70d8b7c38e09ea37091b3a2e04d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/nn-NO/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/nn-NO/thunderbird-128.1.0esr.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "0af2bea6b0b4b56dfbbf0b3a4845d5540d17a2998ee000c16a9dee0e63814ee7";
+      sha256 = "6816386d06eb3faa8d6ee533157153f5f3ff1cc9f9fbc1ab871baa32d3e5de3b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/pa-IN/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/pa-IN/thunderbird-128.1.0esr.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "7a686986ed8d899ffd00dd770c04c16a0ba5ef66e6889dbf34e86d9794d27448";
+      sha256 = "eb8fe69a9a88593f1c4cf953a4066cd0c79c8f61c270f65177ef5de196481744";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/pl/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/pl/thunderbird-128.1.0esr.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "d736d10c5c57a2b8b5c7ddd8620eea673e83a4efb66288dcac4f39fb9cafdeef";
+      sha256 = "c7e97e39ca32dc0369da1e2cbbb714b3b2614e552c932e328d9ec01c28dcfa88";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/pt-BR/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/pt-BR/thunderbird-128.1.0esr.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "2666dfb8ed5cdcc747d91b5a8f396a268243c9e46aada60b26a62ac1904f11d0";
+      sha256 = "5cbf7fddd22b227ef57b9902273820be8ab518511a9a4305941a178fcaadc5d6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/pt-PT/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/pt-PT/thunderbird-128.1.0esr.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "ba1a76293cac33601f8317e538b54c4a05b277f862d3e76e11944a0d51d0b4c2";
+      sha256 = "23bae7cbb8528b607ea8b7e8d5fba51edd85682e50e823525b7d88633cba67cb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/rm/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/rm/thunderbird-128.1.0esr.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "d55625a4a75b671cc614f04fa55337df80d0949906256c8852274b0c73f9d8c1";
+      sha256 = "3e47ef468d5608badb81a085a4bdb4e5e471698afd613430b36b55203b6392a2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/ro/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/ro/thunderbird-128.1.0esr.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "ff56d88c4c003bf8e5aa245b65ae17d0d2a3f40ab5cf341fedf7b2bbcfec7088";
+      sha256 = "dc819bba617164a42f4564584a727a33cff2fb9c9fa6795f154d0ba836700016";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/ru/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/ru/thunderbird-128.1.0esr.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "a9eb569ff312c13fc651c44f192c64cd46eb27624f71a4ad9399b0531cdf1a57";
+      sha256 = "92b8d9dfbd033c00ae7860d4d3912e713c193b75bb533088b1eac1ae4d5cb131";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/sk/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/sk/thunderbird-128.1.0esr.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "82bb11f5491a90404d40692218848a36c62ee1f73294f94abaf89102c185dfae";
+      sha256 = "694460056e16866c1b807864c6ea0593d01d45157178adfb3f29ad8277554491";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/sl/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/sl/thunderbird-128.1.0esr.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "b5400b07f12e0712157bbaedafd9f88e7d2326e1407b9a989ae9da8fc245c558";
+      sha256 = "41451768b19248de4827ced8f13fe794401405016adbdf15c80929544c619216";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/sq/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/sq/thunderbird-128.1.0esr.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "cff26cd2e27db6c374d1b34da18bd513010bd4572a5abd3179cb6b0bb062a750";
+      sha256 = "9ee7df88f187862c039c75a68d7fe9e509b4a88c94cfe69adb1b00bbc11b7dbf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/sr/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/sr/thunderbird-128.1.0esr.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "bce534608ef8da85ea0083dfc86c40759b4b073c90369f94ed98df3d41c3e1c9";
+      sha256 = "d4d6ac39c1296ea136f7dc7f85655aa26a3e9bea9499d38be171ba419cc3d146";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/sv-SE/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/sv-SE/thunderbird-128.1.0esr.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "3a2e9f610436b140e3a7098ac27516c3ce5fe2dd672e23a85050bbd896bb2738";
+      sha256 = "ffed8cf698a067490ec9749c66dc8829bdea9f217d7762c3a0d02bace29e9e3a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/th/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/th/thunderbird-128.1.0esr.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "3753527489a666c2e89cc1c4be85d85a52890069700ef9bd809e14a50d253d37";
+      sha256 = "537d70eb286b63faa280c0547059ce0df8c1fc70775f82c3e7865c589005ee0e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/tr/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/tr/thunderbird-128.1.0esr.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "90d37e9512c46db20d8ce44863dabb1c72b196fb26e462e310f83bf7472763b1";
+      sha256 = "e079b676a41c5d7a2011965f7e42bfbc75ef8f85521ea94bafd01bda0dfb28ba";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/uk/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/uk/thunderbird-128.1.0esr.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "07f8d8809d3dc079e9f5d25f0b553b96efa975c69f4b94ddc5772bbb07c6f2a9";
+      sha256 = "0f899cf16ecb4f10456b271ef98672b3c7f043d3dd50190c1140fb4ae4701e1e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/uz/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/uz/thunderbird-128.1.0esr.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "7d3d207fe4f427b5492771a6db5f6716d0f49ea2452f3521c53d06da15090135";
+      sha256 = "3a2cbcd225ec53410dec278d28f08a9af8d23a852304b00325411aa3fefb7134";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/vi/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/vi/thunderbird-128.1.0esr.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "48de00ce91f678f9e2b2fdddd57b164feee7c06079c10796707cd1be67452cf1";
+      sha256 = "456a2eed712a8853bfd014cc556aa1caddcedb0159f8d2fc63d6ee61d5b8bcbc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/zh-CN/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/zh-CN/thunderbird-128.1.0esr.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "686dd1d40c6e5d473b7f768919567d71d7a32bf277aa4f20ee160850d4a19812";
+      sha256 = "f55e16ecdb55927efff18ac94a6703f86972642a2310948604c2573d281ed2d0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/zh-TW/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/zh-TW/thunderbird-128.1.0esr.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "3be64c8cb88ab2e93ce85249110e91da26f958f5f667f9b2c3524d9337aa3ae6";
+      sha256 = "e62968e0457ca8691fb6e474c3b945202912ed019b99caaf7f786ce56e94399a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/af/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/af/thunderbird-128.1.0esr.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "fc6f36e813419ef33d9491c0317c8f73a7d08a10d2767446a6e708499d0664db";
+      sha256 = "6872446b235915fddcffcf9024e83424159977f25c1c9435274c795356645621";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/ar/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/ar/thunderbird-128.1.0esr.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "d7134af862d2f588623a9414d0e09702b04c20577f674ade2c67269db25e7bbf";
+      sha256 = "0dc5ca84ac378cb187b629ea9e138080f5fdef33ad80e2293ae092a742d7a73e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/ast/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/ast/thunderbird-128.1.0esr.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "5632d2264f4ad78115c66542bb9a30bd92044e2e480612f0755d1f2bbac1fa39";
+      sha256 = "9b2744787c0e3d2f26d86cea92d79202f4905a4ccae52128507a38a1e6d803be";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/be/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/be/thunderbird-128.1.0esr.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "522b1219b3586e028023a0b40b5a0b807fd5bbf26981ae0b28fed41111dfd97f";
+      sha256 = "29e667cfb4a280399da8805e1cdf5f924d40ec544b5f6e1450d8b6b0e5417f43";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/bg/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/bg/thunderbird-128.1.0esr.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "cee2dbcb5d3e6cff325cc5a9132d574c48cc356a524b619ab0efea481fed87a5";
+      sha256 = "dcb4ea76cbadbc4693e5bb480513b55216c0456fd757a9819f95e385a38274ed";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/br/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/br/thunderbird-128.1.0esr.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "5583cf26d49f32dfaf5a7000c8c670d3b7fd1e839595960bc73e81e5bed8b2b1";
+      sha256 = "606d741e05d8769f3dafd72540a29e5a98fde968e5c83152554adb705178f1db";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/ca/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/ca/thunderbird-128.1.0esr.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "7ecbeb64308d4a8962c86a75742dcf86ac4f3a0009fa60071f1ba90e3fd89cc3";
+      sha256 = "77585d968f7a34c10f54244c64997094dd22bf1b86d7fd72f36699ba65a11363";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/cak/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/cak/thunderbird-128.1.0esr.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "4c55e8fa96c9763d1b8e9d8c47b55683827dfceac982514206c422edd34afe37";
+      sha256 = "99b192e2153fba6d39c609dc59078956603079d3af0758a203c9c179d3814aba";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/cs/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/cs/thunderbird-128.1.0esr.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "6f0e483d77b6322fcd50decd868994c9a22e8f7f8ede4a8cc6def64cebf3fd36";
+      sha256 = "92bb4fb6261e695c3122c5797edf92084e844a509ed3b77199927f408e780c8d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/cy/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/cy/thunderbird-128.1.0esr.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "0c727b6364d07666417f7ab03dbf9e8e1cc040d855cbe361e1385cb2d4aa4242";
+      sha256 = "2736bbdb40c174ba13be89efb36c77da6842d32a8f589e7e72085e9d5ae0dc0c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/da/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/da/thunderbird-128.1.0esr.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "819b01b0fb03eab22d58de73f464e98133778154e122463d20693b4aa1090ecb";
+      sha256 = "6a1cebef252ab884cf56824045ca6699ba092526ee2c8944f7041fbaa3ec8316";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/de/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/de/thunderbird-128.1.0esr.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "84db18d8ebc383fac729a9e5be2554169368aaaac34523450151ec9c4f8015b1";
+      sha256 = "21fc083977e9bee76118ae38e05cffcf5f77e3c2916f1dba4c6762060603a04e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/dsb/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/dsb/thunderbird-128.1.0esr.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "4d23aead7db91ca8f657f6eefc3cb37d08be537586d492122b2583c5e4bac516";
+      sha256 = "74361c681c861a3e298b494feda3d51489881a8da614726d3d539bafb6eca5bd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/el/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/el/thunderbird-128.1.0esr.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "44833b968bf29d784163776cc7343d23a9c4a781aa36728dcea9fad23b776aa8";
+      sha256 = "22f9f3dc25c4de5ea33e98ccdf9743540d04dc6bc6b501da638db31531ee9464";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/en-CA/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/en-CA/thunderbird-128.1.0esr.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "c29f159ff4a8aa234f8117c936fc1621aac4ad12841ac261a85c7326d9ad8704";
+      sha256 = "bac464a25326ae1062fac17430911a34a89f0c8fffc3c7b2032f1cc146dd9b29";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/en-GB/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/en-GB/thunderbird-128.1.0esr.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "51a2633ed89f3eb08df77153a1a894983b9609fab6aed998cbad7e78129845aa";
+      sha256 = "b41780d9a1aa4e801f905a87b11763305b32bd0fa50b0c3c23876b5833bb7b73";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/en-US/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/en-US/thunderbird-128.1.0esr.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "badce662962c90cc0fe4a0e89c7b69185fcf11ac1fdebcb12078226d06eec7cd";
+      sha256 = "89a8f5019cf334a1cfd957f1dc9a4bf53eccf5ff0b23ef2db6058756453f3b68";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/es-AR/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/es-AR/thunderbird-128.1.0esr.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "6e26898de69237d3915c7b7b18ee565e1b882a0a62ff89d0c64de74f4cf32b06";
+      sha256 = "042d331b9f57dd7074c3a7c50e1b038eb8e3f08881b149bb9af6c5146c92f374";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/es-ES/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/es-ES/thunderbird-128.1.0esr.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "8de6a6bc3c688375239fd56a72c8f9b5db45dbc01793cdb4e508b89b600957cf";
+      sha256 = "46b136ade4bb3dcb1be7fcb18924693786930d6218c84d86e92f8f004cb2db4f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/es-MX/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/es-MX/thunderbird-128.1.0esr.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "d7fa892b266cde71881c6bc1a2926c273ac9990a5f555a1da7ad92e8da7d2079";
+      sha256 = "2242396853b6568562cf8c6864b90be994773a1139cb91ea7d65c61ee0dcbb0b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/et/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/et/thunderbird-128.1.0esr.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "7e3f6026fd7eb69fcc716b1fd512e43bb24e666fd9792b9c0fcdecc6c2080c64";
+      sha256 = "6bd30efd3e297214dd0ab0cd5fa8c4b21791674ff8c86bff7f5a38a692fb7a10";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/eu/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/eu/thunderbird-128.1.0esr.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "6992361227e6455834651d2d4c322d68b2772e81f5d41495bc891c6968a31fb3";
+      sha256 = "8a69d159cb93c3bb441b2b33a4b3251eba02bc10025ff29b39cdb54817cf930f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/fi/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/fi/thunderbird-128.1.0esr.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "eb2f64b6079a7fc82ac9cb300a3263682c30f5d5ca88b7e8ffc239b0eeff2e4b";
+      sha256 = "676004498bfb20b8b1fad723bb254ca210cd2bd6ee3141df41e0460fb5dcba2a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/fr/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/fr/thunderbird-128.1.0esr.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "2cd90fda0de39c0c5f880967d5b3c887b82a4b2b2cff68e563cacf918d1067c2";
+      sha256 = "7dcb30ece74cf8e0fcda595cb44d84b43059fc00939da120372e908bd158f1e8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/fy-NL/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/fy-NL/thunderbird-128.1.0esr.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "79e3d745529f8ba10c47bf47c530d251a60fba60ae6434c28b21d6d920715343";
+      sha256 = "394b3e2d5e7fb772c45c94cd38849e181cb414362bac279abdc545bc920917d0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/ga-IE/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/ga-IE/thunderbird-128.1.0esr.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "eecef1ff59423519f2dcda87e5bbe2d627324c1e2812d2ee8554fe4624ae5f13";
+      sha256 = "58f1dfa592cd1d02e782bb832a2eeecb69c5438000a2700f3b1b0a5d6c25ed52";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/gd/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/gd/thunderbird-128.1.0esr.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "98061b5bbba7663a76ba1fd81c45da1b819dc60d7eb328865bb4e6054893e68c";
+      sha256 = "e385995eceac9f84dbffb561851784a5c7c4b1560994631f9d6e31c9c09ed50f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/gl/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/gl/thunderbird-128.1.0esr.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "20b27324d5d1007898432a5149be39e023d0574cd9412e1981644fa437559462";
+      sha256 = "1bccd0f5870159883b3b77226050b8475d61252c581bcebe89067da9a110d0b6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/he/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/he/thunderbird-128.1.0esr.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "d0b623cb12b09e8da788a248d9d0c73075a47ab400cd5e9636d63f802d81239f";
+      sha256 = "2652f6723d7aa4b6abf517fa23d493deabde1f37891d7ce8e190f04bc72d550f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/hr/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/hr/thunderbird-128.1.0esr.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "a4c6f3c8c4e39677e4fa7a7260bff44764fa66e571919d70349f615429ded199";
+      sha256 = "a941a94afc2692c3329b22afe40cbcd2b6c3bfb964178bf66f699f5dd0ee3ce5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/hsb/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/hsb/thunderbird-128.1.0esr.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "e059202e8add45d767878d96af50d08e540e21af6239e101825153ad3bcde087";
+      sha256 = "2eea4f3167ffdcbdb3e6712c2ac67d03c6f84cf8fc611e854491c5d2d7759ada";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/hu/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/hu/thunderbird-128.1.0esr.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "a02b0c0460e6bdc54f4d9be92e78ff5c6f8730e1f7199f5f0eceefc220d585ab";
+      sha256 = "c0811928b99556f2de5876fc22520bfdf1d38ecf97c8e7ded2bb882b85cbbe33";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/hy-AM/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/hy-AM/thunderbird-128.1.0esr.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "53b02544de8294c1292311510f5e72b0b0c6c0209e3d01d92d603e5e52f988b6";
+      sha256 = "29bb49dadf3bcc501d829c451cc1c541f103ab27c58bb94a50af6deb63dc139e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/id/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/id/thunderbird-128.1.0esr.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "014a9d5214ccd346df23168d1f523374bc5058d247a3817fa8a3df1af7255230";
+      sha256 = "eda238b6f688bff2396d4aed23c3a24929883a6bfe814873b44fd256f1cffc19";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/is/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/is/thunderbird-128.1.0esr.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "f81280dd398b1e5f6e003ec040052f739d20e3f5bc6ebf79ba5ddef068ab9cd7";
+      sha256 = "6b5f7cec11eadddc310140dfc109c801e1d10e711b41d3a132d55bce91923402";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/it/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/it/thunderbird-128.1.0esr.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "54a9b84390fe010708a901aeedd95a1a6b51aeeb44c47760ee68c261898fa52a";
+      sha256 = "c24f656d53c604cd06a05388d03e93c424bd831c355b75ef64f1072f307d2305";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/ja/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/ja/thunderbird-128.1.0esr.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "a3a1e497d31244a7acc5ea99a1cd4129c28fc00d82d750b5ce360165e7c6b915";
+      sha256 = "810b09ed1875094440eb966e5b2e91afef8becaa62901806310235d0c6cde253";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/ka/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/ka/thunderbird-128.1.0esr.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "df4ea755689a82315627d851fa7b59d5cb9730064785099273431e1993ccb529";
+      sha256 = "924e98fbf30c7e05d2d5d65fc9908e9a9ef69113ef8f9a19becda6a5e110cced";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/kab/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/kab/thunderbird-128.1.0esr.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "e40f72751b40fe6896ab0cdd78ab540ece04d1650c35d1d9af944f5e9983da69";
+      sha256 = "304fc281009a152c4c9987d332d8d295e151de889a52bb760ad1027fab257e4d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/kk/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/kk/thunderbird-128.1.0esr.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "aee0ac4b2bf06468b0fd4d302507693c3e5a76426d4aa2b4deb9081f054156b3";
+      sha256 = "dc0e71b08952382d816f2d814bb0e5d8b9f0ca94043bdd482338b08fbc08f401";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/ko/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/ko/thunderbird-128.1.0esr.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "32cbdac8073fdc47feda1e17754a1966d668d10b881d137d593f10ef61f1c8a8";
+      sha256 = "979378c1aae8a61b6cd0a091a44c65169cddb10d9e8e8fc0629dbdfe284c6427";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/lt/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/lt/thunderbird-128.1.0esr.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "be4a3241453d43ec04586d27c7a2d09c96ab0558eba5c52a6242b5cc39f7be89";
+      sha256 = "a3deb9c4288291d8ebf1597e931fd997329c0b3e703f7856dc79d2f0da8b0627";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/lv/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/lv/thunderbird-128.1.0esr.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "6b92c31b2e2cbb9f2dcf73d29004233f4a4128dfa315fcc0e642aab59ea65c82";
+      sha256 = "618a9034c7d4a16be49f8ff69732a54350a57398b7d453258809502fcc13d560";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/ms/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/ms/thunderbird-128.1.0esr.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "87cc4f4a7cf59361c899990e023a57ffd6cd7f8b575fa4f06b5045d71b7d0ba8";
+      sha256 = "7c8a8b9afa8a34c3372b2cb45350ef6aa45d4635ad8a41f3a9b480a49c5d925e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/nb-NO/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/nb-NO/thunderbird-128.1.0esr.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "5a21efede9c8f142e77c37dd569a42467408c9863c03b791b26153c4e09a962a";
+      sha256 = "4aea3cc49dfda9e4415f918577d398a93f7bf603f809f63181a2d25272614c63";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/nl/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/nl/thunderbird-128.1.0esr.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "d6158645ee629b89a6d518d1e62f6777f3f453e6546ad177979473f432dfb376";
+      sha256 = "261bf62d63b066811d586305ffc923ae83c78e5ae17ca445cdc5b3f96bc3a06d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/nn-NO/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/nn-NO/thunderbird-128.1.0esr.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "1528148ba47eabfce476ca351ba0c7341a5454d38c798c3b6dfb1c2f02efd3f8";
+      sha256 = "60def136f945da719dd5809764ad726c0c0158b82f358599757a009aa0fcc90d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/pa-IN/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/pa-IN/thunderbird-128.1.0esr.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "8d6c1f3ce92af5e19e24661aa7bbbe815e3c9ac7ff3e9b6db7c2662e8f56f97c";
+      sha256 = "c2c2d4a5dada97059408382cc70a87bcf5455af05a7476dccfa07d11574da695";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/pl/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/pl/thunderbird-128.1.0esr.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "b26ab380e57e442047092f8f12ce701fc062d3dffb3fb905ffde8ec1c2bd9975";
+      sha256 = "eab954d862710fd80254b5106ff5daa9f94d3a1a4b145b4dfc2b665854356fe0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/pt-BR/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/pt-BR/thunderbird-128.1.0esr.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "23ff7b60b2a754c34bf243851ce7896cba6918126615ebffb030180fc4df754b";
+      sha256 = "ca5bac344bcc1ba4471221a0a51611ddc69319d508ce558d43d0e09541891e48";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/pt-PT/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/pt-PT/thunderbird-128.1.0esr.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "f6667f60d0a54f4e5c25b7c15d843f7215fb0ff8f65962b9ed219f9fa1cac9c1";
+      sha256 = "cc60009903fef2a55059b42fa50c08d68b75187691b339ce0caeecc6dd22bea8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/rm/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/rm/thunderbird-128.1.0esr.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "c6c6d412f9a01824bedb46094239caec8c8f32b249f5c9bcce455166472e0c8a";
+      sha256 = "37c112550593f33eab61427b60f2450d22b35c3419ddc811fc91dc485cc13a17";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/ro/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/ro/thunderbird-128.1.0esr.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "d87bb9e6262ca8639db9c72dc512ccd6e2c5c644b2540b76f1d8db2c6cc11681";
+      sha256 = "60f1aa505c5fe359795722f552546c39b65a9615676d889f2946a001f4897840";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/ru/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/ru/thunderbird-128.1.0esr.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "933509f254d0a83807eb8423a812b44fa293a34302179bde31f8e7c63f29f17a";
+      sha256 = "e7f6ed6889366a6bd925dd5becf567ff4caa61b8f66549ec18478ece1bbc2848";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/sk/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/sk/thunderbird-128.1.0esr.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "7075f022ecbc76d4c00a9816f85f22a08998bd44080b3edf7bb2b15f78a5ca98";
+      sha256 = "327afe61acc5a1ee0a8b73e88393c98d1970d594bb45295ffe50b042ff515764";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/sl/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/sl/thunderbird-128.1.0esr.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "66bd3ea1238198fdf240fa471c846b83ae6ddcb7bb164d3e0bad8480c2b0c9cc";
+      sha256 = "42e721f86d33aa897e13c3881ed7157194fbdcf3e8f19e7e38767605c957427e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/sq/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/sq/thunderbird-128.1.0esr.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "0fa98fbe0ebd473ffb247546fba6e7ebcb994bbd4bbbbffb868c2d27984ed8e2";
+      sha256 = "e00555fb3e07cc211053ab7532bed98b1bc0d33165cc9f407f8aece16a472a4b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/sr/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/sr/thunderbird-128.1.0esr.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "8388932ebc71148cfd3be78d5fd31754c78c4e249930ec5290876655e115207a";
+      sha256 = "de2c3ae4976ebe92b08bdcc5d8f22e51112b9b5e09c3e16b4bdebfc13829c54e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/sv-SE/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/sv-SE/thunderbird-128.1.0esr.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "793f43ad4062323b408527cbf98988291452fb5007938fc6c75f794a95f6fbbd";
+      sha256 = "59148b62f82f6bf64a06e6bff89118bb6f34f41c0be05c634765f19b6fb16888";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/th/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/th/thunderbird-128.1.0esr.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "ccd43eb6dd39d0be2af3ab4581a1d49563b78aa1389ff227b5b9c7ae83a782b1";
+      sha256 = "2fb1973f1dd26dc1c25fc73dedd911f47c7664df09f58fa12fd822e995f89fa1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/tr/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/tr/thunderbird-128.1.0esr.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "61cef2f34fba3606af62ed2cdeff626f73d1bf628af17c9a30b151da4f7357e2";
+      sha256 = "0d99bf6f23a52442a09248c46a88523fbe629a95af74dcb45f0c18cade169c90";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/uk/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/uk/thunderbird-128.1.0esr.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "51daf721ea9864fb199eab9908792b67031005238067543f4a69ebc5ad4fb10c";
+      sha256 = "172909dfa64f1659edb440fbc1e2ff2d45ae690dfb859bad63b645cfafe3f16f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/uz/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/uz/thunderbird-128.1.0esr.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "83acb46cce8a7e94e16bb0dd323af816284728d507c2787ae3a8e77fd78662d9";
+      sha256 = "7804f6b2270e6cde60ec996e3ff4c1ecf6b9c7b3e16b05caddf000a270e8c7d4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/vi/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/vi/thunderbird-128.1.0esr.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "2ddc9a1b085f1a936e1ac10fb84440cb6159d77baab95ee7a2073202b3341987";
+      sha256 = "ce35721456873a1619379623c505f825d82b558c20c220ff29c16514f5f11619";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/zh-CN/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/zh-CN/thunderbird-128.1.0esr.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "6468070bca4ab013646945206c04a03a9b5ac5bac5b07cd48543aa0b7e980353";
+      sha256 = "9e6bee2ab2c647e55fff98509cda69fd61e721bcab83c35df91dfffba6f5edbe";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/zh-TW/thunderbird-115.13.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/zh-TW/thunderbird-128.1.0esr.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "27a73e84abdea7e4f9d4fe595129f08dd92dc9fdb4d2a3c275481096be90cb8a";
+      sha256 = "f395a5e9cc54ddf0d883e10d129f0111c992f33fba46981622832665f491480b";
     }
     ];
 }

From 492ae30d9d8df09998200c2243d0ad52cc9d6336 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 24 Aug 2024 21:18:46 +0100
Subject: [PATCH 034/241] suricata: enable tests

---
 pkgs/applications/networking/ids/suricata/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix
index 63a13a26923c..14dbdacd7210 100644
--- a/pkgs/applications/networking/ids/suricata/default.nix
+++ b/pkgs/applications/networking/ids/suricata/default.nix
@@ -128,6 +128,8 @@ stdenv.mkDerivation rec {
   # zerocallusedregs interferes during BPF compilation; TODO: perhaps improve
   hardeningDisable = [ "stackprotector" "zerocallusedregs" ];
 
+  doCheck = true;
+
   installFlags = [
     "e_datadir=\${TMPDIR}"
     "e_localstatedir=\${TMPDIR}"

From 88ca9cc9ad4b85027e93626716a438217c628d61 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sun, 25 Aug 2024 15:03:53 +0900
Subject: [PATCH 035/241] thunderbird-bin: migrated to autoPatchelfHook

---
 .../mailreaders/thunderbird-bin/default.nix   | 134 ++----------------
 1 file changed, 14 insertions(+), 120 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index c85560a75b5e..cd3954ba590a 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -3,48 +3,10 @@
 # To update `thunderbird-bin`'s `release_sources.nix`, run from the nixpkgs root:
 #
 #     nix-shell maintainers/scripts/update.nix --argstr package pkgs.thunderbird-bin-unwrapped
-{ lib, stdenv, fetchurl, config, wrapGAppsHook3
+{ lib, stdenv, fetchurl, config, wrapGAppsHook3, autoPatchelfHook
 , alsa-lib
-, atk
-, cairo
 , curl
-, cups
-, dbus-glib
-, dbus
-, fontconfig
-, freetype
-, gdk-pixbuf
-, glib
-, glibc
-, gtk2
 , gtk3
-, libkrb5
-, libX11
-, libXScrnSaver
-, libxcb
-, libXcomposite
-, libXcursor
-, libXdamage
-, libXext
-, libXfixes
-, libXi
-, libXinerama
-, libXrender
-, libXrandr
-, libXt
-, libXtst
-, libcanberra
-, libnotify
-, adwaita-icon-theme
-, libGLU, libGL
-, nspr
-, nss_latest
-, pango
-, pipewire
-, pciutils
-, heimdal
-, libpulseaudio
-, systemd
 , writeScript
 , writeText
 , xidel
@@ -52,10 +14,9 @@
 , gnused
 , gnugrep
 , gnupg
-, ffmpeg
 , runtimeShell
-, mesa # thunderbird wants gbm for drm+dmabuf
 , systemLocale ? config.i18n.defaultLocale or "en_US"
+, patchelfUnstable  # have to use patchelfUnstable to support --no-clobber-old-sections
 , generated
 }:
 
@@ -86,83 +47,30 @@ let
     else lib.replaceStrings ["_"] ["-"] systemLocale;
 
   source = lib.findFirst (sourceMatches mozLocale) defaultSource sources;
+
+  pname = "thunderbird-bin";
 in
 
 stdenv.mkDerivation {
-  pname = "thunderbird-bin";
-  inherit version;
+  inherit pname version;
 
   src = fetchurl {
     url = "https://download-installer.cdn.mozilla.net/pub/thunderbird/releases/${version}/${source.arch}/${source.locale}/thunderbird-${version}.tar.bz2";
     inherit (source) sha256;
   };
 
-  libPath = lib.makeLibraryPath
-    [ stdenv.cc.cc
-      alsa-lib
-      atk
-      cairo
-      curl
-      cups
-      dbus-glib
-      dbus
-      fontconfig
-      freetype
-      gdk-pixbuf
-      glib
-      glibc
-      gtk2
-      gtk3
-      libkrb5
-      mesa
-      libX11
-      libXScrnSaver
-      libXcomposite
-      libXcursor
-      libxcb
-      libXdamage
-      libXext
-      libXfixes
-      libXi
-      libXinerama
-      libXrender
-      libXrandr
-      libXt
-      libXtst
-      libcanberra
-      libnotify
-      libGLU libGL
-      nspr
-      nss_latest
-      pango
-      pipewire
-      pciutils
-      heimdal
-      libpulseaudio
-      systemd
-      ffmpeg
-    ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [
-      stdenv.cc.cc
-    ];
-
-  inherit gtk3;
-
-  nativeBuildInputs = [ wrapGAppsHook3 ];
-
-  buildInputs = [ gtk3 adwaita-icon-theme ];
-
-  # "strip" after "patchelf" may break binaries.
-  # See: https://github.com/NixOS/patchelf/issues/10
-  dontStrip = true;
-  dontPatchELF = true;
+  nativeBuildInputs = [ wrapGAppsHook3 autoPatchelfHook patchelfUnstable ];
+  buildInputs = [
+    alsa-lib
+  ];
+  # Thunderbird uses "relrhack" to manually process relocations from a fixed offset
+  patchelfFlags = [ "--no-clobber-old-sections" ];
 
   patchPhase = ''
     # Don't download updates from Mozilla directly
     echo 'pref("app.update.auto", "false");' >> defaults/pref/channel-prefs.js
   '';
 
-  # See "Note on GPG support" in `../thunderbird/default.nix` for explanations
-  # on adding `gnupg` and `gpgme` into PATH/LD_LIBRARY_PATH.
   installPhase =
     ''
       mkdir -p "$prefix/usr/lib/thunderbird-bin-${version}"
@@ -171,21 +79,6 @@ stdenv.mkDerivation {
       mkdir -p "$out/bin"
       ln -s "$prefix/usr/lib/thunderbird-bin-${version}/thunderbird" "$out/bin/"
 
-      for executable in \
-        thunderbird thunderbird-bin plugin-container \
-        updater crashreporter webapprt-stub \
-        glxtest vaapitest
-      do
-        if [ -e "$out/usr/lib/thunderbird-bin-${version}/$executable" ]; then
-          patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-            "$out/usr/lib/thunderbird-bin-${version}/$executable"
-        fi
-      done
-
-      find . -executable -type f -exec \
-        patchelf --set-rpath "$libPath" \
-          "$out/usr/lib/thunderbird-bin-${version}/{}" \;
-
       # wrapThunderbird expects "$out/lib" instead of "$out/usr/lib"
       ln -s "$out/usr/lib" "$out/lib"
 
@@ -197,8 +90,7 @@ stdenv.mkDerivation {
     '';
 
   passthru.updateScript = import ./../../browsers/firefox-bin/update.nix {
-    inherit lib writeScript xidel coreutils gnused gnugrep curl gnupg runtimeShell;
-    pname = "thunderbird-bin";
+    inherit pname lib writeScript xidel coreutils gnused gnugrep curl gnupg runtimeShell;
     baseName = "thunderbird";
     channel = "release";
     basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin";
@@ -208,6 +100,8 @@ stdenv.mkDerivation {
 
   passthru = {
     binaryName = "thunderbird";
+    gssSupport = true;
+    gtk3 = gtk3;
   };
 
   meta = with lib; {

From 337bd8c31c26c152b1cb88b10cf4b600ef158a99 Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Fri, 30 Aug 2024 09:18:44 +0200
Subject: [PATCH 036/241] fscryptctl: 1.0.0 -> 1.2.0

Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
---
 pkgs/os-specific/linux/fscryptctl/default.nix | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/fscryptctl/default.nix b/pkgs/os-specific/linux/fscryptctl/default.nix
index 4b38913b7122..053be640d45b 100644
--- a/pkgs/os-specific/linux/fscryptctl/default.nix
+++ b/pkgs/os-specific/linux/fscryptctl/default.nix
@@ -1,21 +1,28 @@
-{ lib, stdenv, fetchFromGitHub }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  pandoc,
+}:
 
 stdenv.mkDerivation rec {
   pname = "fscryptctl";
-  version = "1.0.0";
-
-  goPackagePath = "github.com/google/fscrypt";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "fscryptctl";
     rev = "v${version}";
-    sha256 = "1hwj726mm0yhlcf6523n07h0yq1rvkv4km64h3ydpjcrcxklhw6l";
+    hash = "sha256-5suEdSpX8alDkSnSnyiIjUmZq98eK0ZPVAtDKhOs65c=";
   };
 
+  nativeBuildInputs = [ pandoc ];
+
+  strictDeps = true;
+
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
-  meta = with lib; {
+  meta = {
     description = "Small C tool for Linux filesystem encryption";
     mainProgram = "fscryptctl";
     longDescription = ''
@@ -33,9 +40,9 @@ stdenv.mkDerivation rec {
       documentation for filesystem encryption before using fscryptctl.
     '';
     inherit (src.meta) homepage;
-    changelog = "https://github.com/google/fscryptctl/releases/tag/v${version}";
-    license = licenses.asl20;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ primeos ];
+    changelog = "https://github.com/google/fscryptctl/blob/master/NEWS.md";
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ primeos ];
   };
 }

From 4e49df05ed42a11de3fb0313d466ebb32cea09cf Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Fri, 30 Aug 2024 09:19:47 +0200
Subject: [PATCH 037/241] fscryptctl: move to by-name

Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
---
 .../fscryptctl/default.nix => by-name/fs/fscryptctl/package.nix} | 0
 pkgs/top-level/all-packages.nix                                  | 1 -
 2 files changed, 1 deletion(-)
 rename pkgs/{os-specific/linux/fscryptctl/default.nix => by-name/fs/fscryptctl/package.nix} (100%)

diff --git a/pkgs/os-specific/linux/fscryptctl/default.nix b/pkgs/by-name/fs/fscryptctl/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/fscryptctl/default.nix
rename to pkgs/by-name/fs/fscryptctl/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4be7ec3ca2cd..9fa187fa9b29 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26203,7 +26203,6 @@ with pkgs;
 
   evdev-proto = callPackage ../os-specific/bsd/freebsd/evdev-proto { };
 
-  fscryptctl = callPackage ../os-specific/linux/fscryptctl { };
   # unstable until the first 1.x release
   fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { };
 

From 9a047da69b72055b438da0a8af597915fa0d9ad0 Mon Sep 17 00:00:00 2001
From: Adrien Langou <adrien.langou@epita.fr>
Date: Tue, 3 Sep 2024 19:56:50 +0200
Subject: [PATCH 038/241] cudaPackages.tensorrt: 8.6 -> 10.3 changelog:
 https://docs.nvidia.com/deeplearning/tensorrt/release-notes/index.html#rel-10-3-0

---
 pkgs/development/cuda-modules/tensorrt/fixup.nix |  3 +--
 .../cuda-modules/tensorrt/releases.nix           | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/cuda-modules/tensorrt/fixup.nix b/pkgs/development/cuda-modules/tensorrt/fixup.nix
index 42359aedac11..0d52c91320c4 100644
--- a/pkgs/development/cuda-modules/tensorrt/fixup.nix
+++ b/pkgs/development/cuda-modules/tensorrt/fixup.nix
@@ -99,9 +99,8 @@ finalAttrs: prevAttrs: {
     cudnn =
       let
         desiredName = mkVersionedPackageName "cudnn" package.cudnnVersion;
-        desiredIsAvailable = final ? desiredName;
       in
-      if package.cudnnVersion == null || !desiredIsAvailable then final.cudnn else final.${desiredName};
+      if package.cudnnVersion == null || (final ? desiredName) then final.cudnn else final.${desiredName};
   };
 
   meta = prevAttrs.meta // {
diff --git a/pkgs/development/cuda-modules/tensorrt/releases.nix b/pkgs/development/cuda-modules/tensorrt/releases.nix
index a0c29e345a27..976f8fab115b 100644
--- a/pkgs/development/cuda-modules/tensorrt/releases.nix
+++ b/pkgs/development/cuda-modules/tensorrt/releases.nix
@@ -125,6 +125,22 @@
         filename = "TensorRT-8.6.1.6.Linux.x86_64-gnu.cuda-12.0.tar.gz";
         hash = "sha256-D4FXpfxTKZQ7M4uJNZE3M1CvqQyoEjnNrddYDNHrolQ=";
       }
+      {
+        version = "10.3.0.26";
+        minCudaVersion = "11.0";
+        maxCudaVersion = "11.8";
+        cudnnVersion = "8.9";
+        filename = "TensorRT-10.3.0.26.Linux.x86_64-gnu.cuda-11.8.tar.gz";
+        hash = "sha256-1O9TwlUP0eLqTozMs53EefmjriiaHjxb4A4GIuN9jvc=";
+      }
+      {
+        version = "10.3.0.26";
+        minCudaVersion = "12.0";
+        maxCudaVersion = "12.5";
+        cudnnVersion = "8.9";
+        filename = "TensorRT-10.3.0.26.Linux.x86_64-gnu.cuda-12.5.tar.gz";
+        hash = "sha256-rf8c1avl2HATgGFyNR5Y/QJOW/D8YdSe9LhM047ZkIE=";
+      }
     ];
   };
 }

From ca7cb5d6ea1dde0f3fb050cb4e086cbfb136d7a4 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 3 Sep 2024 21:21:53 +0100
Subject: [PATCH 039/241] openjfx22: 22.0.1-ga -> 22.0.2-ga

---
 pkgs/development/compilers/openjdk/openjfx/22/default.nix | 4 ++--
 pkgs/development/compilers/openjdk/openjfx/22/deps.json   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/openjfx/22/default.nix b/pkgs/development/compilers/openjdk/openjfx/22/default.nix
index 4359a880ec04..28c8b14c7844 100644
--- a/pkgs/development/compilers/openjdk/openjfx/22/default.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/22/default.nix
@@ -25,7 +25,7 @@
 let
   pname = "openjfx-modular-sdk";
   major = "22";
-  update = ".0.1";
+  update = ".0.2";
   build = "-ga";
   repover = "${major}${update}${build}";
   jdk = openjdk21_headless;
@@ -38,7 +38,7 @@ in stdenv.mkDerivation {
     owner = "openjdk";
     repo = "jfx22u";
     rev = repover;
-    hash = "sha256-VoEufSO+LciUCvoAM86MG1iMjCA3FSb60Ik4OP2Rk/Q=";
+    hash = "sha256-7Q9nZ2p3KfQPt1A2ULwk64OU/5/ghEkcsf9ECD6Ln2g=";
   };
 
   buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_6 ];
diff --git a/pkgs/development/compilers/openjdk/openjfx/22/deps.json b/pkgs/development/compilers/openjdk/openjfx/22/deps.json
index 9ce577967ae2..a5b5a76852bf 100644
--- a/pkgs/development/compilers/openjdk/openjfx/22/deps.json
+++ b/pkgs/development/compilers/openjdk/openjfx/22/deps.json
@@ -7,8 +7,8 @@
   }
  },
  "https://github.com": {
-  "unicode-org/icu/releases/download/release-73-1/icu4c-73_1-data-bin-l": {
-   "zip": "sha256-QDgpjuAqDDiRcYXvj/Tr3pyLVSx3f9A+TfbGtLGCXiA="
+  "unicode-org/icu/releases/download/release-74-2/icu4c-74_2-data-bin-l": {
+   "zip": "sha256-Ks2xuYIigECWPRg7LdnTISUsYT4PTbIT1LvBBBfN5Wk="
   }
  },
  "https://repo.maven.apache.org/maven2": {

From 19d7a635e878846a7d4d1c586884bb8245924484 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 3 Sep 2024 21:21:53 +0100
Subject: [PATCH 040/241] openjfx{11,17,21,22}: add upstream patch for FFmpeg 7

---
 .../compilers/openjdk/openjfx/11/default.nix  |   5 +-
 .../compilers/openjdk/openjfx/17/default.nix  |   5 +-
 .../compilers/openjdk/openjfx/21/default.nix  |   8 +-
 .../compilers/openjdk/openjfx/22/default.nix  |  14 +-
 .../backport-ffmpeg-7-support-jfx11.patch     | 155 +++++++++++++
 .../backport-ffmpeg-7-support-jfx21.patch     | 213 ++++++++++++++++++
 6 files changed, 392 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-7-support-jfx11.patch
 create mode 100644 pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-7-support-jfx21.patch

diff --git a/pkgs/development/compilers/openjdk/openjfx/11/default.nix b/pkgs/development/compilers/openjdk/openjfx/11/default.nix
index 79df8c0da364..dcce1a2de6fc 100644
--- a/pkgs/development/compilers/openjdk/openjfx/11/default.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/11/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, pkgs, fetchFromGitHub, writeText, gradle_7, pkg-config, perl, cmake
-, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_6-headless, python3, ruby
+, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_7-headless, python3, ruby
 , openjdk11-bootstrap
 , withMedia ? true
 , withWebKit ? false
@@ -27,9 +27,10 @@ in stdenv.mkDerivation {
 
   patches = [
     ../backport-ffmpeg-6-support-jfx11.patch
+    ../backport-ffmpeg-7-support-jfx11.patch
   ];
 
-  buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_6-headless ];
+  buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_7-headless ];
   nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ];
 
   dontUseCmakeConfigure = true;
diff --git a/pkgs/development/compilers/openjdk/openjfx/17/default.nix b/pkgs/development/compilers/openjdk/openjfx/17/default.nix
index 1b19ee30eca6..de0f50dab7c7 100644
--- a/pkgs/development/compilers/openjdk/openjfx/17/default.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/17/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, pkgs, fetchFromGitHub, writeText, openjdk17_headless, gradle_7
 , pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib
-, ffmpeg_6-headless, python3, ruby
+, ffmpeg_7-headless, python3, ruby
 , withMedia ? true
 , withWebKit ? false
 }:
@@ -27,9 +27,10 @@ in stdenv.mkDerivation {
 
   patches = [
     ../backport-ffmpeg-6-support-jfx11.patch
+    ../backport-ffmpeg-7-support-jfx11.patch
   ];
 
-  buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_6-headless ];
+  buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_7-headless ];
   nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ];
 
   dontUseCmakeConfigure = true;
diff --git a/pkgs/development/compilers/openjdk/openjfx/21/default.nix b/pkgs/development/compilers/openjdk/openjfx/21/default.nix
index 85fe036fe767..5eed503cad11 100644
--- a/pkgs/development/compilers/openjdk/openjfx/21/default.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/21/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, pkgs, fetchFromGitHub, writeText
 , openjdk21_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst
-, libXxf86vm, glib, alsa-lib, ffmpeg_6, python3, ruby
+, libXxf86vm, glib, alsa-lib, ffmpeg_7, python3, ruby
 , withMedia ? true
 , withWebKit ? false
 }:
@@ -25,7 +25,11 @@ in stdenv.mkDerivation {
     hash = "sha256-7z0GIbkQwG9mXY9dssaicqaKpMo3FkNEpyAvkswoQQ4=";
   };
 
-  buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_6 ];
+  patches = [
+    ../backport-ffmpeg-7-support-jfx21.patch
+  ];
+
+  buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_7 ];
   nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ];
 
   dontUseCmakeConfigure = true;
diff --git a/pkgs/development/compilers/openjdk/openjfx/22/default.nix b/pkgs/development/compilers/openjdk/openjfx/22/default.nix
index 28c8b14c7844..a64cecb8c9b5 100644
--- a/pkgs/development/compilers/openjdk/openjfx/22/default.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/22/default.nix
@@ -2,6 +2,7 @@
 , lib
 , pkgs
 , fetchFromGitHub
+, fetchpatch2
 , writeText
 , openjdk21_headless
 , gradle
@@ -15,7 +16,7 @@
 , libXxf86vm
 , glib
 , alsa-lib
-, ffmpeg_6
+, ffmpeg_7
 , python3
 , ruby
 , withMedia ? true
@@ -41,7 +42,16 @@ in stdenv.mkDerivation {
     hash = "sha256-7Q9nZ2p3KfQPt1A2ULwk64OU/5/ghEkcsf9ECD6Ln2g=";
   };
 
-  buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_6 ];
+  patches = [
+    # 8338701: Provide media support for libavcodec version 61
+    # <https://github.com/openjdk/jfx/pull/1552>
+    (fetchpatch2 {
+      url = "https://github.com/openjdk/jfx/commit/6115b396bacf62f39dcaa93c7c0adcd60b428b8c.patch?full_index=1";
+      hash = "sha256-6EES4qsumFgXePZSDEetJC1Li65zquz3UjwRbq/6YJM=";
+    })
+  ];
+
+  buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_7 ];
   nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ];
 
   dontUseCmakeConfigure = true;
diff --git a/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-7-support-jfx11.patch b/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-7-support-jfx11.patch
new file mode 100644
index 000000000000..edd49ddf4a99
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-7-support-jfx11.patch
@@ -0,0 +1,155 @@
+Backported from <https://github.com/openjdk/jfx/pull/1552>.
+
+Original author: Alexander Matveev <alexander.matveev@oracle.com>
+
+diff --git a/build.gradle b/build.gradle
+index d1ae3b401f..848a385f36 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -3343,6 +3343,7 @@
+             media name: "ffmpeg-4.0.2", ext: "tar.gz"
+             media name: "ffmpeg-5.1.2", ext: "tar.gz"
+             media name: "ffmpeg-6.0", ext: "tar.gz"
++            media name: "ffmpeg-7.0.2", ext: "tar.gz"
+         }
+         implementation project(":base")
+         implementation project(":graphics")
+@@ -3689,8 +3690,8 @@
+                     doLast {
+                         project.ext.libav = [:]
+                         project.ext.libav.basedir = "${buildDir}/native/linux/ffmpeg"
+-                        project.ext.libav.versions = [ "3.3.3", "4.0.2", "5.1.2", "6.0" ]
+-                        project.ext.libav.versionmap = [ "3.3.3" : "57", "4.0.2" : "58", "5.1.2" : "59", "6.0" : "60" ]
++                        project.ext.libav.versions = [ "3.3.3", "4.0.2", "5.1.2", "6.0", "7.0.2" ]
++                        project.ext.libav.versionmap = [ "3.3.3" : "57", "4.0.2" : "58", "5.1.2" : "59", "6.0" : "60", "7.0.2" : "61" ]
+ 
+                         libav.versions.each { version ->
+                             def libavDir = "${libav.basedir}/ffmpeg-${version}"
+@@ -3770,7 +3771,7 @@
+                             project.ext.libav.libavffmpeg.versions = [ "56" ]
+                             project.ext.libav.ffmpeg = [:]
+                             project.ext.libav.ffmpeg.basedir = "${buildDir}/native/linux/ffmpeg/ffmpeg"
+-                            project.ext.libav.ffmpeg.versions = [ "57", "58", "59", "60" ]
++                            project.ext.libav.ffmpeg.versions = [ "57", "58", "59", "60", "61" ]
+ 
+                             project.ext.libav.versions.each { version ->
+                                 def libavDir = "${project.ext.libav.basedir}-${version}"
+diff --git a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java
+index b05bb68341..2add519ed4 100644
+--- a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java
++++ b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  *
+  * This code is free software; you can redistribute it and/or modify it
+@@ -126,6 +126,7 @@
+                     dependencies.add("avplugin-ffmpeg-58");
+                     dependencies.add("avplugin-ffmpeg-59");
+                     dependencies.add("avplugin-ffmpeg-60");
++                    dependencies.add("avplugin-ffmpeg-61");
+                 }
+                 if (HostUtils.isMacOSX()) {
+                     dependencies.add("fxplugins");
+diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c
+index ee64e4bafd..0204db4250 100644
+--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c
++++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c
+@@ -146,7 +146,7 @@
+ // For ffmpeg (libavcodec-ffmpeg.so)
+ static const int AVCODEC_FFMPEG_EXPLICIT_VERSIONS[] = { 56 };
+ // For libav or ffmpeg (libavcodec.so)
+-static const int AVCODEC_EXPLICIT_VERSIONS[] = { 57, 58, 59, 60 };
++static const int AVCODEC_EXPLICIT_VERSIONS[] = { 57, 58, 59, 60, 61 };
+ 
+ /*
+  * Callback passed to dl_iterate_phdr(): finds the path of
+diff --git a/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h b/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h
+index bb93df5f96..a09b954714 100644
+--- a/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h
++++ b/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  *
+  * This code is free software; you can redistribute it and/or modify it
+@@ -50,5 +50,14 @@
+ // Do not call avcodec_register_all() and av_register_all()
+ // Not required since 58 and removed in 59
+ #define NO_REGISTER_ALL        (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59,0,0))
++
++// Do not use reordered_opaque to pass PTS. Use AVPacket.pts/AVFrame.pts instead.
++// reordered_opaque is removed since 61.
++#define NO_REORDERED_OPAQUE    (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61,0,0))
++
++// Use AVCodecContext.frame_num instead of AVCodecContext.frame_number. They same
++// except frame_num is 64-bit and frame_number is 32-bit. Since 61.
++#define USE_FRAME_NUM          (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61,0,0))
++
+ #endif  /* AVDEFINES_H */
+ 
+diff --git a/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c b/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c
+index fe1f96b9cb..9179ef8b68 100644
+--- a/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c
++++ b/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c
+@@ -397,10 +397,17 @@
+         if (av_new_packet(&decoder->packet, info.size) == 0)
+         {
+             memcpy(decoder->packet.data, info.data, info.size);
++#if NO_REORDERED_OPAQUE
++            if (GST_BUFFER_TIMESTAMP_IS_VALID(buf))
++                decoder->packet.pts = (int64_t)GST_BUFFER_TIMESTAMP(buf);
++            else
++                decoder->packet.pts = AV_NOPTS_VALUE;
++#else // NO_REORDERED_OPAQUE
+             if (GST_BUFFER_TIMESTAMP_IS_VALID(buf))
+                 base->context->reordered_opaque = GST_BUFFER_TIMESTAMP(buf);
+             else
+                 base->context->reordered_opaque = AV_NOPTS_VALUE;
++#endif // NO_REORDERED_OPAQUE
+ #if USE_SEND_RECEIVE
+             num_dec = avcodec_send_packet(base->context, &decoder->packet);
+             if (num_dec == 0)
+@@ -432,10 +439,17 @@
+         av_init_packet(&decoder->packet);
+         decoder->packet.data = info.data;
+         decoder->packet.size = info.size;
++#if NO_REORDERED_OPAQUE
++        if (GST_BUFFER_TIMESTAMP_IS_VALID(buf))
++            decoder->packet.pts = (int64_t)GST_BUFFER_TIMESTAMP(buf);
++        else
++            decoder->packet.pts = AV_NOPTS_VALUE;
++#else // NO_REORDERED_OPAQUE
+         if (GST_BUFFER_TIMESTAMP_IS_VALID(buf))
+             base->context->reordered_opaque = GST_BUFFER_TIMESTAMP(buf);
+         else
+             base->context->reordered_opaque = AV_NOPTS_VALUE;
++#endif // NO_REORDERED_OPAQUE
+ 
+ #if USE_SEND_RECEIVE
+         num_dec = avcodec_send_packet(base->context, &decoder->packet);
+@@ -480,10 +494,20 @@
+             }
+             else
+             {
++#if USE_FRAME_NUM
++                GST_BUFFER_OFFSET(outbuf) = base->context->frame_num;
++#else // USE_FRAME_NUM
+                 GST_BUFFER_OFFSET(outbuf) = base->context->frame_number;
++#endif // USE_FRAME_NUM
++#if NO_REORDERED_OPAQUE
++                if (base->frame->pts != AV_NOPTS_VALUE)
++                {
++                    GST_BUFFER_TIMESTAMP(outbuf) = base->frame->pts;
++#else // NO_REORDERED_OPAQUE
+                 if (base->frame->reordered_opaque != AV_NOPTS_VALUE)
+                 {
+                     GST_BUFFER_TIMESTAMP(outbuf) = base->frame->reordered_opaque;
++#endif // NO_REORDERED_OPAQUE
+                     GST_BUFFER_DURATION(outbuf) = GST_BUFFER_DURATION(buf); // Duration for video usually same
+                 }
+ 
diff --git a/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-7-support-jfx21.patch b/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-7-support-jfx21.patch
new file mode 100644
index 000000000000..3e746b0cab8f
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/openjfx/backport-ffmpeg-7-support-jfx21.patch
@@ -0,0 +1,213 @@
+Backported from <https://github.com/openjdk/jfx/pull/1552>.
+
+Original author: Alexander Matveev <alexander.matveev@oracle.com>
+
+diff --git a/build.gradle b/build.gradle
+index f9dbc53076..77856226a6 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -2946,6 +2946,7 @@
+             media name: "ffmpeg-4.0.2", ext: "tar.gz"
+             media name: "ffmpeg-5.1.2", ext: "tar.gz"
+             media name: "ffmpeg-6.0", ext: "tar.gz"
++            media name: "ffmpeg-7.0.2", ext: "tar.gz"
+         }
+         implementation project(":base")
+         implementation project(":graphics")
+@@ -3292,8 +3293,8 @@
+                     doLast {
+                         project.ext.libav = [:]
+                         project.ext.libav.basedir = "${buildDir}/native/linux/ffmpeg"
+-                        project.ext.libav.versions = [ "3.3.3", "4.0.2", "5.1.2", "6.0" ]
+-                        project.ext.libav.versionmap = [ "3.3.3" : "57", "4.0.2" : "58", "5.1.2" : "59", "6.0" : "60" ]
++                        project.ext.libav.versions = [ "3.3.3", "4.0.2", "5.1.2", "6.0", "7.0.2" ]
++                        project.ext.libav.versionmap = [ "3.3.3" : "57", "4.0.2" : "58", "5.1.2" : "59", "6.0" : "60", "7.0.2" : "61" ]
+ 
+                         libav.versions.each { version ->
+                             def libavDir = "${libav.basedir}/ffmpeg-${version}"
+@@ -3373,7 +3374,7 @@
+                             project.ext.libav.libavffmpeg.versions = [ "56" ]
+                             project.ext.libav.ffmpeg = [:]
+                             project.ext.libav.ffmpeg.basedir = "${buildDir}/native/linux/ffmpeg/ffmpeg"
+-                            project.ext.libav.ffmpeg.versions = [ "57", "58", "59", "60" ]
++                            project.ext.libav.ffmpeg.versions = [ "57", "58", "59", "60", "61" ]
+ 
+                             project.ext.libav.versions.each { version ->
+                                 def libavDir = "${project.ext.libav.basedir}-${version}"
+diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
+index 887b9d100c..a10610b0f5 100644
+--- a/gradle/verification-metadata.xml
++++ b/gradle/verification-metadata.xml
+@@ -28,6 +28,11 @@
+             <sha256 value="f4ccf961403752c93961927715f524576d1f4dd02cd76d8c76aed3bbe6686656" origin="Generated by Gradle"/>
+          </artifact>
+       </component>
++      <component group="" name="ffmpeg-7.0.2" version="">
++         <artifact name="ffmpeg-7.0.2-.tar.gz">
++            <sha256 value="1233b3a93dd7517cc3c56b72a67f64041c044848d981e3deff4bebffa25f1054" origin="Generated by Gradle"/>
++         </artifact>
++      </component>
+       <component group="" name="icu4c-73_1-data-bin-l" version="">
+          <artifact name="icu4c-73_1-data-bin-l-.zip">
+             <sha256 value="4038298ee02a0c38917185ef8ff4ebde9c8b552c777fd03e4df6c6b4b1825e20" origin="Generated by Gradle"/>
+diff --git a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java
+index 097004bd17..0c2ae1ddbc 100644
+--- a/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java
++++ b/modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  *
+  * This code is free software; you can redistribute it and/or modify it
+@@ -127,6 +127,7 @@
+                     dependencies.add("avplugin-ffmpeg-58");
+                     dependencies.add("avplugin-ffmpeg-59");
+                     dependencies.add("avplugin-ffmpeg-60");
++                    dependencies.add("avplugin-ffmpeg-61");
+                 }
+                 if (PlatformUtil.isMac()) {
+                     dependencies.add("fxplugins");
+diff --git a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c
+index 22c8be9300..38bae197fe 100644
+--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c
++++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c
+@@ -146,7 +146,7 @@
+ // For ffmpeg (libavcodec-ffmpeg.so)
+ static const int AVCODEC_FFMPEG_EXPLICIT_VERSIONS[] = { 56 };
+ // For libav or ffmpeg (libavcodec.so)
+-static const int AVCODEC_EXPLICIT_VERSIONS[] = { 57, 58, 59, 60 };
++static const int AVCODEC_EXPLICIT_VERSIONS[] = { 57, 58, 59, 60, 61 };
+ 
+ /*
+  * Callback passed to dl_iterate_phdr(): finds the path of
+diff --git a/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h b/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h
+index 60fa7b631c..f49ad56e1e 100644
+--- a/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h
++++ b/modules/javafx.media/src/main/native/gstreamer/plugins/av/avdefines.h
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  *
+  * This code is free software; you can redistribute it and/or modify it
+@@ -53,5 +53,13 @@
+ // Not required since 58 and removed in 59
+ #define NO_REGISTER_ALL        (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59,0,0))
+ 
++// Do not use reordered_opaque to pass PTS. Use AVPacket.pts/AVFrame.pts instead.
++// reordered_opaque is removed since 61.
++#define NO_REORDERED_OPAQUE    (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61,0,0))
++
++// Use AVCodecContext.frame_num instead of AVCodecContext.frame_number. They same
++// except frame_num is 64-bit and frame_number is 32-bit. Since 61.
++#define USE_FRAME_NUM          (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61,0,0))
++
+ #endif  /* AVDEFINES_H */
+ 
+diff --git a/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c b/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c
+index c9fa787e63..8a5cd78f2d 100644
+--- a/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c
++++ b/modules/javafx.media/src/main/native/gstreamer/plugins/av/videodecoder.c
+@@ -554,7 +554,11 @@
+     if (ret < 0)
+         return FALSE;
+ 
++#if NO_REORDERED_OPAQUE
++    decoder->dest_frame->pts = base->frame->pts;
++#else // NO_REORDERED_OPAQUE
+     decoder->dest_frame->reordered_opaque = base->frame->reordered_opaque;
++#endif // NO_REORDERED_OPAQUE
+ 
+     return TRUE;
+ }
+@@ -679,7 +683,7 @@
+     GstMapInfo     info2;
+     gboolean       unmap_buf = FALSE;
+     gboolean       set_frame_values = TRUE;
+-    int64_t        reordered_opaque = AV_NOPTS_VALUE;
++    int64_t        pts = AV_NOPTS_VALUE;
+     unsigned int   out_buf_size = 0;
+     gboolean       copy_error = FALSE;
+     uint8_t*       data0 = NULL;
+@@ -711,10 +715,17 @@
+         if (av_new_packet(&decoder->packet, info.size) == 0)
+         {
+             memcpy(decoder->packet.data, info.data, info.size);
++#if NO_REORDERED_OPAQUE
++            if (GST_BUFFER_TIMESTAMP_IS_VALID(buf))
++                decoder->packet.pts = (int64_t)GST_BUFFER_TIMESTAMP(buf);
++            else
++                decoder->packet.pts = AV_NOPTS_VALUE;
++#else // NO_REORDERED_OPAQUE
+             if (GST_BUFFER_TIMESTAMP_IS_VALID(buf))
+                 base->context->reordered_opaque = GST_BUFFER_TIMESTAMP(buf);
+             else
+                 base->context->reordered_opaque = AV_NOPTS_VALUE;
++#endif // NO_REORDERED_OPAQUE
+ #if USE_SEND_RECEIVE
+             num_dec = avcodec_send_packet(base->context, &decoder->packet);
+             if (num_dec == 0)
+@@ -746,10 +757,17 @@
+         av_init_packet(&decoder->packet);
+         decoder->packet.data = info.data;
+         decoder->packet.size = info.size;
++#if NO_REORDERED_OPAQUE
++        if (GST_BUFFER_TIMESTAMP_IS_VALID(buf))
++            decoder->packet.pts = (int64_t)GST_BUFFER_TIMESTAMP(buf);
++        else
++            decoder->packet.pts = AV_NOPTS_VALUE;
++#else // NO_REORDERED_OPAQUE
+         if (GST_BUFFER_TIMESTAMP_IS_VALID(buf))
+             base->context->reordered_opaque = GST_BUFFER_TIMESTAMP(buf);
+         else
+             base->context->reordered_opaque = AV_NOPTS_VALUE;
++#endif // NO_REORDERED_OPAQUE
+ 
+ #if USE_SEND_RECEIVE
+         num_dec = avcodec_send_packet(base->context, &decoder->packet);
+@@ -796,7 +814,11 @@
+                     goto _exit;
+                 }
+ 
+-                reordered_opaque = decoder->dest_frame->reordered_opaque;
++#if NO_REORDERED_OPAQUE
++                pts = decoder->dest_frame->pts;
++#else // NO_REORDERED_OPAQUE
++                pts = decoder->dest_frame->reordered_opaque;
++#endif // NO_REORDERED_OPAQUE
+                 data0 = decoder->dest_frame->data[0];
+                 data1 = decoder->dest_frame->data[1];
+                 data2 = decoder->dest_frame->data[2];
+@@ -806,7 +828,11 @@
+ 
+             if (set_frame_values)
+             {
+-                reordered_opaque = base->frame->reordered_opaque;
++#if NO_REORDERED_OPAQUE
++                pts = base->frame->pts;
++#else // NO_REORDERED_OPAQUE
++                pts = base->frame->reordered_opaque;
++#endif // NO_REORDERED_OPAQUE
+                 data0 = base->frame->data[0];
+                 data1 = base->frame->data[1];
+                 data2 = base->frame->data[2];
+@@ -825,10 +851,14 @@
+             }
+             else
+             {
++#if USE_FRAME_NUM
++                GST_BUFFER_OFFSET(outbuf) = base->context->frame_num;
++#else // USE_FRAME_NUM
+                 GST_BUFFER_OFFSET(outbuf) = base->context->frame_number;
+-                if (reordered_opaque != AV_NOPTS_VALUE)
++#endif // USE_FRAME_NUM
++                if (pts != AV_NOPTS_VALUE)
+                 {
+-                    GST_BUFFER_TIMESTAMP(outbuf) = reordered_opaque;
++                    GST_BUFFER_TIMESTAMP(outbuf) = pts;
+                     GST_BUFFER_DURATION(outbuf) = GST_BUFFER_DURATION(buf); // Duration for video usually same
+                 }
+ 

From 9706ea618a983552f5c7d103b07c82592a2f5a78 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Fri, 6 Sep 2024 20:47:51 +0800
Subject: [PATCH 041/241] duplicati: move to by-name

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

diff --git a/pkgs/tools/backup/duplicati/default.nix b/pkgs/by-name/du/duplicati/package.nix
similarity index 100%
rename from pkgs/tools/backup/duplicati/default.nix
rename to pkgs/by-name/du/duplicati/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e69ca4d78f5b..96b523b808d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7239,8 +7239,6 @@ with pkgs;
 
   duplicacy = callPackage ../tools/backup/duplicacy { };
 
-  duplicati = callPackage ../tools/backup/duplicati { };
-
   duplicity = callPackage ../tools/backup/duplicity { };
 
   duply = callPackage ../tools/backup/duply { };

From 0374204eccb1ee66fc5c445673259b02204b32bc Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Fri, 6 Sep 2024 21:02:12 +0800
Subject: [PATCH 042/241] duplicati: 2.0.7.1 -> 2.0.8.1

---
 pkgs/by-name/du/duplicati/package.nix | 29 +++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/du/duplicati/package.nix b/pkgs/by-name/du/duplicati/package.nix
index 2cb003d2d080..4a6f9879976a 100644
--- a/pkgs/by-name/du/duplicati/package.nix
+++ b/pkgs/by-name/du/duplicati/package.nix
@@ -1,14 +1,21 @@
-{ lib, stdenv, fetchzip, mono, sqlite, makeWrapper }:
+{
+  lib,
+  stdenv,
+  fetchzip,
+  mono,
+  sqlite,
+  makeWrapper,
+}:
 
 stdenv.mkDerivation rec {
   pname = "duplicati";
-  version = "2.0.7.1";
+  version = "2.0.8.1";
   channel = "beta";
-  build_date = "2023-05-25";
+  build_date = "2024-05-07";
 
   src = fetchzip {
     url = "https://github.com/duplicati/duplicati/releases/download/v${version}-${version}_${channel}_${build_date}/duplicati-${version}_${channel}_${build_date}.zip";
-    hash = "sha256-isPmRC6N+gEZgvJ0bgeFf5kOQJsicZOsGnT+CAGgg+U=";
+    hash = "sha256-LmW6yGutxP33ghFqyOLKrGDNCQdr8DDFn/IHigsLpzA=";
     stripRoot = false;
   };
 
@@ -19,12 +26,18 @@ stdenv.mkDerivation rec {
     cp -r * $out/share/${pname}-${version}
     makeWrapper "${mono}/bin/mono" $out/bin/duplicati-cli \
       --add-flags "$out/share/${pname}-${version}/Duplicati.CommandLine.exe" \
-      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
-          sqlite ]}
+      --prefix LD_LIBRARY_PATH : ${
+        lib.makeLibraryPath [
+          sqlite
+        ]
+      }
     makeWrapper "${mono}/bin/mono" $out/bin/duplicati-server \
       --add-flags "$out/share/${pname}-${version}/Duplicati.Server.exe" \
-      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
-          sqlite ]}
+      --prefix LD_LIBRARY_PATH : ${
+        lib.makeLibraryPath [
+          sqlite
+        ]
+      }
   '';
 
   meta = with lib; {

From e1c102250e4dcf828d50514ceb8f8c969fd501ca Mon Sep 17 00:00:00 2001
From: toastal <toastal@posteo.net>
Date: Sat, 7 Sep 2024 21:34:26 +0700
Subject: [PATCH 043/241] =?UTF-8?q?soupault:=204.10.0=20=E2=86=92=204.11.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/so/soupault/package.nix b/pkgs/by-name/so/soupault/package.nix
index c38e58d181d9..615fd3dc7b9e 100644
--- a/pkgs/by-name/so/soupault/package.nix
+++ b/pkgs/by-name/so/soupault/package.nix
@@ -9,7 +9,7 @@
 
 ocamlPackages.buildDunePackage rec {
   pname = "soupault";
-  version = "4.10.0";
+  version = "4.11.0";
 
   minimalOCamlVersion = "4.13";
 
@@ -18,7 +18,7 @@ ocamlPackages.buildDunePackage rec {
       "https://github.com/PataphysicalSociety/soupault/archive/${version}.tar.gz"
       "https://codeberg.org/PataphysicalSociety/soupault/archive/${version}.tar.gz"
     ];
-    hash = "sha256-mkbRWw4Qj7pk2MQJERA9cAuC8DXD/fOShVXz2zPtXZ4=";
+    hash = "sha256-UABbrNNcNaN9NgtAjCs4HUoNXMaK4QvCuWERuEnMG6I=";
   };
 
   nativeBuildInputs = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ darwin.sigtool ];

From 8b8a20d1b4e15f1740aa04ac72bd72e8a3242364 Mon Sep 17 00:00:00 2001
From: mksafavi <mksafavi@gmail.com>
Date: Sun, 8 Sep 2024 01:23:18 +0330
Subject: [PATCH 044/241] lms: 3.56.0 -> 3.57.0

---
 pkgs/by-name/lm/lms/package.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/lm/lms/package.nix b/pkgs/by-name/lm/lms/package.nix
index 1fac7a82299e..099ac24e77ae 100644
--- a/pkgs/by-name/lm/lms/package.nix
+++ b/pkgs/by-name/lm/lms/package.nix
@@ -17,16 +17,18 @@
   libSM,
   libICE,
   stb,
+  openssl,
 }:
 
 stdenv.mkDerivation rec {
   pname = "lms";
-  version = "3.56.0";
+  version = "3.57.0";
+
   src = fetchFromGitHub {
     owner = "epoupon";
     repo = "lms";
     rev = "v${version}";
-    hash = "sha256-o/wgh/PtFcTOmfl5H1cc1cTsWFvEnVQYhh4hPTnLNMU=";
+    hash = "sha256-KeskFVTZMxsFefbjnRBfrbS88Wt+2kwzboDziBsZJrY=";
   };
 
   strictDeps = true;
@@ -48,6 +50,7 @@ stdenv.mkDerivation rec {
     libSM
     libICE
     stb
+    openssl
   ];
 
   postPatch = ''
@@ -77,12 +80,12 @@ stdenv.mkDerivation rec {
       --prefix LD_LIBRARY_PATH : "${lib.strings.makeLibraryPath [libSM libICE]}"
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/epoupon/lms";
     description = "Lightweight Music Server - Access your self-hosted music using a web interface";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
     mainProgram = "lms";
-    maintainers = with maintainers; [ mksafavi ];
+    maintainers = with lib.maintainers; [ mksafavi ];
   };
 }

From 83d27c3878f875d96fbcbe738f3731be3cd88ddb Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sun, 8 Sep 2024 20:49:49 +0800
Subject: [PATCH 045/241] duplicati: add bot-wxt1221 as maintainers

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

diff --git a/pkgs/by-name/du/duplicati/package.nix b/pkgs/by-name/du/duplicati/package.nix
index 4a6f9879976a..3576048d6a62 100644
--- a/pkgs/by-name/du/duplicati/package.nix
+++ b/pkgs/by-name/du/duplicati/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     description = "Free backup client that securely stores encrypted, incremental, compressed backups on cloud storage services and remote file servers";
     homepage = "https://www.duplicati.com/";
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ nyanloutre ];
+    maintainers = with maintainers; [ nyanloutre bot-wxt1221 ];
     platforms = platforms.all;
   };
 }

From 45d49fecefbfc06fd238a100a3223da957a0ac06 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sun, 8 Sep 2024 20:50:24 +0800
Subject: [PATCH 046/241] duplicati: add sourceProvenance patern

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

diff --git a/pkgs/by-name/du/duplicati/package.nix b/pkgs/by-name/du/duplicati/package.nix
index 3576048d6a62..d818b7c5b537 100644
--- a/pkgs/by-name/du/duplicati/package.nix
+++ b/pkgs/by-name/du/duplicati/package.nix
@@ -45,6 +45,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.duplicati.com/";
     license = licenses.lgpl21;
     maintainers = with maintainers; [ nyanloutre bot-wxt1221 ];
+    sourceProvenance = with sourceTypes; [ binaryBytecode ];
     platforms = platforms.all;
   };
 }

From 4175200f2c40528b5fa3f116745244ad9b91eb36 Mon Sep 17 00:00:00 2001
From: hand7s <litvinovb0@gmail.com>
Date: Sun, 8 Sep 2024 17:07:33 +0300
Subject: [PATCH 047/241]   spoofdpi: 0.11.1 -> 0.12.0

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

diff --git a/pkgs/by-name/sp/spoofdpi/package.nix b/pkgs/by-name/sp/spoofdpi/package.nix
index 5c3e30f342a6..1b7d67f8cd36 100644
--- a/pkgs/by-name/sp/spoofdpi/package.nix
+++ b/pkgs/by-name/sp/spoofdpi/package.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  stdenv,
   fetchFromGitHub,
   buildGoModule,
   ...
@@ -8,20 +7,20 @@
 
 buildGoModule rec {
   pname = "SpoofDPI";
-  version = "0.11.1";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "xvzc";
     repo = "SpoofDPI";
     rev = "v${version}";
-    hash = "sha256-GdGOnaIDy7XWWo0MOu+HfQcLrW/PDlRxf0y1jjJrZNQ=";
+    hash = "sha256-m4fhFhZLuWT1diDlDTmTsNrckKTjhEZbhciv44FZcro=";
   };
 
   vendorHash = "sha256-47Gt5SI6VXq4+1T0LxFvQoYNk+JqTt3DonDXLfmFBzw=";
 
   meta = {
     homepage = "https://github.com/xvzc/SpoofDPI";
-    description = "A simple and fast anti-censorship tool written in Go";
+    description = "Simple and fast anti-censorship tool written in Go";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ s0me1newithhand7s ];
   };

From 89795ca29333a90d3c52ee3a14bbe3418a2d9060 Mon Sep 17 00:00:00 2001
From: linsui <36977733+linsui@users.noreply.github.com>
Date: Sun, 8 Sep 2024 22:53:29 +0800
Subject: [PATCH 048/241] vimPlugins.nvim-rip-substitute: init at 2024-08-30

---
 pkgs/applications/editors/vim/plugins/generated.nix  | 12 ++++++++++++
 .../editors/vim/plugins/vim-plugin-names             |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 84e554df35f8..e2a7041c2304 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -8523,6 +8523,18 @@ final: prev:
     meta.homepage = "https://github.com/olrtg/nvim-rename-state/";
   };
 
+  nvim-rip-substitute = buildVimPlugin {
+    pname = "nvim-rip-substitute";
+    version = "2024-08-30";
+    src = fetchFromGitHub {
+      owner = "chrisgrieser";
+      repo = "nvim-rip-substitute";
+      rev = "4e5ed58d74d210b853255e3d1a4ab6410f3007b5";
+      sha256 = "0p6ycz1bq8j5xafn59kyn5xdashbir66gnzlqdpdmzmigw3z9vq1";
+    };
+    meta.homepage = "https://github.com/chrisgrieser/nvim-rip-substitute/";
+  };
+
   nvim-scrollbar = buildVimPlugin {
     pname = "nvim-scrollbar";
     version = "2024-06-03";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index fa97d6ce8961..fca5092e1dcc 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -718,6 +718,7 @@ https://github.com/gennaro-tedesco/nvim-peekup/,,
 https://github.com/yorickpeterse/nvim-pqf/,HEAD,
 https://github.com/jamestthompson3/nvim-remote-containers/,HEAD,
 https://github.com/olrtg/nvim-rename-state/,HEAD,
+https://github.com/chrisgrieser/nvim-rip-substitute/,,
 https://github.com/petertriho/nvim-scrollbar/,HEAD,
 https://github.com/dstein64/nvim-scrollview/,,
 https://github.com/s1n7ax/nvim-search-and-replace/,HEAD,

From 0de0b9d7a27cb113d1e7d8dbfdb24d9631ce5418 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Sep 2024 01:31:44 +0000
Subject: [PATCH 049/241] pmtiles: 1.20.0 -> 1.21.0

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

diff --git a/pkgs/by-name/pm/pmtiles/package.nix b/pkgs/by-name/pm/pmtiles/package.nix
index ad214c35de6f..230b1d65bdaa 100644
--- a/pkgs/by-name/pm/pmtiles/package.nix
+++ b/pkgs/by-name/pm/pmtiles/package.nix
@@ -1,16 +1,16 @@
 { lib, buildGoModule, fetchFromGitHub }:
 buildGoModule rec {
   pname = "pmtiles";
-  version = "1.20.0";
+  version = "1.21.0";
 
   src = fetchFromGitHub {
     owner = "protomaps";
     repo = "go-pmtiles";
     rev = "v${version}";
-    hash = "sha256-ZwTZtMNgQE0AIbxdjA+8CFKSp1B9QnV5wmP+z/JoIpg=";
+    hash = "sha256-scicNAl1Lu8oD/g/63CXLeys+yorpH6Unhk5p4V78eY=";
   };
 
-  vendorHash = "sha256-Buzk+rPSPrs0q+g6MWVb47cAIKMxsNXlj3CWA0JINXM=";
+  vendorHash = "sha256-8HShM4YznUAc6rJyDbdL5vv0dOk+d4IRKQpmEhWiNjo=";
 
   ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=v${version}" ];
 

From c654691181464e798c0d5bc1403427f6c6554ed2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Sep 2024 12:05:52 +0200
Subject: [PATCH 050/241] python311Packages.llama-cloud: 0.0.15 -> 0.0.17

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

diff --git a/pkgs/development/python-modules/llama-cloud/default.nix b/pkgs/development/python-modules/llama-cloud/default.nix
index 467dd9685c1c..8e409c9fe79a 100644
--- a/pkgs/development/python-modules/llama-cloud/default.nix
+++ b/pkgs/development/python-modules/llama-cloud/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-cloud";
-  version = "0.0.15";
+  version = "0.0.17";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_cloud";
     inherit version;
-    hash = "sha256-vgb9iI6IliN5a5wqoPwNCe8DntUUX/Jn2ECMy+pwwEg=";
+    hash = "sha256-f9aFe7u5GTdTVXLMtI2qOBifVc3XQRGF2Ag9qym6Epk=";
   };
 
   build-system = [ poetry-core ];

From 8d811438a9be4fca37dba706ebfeb0a4ccd00c6f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Sep 2024 12:12:16 +0200
Subject: [PATCH 051/241] python311Packages.llama-index-core: 0.11.7 -> 0.11.8

Diff: https://github.com/run-llama/llama_index/compare/refs/tags/v0.11.7...v0.11.8

Changelog: https://github.com/run-llama/llama_index/blob/0.11.8/CHANGELOG.md
---
 pkgs/development/python-modules/llama-index-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix
index e026cfa97d5a..afed83d8e762 100644
--- a/pkgs/development/python-modules/llama-index-core/default.nix
+++ b/pkgs/development/python-modules/llama-index-core/default.nix
@@ -47,7 +47,7 @@ in
 
 buildPythonPackage rec {
   pname = "llama-index-core";
-  version = "0.11.7";
+  version = "0.11.8";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -56,7 +56,7 @@ buildPythonPackage rec {
     owner = "run-llama";
     repo = "llama_index";
     rev = "refs/tags/v${version}";
-    hash = "sha256-48cx+hquZCjAEIp40cO1jM5wMwKQ1PNQftuwmJBnHVQ=";
+    hash = "sha256-xm5QIenvEAmFhGeJJ9FczXat1wuv2Qw99m38ZsmmucU=";
   };
 
   sourceRoot = "${src.name}/${pname}";

From 25862e1a2b4b2c80aa418b9f3acb116b4730ab38 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Sep 2024 12:14:01 +0200
Subject: [PATCH 052/241] python311Packages.llama-index-cli: 0.3.0 -> 0.3.1

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

diff --git a/pkgs/development/python-modules/llama-index-cli/default.nix b/pkgs/development/python-modules/llama-index-cli/default.nix
index 264316d0d626..d3229e4de03c 100644
--- a/pkgs/development/python-modules/llama-index-cli/default.nix
+++ b/pkgs/development/python-modules/llama-index-cli/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-cli";
-  version = "0.3.0";
+  version = "0.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_cli";
     inherit version;
-    hash = "sha256-pC4B/ioCqg/TtkXrFAP5BY+n9i++6ioGpVt/uMB9XQI=";
+    hash = "sha256-GJDdaHz0QPNlE2WlSeMDNjFiwWe4772Ho6oQBY1tXHc=";
   };
 
   build-system = [ poetry-core ];

From 90a45d8cb1d940ad6dd860f3c09ea719bdd766f2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Sep 2024 12:17:00 +0200
Subject: [PATCH 053/241] python311Packages.llama-index-vector-stores-postgres:
 0.2.1 -> 0.2.2

---
 .../llama-index-vector-stores-postgres/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix
index fb8aa5970f88..f0a5aa3ac07e 100644
--- a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix
+++ b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-vector-stores-postgres";
-  version = "0.2.1";
+  version = "0.2.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_vector_stores_postgres";
     inherit version;
-    hash = "sha256-xjlFAa3HTJRP/34HaN4fN5BE1VvfAWSLDZnj2s/ES/U=";
+    hash = "sha256-0QTT8eLkQb6Wjs+I2IbfJ8c4/vOJwQu4u1xOy4iDOCc=";
   };
 
   pythonRemoveDeps = [ "psycopg2-binary" ];

From 110af40a829afee7f05c439ef921cbc564031450 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Sep 2024 12:18:39 +0200
Subject: [PATCH 054/241] python311Packages.llama-parse: 0.5.2 -> 0.5.3

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

diff --git a/pkgs/development/python-modules/llama-parse/default.nix b/pkgs/development/python-modules/llama-parse/default.nix
index 122c2a80549c..1d89a7904167 100644
--- a/pkgs/development/python-modules/llama-parse/default.nix
+++ b/pkgs/development/python-modules/llama-parse/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "llama-parse";
-  version = "0.5.2";
+  version = "0.5.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_parse";
     inherit version;
-    hash = "sha256-7ER3jp+KOKG4gZp82tIKtEJi1QZD2l2K2zi5VUfzMEc=";
+    hash = "sha256-UjwldGujOM1OGYAGzbtkQtUBzJyiR7wkU3C87UQNgL0=";
   };
 
   build-system = [ poetry-core ];

From e2ff45f9b30827df9686b597e1b8da0a352d2123 Mon Sep 17 00:00:00 2001
From: Cobalt <cobalt@cobalt.rocks>
Date: Tue, 10 Sep 2024 18:43:27 +0200
Subject: [PATCH 055/241] syslogng: add option to enable grpc module

This adds a package option to build with the grpc module.

This module is required for some outputs, like the loki output, and
other grpc related modules.
---
 pkgs/by-name/sy/syslogng/package.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sy/syslogng/package.nix b/pkgs/by-name/sy/syslogng/package.nix
index 87e556dbabaa..1d3fc9df8dcc 100644
--- a/pkgs/by-name/sy/syslogng/package.nix
+++ b/pkgs/by-name/sy/syslogng/package.nix
@@ -33,6 +33,9 @@
 , libesmtp
 , rdkafka
 , gperf
+, withGrpc ? true
+, grpc
+, protobuf
 }:
 let
   python-deps = ps: with ps; [
@@ -94,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
     paho-mqtt-c
     hiredis
     rdkafka
-  ];
+  ] ++ (lib.optionals withGrpc [ protobuf grpc ]);
 
   configureFlags = [
     "--enable-manpages"
@@ -111,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: {
     "--with-systemd-journal=system"
     "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
     "--without-compile-date"
-  ];
+  ] ++ (lib.optionals withGrpc [ "--enable-grpc" ]);
 
   outputs = [ "out" "man" ];
 

From ff8b2d5162558d80646b2f4f393e239414071f5e Mon Sep 17 00:00:00 2001
From: Josh Hoffer <jhoffer@sansorgan.es>
Date: Tue, 10 Sep 2024 22:01:39 -0700
Subject: [PATCH 056/241] nixos/iso-image: mount squashfs with threads=multi

---
 nixos/modules/installer/cd-dvd/iso-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index e516d8ea6f8b..2aa71aca0834 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -726,7 +726,7 @@ in
     "/nix/.ro-store" = mkImageMediaOverride
       { fsType = "squashfs";
         device = "/iso/nix-store.squashfs";
-        options = [ "loop" ];
+        options = [ "loop" "threads=multi" ];
         neededForBoot = true;
       };
 

From d308cfcb3865c6411dabde5f8c2d8f30463efee7 Mon Sep 17 00:00:00 2001
From: Josh Hoffer <jhoffer@sansorgan.es>
Date: Tue, 10 Sep 2024 22:02:20 -0700
Subject: [PATCH 057/241] nixos/netboot: mount squashfs with threads=multi

---
 nixos/modules/installer/netboot/netboot.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix
index 33301c6423db..0e4f456dce49 100644
--- a/nixos/modules/installer/netboot/netboot.nix
+++ b/nixos/modules/installer/netboot/netboot.nix
@@ -47,7 +47,7 @@ with lib;
     fileSystems."/nix/.ro-store" = mkImageMediaOverride
       { fsType = "squashfs";
         device = "../nix-store.squashfs";
-        options = [ "loop" ];
+        options = [ "loop" "threads=multi" ];
         neededForBoot = true;
       };
 

From 951afba3ae436be3e170951b2ff3993186740b1f Mon Sep 17 00:00:00 2001
From: QuincePie <flaky@quincepie.dev>
Date: Tue, 10 Sep 2024 19:36:21 -0500
Subject: [PATCH 058/241] scorecard: 4.13.1 -> 5.0.0

---
 pkgs/tools/security/scorecard/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/scorecard/default.nix b/pkgs/tools/security/scorecard/default.nix
index 75b6657fe7e2..de2f9b9b07dc 100644
--- a/pkgs/tools/security/scorecard/default.nix
+++ b/pkgs/tools/security/scorecard/default.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "scorecard";
-  version = "4.13.1";
+  version = "5.0.0";
 
   src = fetchFromGitHub {
     owner = "ossf";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-xf6HyiZlkU9ifgXr+/O8UeElqwF8c1h/9IRWDVHx2+g=";
+    hash = "sha256-9DuADuEIoZNwkvdKyqus2zNfIK31Jc3+bPW3/z8fvlc=";
     # populate values otherwise taken care of by goreleaser,
     # unfortunately these require us to use git. By doing
     # this in postFetch we can delete .git afterwards and
@@ -28,7 +28,7 @@ buildGoModule rec {
       find "$out" -name .git -print0 | xargs -0 rm -rf
     '';
   };
-  vendorHash = "sha256-ohZcz7fn/YAglLI3YOi0J4FWkCJa2/nsM7T03+BOWkw=";
+  vendorHash = "sha256-apOVAlGjaYSrW4qtUdDNgqwWxnVlBLhrefWEUvN4lzE=";
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -59,8 +59,7 @@ buildGoModule rec {
   '';
 
   checkFlags = [
-    # https://github.com/ossf/scorecard/pull/4134
-    "-skip TestRunScorecard/empty_commits_repos_should_return_repo_details_but_no_checks"
+    "-skip TestCollectDockerfilePinning/Non-pinned_dockerfile|TestMixedPinning"
   ];
 
   postInstall = ''

From a933509293a2ee24b7f34945fd5fbe47253e2726 Mon Sep 17 00:00:00 2001
From: Adam Stephens <adam@valkor.net>
Date: Wed, 11 Sep 2024 19:15:22 -0400
Subject: [PATCH 059/241] firefoxpwa: 2.12.1 -> 2.12.3

https://github.com/filips123/PWAsForFirefox/releases/tag/v2.12.2
https://github.com/filips123/PWAsForFirefox/releases/tag/v2.12.3
---
 pkgs/by-name/fi/firefoxpwa/Cargo.lock  | 1038 ++++++++++++++----------
 pkgs/by-name/fi/firefoxpwa/package.nix |    4 +-
 2 files changed, 625 insertions(+), 417 deletions(-)

diff --git a/pkgs/by-name/fi/firefoxpwa/Cargo.lock b/pkgs/by-name/fi/firefoxpwa/Cargo.lock
index 66005e428099..75237c9706b1 100644
--- a/pkgs/by-name/fi/firefoxpwa/Cargo.lock
+++ b/pkgs/by-name/fi/firefoxpwa/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "ab_glyph"
-version = "0.2.25"
+version = "0.2.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f90148830dac590fac7ccfe78ec4a8ea404c60f75a24e16407a71f0f40de775"
+checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb"
 dependencies = [
  "ab_glyph_rasterizer",
  "owned_ttf_parser",
@@ -20,9 +20,9 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
 
 [[package]]
 name = "addr2line"
-version = "0.21.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
 dependencies = [
  "gimli",
 ]
@@ -33,6 +33,12 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
+[[package]]
+name = "adler2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+
 [[package]]
 name = "adler32"
 version = "1.2.0"
@@ -86,47 +92,48 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.13"
+version = "0.6.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
 dependencies = [
  "anstyle",
  "anstyle-parse",
  "anstyle-query",
  "anstyle-wincon",
  "colorchoice",
+ "is_terminal_polyfill",
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle"
-version = "1.0.6"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.3"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
+checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.0.2"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
+checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
 dependencies = [
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.2"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
 dependencies = [
  "anstyle",
  "windows-sys 0.52.0",
@@ -134,9 +141,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.82"
+version = "1.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
+checksum = "10f00e1f6e58a40e807377c75c6a7f97bf9044fab57816f2414e6f5f4499d7b8"
 
 [[package]]
 name = "arbitrary"
@@ -157,21 +164,21 @@ dependencies = [
 
 [[package]]
 name = "arrayref"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
+checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "async-compression"
-version = "0.4.9"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e9eabd7a98fe442131a17c316bd9349c43695e49e730c3c8e12cfb5f4da2693"
+checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa"
 dependencies = [
  "brotli",
  "flate2",
@@ -184,10 +191,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "autocfg"
-version = "1.2.0"
+name = "atomic-waker"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "autocfg"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "av1-grain"
@@ -214,25 +227,19 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.71"
+version = "0.3.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
+checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
 dependencies = [
  "addr2line",
  "cc",
  "cfg-if",
  "libc",
- "miniz_oxide 0.7.2",
+ "miniz_oxide 0.7.4",
  "object",
  "rustc-demangle",
 ]
 
-[[package]]
-name = "base64"
-version = "0.21.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-
 [[package]]
 name = "base64"
 version = "0.22.1"
@@ -253,21 +260,21 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "bitstream-io"
-version = "2.2.0"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06c9989a51171e2e81038ab168b6ae22886fe9ded214430dbb4f41c28cf176da"
+checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452"
 
 [[package]]
 name = "blake3"
-version = "1.5.1"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52"
+checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7"
 dependencies = [
  "arrayref",
  "arrayvec",
@@ -278,9 +285,9 @@ dependencies = [
 
 [[package]]
 name = "brotli"
-version = "5.0.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19483b140a7ac7174d34b5a581b406c64f84da5409d3e09cf4fff604f9270e67"
+checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -289,9 +296,9 @@ dependencies = [
 
 [[package]]
 name = "brotli-decompressor"
-version = "4.0.0"
+version = "4.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6221fe77a248b9117d431ad93761222e1cf8ff282d9d1d5d9f53d6299a1cf76"
+checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -299,9 +306,9 @@ dependencies = [
 
 [[package]]
 name = "built"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41bfbdb21256b87a8b5e80fab81a8eed158178e812fd7ba451907518b2742f16"
+checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4"
 
 [[package]]
 name = "bumpalo"
@@ -311,9 +318,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "bytemuck"
-version = "1.15.0"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15"
+checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
 
 [[package]]
 name = "byteorder"
@@ -329,9 +336,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
 
 [[package]]
 name = "bytes"
-version = "1.6.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
 
 [[package]]
 name = "bzip2"
@@ -356,13 +363,13 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.96"
+version = "1.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd"
+checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476"
 dependencies = [
  "jobserver",
  "libc",
- "once_cell",
+ "shlex",
 ]
 
 [[package]]
@@ -383,9 +390,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "cfg_aliases"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77e53693616d3075149f4ead59bdeecd204ac6b8192d8969757601b74bddf00f"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "chrono"
@@ -397,14 +404,14 @@ dependencies = [
  "iana-time-zone",
  "num-traits",
  "serde",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "clap"
-version = "4.5.4"
+version = "4.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
+checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -412,30 +419,30 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.2"
+version = "4.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
+checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73"
 dependencies = [
  "anstream",
  "anstyle",
  "clap_lex",
- "strsim 0.11.1",
+ "strsim",
 ]
 
 [[package]]
 name = "clap_complete"
-version = "4.5.2"
+version = "4.5.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd79504325bf38b10165b02e89b4347300f855f273c4cb30c4a3209e6583275e"
+checksum = "205d5ef6d485fa47606b98b0ddc4ead26eb850aaa86abfb562a94fb3280ecba0"
 dependencies = [
  "clap",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.5.4"
+version = "4.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
+checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -445,9 +452,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
 
 [[package]]
 name = "color_quant"
@@ -457,30 +464,30 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
 [[package]]
 name = "colorchoice"
-version = "1.0.0"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
 
 [[package]]
 name = "configparser"
-version = "3.0.4"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec6d3da8e550377a85339063af6e3735f4b1d9392108da4e083a1b3b9820288"
+checksum = "e57e3272f0190c3f1584272d613719ba5fc7df7f4942fe542e63d949cf3a649b"
 
 [[package]]
 name = "const_format"
-version = "0.2.32"
+version = "0.2.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673"
+checksum = "50c655d81ff1114fb0dcdea9225ea9f0cc712a6f8d189378e82bdf62a473a64b"
 dependencies = [
  "const_format_proc_macros",
 ]
 
 [[package]]
 name = "const_format_proc_macros"
-version = "0.2.32"
+version = "0.2.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500"
+checksum = "eff1a44b93f47b1bac19a27932f5c591e43d1ba357ee4f61526c8a25603f0eb1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -489,9 +496,9 @@ dependencies = [
 
 [[package]]
 name = "constant_time_eq"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
+checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
 
 [[package]]
 name = "core-foundation"
@@ -505,15 +512,24 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "core_maths"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3b02505ccb8c50b0aa21ace0fc08c3e53adebd4e58caa18a36152803c7709a3"
+dependencies = [
+ "libm",
+]
 
 [[package]]
 name = "crc32fast"
-version = "1.4.0"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
  "cfg-if",
 ]
@@ -539,9 +555,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.19"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
 [[package]]
 name = "crunchy"
@@ -561,9 +577,9 @@ dependencies = [
 
 [[package]]
 name = "darling"
-version = "0.20.8"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391"
+checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -571,23 +587,23 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.8"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f"
+checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
- "strsim 0.10.0",
+ "strsim",
  "syn",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.20.8"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
+checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
@@ -653,9 +669,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.11.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "encoding_rs"
@@ -674,9 +690,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -692,7 +708,7 @@ dependencies = [
  "flume",
  "half",
  "lebe",
- "miniz_oxide 0.7.2",
+ "miniz_oxide 0.7.4",
  "rayon-core",
  "smallvec",
  "zune-inflate",
@@ -700,9 +716,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
 
 [[package]]
 name = "fdeflate"
@@ -726,14 +742,14 @@ dependencies = [
 
 [[package]]
 name = "filetime"
-version = "0.2.23"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall",
- "windows-sys 0.52.0",
+ "libredox",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -783,12 +799,12 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.30"
+version = "1.0.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
 dependencies = [
  "crc32fast",
- "miniz_oxide 0.7.2",
+ "miniz_oxide 0.8.0",
 ]
 
 [[package]]
@@ -814,18 +830,18 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "fontconfig-parser"
-version = "0.5.6"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d"
+checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7"
 dependencies = [
  "roxmltree",
 ]
 
 [[package]]
 name = "fontdb"
-version = "0.16.2"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3"
+checksum = "37be9fc20d966be438cd57a45767f73349477fb0f85ce86e000557f787298afb"
 dependencies = [
  "fontconfig-parser",
  "log",
@@ -927,9 +943,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -950,9 +966,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.28.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
 
 [[package]]
 name = "glob"
@@ -962,17 +978,17 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "h2"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069"
+checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205"
 dependencies = [
+ "atomic-waker",
  "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
- "futures-util",
  "http",
- "indexmap 2.2.6",
+ "indexmap 2.5.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -1032,9 +1048,9 @@ dependencies = [
 
 [[package]]
 name = "http-body"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
 dependencies = [
  "bytes",
  "http",
@@ -1042,12 +1058,12 @@ dependencies = [
 
 [[package]]
 name = "http-body-util"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
 dependencies = [
  "bytes",
- "futures-core",
+ "futures-util",
  "http",
  "http-body",
  "pin-project-lite",
@@ -1055,15 +1071,15 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.8.0"
+version = "1.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
 
 [[package]]
 name = "hyper"
-version = "1.3.1"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d"
+checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1079,6 +1095,23 @@ dependencies = [
  "want",
 ]
 
+[[package]]
+name = "hyper-rustls"
+version = "0.27.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
+dependencies = [
+ "futures-util",
+ "http",
+ "hyper",
+ "hyper-util",
+ "rustls",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls",
+ "tower-service",
+]
+
 [[package]]
 name = "hyper-tls"
 version = "0.6.0"
@@ -1097,9 +1130,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.3"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa"
+checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1126,7 +1159,7 @@ dependencies = [
  "iana-time-zone-haiku",
  "js-sys",
  "wasm-bindgen",
- "windows-core",
+ "windows-core 0.52.0",
 ]
 
 [[package]]
@@ -1166,12 +1199,12 @@ dependencies = [
 
 [[package]]
 name = "image"
-version = "0.25.1"
+version = "0.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11"
+checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10"
 dependencies = [
  "bytemuck",
- "byteorder",
+ "byteorder-lite",
  "color_quant",
  "exr",
  "gif",
@@ -1189,19 +1222,19 @@ dependencies = [
 
 [[package]]
 name = "image-webp"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d"
+checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904"
 dependencies = [
  "byteorder-lite",
- "thiserror",
+ "quick-error 2.0.1",
 ]
 
 [[package]]
 name = "imagesize"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284"
+checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285"
 
 [[package]]
 name = "imgref"
@@ -1222,9 +1255,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.2.6"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
 dependencies = [
  "equivalent",
  "hashbrown 0.14.5",
@@ -1248,6 +1281,12 @@ version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
 
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
 [[package]]
 name = "itertools"
 version = "0.12.1"
@@ -1265,9 +1304,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "jobserver"
-version = "0.1.31"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
 dependencies = [
  "libc",
 ]
@@ -1280,9 +1319,9 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
 
 [[package]]
 name = "js-sys"
-version = "0.3.69"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1308,9 +1347,9 @@ dependencies = [
 
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "lebe"
@@ -1320,9 +1359,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
 
 [[package]]
 name = "libc"
-version = "0.2.154"
+version = "0.2.158"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
 
 [[package]]
 name = "libfuzzer-sys"
@@ -1335,27 +1374,28 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "libm"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+
 [[package]]
 name = "libredox"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "libc",
+ "redox_syscall",
 ]
 
-[[package]]
-name = "line-wrap"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e"
-
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
 [[package]]
 name = "lock_api"
@@ -1369,9 +1409,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "loop9"
@@ -1389,14 +1429,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519"
 dependencies = [
  "cfg-if",
- "rayon",
 ]
 
 [[package]]
 name = "memchr"
-version = "2.7.2"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memmap2"
@@ -1445,32 +1484,41 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
 dependencies = [
  "adler",
  "simd-adler32",
 ]
 
 [[package]]
-name = "mio"
-version = "0.8.11"
+name = "miniz_oxide"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
 dependencies = [
+ "adler2",
+]
+
+[[package]]
+name = "mio"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+dependencies = [
+ "hermit-abi",
  "libc",
  "wasi",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "native-tls"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
 dependencies = [
- "lazy_static",
  "libc",
  "log",
  "openssl",
@@ -1506,11 +1554,10 @@ checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8"
 
 [[package]]
 name = "num-bigint"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
- "autocfg",
  "num-integer",
  "num-traits",
 ]
@@ -1543,11 +1590,10 @@ dependencies = [
 
 [[package]]
 name = "num-rational"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
+checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
 dependencies = [
- "autocfg",
  "num-bigint",
  "num-integer",
  "num-traits",
@@ -1555,23 +1601,13 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
 [[package]]
 name = "num_threads"
 version = "0.1.7"
@@ -1583,9 +1619,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.32.2"
+version = "0.36.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
 dependencies = [
  "memchr",
 ]
@@ -1598,11 +1634,11 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "openssl"
-version = "0.10.64"
+version = "0.10.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
+checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -1630,18 +1666,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-src"
-version = "300.2.3+3.2.1"
+version = "300.3.2+3.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843"
+checksum = "a211a18d945ef7e648cc6e0058f4c548ee46aab922ea203e0d30e966ea23647b"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.102"
+version = "0.9.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"
+checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
 dependencies = [
  "cc",
  "libc",
@@ -1658,9 +1694,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 
 [[package]]
 name = "owned_ttf_parser"
-version = "0.20.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7"
+checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90"
 dependencies = [
  "ttf-parser",
 ]
@@ -1693,9 +1729,9 @@ dependencies = [
 
 [[package]]
 name = "paste"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "percent-encoding"
@@ -1797,13 +1833,12 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
 [[package]]
 name = "plist"
-version = "1.6.1"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9"
+checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016"
 dependencies = [
- "base64 0.21.7",
- "indexmap 2.2.6",
- "line-wrap",
+ "base64",
+ "indexmap 2.5.0",
  "quick-xml",
  "serde",
  "time",
@@ -1831,7 +1866,7 @@ dependencies = [
  "crc32fast",
  "fdeflate",
  "flate2",
- "miniz_oxide 0.7.2",
+ "miniz_oxide 0.7.4",
 ]
 
 [[package]]
@@ -1842,15 +1877,18 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.81"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -1897,18 +1935,18 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
 
 [[package]]
 name = "quick-xml"
-version = "0.31.0"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
+checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -1989,16 +2027,15 @@ dependencies = [
 
 [[package]]
 name = "ravif"
-version = "0.11.5"
+version = "0.11.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234"
+checksum = "a8f0bfd976333248de2078d350bfdf182ff96e168a24d23d2436cef320dd4bdd"
 dependencies = [
  "avif-serialize",
  "imgref",
  "loop9",
  "quick-error 2.0.1",
  "rav1e",
- "rayon",
  "rgb",
 ]
 
@@ -2024,18 +2061,18 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.4.1"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
 name = "redox_users"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
  "getrandom",
  "libredox",
@@ -2044,25 +2081,25 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.4"
+version = "1.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
 dependencies = [
  "aho-corasick",
  "memchr",
  "regex-automata",
- "regex-syntax 0.8.3",
+ "regex-syntax 0.8.4",
 ]
 
 [[package]]
 name = "regex-automata"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.3",
+ "regex-syntax 0.8.4",
 ]
 
 [[package]]
@@ -2073,18 +2110,18 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
 [[package]]
 name = "reqwest"
-version = "0.12.4"
+version = "0.12.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10"
+checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
 dependencies = [
  "async-compression",
- "base64 0.22.1",
+ "base64",
  "bytes",
  "encoding_rs",
  "futures-channel",
@@ -2095,6 +2132,7 @@ dependencies = [
  "http-body",
  "http-body-util",
  "hyper",
+ "hyper-rustls",
  "hyper-tls",
  "hyper-util",
  "ipnet",
@@ -2120,54 +2158,69 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "winreg",
+ "windows-registry",
 ]
 
 [[package]]
 name = "resvg"
-version = "0.41.0"
+version = "0.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2327ced609dadeed3e9702fec3e6b2ddd208758a9268d13e06566c6101ba533"
+checksum = "c7314563c59c7ce31c18e23ad3dd092c37b928a0fa4e1c0a1a6504351ab411d1"
 dependencies = [
  "gif",
- "jpeg-decoder",
+ "image-webp",
  "log",
  "pico-args",
- "png 0.17.13",
  "rgb",
  "svgtypes",
  "tiny-skia",
  "usvg",
+ "zune-jpeg",
 ]
 
 [[package]]
 name = "rgb"
-version = "0.8.37"
+version = "0.8.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8"
+checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a"
 dependencies = [
  "bytemuck",
 ]
 
 [[package]]
-name = "roxmltree"
-version = "0.19.0"
+name = "ring"
+version = "0.17.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f"
+checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom",
+ "libc",
+ "spin",
+ "untrusted",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "roxmltree"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97"
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustix"
-version = "0.38.34"
+version = "0.38.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -2175,29 +2228,55 @@ dependencies = [
 ]
 
 [[package]]
-name = "rustls-pemfile"
-version = "2.1.2"
+name = "rustls"
+version = "0.23.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
+checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
 dependencies = [
- "base64 0.22.1",
+ "once_cell",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+dependencies = [
+ "base64",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.5.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54"
+checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+
+[[package]]
+name = "rustls-webpki"
+version = "0.102.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56"
+dependencies = [
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
 
 [[package]]
 name = "rustybuzz"
-version = "0.13.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88117946aa1bfb53c2ae0643ceac6506337f44887f8c9fbfb43587b1cc52ba49"
+checksum = "c85d1ccd519e61834798eb52c4e886e8c2d7d698dd3d6ce0b1b47eb8557f1181"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "bytemuck",
+ "core_maths",
+ "log",
  "smallvec",
  "ttf-parser",
  "unicode-bidi-mirroring",
@@ -2208,9 +2287,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "sanitize-filename"
@@ -2224,11 +2303,11 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2239,11 +2318,11 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "security-framework"
-version = "2.10.0"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -2252,9 +2331,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.10.0"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef"
+checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -2262,18 +2341,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.199"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.199"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2282,20 +2361,21 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.116"
+version = "1.0.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
 dependencies = [
  "itoa",
+ "memchr",
  "ryu",
  "serde",
 ]
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.5"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
 dependencies = [
  "serde",
 ]
@@ -2314,15 +2394,15 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.8.1"
+version = "3.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20"
+checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
 dependencies = [
- "base64 0.22.1",
+ "base64",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.2.6",
+ "indexmap 2.5.0",
  "serde",
  "serde_derive",
  "serde_json",
@@ -2332,9 +2412,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.8.1"
+version = "3.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2"
+checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -2342,6 +2422,12 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
 [[package]]
 name = "simd-adler32"
 version = "0.3.7"
@@ -2452,12 +2538,6 @@ dependencies = [
  "float-cmp",
 ]
 
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -2488,10 +2568,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "svgtypes"
-version = "0.15.0"
+name = "subtle"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d97ca9a891c9c70da8139ac9d8e8ea36a210fa21bb50eccd75d4a9561c83e87f"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
+[[package]]
+name = "svgtypes"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "794de53cc48eaabeed0ab6a3404a65f40b3e38c067e4435883a65d2aa4ca000e"
 dependencies = [
  "kurbo",
  "siphasher 1.0.1",
@@ -2499,9 +2585,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.60"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2510,26 +2596,29 @@ dependencies = [
 
 [[package]]
 name = "sync_wrapper"
-version = "0.1.2"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+dependencies = [
+ "futures-core",
+]
 
 [[package]]
 name = "system-configuration"
-version = "0.5.1"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
+checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "core-foundation",
  "system-configuration-sys",
 ]
 
 [[package]]
 name = "system-configuration-sys"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
+checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -2550,9 +2639,9 @@ dependencies = [
 
 [[package]]
 name = "tar"
-version = "0.4.40"
+version = "0.4.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb"
+checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909"
 dependencies = [
  "filetime",
  "libc",
@@ -2561,20 +2650,21 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.14"
+version = "0.12.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "tempfile"
-version = "3.10.1"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
 dependencies = [
  "cfg-if",
  "fastrand",
+ "once_cell",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2588,18 +2678,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.59"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.59"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2678,9 +2768,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.6.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -2693,18 +2783,17 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.37.0"
+version = "1.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
+checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
 dependencies = [
  "backtrace",
  "bytes",
  "libc",
  "mio",
- "num_cpus",
  "pin-project-lite",
  "socket2",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2718,10 +2807,21 @@ dependencies = [
 ]
 
 [[package]]
-name = "tokio-socks"
-version = "0.5.1"
+name = "tokio-rustls"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0"
+checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+dependencies = [
+ "rustls",
+ "rustls-pki-types",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-socks"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f"
 dependencies = [
  "either",
  "futures-util",
@@ -2731,23 +2831,22 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.10"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
+checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
 dependencies = [
  "bytes",
  "futures-core",
  "futures-sink",
  "pin-project-lite",
  "tokio",
- "tracing",
 ]
 
 [[package]]
 name = "toml"
-version = "0.8.12"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -2757,20 +2856,20 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.5"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.12"
+version = "0.22.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef"
+checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.5.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -2790,20 +2889,19 @@ dependencies = [
  "tokio",
  "tower-layer",
  "tower-service",
- "tracing",
 ]
 
 [[package]]
 name = "tower-layer"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
 
 [[package]]
 name = "tower-service"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
@@ -2811,7 +2909,6 @@ version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
- "log",
  "pin-project-lite",
  "tracing-core",
 ]
@@ -2833,15 +2930,18 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "ttf-parser"
-version = "0.20.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4"
+checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a"
+dependencies = [
+ "core_maths",
+]
 
 [[package]]
 name = "ulid"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34778c17965aa2a08913b57e1f34db9b4a63f5de31768b55bf20d2795f921259"
+checksum = "04f903f293d11f31c0c29e4148f6dc0d033a7f80cebc0282bea147611667d289"
 dependencies = [
  "getrandom",
  "rand",
@@ -2857,15 +2957,15 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
 
 [[package]]
 name = "unicode-bidi-mirroring"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86"
+checksum = "64af057ad7466495ca113126be61838d8af947f41d93a949980b2389a118082f"
 
 [[package]]
 name = "unicode-ccc"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656"
+checksum = "260bc6647b3893a9a90668360803a15f96b85a5257b1c3a0c3daf6ae2496de42"
 
 [[package]]
 name = "unicode-ident"
@@ -2884,9 +2984,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-properties"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291"
+checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524"
 
 [[package]]
 name = "unicode-script"
@@ -2902,15 +3002,21 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
+checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
+
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.0"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -2926,11 +3032,11 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
 
 [[package]]
 name = "usvg"
-version = "0.41.0"
+version = "0.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c704361d822337cfc00387672c7b59eaa72a1f0744f62b2a68aa228a0c6927d"
+checksum = "6803057b5cbb426e9fb8ce2216f3a9b4ca1dd2c705ba3cbebc13006e437735fd"
 dependencies = [
- "base64 0.22.1",
+ "base64",
  "data-url",
  "flate2",
  "fontdb",
@@ -2953,9 +3059,9 @@ dependencies = [
 
 [[package]]
 name = "utf8parse"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "v_frame"
@@ -2982,9 +3088,9 @@ checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
 
 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "want"
@@ -3003,19 +3109,20 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
 dependencies = [
  "cfg-if",
+ "once_cell",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
 dependencies = [
  "bumpalo",
  "log",
@@ -3028,9 +3135,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.42"
+version = "0.4.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
+checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -3040,9 +3147,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3050,9 +3157,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3063,15 +3170,15 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
 
 [[package]]
 name = "web-sys"
-version = "0.3.69"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -3127,11 +3234,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3142,12 +3249,12 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows"
-version = "0.52.0"
+version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
+checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
 dependencies = [
- "windows-core",
- "windows-targets 0.52.5",
+ "windows-core 0.58.0",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -3156,7 +3263,72 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-result",
+ "windows-strings",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-registry"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
+dependencies = [
+ "windows-result",
+ "windows-strings",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+dependencies = [
+ "windows-result",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -3174,7 +3346,16 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -3194,18 +3375,18 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.5",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
  "windows_i686_gnullvm",
- "windows_i686_msvc 0.52.5",
- "windows_x86_64_gnu 0.52.5",
- "windows_x86_64_gnullvm 0.52.5",
- "windows_x86_64_msvc 0.52.5",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
 ]
 
 [[package]]
@@ -3216,9 +3397,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -3228,9 +3409,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -3240,15 +3421,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
 [[package]]
 name = "windows_i686_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -3258,9 +3439,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -3270,9 +3451,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -3282,9 +3463,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -3294,15 +3475,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.7"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578"
+checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
 dependencies = [
  "memchr",
 ]
@@ -3335,28 +3516,55 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"
 
 [[package]]
-name = "zstd"
-version = "0.13.1"
+name = "zerocopy"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+
+[[package]]
+name = "zstd"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9"
 dependencies = [
  "zstd-safe",
 ]
 
 [[package]]
 name = "zstd-safe"
-version = "7.1.0"
+version = "7.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a"
+checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059"
 dependencies = [
  "zstd-sys",
 ]
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.10+zstd.1.5.6"
+version = "2.0.13+zstd.1.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa"
+checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa"
 dependencies = [
  "cc",
  "pkg-config",
@@ -3379,9 +3587,9 @@ dependencies = [
 
 [[package]]
 name = "zune-jpeg"
-version = "0.4.11"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448"
+checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768"
 dependencies = [
  "zune-core",
 ]
diff --git a/pkgs/by-name/fi/firefoxpwa/package.nix b/pkgs/by-name/fi/firefoxpwa/package.nix
index 25a9cccf5834..16590548c0a7 100644
--- a/pkgs/by-name/fi/firefoxpwa/package.nix
+++ b/pkgs/by-name/fi/firefoxpwa/package.nix
@@ -28,13 +28,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "firefoxpwa";
-  version = "2.12.1";
+  version = "2.12.3";
 
   src = fetchFromGitHub {
     owner = "filips123";
     repo = "PWAsForFirefox";
     rev = "v${version}";
-    hash = "sha256-0Yyd0mJK/eDallg9ERimvZIRCOTeDkzeAVUfDeNP928=";
+    hash = "sha256-+dQr8eMOvCKt3ZEVU/EbEroVSpLQsBC+1Wix01IrOyc=";
   };
 
   sourceRoot = "${src.name}/native";

From 317a52a7570617ec89d733f8e4dd5865fb653f8a Mon Sep 17 00:00:00 2001
From: Florian Agbuya <fa@m-labs.ph>
Date: Thu, 12 Sep 2024 15:52:09 +0800
Subject: [PATCH 060/241] flarum: fix installation and migration logic

---
 nixos/modules/services/web-apps/flarum.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/web-apps/flarum.nix b/nixos/modules/services/web-apps/flarum.nix
index 95ebcc23e7e8..129f5a282681 100644
--- a/nixos/modules/services/web-apps/flarum.nix
+++ b/nixos/modules/services/web-apps/flarum.nix
@@ -203,10 +203,13 @@ in {
         ln -sf ${cfg.package}/share/php/flarum/public/index.php public/
       '' + optionalString (cfg.createDatabaseLocally && cfg.database.driver == "mysql") ''
         if [ ! -f config.php ]; then
-            php flarum install --file=${flarumInstallConfig}
+          php flarum install --file=${flarumInstallConfig}
+        fi
+      '' + ''
+        if [ -f config.php ]; then
+          php flarum migrate
+          php flarum cache:clear
         fi
-        php flarum migrate
-        php flarum cache:clear
       '';
     };
   };

From f747eba81f8487ef5e01f9a69e40f478888effac Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Thu, 12 Sep 2024 14:51:58 +0200
Subject: [PATCH 061/241] librealsense: 2.55.1 -> 2.56.1

Diff: https://github.com/IntelRealSense/librealsense/compare/v2.55.1...v2.56.1
---
 pkgs/development/libraries/librealsense/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix
index 0e0bfc51cb42..5dc620fd5c01 100644
--- a/pkgs/development/libraries/librealsense/default.nix
+++ b/pkgs/development/libraries/librealsense/default.nix
@@ -23,7 +23,7 @@ assert enablePython -> pythonPackages != null;
 
 stdenv.mkDerivation rec {
   pname = "librealsense";
-  version = "2.55.1";
+  version = "2.56.1";
 
   outputs = [ "out" "dev" ];
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     owner = "IntelRealSense";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-MNHvfWk58WRtu6Xysfvn+lx8J1+HlNw5AmmgaTAzuok=";
+    sha256 = "sha256-1ICSJqr5WRePLIHsD3T2L0Nxdn1LWaHqHDJrfTIRl88=";
   };
 
   buildInputs = [

From 0f9739557845c46aad9a18bc7fe424eecd0f2074 Mon Sep 17 00:00:00 2001
From: Michal Sojka <michal.sojka@cvut.cz>
Date: Thu, 12 Sep 2024 15:43:34 +0200
Subject: [PATCH 062/241] fastddsgen: 4.0.0 -> 4.0.1

Diff: https://github.com/eProsima/Fast-DDS-Gen/compare/v4.0.0...v4.0.1
---
 pkgs/development/tools/fastddsgen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/fastddsgen/default.nix b/pkgs/development/tools/fastddsgen/default.nix
index e3f0db515cb1..3a04f6c2fd3d 100644
--- a/pkgs/development/tools/fastddsgen/default.nix
+++ b/pkgs/development/tools/fastddsgen/default.nix
@@ -8,7 +8,7 @@
 
 let
   pname = "fastddsgen";
-  version = "4.0.0";
+  version = "4.0.1";
 
   gradle = gradle_7;
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
     repo = "Fast-DDS-Gen";
     rev = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-Gs2O/8AIjpvN55HtA3gEwfBqxNZ3rqpVlJnTwOm4wXM=";
+    hash = "sha256-6kZndC5v/75FKY78jwmMuFXWpWzxZkCesYK4GLYxUY8=";
   };
 
   nativeBuildInputs = [

From 86df4f6a364bbbe2df52c80030ac34ddc3f0ddb3 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 11 Sep 2024 02:10:32 +0200
Subject: [PATCH 063/241] flexget: 3.11.43 -> 3.11.45

Changelog: https://github.com/Flexget/Flexget/releases/tag/v3.11.45
---
 pkgs/by-name/fl/flexget/package.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix
index 79203498ec6e..3080bd4237e9 100644
--- a/pkgs/by-name/fl/flexget/package.nix
+++ b/pkgs/by-name/fl/flexget/package.nix
@@ -5,7 +5,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "flexget";
-  version = "3.11.43";
+  version = "3.11.45";
   pyproject = true;
 
   # Fetch from GitHub in order to use `requirements.in`
@@ -13,21 +13,17 @@ python3.pkgs.buildPythonApplication rec {
     owner = "Flexget";
     repo = "Flexget";
     rev = "refs/tags/v${version}";
-    hash = "sha256-KX7Bvu4rt+Q7x2XkBiZMngAgqRKYu90EVi2oQ21o5AI=";
+    hash = "sha256-QtxtkXKBYf46cS+TAxJGQNQktHpLgGDIf7Czfznzr1s=";
   };
 
-  postPatch = ''
-    # remove dependency constraints but keep environment constraints
-    sed 's/[~<>=][^;]*//' -i requirements.txt
-  '';
+  # relax dep constrains, keep environment constraints
+  pythonRelaxDeps = true;
 
-  build-system = with python3.pkgs; [
-    setuptools
-    wheel
-  ];
+  build-system = with python3.pkgs; [ setuptools ];
 
   dependencies = with python3.pkgs; [
     # See https://github.com/Flexget/Flexget/blob/master/pyproject.toml
+    # and https://github.com/Flexget/Flexget/blob/develop/requirements.txt
     apscheduler
     beautifulsoup4
     colorama
@@ -48,6 +44,7 @@ python3.pkgs.buildPythonApplication rec {
     rich
     rpyc
     sqlalchemy
+    zstandard
 
     # WebUI requirements
     cherrypy

From 826a9ba899c6a2517678ecc716ce9a8f2ef52507 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Thu, 12 Sep 2024 22:19:16 +0200
Subject: [PATCH 064/241] tomcat9: 9.0.93 -> 9.0.94

https://github.com/apache/tomcat/compare/9.0.93...9.0.94
https://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.94_(remm)
---
 pkgs/servers/http/tomcat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index f883f3d3e58a..94b742e115d7 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -59,8 +59,8 @@ let
 in
 {
   tomcat9 = common {
-    version = "9.0.93";
-    hash = "sha256-aeDzU+p9hQBPneN5wepo5XdSh/4uCFnFYIHghcGykiY=";
+    version = "9.0.94";
+    hash = "sha256-KMjFSxBc6/qw196lxkwLJPV7N5efrB9p0C9Q0gPSPfA=";
   };
 
   tomcat10 = common {

From e7354e83da0752096a84fe8c54497f24071b8209 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Thu, 12 Sep 2024 22:20:01 +0200
Subject: [PATCH 065/241] tomcat10: 10.1.28 -> 10.1.29

https://github.com/apache/tomcat/compare/10.1.28...10.1.29
https://tomcat.apache.org/tomcat-10.1-doc/changelog.html#Tomcat_10.1.29_(schultz)
---
 pkgs/servers/http/tomcat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 94b742e115d7..fee5d15e112e 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -64,7 +64,7 @@ in
   };
 
   tomcat10 = common {
-    version = "10.1.28";
-    hash = "sha256-89N3d9Pqv4TwQ9ljTQj6Qzfw2B75ADzo/H4c8Uc7hdo=";
+    version = "10.1.29";
+    hash = "sha256-k9klJ9Rn//CU1F2xyrvhos77kpeXeaRPKlDQU7QVXOM=";
   };
 }

From e2d17e900880e624808df0cbce421a8ebe2e8b7d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Sep 2024 04:58:28 +0000
Subject: [PATCH 066/241] podofo010: 0.10.3 -> 0.10.4

---
 pkgs/development/libraries/podofo/0.10.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/podofo/0.10.x.nix b/pkgs/development/libraries/podofo/0.10.x.nix
index 0916c2f9e9a0..fdc42bc0f565 100644
--- a/pkgs/development/libraries/podofo/0.10.x.nix
+++ b/pkgs/development/libraries/podofo/0.10.x.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "podofo";
-  version = "0.10.3";
+  version = "0.10.4";
 
   src = fetchFromGitHub {
     owner = "podofo";
     repo = "podofo";
     rev = finalAttrs.version;
-    hash = "sha256-B+YNTo2rZAL4PqDo+lFOQiWM9bl/TIn8xrJyefrIAYE=";
+    hash = "sha256-ZY+kyimLzAeEgvDaflXM7MbyzsGgivOnG1aBD9/ozbk=";
   };
 
   outputs = [ "out" "dev" "lib" ];

From 47b0dfe793b66241cacca50d722783425986c7a7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Sep 2024 05:35:12 +0000
Subject: [PATCH 067/241] trexio: 2.4.2 -> 2.5.0

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

diff --git a/pkgs/by-name/tr/trexio/package.nix b/pkgs/by-name/tr/trexio/package.nix
index 2e61c9f41ea5..da9770a6dff6 100644
--- a/pkgs/by-name/tr/trexio/package.nix
+++ b/pkgs/by-name/tr/trexio/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "trexio";
-  version = "2.4.2";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "TREX-CoE";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-SE5cylLThpwDWyAcQZgawcdYGc/8iiIwL6EyQ+hOIYY=";
+    hash = "sha256-KP8tpwBr/ymjcXmCssdn+Xti0UKgazJSGTgVpvE+CiM=";
   };
 
   postPatch = ''

From 67a611c2f6fde3a4213be2890a71dd265232287a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Sep 2024 06:26:23 +0000
Subject: [PATCH 068/241] python312Packages.stanza: 1.8.2 -> 1.9.2

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

diff --git a/pkgs/development/python-modules/stanza/default.nix b/pkgs/development/python-modules/stanza/default.nix
index dbc64f227bda..543ab64e63bf 100644
--- a/pkgs/development/python-modules/stanza/default.nix
+++ b/pkgs/development/python-modules/stanza/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "stanza";
-  version = "1.8.2";
+  version = "1.9.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "stanfordnlp";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-twgMWKWUvhnGNqQ42MOptnikdSBiDFpiMCI2RPo+3XU=";
+    hash = "sha256-hrRn6ITsN7kFL1T6VjSXPDytANEeJYKwMaSdCG+YJyM=";
   };
 
   propagatedBuildInputs = [

From ef95cc157bd16b2a504d127c8d3c2f2499fb5c35 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Sep 2024 09:45:14 +0000
Subject: [PATCH 069/241] granted: 0.32.0 -> 0.33.0

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

diff --git a/pkgs/tools/admin/granted/default.nix b/pkgs/tools/admin/granted/default.nix
index b5de7a2160c0..4fbe229b2c6d 100644
--- a/pkgs/tools/admin/granted/default.nix
+++ b/pkgs/tools/admin/granted/default.nix
@@ -12,16 +12,16 @@
 
 buildGoModule rec {
   pname = "granted";
-  version = "0.32.0";
+  version = "0.33.0";
 
   src = fetchFromGitHub {
     owner = "common-fate";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-CagRgAStanLD7JnH1L4zAhxD56dpgqUR31DICaklWRE=";
+    sha256 = "sha256-prvdxWdv580BmhjhP6h4FHyjCDlgr5/Z1kg2wOS+pR0=";
   };
 
-  vendorHash = "sha256-iGYAjbWQ8w60NZeMCVydltQLuwxOI74VxLltYIJ37K8=";
+  vendorHash = "sha256-g7GKABv7SunVhRUd4y3ZSqD5lnFxM5nuaHJhxFuF/FE=";
 
   nativeBuildInputs = [ makeWrapper ];
 

From 14f8c145e64e8ec544d9243cbad7bc3f53e99657 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Sep 2024 11:30:20 +0000
Subject: [PATCH 070/241] buildkit: 0.15.2 -> 0.16.0

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

diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix
index a1b95f6ce6cc..bddb8432109d 100644
--- a/pkgs/development/tools/buildkit/default.nix
+++ b/pkgs/development/tools/buildkit/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "buildkit";
-  version = "0.15.2";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "moby";
     repo = "buildkit";
     rev = "v${version}";
-    hash = "sha256-N//XCiWWFjpJ6OncN7OT/C7+ziYr49T+0cOpH61mjg4=";
+    hash = "sha256-rAl2lPcm4JSRO9xVrZctGpWoi/JNZ5uUHDIZKd70+M8=";
   };
 
   vendorHash = null;

From adc9eb141c144a06c3673563336fd9abc804e2b1 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 13 Sep 2024 13:41:50 +0200
Subject: [PATCH 071/241] home-assistant-custom-components.average: init at
 2.3.4

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 .../custom-components/average/default.nix     | 25 +++++++++++++++++++
 .../custom-components/default.nix             |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/servers/home-assistant/custom-components/average/default.nix

diff --git a/pkgs/servers/home-assistant/custom-components/average/default.nix b/pkgs/servers/home-assistant/custom-components/average/default.nix
new file mode 100644
index 000000000000..be381233a116
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-components/average/default.nix
@@ -0,0 +1,25 @@
+{
+  lib,
+  buildHomeAssistantComponent,
+  fetchFromGitHub,
+}:
+
+buildHomeAssistantComponent rec {
+  owner = "Limych";
+  domain = "average";
+  version = "2.3.4";
+
+  src = fetchFromGitHub {
+    inherit owner;
+    repo = "ha-average";
+    rev = version;
+    hash = "sha256-PfN2F1/ScVScXfh5jKQDZ6rK4XlqD9+YW8k4f4i3bk0=";
+  };
+
+  meta = with lib; {
+    description = "Average Sensor for Home Assistant";
+    homepage = "https://github.com/Limych/ha-average";
+    maintainers = with maintainers; [ matthiasbeyer ];
+    license = licenses.cc-by-nc-40;
+  };
+}
diff --git a/pkgs/servers/home-assistant/custom-components/default.nix b/pkgs/servers/home-assistant/custom-components/default.nix
index bd819ad0c36b..f1395d321052 100644
--- a/pkgs/servers/home-assistant/custom-components/default.nix
+++ b/pkgs/servers/home-assistant/custom-components/default.nix
@@ -10,6 +10,8 @@
 
   awtrix = callPackage ./awtrix {};
 
+  average = callPackage ./average {};
+
   better_thermostat = callPackage ./better_thermostat {};
 
   dwd = callPackage ./dwd { };

From df8c8b2e624495f3038346c6f16995fa7f07f2a9 Mon Sep 17 00:00:00 2001
From: Nate Smith <nate@theinternate.com>
Date: Thu, 12 Sep 2024 16:16:42 -0400
Subject: [PATCH 072/241] aider-chat: skip version check in tests

aider checks for a new version and prompts for an install on each
launch. These prompts cause checks to fail on the package whenever a new
version of the application is released.

Skip those version checks and include some dependencies missing from the
dependency check.
---
 pkgs/by-name/ai/aider-chat/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/ai/aider-chat/package.nix b/pkgs/by-name/ai/aider-chat/package.nix
index 4317402281b1..ba5540a97688 100644
--- a/pkgs/by-name/ai/aider-chat/package.nix
+++ b/pkgs/by-name/ai/aider-chat/package.nix
@@ -51,6 +51,7 @@ python3.pkgs.buildPythonApplication {
       numpy
       packaging
       pathspec
+      pexpect
       pillow
       playwright
       prompt-toolkit
@@ -93,6 +94,8 @@ python3.pkgs.buildPythonApplication {
       "test_browser_flag_imports_streamlit"
       # AttributeError
       "test_simple_send_with_retries"
+      # Expected 'check_version' to have been called once
+      "test_main_exit_calls_version_check"
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       # Tests fails on darwin
@@ -102,6 +105,7 @@ python3.pkgs.buildPythonApplication {
 
   preCheck = ''
     export HOME=$(mktemp -d)
+    export AIDER_CHECK_UPDATE=false
   '';
 
   meta = {

From d5b29d1ea167ba26cbd6ee64b12801b720e704cb Mon Sep 17 00:00:00 2001
From: Bruno Rodrigues <bruno@brodrigues.co>
Date: Fri, 13 Sep 2024 15:49:58 +0200
Subject: [PATCH 073/241] python312Packages.radian: 0.6.12 -> 0.6.13

---
 .../python-modules/radian/default.nix           | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/radian/default.nix b/pkgs/development/python-modules/radian/default.nix
index fd185ac7be4b..e42e16f307c2 100644
--- a/pkgs/development/python-modules/radian/default.nix
+++ b/pkgs/development/python-modules/radian/default.nix
@@ -6,6 +6,7 @@
   pyte,
   pexpect,
   ptyprocess,
+  pythonOlder,
   jedi,
   git,
   lineedit,
@@ -14,21 +15,22 @@
   rchitect,
   R,
   rPackages,
-  pythonOlder,
+  setuptools,
+  setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "radian";
-  version = "0.6.12";
-  format = "setuptools";
+  version = "0.6.13";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "randy3k";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-cojKbDNqcUay5RxvWszQ96eC4jVI4G7iRv/ZYWgidCQ=";
+    hash = "sha256-gz2VczAgVbvISzvY/v0GvZ/Erv6ipZwPU61r6OJ+3Fo=";
   };
 
   postPatch = ''
@@ -36,6 +38,11 @@ buildPythonPackage rec {
       --replace '"pytest-runner"' ""
   '';
 
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
   nativeBuildInputs = [
     R # needed at setup time to detect R_HOME
   ];

From d1e5bbc756535966e3047e61c45b65137d0ffe9a Mon Sep 17 00:00:00 2001
From: Bruno Rodrigues <bruno@brodrigues.co>
Date: Fri, 13 Sep 2024 15:50:07 +0200
Subject: [PATCH 074/241] python312Packages.rchitect: 0.4.6 -> 0.4.7

---
 .../python-modules/rchitect/default.nix         | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/rchitect/default.nix b/pkgs/development/python-modules/rchitect/default.nix
index dc2f22e97194..785b0218d9f2 100644
--- a/pkgs/development/python-modules/rchitect/default.nix
+++ b/pkgs/development/python-modules/rchitect/default.nix
@@ -3,27 +3,29 @@
   buildPythonPackage,
   fetchFromGitHub,
   cffi,
+  packaging,
   pytestCheckHook,
   pytest-mock,
   pythonOlder,
   R,
   rPackages,
+  setuptools,
+  setuptools-scm,
   six,
-  packaging,
 }:
 
 buildPythonPackage rec {
   pname = "rchitect";
-  version = "0.4.6";
-  format = "setuptools";
+  version = "0.4.7";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "randy3k";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-IVyYzf433m03RRfL5SmUOdaXFy0NHf/QuAdtUeUjIz0=";
+    hash = "sha256-M7OWDo3mEEOYtjIpzPIpzPMBtv2TZJKJkSfHczZYS8Y=";
   };
 
   postPatch = ''
@@ -31,6 +33,11 @@ buildPythonPackage rec {
       --replace '"pytest-runner"' ""
   '';
 
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
   propagatedBuildInputs = [
     cffi
     six

From c7b2d3b1a704898fec88546c99f17176fea7ab04 Mon Sep 17 00:00:00 2001
From: Jesse Y Lin <jesseyounglin@gmail.com>
Date: Sun, 7 Jan 2024 14:59:34 -0600
Subject: [PATCH 075/241] glibtool: init

glibtool is simply libtool with "g" prefixed, because this is the
convention adopted in MacOS for distinguishing between GNU versions of
binaries/libraries and their equivalents shipped by Apple. Much software
for MacOS assumes that libtool can be found at `glibtool` so this is a
convenience wrapper for this case.
---
 pkgs/by-name/gl/glibtool/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 pkgs/by-name/gl/glibtool/package.nix

diff --git a/pkgs/by-name/gl/glibtool/package.nix b/pkgs/by-name/gl/glibtool/package.nix
new file mode 100644
index 000000000000..286ba6dc95c2
--- /dev/null
+++ b/pkgs/by-name/gl/glibtool/package.nix
@@ -0,0 +1,7 @@
+{ libtool }:
+
+libtool.overrideAttrs {
+  pname = "glibtool";
+  meta.mainProgram = "glibtool";
+  configureFlags = [ "--program-prefix=g" ];
+}

From 496ca405d84176d310bcc4f3dd08884675b34717 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Sep 2024 17:35:22 +0000
Subject: [PATCH 076/241] python312Packages.manifestoo-core: 1.7 -> 1.8

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

diff --git a/pkgs/development/python-modules/manifestoo-core/default.nix b/pkgs/development/python-modules/manifestoo-core/default.nix
index 35b713babb5f..b52039bf7fba 100644
--- a/pkgs/development/python-modules/manifestoo-core/default.nix
+++ b/pkgs/development/python-modules/manifestoo-core/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "manifestoo-core";
-  version = "1.7";
+  version = "1.8";
   format = "pyproject";
 
   src = fetchPypi {
     inherit version;
     pname = "manifestoo_core";
-    hash = "sha256-CLYySNkMysd81ZBA2yfHGSvBuuf8vEvVXkzVsTeEoNM=";
+    hash = "sha256-AjvwG9j2TILslTR4GwK6eHfql4l7I+QIwUd6XQ2ojmg=";
   };
 
   nativeBuildInputs = [ hatch-vcs ];

From c014be4eba12f7e618576c84c8e2721c34f63baf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Sep 2024 17:35:30 +0000
Subject: [PATCH 077/241] sqlite-vec: 0.1.1 -> 0.1.2

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

diff --git a/pkgs/by-name/sq/sqlite-vec/package.nix b/pkgs/by-name/sq/sqlite-vec/package.nix
index cb89114d7feb..01bb7229fd43 100644
--- a/pkgs/by-name/sq/sqlite-vec/package.nix
+++ b/pkgs/by-name/sq/sqlite-vec/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sqlite-vec";
-  version = "0.1.1";
+  version = "0.1.2";
 
   src = fetchFromGitHub {
     owner = "asg017";
     repo = "sqlite-vec";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-h5gCKyeEAgmXCpOpXVDzoZEtv7Yiq7GtgImuoF9uBm0=";
+    hash = "sha256-8vof4gfESfWHAW+MBYdhyte2bKnVk+VEiowDK42/G/0=";
   };
 
   nativeBuildInputs = [ gettext ];

From abe503e2b326f4c222591de58f1ddc8c36425d1b Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 13 Sep 2024 20:54:04 +0200
Subject: [PATCH 078/241] python312Packages.huggingface-hub: 0.24.6 -> 0.24.7

Diff: https://github.com/huggingface/huggingface_hub/compare/refs/tags/v0.24.6...v0.24.7

Changelog: https://github.com/huggingface/huggingface_hub/releases/tag/v0.24.7
---
 .../development/python-modules/huggingface-hub/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix
index 213d4f2f4e0b..229daf9b15e2 100644
--- a/pkgs/development/python-modules/huggingface-hub/default.nix
+++ b/pkgs/development/python-modules/huggingface-hub/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
 
   # build-system
@@ -19,16 +18,14 @@
 
 buildPythonPackage rec {
   pname = "huggingface-hub";
-  version = "0.24.6";
+  version = "0.24.7";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "huggingface_hub";
     rev = "refs/tags/v${version}";
-    hash = "sha256-1W+hfe2m5mXidbepVPMObnOZH6LCQG9dvFRbo9iUjKg=";
+    hash = "sha256-7JW98PVJy3dKn3V+JmyxCZJplFUpqPckMbOJR45ZH7o=";
   };
 
   build-system = [ setuptools ];

From 5c59c2a2cb1596e1d1df510506fb0bbd35c7b913 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 14 Sep 2024 00:13:43 +0000
Subject: [PATCH 079/241] python312Packages.playwright: 1.46.0 -> 1.47.0

---
 pkgs/development/python-modules/playwright/default.nix |  4 ++--
 pkgs/development/web/playwright/driver.nix             | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix
index 1c215be9d897..811aa8ce8243 100644
--- a/pkgs/development/python-modules/playwright/default.nix
+++ b/pkgs/development/python-modules/playwright/default.nix
@@ -21,7 +21,7 @@ in
 buildPythonPackage rec {
   pname = "playwright";
   # run ./pkgs/development/python-modules/playwright/update.sh to update
-  version = "1.46.0";
+  version = "1.47.0";
   pyproject = true;
   disabled = pythonOlder "3.7";
 
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "microsoft";
     repo = "playwright-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-88ZFhP8Bd10czoW71ltelWStypX4z4g18LT3Zo5ACMg=";
+    hash = "sha256-C/spH54hhLI0Egs2jjTjQ5BH1pIw1syrfSyUvVQRoKM=";
   };
 
   patches = [
diff --git a/pkgs/development/web/playwright/driver.nix b/pkgs/development/web/playwright/driver.nix
index 3c2dc6210d90..107bf6281a44 100644
--- a/pkgs/development/web/playwright/driver.nix
+++ b/pkgs/development/web/playwright/driver.nix
@@ -17,13 +17,13 @@ let
 
   throwSystem = throw "Unsupported system: ${system}";
 
-  version = "1.46.0";
+  version = "1.47.0";
 
   src = fetchFromGitHub {
     owner = "Microsoft";
     repo = "playwright";
     rev = "v${version}";
-    hash = "sha256-pNvjWyedKsac7WffOXZjsxGVlUSkmXqSGHvivF9ek4g=";
+    hash = "sha256-cKjVDy1wFo8NlF8v+8YBuQUF2OUYjCmv27uhEoVUrno=";
   };
 
   babel-bundle = buildNpmPackage {
@@ -40,7 +40,7 @@ let
     pname = "expect-bundle";
     inherit version src;
     sourceRoot = "${src.name}/packages/playwright/bundles/expect";
-    npmDepsHash = "sha256-jNrFQ6BcMsVdEyB2ATFH4wRNb12v4w1kXo6rVv6rzAw=";
+    npmDepsHash = "sha256-qnFx/AQZtmxNFrrabfOpsWy6I64DFJf3sWrJzL1wfU4=";
     dontNpmBuild = true;
     installPhase = ''
       cp -r . "$out"
@@ -60,7 +60,7 @@ let
     pname = "utils-bundle-core";
     inherit version src;
     sourceRoot = "${src.name}/packages/playwright-core/bundles/utils";
-    npmDepsHash = "sha256-lh57Xvrqt0YDenBvahoUuQNW6GdRUiBBkA3TLmnz9WE=";
+    npmDepsHash = "sha256-aktxEDQKxsDcInyjDKDuIu4zwtrAH0lRda/mP1IayPA=";
     dontNpmBuild = true;
     installPhase = ''
       cp -r . "$out"
@@ -82,7 +82,7 @@ let
     inherit version src;
 
     sourceRoot = "${src.name}"; # update.sh depends on sourceRoot presence
-    npmDepsHash = "sha256-8wc/QfABTIVrzQxM9aCyXGkLaothOBVLteH8SiPanZU=";
+    npmDepsHash = "sha256-FaDTJmIiaaOCvq6tARfiWX5IBTTNOJ/iVkRsO4D8aqc=";
 
     nativeBuildInputs = [ cacert ];
 

From fa023952c69f1d152d75e28ce022d8e7519e64f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 14 Sep 2024 00:38:35 +0000
Subject: [PATCH 080/241] signalbackup-tools: 20240910 -> 20240913

---
 .../instant-messengers/signalbackup-tools/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
index ee88f6020aac..7e381c1205f5 100644
--- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "signalbackup-tools";
-  version = "20240910";
+  version = "20240913";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = "signalbackup-tools";
     rev = version;
-    hash = "sha256-VOC13xXWRGHq7K5ju1U/+SNj+qgkJCSYN11l01hwYhI=";
+    hash = "sha256-Rtoxa0LYL2ElBtt6KxRmKAkRDc8PNvRCoP0s51h+sIM=";
   };
 
   nativeBuildInputs = [

From 9bdd5a1298e0c2963c118f1f0714505927867f38 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 13 Sep 2024 23:19:01 -0400
Subject: [PATCH 081/241] easyeffects: 7.1.8 -> 7.1.9

Changelog: https://github.com/wwmm/easyeffects/blob/4c35ba8c385723fdefc81ad8fcb816eb965fe1d8/CHANGELOG.md#719
Diff: https://github.com/wwmm/easyeffects/compare/v7.1.8...v7.1.9
---
 pkgs/by-name/ea/easyeffects/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix
index 21d897bc2fde..5c371efca5d3 100644
--- a/pkgs/by-name/ea/easyeffects/package.nix
+++ b/pkgs/by-name/ea/easyeffects/package.nix
@@ -47,13 +47,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "easyeffects";
-  version = "7.1.8";
+  version = "7.1.9";
 
   src = fetchFromGitHub {
     owner = "wwmm";
     repo = "easyeffects";
     rev = "refs/tags/v${version}";
-    hash = "sha256-eDjtmr100WOCd0k0p3rUEtu6O9LlSGs43oaIXT07ikI=";
+    hash = "sha256-It+kldlhThWF9y/rTgKt9QlIouH1cQcCtSHQTsaGjfo=";
   };
 
   nativeBuildInputs = [

From 29a684b0a0051ff18ce0f81820a62ba5f01f9bd2 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Fri, 13 Sep 2024 19:30:47 +0800
Subject: [PATCH 082/241] hackgregator: init at 0.5.0-unstable-2023-12-05

---
 pkgs/by-name/ha/hackgregator/package.nix | 65 ++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 pkgs/by-name/ha/hackgregator/package.nix

diff --git a/pkgs/by-name/ha/hackgregator/package.nix b/pkgs/by-name/ha/hackgregator/package.nix
new file mode 100644
index 000000000000..d914a9fc9fa9
--- /dev/null
+++ b/pkgs/by-name/ha/hackgregator/package.nix
@@ -0,0 +1,65 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitLab,
+  pkg-config,
+  wrapGAppsHook4,
+  libadwaita,
+  openssl,
+  webkitgtk_6_0,
+  sqlite,
+  glib-networking,
+}:
+
+rustPlatform.buildRustPackage {
+  pname = "hackgregator";
+  version = "0.5.0-unstable-2023-12-05";
+
+  src = fetchFromGitLab {
+    owner = "gunibert";
+    repo = "hackgregator";
+    rev = "594bdcdc3919c7216d611ddbbc77ab4d0c1f4f2b";
+    hash = "sha256-RE0x4YWquWAcQzxGk9zdNjEp1pijrBtjV1EMBu9c5cs=";
+  };
+
+  cargoHash = "sha256-OPlYFUhAFRHqXS2vad0QYlhcwyyxdxi1kjpTxVlgyxs=";
+
+  nativeBuildInputs = [
+    pkg-config
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    libadwaita
+    openssl
+    webkitgtk_6_0
+    sqlite
+    glib-networking
+  ];
+
+  # 'error[E0432]: unresolved import' when compiling checks
+  doCheck = false;
+
+  postInstall = ''
+    rm $out/bin/xtask
+    mkdir -p $out/share
+    pushd hackgregator/data
+      cp -r icons $out/share/icons
+      install -Dm644 de.gunibert.Hackgregator.desktop -t $out/share/applications
+      install -Dm644 de.gunibert.Hackgregator.appdata.xml -t $out/share/appdata
+    popd
+  '';
+
+  meta = {
+    description = "Comfortable GTK reader application for news.ycombinator.com";
+    homepage = "https://gitlab.com/gunibert/hackgregator";
+    license = with lib.licenses; [
+      gpl3Plus
+      # and
+      cc0
+    ];
+    mainProgram = "hackgregator";
+    maintainers = with lib.maintainers; [ aleksana ];
+    platforms = lib.platforms.unix;
+  };
+}

From dca4e1190697c0144edd32fe460071a112919850 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 14 Sep 2024 06:06:47 +0000
Subject: [PATCH 083/241] osv-scanner: 1.8.4 -> 1.8.5

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

diff --git a/pkgs/tools/security/osv-scanner/default.nix b/pkgs/tools/security/osv-scanner/default.nix
index d0b3bf151e02..8067dab02cc8 100644
--- a/pkgs/tools/security/osv-scanner/default.nix
+++ b/pkgs/tools/security/osv-scanner/default.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "osv-scanner";
-  version = "1.8.4";
+  version = "1.8.5";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "osv-scanner";
     rev = "refs/tags/v${version}";
-    hash = "sha256-e1a21zBxMa89PuNXPbeTpY3mHeO0TvxcoHcWRPUYwsM=";
+    hash = "sha256-bwCY1LK2Ig/VcJJHu88cyrZ5ImOOEUYdGMBkZTmpG+g=";
   };
 
-  vendorHash = "sha256-ZmWgupPHZhv+MmNfFmuU1Cjin5liNcgkzdxw3Sf614c=";
+  vendorHash = "sha256-uZ0FDQaYaCMYu92e5i2YqS31NP1whaiDE8s+0KLh7k4=";
 
   subPackages = [
     "cmd/osv-scanner"

From 521c3dafeec138f7bb4c244925160383441c279d Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 12 Sep 2024 09:22:14 +0000
Subject: [PATCH 084/241] polyphone: 2.3.0 -> 2.4.0

---
 pkgs/applications/audio/polyphone/default.nix | 59 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/pkgs/applications/audio/polyphone/default.nix b/pkgs/applications/audio/polyphone/default.nix
index f9e33dc94a80..11feb31ff1c9 100644
--- a/pkgs/applications/audio/polyphone/default.nix
+++ b/pkgs/applications/audio/polyphone/default.nix
@@ -1,46 +1,62 @@
-{ stdenv, lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, alsa-lib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg, qttools }:
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  pkg-config,
+  qmake,
+  qttools,
+  wrapQtAppsHook,
+  alsa-lib,
+  flac,
+  libjack2,
+  libogg,
+  libvorbis,
+  qtsvg,
+  qtwayland,
+  rtmidi,
+}:
 
-mkDerivation rec {
-  version = "2.3.0";
+stdenv.mkDerivation rec {
+  version = "2.4.0";
   pname = "polyphone";
 
   src = fetchFromGitHub {
     owner = "davy7125";
     repo = "polyphone";
     rev = version;
-    sha256 = "09habv51pw71wrb39shqi80i2w39dx5a39klzswsald5j9sia0ir";
+    hash = "sha256-cPHLmqsS4ReqOCcsgOf77V/ShIkk7chGoJ6bU4W5ejs=";
   };
 
+  nativeBuildInputs = [
+    pkg-config
+    qmake
+    qttools
+    wrapQtAppsHook
+  ];
+
   buildInputs = [
     alsa-lib
-    libjack2
-    portaudio
-    libogg
     flac
+    libjack2
+    libogg
     libvorbis
-    rtmidi
     qtsvg
+    qtwayland
+    rtmidi
   ];
 
-  nativeBuildInputs = [ qmake qttools pkg-config ];
-
   preConfigure = ''
     cd ./sources/
   '';
 
-  installPhase = ''
-    runHook preInstall
-    install -d $out/bin
-    install -m755 bin/polyphone $out/bin/
-
-    install -Dm444 ./contrib/com.polyphone_soundfonts.polyphone.desktop -t $out/share/applications/
-    install -Dm444 ./contrib/polyphone.svg -t $out/share/icons/hicolor/scalable/apps/
-    runHook postInstall
+  postConfigure = ''
+    # Work around https://github.com/NixOS/nixpkgs/issues/214765
+    substituteInPlace Makefile \
+      --replace-fail "$(dirname $QMAKE)/lrelease" "${lib.getBin qttools}/bin/lrelease"
   '';
 
   qmakeFlags = [
     "DEFINES+=USE_LOCAL_STK"
-    "DEFINES+=USE_LOCAL_QCUSTOMPLOT"
   ];
 
   meta = with lib; {
@@ -49,7 +65,10 @@ mkDerivation rec {
     mainProgram = "polyphone";
     homepage = "https://www.polyphone-soundfonts.com/";
     license = licenses.gpl3;
-    maintainers = [ maintainers.maxdamantus ];
+    maintainers = with maintainers; [
+      maxdamantus
+      orivej
+    ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85fb98cb0f44..30aa1247a6e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -32094,7 +32094,7 @@ with pkgs;
 
   yambar-hyprland-wses = callPackage ../applications/misc/yambar-hyprland-wses { };
 
-  polyphone = libsForQt5.callPackage ../applications/audio/polyphone { };
+  polyphone = qt6.callPackage ../applications/audio/polyphone { };
 
   psi-notify = callPackage ../applications/misc/psi-notify { };
 

From f8afc980039d347679f3d93b5382d9c9c85f7be9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 14 Sep 2024 10:42:44 +0000
Subject: [PATCH 085/241] obs-studio-plugins.obs-text-pthread: 2.0.4 -> 2.0.5

---
 .../video/obs-studio/plugins/obs-text-pthread.nix             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix b/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix
index 8819f4f53779..8ce601f08ea5 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "obs-text-pthread";
-  version = "2.0.4";
+  version = "2.0.5";
 
   src = fetchFromGitHub {
     owner = "norihiro";
     repo = "obs-text-pthread";
     rev = version;
-    sha256 = "sha256-3Y++zpy5TEp8AtyRw+1fZDEFY9AuN7JpUNqUhM7h04U=";
+    sha256 = "sha256-zrgxKs3jmrwQJiEgKfZz1BOVToTLauQXtFYcuFlV71o=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];

From 6749b1c4bcfe88bdcfdea480ecda17a61e70ecbc Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Sat, 6 Jul 2024 05:48:32 +0000
Subject: [PATCH 086/241] lib/tests/misc.nix: move testFix into new category
 FIXED-POINTS

---
 lib/tests/misc.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index 7445c634558c..06df9fb02ec7 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -233,11 +233,6 @@ runTests {
     ];
   };
 
-  testFix = {
-    expr = fix (x: {a = if x ? a then "a" else "b";});
-    expected = {a = "a";};
-  };
-
   testComposeExtensions = {
     expr = let obj = makeExtensible (self: { foo = self.bar; });
                f = self: super: { bar = false; baz = true; };
@@ -1237,6 +1232,13 @@ runTests {
     attrsToList { someFunc= a: a + 1;}
   );
 
+# FIXED-POINTS
+
+  testFix = {
+    expr = fix (x: {a = if x ? a then "a" else "b";});
+    expected = {a = "a";};
+  };
+
 # GENERATORS
 # these tests assume attributes are converted to lists
 # in alphabetical order

From 11c20cd39099033adec0688aa44cf2f95f28b1ff Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Thu, 4 Jul 2024 20:37:01 +0000
Subject: [PATCH 087/241] lib.toExtension: init

Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
---
 lib/default.nix      |  3 ++-
 lib/fixed-points.nix | 64 ++++++++++++++++++++++++++++++++++++++++++++
 lib/tests/misc.nix   | 17 ++++++++++++
 3 files changed, 83 insertions(+), 1 deletion(-)

diff --git a/lib/default.nix b/lib/default.nix
index 0ff3a3980745..4d0035945aaa 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -79,7 +79,8 @@ let
       fromHexString toHexString toBaseDigits inPureEvalMode isBool isInt pathExists
       genericClosure readFile;
     inherit (self.fixedPoints) fix fix' converge extends composeExtensions
-      composeManyExtensions makeExtensible makeExtensibleWithCustomName;
+      composeManyExtensions makeExtensible makeExtensibleWithCustomName
+      toExtension;
     inherit (self.attrsets) attrByPath hasAttrByPath setAttrByPath
       getAttrFromPath attrVals attrNames attrValues getAttrs catAttrs filterAttrs
       filterAttrsRecursive foldlAttrs foldAttrs collect nameValuePair mapAttrs
diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix
index c8d2d1f03acb..ecacddadb94b 100644
--- a/lib/fixed-points.nix
+++ b/lib/fixed-points.nix
@@ -438,4 +438,68 @@ rec {
         ${extenderName} = f: makeExtensibleWithCustomName extenderName (extends f rattrs);
       }
     );
+
+  /**
+    Convert to an extending function (overlay).
+
+    `toExtension` is the `toFunction` for extending functions (a.k.a. extensions or overlays).
+    It converts a non-function or a single-argument function to an extending function,
+    while returning a double-argument function as-is.
+
+    That is, it takes one of `x`, `prev: x`, or `final: prev: x`,
+    and returns `final: prev: x`, where `x` is not a function.
+
+    This function is extracted from the implementation of
+    the fixed-point arguments support of `stdenv.mkDerivation`.
+    It bridges the gap between `<pkg>.overrideAttrs`
+    before and after the overlay-style support,
+    as well as `config.packageOverrides` and `config.overlays` in `pkgs`.
+
+    # Inputs
+
+    `f`
+    : The function or non-function to convert to an extending function.
+
+    # Type
+
+    ```
+    toExtension ::: (a | a -> a | a -> a -> a) -> a -> a -> a
+    a = AttrSet & !Function
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.fixedPoints.toExtension` usage example
+
+    ```nix
+    fix (final: { a = 0; c = final.a; })
+    => { a = 0; c = 0; };
+
+    fix (extends (toExtension { a = 1; b = 2; }) (final: { a = 0; c = final.a; }))
+    => { a = 1; b = 2; c = 1; };
+
+    fix (extends (toExtension (prev: { a = 1; b = prev.a; })) (final: { a = 0; c = final.a; }))
+    => { a = 1; b = 0; c = 1; };
+
+    fix (extends (toExtension (final: prev: { a = 1; b = prev.a; c = final.a + 1 })) (final: { a = 0; c = final.a; }))
+    => { a = 1; b = 0; c = 2; };
+    ```
+    :::
+  */
+  toExtension =
+    f:
+    if lib.isFunction f then
+      final: prev:
+      let
+        fPrev = f prev;
+      in
+      if lib.isFunction fPrev then
+        # f is (final: prev: { ... })
+        f final prev
+      else
+        # f is (prev: { ... })
+        fPrev
+    else
+      # f is { ... }
+      final: prev: f;
 }
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index 06df9fb02ec7..116d86cdfb3f 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -45,6 +45,7 @@ let
     const
     escapeXML
     evalModules
+    extends
     filter
     fix
     fold
@@ -102,6 +103,7 @@ let
     take
     testAllTrue
     toBaseDigits
+    toExtension
     toHexString
     fromHexString
     toInt
@@ -1239,6 +1241,21 @@ runTests {
     expected = {a = "a";};
   };
 
+  testToExtension = {
+    expr = [
+      (fix (final: { a = 0; c = final.a; }))
+      (fix (extends (toExtension { a = 1; b = 2; }) (final: { a = 0; c = final.a; })))
+      (fix (extends (toExtension (prev: { a = 1; b = prev.a; })) (final: { a = 0; c = final.a; })))
+      (fix (extends (toExtension (final: prev: { a = 1; b = prev.a; c = final.a + 1; })) (final: { a = 0; c = final.a; })))
+    ];
+    expected = [
+      { a = 0; c = 0; }
+      { a = 1; b = 2; c = 1; }
+      { a = 1; b = 0; c = 1; }
+      { a = 1; b = 0; c = 2; }
+    ];
+  };
+
 # GENERATORS
 # these tests assume attributes are converted to lists
 # in alphabetical order

From 30809ccecd64b3274e029af552a6f89512c9f624 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Thu, 4 Jul 2024 20:52:52 +0000
Subject: [PATCH 088/241] stdenv.mkDerivation: simplify overrideAttrs with
 extends and toOverlay

---
 pkgs/stdenv/generic/make-derivation.nix | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 3068ad726658..9cd22e364ea6 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -67,26 +67,8 @@ let
       #              ^^^^
 
       overrideAttrs = f0:
-        let
-          f = self: super:
-            # Convert f0 to an overlay. Legacy is:
-            #   overrideAttrs (super: {})
-            # We want to introduce self. We follow the convention of overlays:
-            #   overrideAttrs (self: super: {})
-            # Which means the first parameter can be either self or super.
-            # This is surprising, but far better than the confusion that would
-            # arise from flipping an overlay's parameters in some cases.
-            let x = f0 super;
-            in
-              if builtins.isFunction x
-              then
-                # Can't reuse `x`, because `self` comes first.
-                # Looks inefficient, but `f0 super` was a cheap thunk.
-                f0 self super
-              else x;
-        in
-          makeDerivationExtensible
-            (self: let super = rattrs self; in super // (if builtins.isFunction f0 || f0?__functor then f self super else f0));
+        makeDerivationExtensible
+          (lib.extends (lib.toExtension f0) rattrs);
 
       finalPackage =
         mkDerivationSimple overrideAttrs args;

From 2937899befc968859611cb721c8fd958b65ee18f Mon Sep 17 00:00:00 2001
From: Robert Hensing <roberth@users.noreply.github.com>
Date: Wed, 28 Aug 2024 11:26:32 +0200
Subject: [PATCH 089/241] lib.fixedPoints.toExtension: Improve type

This makes the type more informative and general - closer to how the function behaves, particularly in isolation.

Co-authored-by: Yueh-Shun Li <shamrocklee@posteo.net>
---
 lib/fixed-points.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix
index ecacddadb94b..13a4e8d2b118 100644
--- a/lib/fixed-points.nix
+++ b/lib/fixed-points.nix
@@ -463,8 +463,17 @@ rec {
     # Type
 
     ```
-    toExtension ::: (a | a -> a | a -> a -> a) -> a -> a -> a
-    a = AttrSet & !Function
+    toExtension ::
+      b' -> Any -> Any -> b'
+    or
+    toExtension ::
+      (a -> b') -> Any -> a -> b'
+    or
+    toExtension ::
+      (a -> a -> b) -> a -> a -> b
+    where b' = ! Callable
+
+    Set a = b = b' = AttrSet & ! Callable to make toExtension return an extending function.
     ```
 
     # Examples

From 53a24f4a7c6e39153d26d107da52392620e932a5 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Tue, 3 Sep 2024 19:04:14 +0800
Subject: [PATCH 090/241] lib.fixedPoints.toExtension: improve documentation

Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
---
 lib/fixed-points.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix
index 13a4e8d2b118..ccc897755c11 100644
--- a/lib/fixed-points.nix
+++ b/lib/fixed-points.nix
@@ -444,21 +444,20 @@ rec {
 
     `toExtension` is the `toFunction` for extending functions (a.k.a. extensions or overlays).
     It converts a non-function or a single-argument function to an extending function,
-    while returning a double-argument function as-is.
+    while returning a two-argument function as-is.
 
-    That is, it takes one of `x`, `prev: x`, or `final: prev: x`,
-    and returns `final: prev: x`, where `x` is not a function.
+    That is, it takes a value of the shape `x`, `prev: x`, or `final: prev: x`,
+    and returns `final: prev: x`, assuming `x` is not a function.
 
-    This function is extracted from the implementation of
-    the fixed-point arguments support of `stdenv.mkDerivation`.
+    This function takes care of the input to `stdenv.mkDerivation`'s
+    `overrideAttrs` function.
     It bridges the gap between `<pkg>.overrideAttrs`
-    before and after the overlay-style support,
-    as well as `config.packageOverrides` and `config.overlays` in `pkgs`.
+    before and after the overlay-style support.
 
     # Inputs
 
     `f`
-    : The function or non-function to convert to an extending function.
+    : The function or value to convert to an extending function.
 
     # Type
 
@@ -509,6 +508,6 @@ rec {
         # f is (prev: { ... })
         fPrev
     else
-      # f is { ... }
+      # f is not a function; probably { ... }
       final: prev: f;
 }

From e31ace5cd4bd50e773604deca5939d49985d11e6 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Sat, 14 Sep 2024 21:47:59 +0800
Subject: [PATCH 091/241] buildGoModule: use lib.toExtension

Use toExtension from Nixpkgs library instead of the one defined locally.
---
 pkgs/build-support/go/module.nix | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix
index b8dd1cbd6f1f..e1e39918436b 100644
--- a/pkgs/build-support/go/module.nix
+++ b/pkgs/build-support/go/module.nix
@@ -63,20 +63,6 @@ let
   GO111MODULE = "on";
   GOTOOLCHAIN = "local";
 
-  toExtension =
-    overlay0:
-    if lib.isFunction overlay0 then
-      final: prev:
-      if lib.isFunction (overlay0 prev) then
-        # `overlay0` is `final: prev: { ... }`
-        overlay0 final prev
-      else
-        # `overlay0` is `prev: { ... }`
-        overlay0 prev
-    else
-      # `overlay0` is `{ ... }`
-      final: prev: overlay0;
-
 in
 (stdenv.mkDerivation (finalAttrs:
   args
@@ -333,7 +319,7 @@ in
       # Canonicallize `overrideModAttrs` as an attribute overlay.
       # `passthru.overrideModAttrs` will be overridden
       # when users want to override `goModules`.
-      overrideModAttrs = toExtension overrideModAttrs;
+      overrideModAttrs = lib.toExtension overrideModAttrs;
     } // passthru;
 
     meta = {

From 016f6f9f58b7bc9ac2e599f66a79cec4823f8b7f Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sat, 14 Sep 2024 15:36:12 +0200
Subject: [PATCH 092/241] dnscrypt-wrapper: remove package and NixOS modules

---
 .../manual/release-notes/rl-2411.section.md   |   3 +
 nixos/modules/module-list.nix                 |   1 -
 nixos/modules/rename.nix                      |   6 +
 .../services/networking/dnscrypt-wrapper.nix  | 273 ------------------
 nixos/tests/all-tests.nix                     |   1 -
 nixos/tests/dnscrypt-wrapper/default.nix      | 148 ----------
 nixos/tests/dnscrypt-wrapper/public.key       |   1 -
 nixos/tests/dnscrypt-wrapper/secret.key       |   1 -
 .../networking/dnscrypt-wrapper/default.nix   |  34 ---
 pkgs/top-level/aliases.nix                    |   1 +
 pkgs/top-level/all-packages.nix               |   2 -
 11 files changed, 10 insertions(+), 461 deletions(-)
 delete mode 100644 nixos/modules/services/networking/dnscrypt-wrapper.nix
 delete mode 100644 nixos/tests/dnscrypt-wrapper/default.nix
 delete mode 100644 nixos/tests/dnscrypt-wrapper/public.key
 delete mode 100644 nixos/tests/dnscrypt-wrapper/secret.key
 delete mode 100644 pkgs/tools/networking/dnscrypt-wrapper/default.nix

diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 4f773fccd23a..623c655fa74e 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -356,6 +356,9 @@
 - `zx` was updated to v8, which introduces several breaking changes.
   See the [v8 changelog](https://github.com/google/zx/releases/tag/8.0.0) for more information.
 
+- The `dnscrypt-wrapper` module was removed since the project has been effectively unmaintained since 2018; moreover the NixOS module had to rely on an abandoned version of dnscrypt-proxy v1 for the rotation of keys.
+  To wrap a resolver with DNSCrypt you can instead use `dnsdist`. See options `services.dnsdist.dnscrypt.*`
+
 - The `portunus` package and service do not support weak password hashes anymore.
   If you installed Portunus on NixOS 23.11 or earlier, upgrade to NixOS 24.05 first to get support for strong password hashing.
   Then, follow the instructions on the [upstream release notes](https://github.com/majewsky/portunus/releases/tag/v2.0.0) to upgrade all existing user accounts to strong password hashes.
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 66d82f2ab2d2..006cdeedcaf6 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1014,7 +1014,6 @@
   ./services/networking/dhcpcd.nix
   ./services/networking/dnscache.nix
   ./services/networking/dnscrypt-proxy2.nix
-  ./services/networking/dnscrypt-wrapper.nix
   ./services/networking/dnsdist.nix
   ./services/networking/dnsmasq.nix
   ./services/networking/dnsproxy.nix
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 6d2d1acb8e15..7e3711498383 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -61,6 +61,12 @@ in
     (mkRemovedOptionModule [ "services" "couchpotato" ] "The corresponding package was removed from nixpkgs.")
     (mkRemovedOptionModule [ "services" "dd-agent" ] "dd-agent was removed from nixpkgs in favor of the newer datadog-agent.")
     (mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead")
+    (mkRemovedOptionModule [ "services" "dnscrypt-wrapper" ] ''
+      The dnscrypt-wrapper module was removed since the project has been effectively unmaintained since 2018;
+      moreover the NixOS module had to rely on an abandoned version of dnscrypt-proxy v1 for the rotation of keys.
+
+      To wrap a resolver with DNSCrypt you can instead use dnsdist. See options `services.dnsdist.dnscrypt.*`
+    '')
     (mkRemovedOptionModule [ "services" "exhibitor" ] "The corresponding package was removed from nixpkgs.")
     (mkRemovedOptionModule [ "services" "firefox" "syncserver" ] "The corresponding package was removed from nixpkgs.")
     (mkRemovedOptionModule [ "services" "flashpolicyd" ] "The flashpolicyd module has been removed. Adobe Flash Player is deprecated.")
diff --git a/nixos/modules/services/networking/dnscrypt-wrapper.nix b/nixos/modules/services/networking/dnscrypt-wrapper.nix
deleted file mode 100644
index 2a9ae3cfbaad..000000000000
--- a/nixos/modules/services/networking/dnscrypt-wrapper.nix
+++ /dev/null
@@ -1,273 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  cfg     = config.services.dnscrypt-wrapper;
-  dataDir = "/var/lib/dnscrypt-wrapper";
-
-  mkPath = path: default:
-    if path != null
-      then toString path
-      else default;
-
-  publicKey = mkPath cfg.providerKey.public "${dataDir}/public.key";
-  secretKey = mkPath cfg.providerKey.secret "${dataDir}/secret.key";
-
-  daemonArgs = with cfg; [
-    "--listen-address=${address}:${toString port}"
-    "--resolver-address=${upstream.address}:${toString upstream.port}"
-    "--provider-name=${providerName}"
-    "--provider-publickey-file=${publicKey}"
-    "--provider-secretkey-file=${secretKey}"
-    "--provider-cert-file=${providerName}.crt"
-    "--crypt-secretkey-file=${providerName}.key"
-  ];
-
-  genKeys = ''
-    # generates time-limited keypairs
-    keyGen() {
-      dnscrypt-wrapper --gen-crypt-keypair \
-        --crypt-secretkey-file=${cfg.providerName}.key
-
-      dnscrypt-wrapper --gen-cert-file \
-        --crypt-secretkey-file=${cfg.providerName}.key \
-        --provider-cert-file=${cfg.providerName}.crt \
-        --provider-publickey-file=${publicKey} \
-        --provider-secretkey-file=${secretKey} \
-        --cert-file-expire-days=${toString cfg.keys.expiration}
-    }
-
-    cd ${dataDir}
-
-    # generate provider keypair (first run only)
-    ${lib.optionalString (cfg.providerKey.public == null || cfg.providerKey.secret == null) ''
-      if [ ! -f ${publicKey} ] || [ ! -f ${secretKey} ]; then
-        dnscrypt-wrapper --gen-provider-keypair
-      fi
-    ''}
-
-    # generate new keys for rotation
-    if [ ! -f ${cfg.providerName}.key ] || [ ! -f ${cfg.providerName}.crt ]; then
-      keyGen
-    fi
-  '';
-
-  rotateKeys = ''
-    # check if keys are not expired
-    keyValid() {
-      fingerprint=$(dnscrypt-wrapper \
-        --show-provider-publickey \
-        --provider-publickey-file=${publicKey} \
-        | awk '{print $(NF)}')
-      dnscrypt-proxy --test=${toString (cfg.keys.checkInterval + 1)} \
-        --resolver-address=127.0.0.1:${toString cfg.port} \
-        --provider-name=${cfg.providerName} \
-        --provider-key=$fingerprint
-    }
-
-    cd ${dataDir}
-
-    # archive old keys and restart the service
-    if ! keyValid; then
-      echo "certificate soon to become invalid; backing up old cert"
-      mkdir -p oldkeys
-      mv -v "${cfg.providerName}.key" "oldkeys/${cfg.providerName}-$(date +%F-%T).key"
-      mv -v "${cfg.providerName}.crt" "oldkeys/${cfg.providerName}-$(date +%F-%T).crt"
-      kill "$(pidof -s dnscrypt-wrapper)"
-    fi
-  '';
-
-
-  # This is the fork of the original dnscrypt-proxy maintained by Dyne.org.
-  # dnscrypt-proxy2 doesn't provide the `--test` feature that is needed to
-  # correctly implement key rotation of dnscrypt-wrapper ephemeral keys.
-  dnscrypt-proxy1 = pkgs.callPackage
-    ({ stdenv, fetchFromGitHub, autoreconfHook
-    , pkg-config, libsodium, ldns, openssl, systemd }:
-
-    stdenv.mkDerivation rec {
-      pname = "dnscrypt-proxy";
-      version = "2019-08-20";
-
-      src = fetchFromGitHub {
-        owner = "dyne";
-        repo = "dnscrypt-proxy";
-        rev = "07ac3825b5069adc28e2547c16b1d983a8ed8d80";
-        sha256 = "0c4mq741q4rpmdn09agwmxap32kf0vgfz7pkhcdc5h54chc3g3xy";
-      };
-
-      configureFlags = lib.optional stdenv.isLinux "--with-systemd";
-
-      nativeBuildInputs = [ autoreconfHook pkg-config ];
-
-      # <ldns/ldns.h> depends on <openssl/ssl.h>
-      buildInputs = [ libsodium openssl.dev ldns ] ++ lib.optional stdenv.isLinux systemd;
-
-      postInstall = ''
-        # Previous versions required libtool files to load plugins; they are
-        # now strictly optional.
-        rm $out/lib/dnscrypt-proxy/*.la
-      '';
-
-      meta = {
-        description = "A tool for securing communications between a client and a DNS resolver";
-        homepage = "https://github.com/dyne/dnscrypt-proxy";
-        license = lib.licenses.isc;
-        maintainers = with lib.maintainers; [ rnhmjoj ];
-        platforms = lib.platforms.linux;
-      };
-    }) { };
-
-in {
-
-
-  ###### interface
-
-  options.services.dnscrypt-wrapper = {
-    enable = lib.mkEnableOption "DNSCrypt wrapper";
-
-    address = lib.mkOption {
-      type = lib.types.str;
-      default = "127.0.0.1";
-      description = ''
-        The DNSCrypt wrapper will bind to this IP address.
-      '';
-    };
-
-    port = lib.mkOption {
-      type = lib.types.port;
-      default = 5353;
-      description = ''
-        The DNSCrypt wrapper will listen for DNS queries on this port.
-      '';
-    };
-
-    providerName = lib.mkOption {
-      type = lib.types.str;
-      default = "2.dnscrypt-cert.${config.networking.hostName}";
-      defaultText = lib.literalExpression ''"2.dnscrypt-cert.''${config.networking.hostName}"'';
-      example = "2.dnscrypt-cert.myresolver";
-      description = ''
-        The name that will be given to this DNSCrypt resolver.
-        Note: the resolver name must start with `2.dnscrypt-cert.`.
-      '';
-    };
-
-    providerKey.public = lib.mkOption {
-      type = lib.types.nullOr lib.types.path;
-      default = null;
-      example = "/etc/secrets/public.key";
-      description = ''
-        The filepath to the provider public key. If not given a new
-        provider key pair will be generated on the first run.
-      '';
-    };
-
-    providerKey.secret = lib.mkOption {
-      type = lib.types.nullOr lib.types.path;
-      default = null;
-      example = "/etc/secrets/secret.key";
-      description = ''
-        The filepath to the provider secret key. If not given a new
-        provider key pair will be generated on the first run.
-      '';
-    };
-
-    upstream.address = lib.mkOption {
-      type = lib.types.str;
-      default = "127.0.0.1";
-      description = ''
-        The IP address of the upstream DNS server DNSCrypt will "wrap".
-      '';
-    };
-
-    upstream.port = lib.mkOption {
-      type = lib.types.port;
-      default = 53;
-      description = ''
-        The port of the upstream DNS server DNSCrypt will "wrap".
-      '';
-    };
-
-    keys.expiration = lib.mkOption {
-      type = lib.types.int;
-      default = 30;
-      description = ''
-        The duration (in days) of the time-limited secret key.
-        This will be automatically rotated before expiration.
-      '';
-    };
-
-    keys.checkInterval = lib.mkOption {
-      type = lib.types.int;
-      default = 1440;
-      description = ''
-        The time interval (in minutes) between key expiration checks.
-      '';
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = lib.mkIf cfg.enable {
-
-    users.users.dnscrypt-wrapper = {
-      description = "dnscrypt-wrapper daemon user";
-      home = "${dataDir}";
-      createHome = true;
-      isSystemUser = true;
-      group = "dnscrypt-wrapper";
-    };
-    users.groups.dnscrypt-wrapper = { };
-
-    systemd.services.dnscrypt-wrapper = {
-      description = "dnscrypt-wrapper daemon";
-      after    = [ "network.target" ];
-      wantedBy = [ "multi-user.target" ];
-      path     = [ pkgs.dnscrypt-wrapper ];
-
-      serviceConfig = {
-        User = "dnscrypt-wrapper";
-        WorkingDirectory = dataDir;
-        Restart   = "always";
-        ExecStart = "${pkgs.dnscrypt-wrapper}/bin/dnscrypt-wrapper ${toString daemonArgs}";
-      };
-
-      preStart = genKeys;
-    };
-
-
-    systemd.services.dnscrypt-wrapper-rotate = {
-      after    = [ "network.target" ];
-      requires = [ "dnscrypt-wrapper.service" ];
-      description = "Rotates DNSCrypt wrapper keys if soon to expire";
-
-      path   = with pkgs; [ dnscrypt-wrapper dnscrypt-proxy1 gawk procps ];
-      script = rotateKeys;
-      serviceConfig.User = "dnscrypt-wrapper";
-    };
-
-
-    systemd.timers.dnscrypt-wrapper-rotate = {
-      description = "Periodically check DNSCrypt wrapper keys for expiration";
-      wantedBy = [ "multi-user.target" ];
-
-      timerConfig = {
-        Unit = "dnscrypt-wrapper-rotate.service";
-        OnBootSec = "1min";
-        OnUnitActiveSec = cfg.keys.checkInterval * 60;
-      };
-    };
-
-    assertions = with cfg; [
-      { assertion = (providerKey.public == null && providerKey.secret == null) ||
-                    (providerKey.secret != null && providerKey.public != null);
-        message = "The secret and public provider key must be set together.";
-      }
-    ];
-
-  };
-
-  meta.maintainers = with lib.maintainers; [ rnhmjoj ];
-
-}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 6c9ff9fb9c20..22bedb8d8269 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -260,7 +260,6 @@ in {
   disable-installer-tools = handleTest ./disable-installer-tools.nix {};
   discourse = handleTest ./discourse.nix {};
   dnscrypt-proxy2 = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy2.nix {};
-  dnscrypt-wrapper = runTestOn ["x86_64-linux"] ./dnscrypt-wrapper;
   dnsdist = import ./dnsdist.nix { inherit pkgs runTest; };
   doas = handleTest ./doas.nix {};
   docker = handleTestOn ["aarch64-linux" "x86_64-linux"] ./docker.nix {};
diff --git a/nixos/tests/dnscrypt-wrapper/default.nix b/nixos/tests/dnscrypt-wrapper/default.nix
deleted file mode 100644
index 1a794931dc50..000000000000
--- a/nixos/tests/dnscrypt-wrapper/default.nix
+++ /dev/null
@@ -1,148 +0,0 @@
-
-{ lib, pkgs, ... }:
-
-let
-  snakeoil = import ../common/acme/server/snakeoil-certs.nix;
-
-  hosts = lib.mkForce
-   { "fd::a" = [ "server" snakeoil.domain ];
-     "fd::b" = [ "client" ];
-   };
-in
-
-{
-  name = "dnscrypt-wrapper";
-  meta = with pkgs.lib.maintainers; {
-    maintainers = [ rnhmjoj ];
-  };
-
-  nodes = {
-    server = {
-      networking.hosts = hosts;
-      networking.interfaces.eth1.ipv6.addresses = lib.singleton
-        { address = "fd::a"; prefixLength = 64; };
-
-        services.dnscrypt-wrapper =
-          { enable = true;
-            address = "[::]";
-            port = 5353;
-            keys.expiration = 5; # days
-            keys.checkInterval = 2;  # min
-            # The keypair was generated by the command:
-            # dnscrypt-wrapper --gen-provider-keypair \
-            #  --provider-name=2.dnscrypt-cert.server \
-            providerKey.public = "${./public.key}";
-            providerKey.secret = "${./secret.key}";
-          };
-
-        # nameserver
-        services.bind.enable = true;
-        services.bind.zones = lib.singleton
-          { name = ".";
-            master = true;
-            file = pkgs.writeText "root.zone" ''
-              $TTL 3600
-              . IN SOA example.org. admin.example.org. ( 1 3h 1h 1w 1d )
-              . IN NS example.org.
-              example.org. IN AAAA 2001:db8::1
-            '';
-          };
-
-        # webserver
-        services.nginx.enable = true;
-        services.nginx.virtualHosts.${snakeoil.domain} =
-          { onlySSL = true;
-            listenAddresses = [ "localhost" ];
-            sslCertificate = snakeoil.${snakeoil.domain}.cert;
-            sslCertificateKey = snakeoil.${snakeoil.domain}.key;
-            locations."/ip".extraConfig = ''
-              default_type text/plain;
-              return 200 "Ciao $remote_addr!\n";
-            '';
-          };
-
-        # demultiplex HTTP and DNS from port 443
-        services.sslh =
-          { enable = true;
-            method = "ev";
-            settings.transparent = true;
-            settings.listen = lib.mkForce
-              [ { host = "server"; port = "443"; is_udp = false; }
-                { host = "server"; port = "443"; is_udp = true; }
-              ];
-            settings.protocols =
-              [ # Send TLS to webserver (TCP)
-                { name = "tls"; host= "localhost"; port= "443"; }
-                # Send DNSCrypt to dnscrypt-wrapper (TCP or UDP)
-                { name = "anyprot"; host = "localhost"; port = "5353"; }
-                { name = "anyprot"; host = "localhost"; port = "5353"; is_udp = true;}
-              ];
-          };
-
-        networking.firewall.allowedTCPPorts = [ 443 ];
-        networking.firewall.allowedUDPPorts = [ 443 ];
-      };
-
-    client = {
-      networking.hosts = hosts;
-      networking.interfaces.eth1.ipv6.addresses = lib.singleton
-        { address = "fd::b"; prefixLength = 64; };
-
-      services.dnscrypt-proxy2.enable = true;
-      services.dnscrypt-proxy2.upstreamDefaults = false;
-      services.dnscrypt-proxy2.settings =
-        { server_names = [ "server" ];
-          listen_addresses = [ "[::1]:53" ];
-          cache = false;
-          # Computed using https://dnscrypt.info/stamps/
-          static.server.stamp =
-            "sdns://AQAAAAAAAAAADzE5Mi4xNjguMS4yOjQ0MyAUQdg6"
-            +"_RIIpK6pHkINhrv7nxwIG5c7b_m5NJVT3A1AXRYyLmRuc2NyeXB0LWNlcnQuc2VydmVy";
-        };
-      networking.nameservers = [ "::1" ];
-      security.pki.certificateFiles = [ snakeoil.ca.cert ];
-    };
-
-  };
-
-  testScript = ''
-    with subtest("The server can generate the ephemeral keypair"):
-        server.wait_for_unit("dnscrypt-wrapper")
-        server.wait_for_file("/var/lib/dnscrypt-wrapper/2.dnscrypt-cert.server.key")
-        server.wait_for_file("/var/lib/dnscrypt-wrapper/2.dnscrypt-cert.server.crt")
-        almost_expiration = server.succeed("date --date '4days 23 hours 56min'").strip()
-
-    with subtest("The DNSCrypt client can connect to the server"):
-        server.wait_for_unit("sslh")
-        client.wait_until_succeeds("journalctl -u dnscrypt-proxy2 --grep '\[server\] OK'")
-
-    with subtest("HTTP client can connect to the server"):
-        server.wait_for_unit("nginx")
-        client.succeed("curl -s --fail https://${snakeoil.domain}/ip | grep -q fd::b")
-
-    with subtest("DNS queries over UDP are working"):
-        server.wait_for_unit("bind")
-        client.wait_for_open_port(53)
-        assert "2001:db8::1" in client.wait_until_succeeds(
-            "host -U example.org"
-        ), "The IP address of 'example.org' does not match 2001:db8::1"
-
-    with subtest("DNS queries over TCP are working"):
-        server.wait_for_unit("bind")
-        client.wait_for_open_port(53)
-        assert "2001:db8::1" in client.wait_until_succeeds(
-            "host -T example.org"
-        ), "The IP address of 'example.org' does not match 2001:db8::1"
-
-    with subtest("The server rotates the ephemeral keys"):
-        # advance time by a little less than 5 days
-        server.succeed(f"date -s '{almost_expiration}'")
-        client.succeed(f"date -s '{almost_expiration}'")
-        server.wait_for_file("/var/lib/dnscrypt-wrapper/oldkeys")
-
-    with subtest("The client can still connect to the server"):
-        client.systemctl("restart dnscrypt-proxy2")
-        client.wait_until_succeeds("host -T example.org")
-        client.wait_until_succeeds("host -U example.org")
-  '';
-}
diff --git a/nixos/tests/dnscrypt-wrapper/public.key b/nixos/tests/dnscrypt-wrapper/public.key
deleted file mode 100644
index 80232b97f529..000000000000
--- a/nixos/tests/dnscrypt-wrapper/public.key
+++ /dev/null
@@ -1 +0,0 @@
-AØ:ý¤®©B
†»ûŸ—;où¹4•SÜ
@]
\ No newline at end of file
diff --git a/nixos/tests/dnscrypt-wrapper/secret.key b/nixos/tests/dnscrypt-wrapper/secret.key
deleted file mode 100644
index 01fbf8e08b7a..000000000000
--- a/nixos/tests/dnscrypt-wrapper/secret.key
+++ /dev/null
@@ -1 +0,0 @@
-G½>Æ©»
 ì>Ðà¥(Ò²‡¼J•«º=Ÿ„ÝÁ�lìAØ:ý¤®©B
†»ûŸ—;où¹4•SÜ
@]
\ No newline at end of file
diff --git a/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/pkgs/tools/networking/dnscrypt-wrapper/default.nix
deleted file mode 100644
index d632934b0db0..000000000000
--- a/pkgs/tools/networking/dnscrypt-wrapper/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libsodium, libevent, nixosTests }:
-
-stdenv.mkDerivation rec {
-  pname = "dnscrypt-wrapper";
-  version = "0.4.2";
-
-  src = fetchFromGitHub {
-    owner = "Cofyc";
-    repo = "dnscrypt-wrapper";
-    rev = "v${version}";
-    sha256 = "055vxpcfg80b1456p6p0p236pwykknph9x3c9psg8ya3i8qqywkl";
-  };
-
-  enableParallelBuilding = true;
-
-  # causes `dnscrypt-wrapper --gen-provider-keypair` to crash
-  hardeningDisable = [ "fortify3" ];
-
-  nativeBuildInputs = [ pkg-config autoreconfHook ];
-  buildInputs = [ libsodium libevent ];
-
-  passthru.tests = {
-    inherit (nixosTests) dnscrypt-wrapper;
-  };
-
-  meta = with lib; {
-    description = "Tool for adding dnscrypt support to any name resolver";
-    homepage = "https://dnscrypt.info/";
-    license = licenses.isc;
-    maintainers = with maintainers; [ joachifm ];
-    platforms = platforms.linux;
-    mainProgram = "dnscrypt-wrapper";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 19bfd3ff3eef..150fc46e2a65 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -335,6 +335,7 @@ mapAliases ({
   dhcp = throw "dhcp (ISC DHCP) has been removed from nixpkgs, because it reached its end of life"; # Added 2023-04-04
   dibbler = throw "dibbler was removed because it is not maintained anymore"; # Added 2024-05-14
   dnnl = oneDNN; # Added 2020-04-22
+  dnscrypt-wrapper = throw "dnscrypt-wrapper was removed because it has been effectively unmaintained since 2018. Use DNSCcrypt support in dnsdist instead"; # Added 2024-09-14
   docker-compose_1 = throw "'docker-compose_1' has been removed because it has been unmaintained since May 2021. Use docker-compose instead."; # Added 2024-07-29
   docker-distribution = distribution; # Added 2023-12-26
   docker-machine = throw "'docker-machine' has been removed, because the upstream project was archived"; # Added 2023-12-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fdb9a12185f0..00a8b8be018a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7032,8 +7032,6 @@ with pkgs;
 
   dnscrypt-proxy = callPackage ../tools/networking/dnscrypt-proxy { };
 
-  dnscrypt-wrapper = callPackage ../tools/networking/dnscrypt-wrapper { };
-
   dnscontrol = callPackage ../applications/networking/dnscontrol { };
 
   dnsenum = callPackage ../tools/security/dnsenum { };

From 3f9c21679b7173755a546bbd5f893b2641b0afac Mon Sep 17 00:00:00 2001
From: Nadir Ishiguro <23151917+nadir-ishiguro@users.noreply.github.com>
Date: Sat, 14 Sep 2024 18:30:38 +0200
Subject: [PATCH 093/241] pcloud: 1.14.6 -> 1.14.7

---
 pkgs/applications/networking/pcloud/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix
index ccc0d924cac3..3a2a479e78eb 100644
--- a/pkgs/applications/networking/pcloud/default.nix
+++ b/pkgs/applications/networking/pcloud/default.nix
@@ -38,13 +38,13 @@
 
 let
   pname = "pcloud";
-  version = "1.14.6";
-  code = "XZQDbs0Z4ET1VL0SIUuzr5ewR9LYuf6ssLRk";
+  version = "1.14.7";
+  code = "XZhPkU0Zh5gulxHfMn4j1dYBS4dh45iDQHby";
 
   # Archive link's codes: https://www.pcloud.com/release-notes/linux.html
   src = fetchzip {
     url = "https://api.pcloud.com/getpubzip?code=${code}&filename=pcloud-${version}.zip";
-    hash = "sha256-3HUVIDxeq7svzeWyZrxlE4TjZ8lOwT8bYgyRFRzGnmU=";
+    hash = "sha256-fzQVuCI3mK93Y3Fwzc0WM5rti0fTZhRm+Qj1CHC8CJ4=";
   };
 
   appimageContents = appimageTools.extractType2 {

From ac1ae97199658434938e48850635d725ac9f1b2b Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sat, 14 Sep 2024 10:59:28 -0600
Subject: [PATCH 094/241] cinny-unwrapped, cinny-desktop: 4.1.0 -> 4.2.1

---
 pkgs/by-name/ci/cinny-desktop/package.nix   | 6 +++---
 pkgs/by-name/ci/cinny-unwrapped/package.nix | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix
index eaba2e8e40b4..f85aedc8e447 100644
--- a/pkgs/by-name/ci/cinny-desktop/package.nix
+++ b/pkgs/by-name/ci/cinny-desktop/package.nix
@@ -22,18 +22,18 @@
 rustPlatform.buildRustPackage rec {
   pname = "cinny-desktop";
   # We have to be using the same version as cinny-web or this isn't going to work.
-  version = "4.1.0";
+  version = "4.2.1";
 
   src = fetchFromGitHub {
     owner = "cinnyapp";
     repo = "cinny-desktop";
     rev = "refs/tags/v${version}";
-    hash = "sha256-3HwKDD0O1Yx2OIjyO5FhV4d1INAIFXMO7FjSL7cOVmI=";
+    hash = "sha256-W73ma8ScF3LGv45yhZCV80zhh7URLuWhbi+JumyTp+4=";
   };
 
   sourceRoot = "${src.name}/src-tauri";
 
-  cargoHash = "sha256-CwB4S/5UuDH1LlJ4CY77XUCriplT3ZFfdg1j41AUoTI=";
+  cargoHash = "sha256-ved2W4+Dt7pN9j9vIaDlAkaY517nBEgPKgu8ArcHXsM=";
 
   postPatch =
     let
diff --git a/pkgs/by-name/ci/cinny-unwrapped/package.nix b/pkgs/by-name/ci/cinny-unwrapped/package.nix
index 63f4d84649c6..fabda88152a4 100644
--- a/pkgs/by-name/ci/cinny-unwrapped/package.nix
+++ b/pkgs/by-name/ci/cinny-unwrapped/package.nix
@@ -14,16 +14,16 @@
 
 buildNpmPackage rec {
   pname = "cinny-unwrapped";
-  version = "4.1.0";
+  version = "4.2.1";
 
   src = fetchFromGitHub {
     owner = "cinnyapp";
     repo = "cinny";
     rev = "v${version}";
-    hash = "sha256-GC+TvTPfirov4GxkTp0N3tkDQEAEdmPB71NzOBZQiqs=";
+    hash = "sha256-+sJQosQMji2iLGgOMRykSJm0zIhghsOsROJZvTQk2zQ=";
   };
 
-  npmDepsHash = "sha256-dP+m/ocGn8szZuakrz8slSReNeepOF4Jf7L0/gnXWGU=";
+  npmDepsHash = "sha256-VSTpe1CA6lv5MoqXyk1iZSwzRc6Axy5cM8PmqPOyheA=";
 
   # Fix error: no member named 'aligned_alloc' in the global namespace
   env.NIX_CFLAGS_COMPILE = lib.optionalString (

From 34fb7a52313996cdeb15dca40a156781a70fdfd8 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat, 14 Sep 2024 20:23:53 +0200
Subject: [PATCH 095/241] r2modman: switch to nix-update

nix-update can handle yarn updates for us

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/games/r2modman/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/r2modman/default.nix b/pkgs/games/r2modman/default.nix
index 594a431300ca..50305786fe94 100644
--- a/pkgs/games/r2modman/default.nix
+++ b/pkgs/games/r2modman/default.nix
@@ -6,7 +6,7 @@
 , nodejs
 , electron
 , fetchFromGitHub
-, gitUpdater
+, nix-update-script
 , makeWrapper
 , makeDesktopItem
 , copyDesktopItems
@@ -103,9 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  passthru.updateScript = gitUpdater {
-    rev-prefix = "v";
-  };
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     changelog = "https://github.com/ebkr/r2modmanPlus/releases/tag/v${finalAttrs.version}";

From 8d3fa8f5180cb26eb782396b73c59b7499e3d0e9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Sep 2024 01:41:03 +0000
Subject: [PATCH 096/241] aiken: 1.0.29-alpha -> 1.1.2

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

diff --git a/pkgs/by-name/ai/aiken/package.nix b/pkgs/by-name/ai/aiken/package.nix
index 3ebdb3706b55..866a59c49323 100644
--- a/pkgs/by-name/ai/aiken/package.nix
+++ b/pkgs/by-name/ai/aiken/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "aiken";
-  version = "1.0.29-alpha"; # all releases are 'alpha'
+  version = "1.1.2";
 
   src = fetchFromGitHub {
     owner = "aiken-lang";
     repo = "aiken";
     rev = "v${version}";
-    hash = "sha256-fikXypc9HKil4Ut4jdgQtTTy/CHEogEpDprwdTgd9b4=";
+    hash = "sha256-os8OqLX6vxHQvrn+X8/BeYnfZJSKG7GDScz7ikJ4sl8=";
   };
 
-  cargoHash = "sha256-UWDPXnq2k/PoogrfuW93ieRW8AfuNIEfri9Jo6gHkdg=";
+  cargoHash = "sha256-7VoTL9W9KboBhhxB9nkzPag6IR/RsXZUDVXjdzOITVM=";
 
   buildInputs =
     [ openssl ]

From 248a877d1328f98a18adff36c966bfb20415fb37 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat, 14 Sep 2024 20:25:32 +0200
Subject: [PATCH 097/241] r2modman: 3.1.49 -> 3.1.50

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/games/r2modman/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/r2modman/default.nix b/pkgs/games/r2modman/default.nix
index 50305786fe94..4a4a7fc3716e 100644
--- a/pkgs/games/r2modman/default.nix
+++ b/pkgs/games/r2modman/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "r2modman";
-  version = "3.1.49";
+  version = "3.1.50";
 
   src = fetchFromGitHub {
     owner = "ebkr";
     repo = "r2modmanPlus";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Br+VkBHgwM/Zu1aypzlVYHB/v8T/KV+B6XUNJn/EbYM=";
+    hash = "sha256-WmF7tH5PiaggyvP/klWwNgaLKVhIoApxDtwwLpug52A=";
   };
 
   offlineCache = fetchYarnDeps {

From 074fd2032c1a49a5ede6b49cacf49a5ff9c9c763 Mon Sep 17 00:00:00 2001
From: Eric Wardner <ewardner22@gmail.com>
Date: Fri, 13 Sep 2024 17:12:29 -0400
Subject: [PATCH 098/241] cypress: use lowercase executable

---
 pkgs/development/web/cypress/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix
index 7ab1cfa4d6b4..eebb68cc3fbe 100644
--- a/pkgs/development/web/cypress/default.nix
+++ b/pkgs/development/web/cypress/default.nix
@@ -4,6 +4,7 @@
 , gtk2
 , gtk3
 , lib
+, makeShellWrapper
 , mesa
 , nss
 , stdenv
@@ -39,7 +40,7 @@ in stdenv.mkDerivation rec {
   # don't remove runtime deps
   dontPatchELF = true;
 
-  nativeBuildInputs = [ autoPatchelfHook wrapGAppsHook3 unzip ];
+  nativeBuildInputs = [ autoPatchelfHook (wrapGAppsHook3.override { makeWrapper = makeShellWrapper; }) unzip makeShellWrapper];
 
   buildInputs = with xorg; [
     libXScrnSaver
@@ -67,11 +68,16 @@ in stdenv.mkDerivation rec {
     printf '{"version":"%b"}' $version > $out/bin/resources/app/package.json
     # Cypress now looks for binary_state.json in bin
     echo '{"verified": true}' > $out/binary_state.json
-    ln -s $out/opt/cypress/Cypress $out/bin/Cypress
-
+    ln -s $out/opt/cypress/Cypress $out/bin/cypress
     runHook postInstall
   '';
 
+  postFixup = ''
+    # exit with 1 after 25.05
+    makeWrapper $out/opt/cypress/Cypress $out/bin/Cypress \
+      --run 'echo "Warning: Use the lowercase cypress executable instead of the capitalized one."'
+  '';
+
   passthru = {
     updateScript = ./update.sh;
 

From e717b3f49a786e0ea66ac10746a8d619b7ed09cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 14 Sep 2024 18:02:58 -0700
Subject: [PATCH 099/241] iptsd: 2 -> 3

Diff: https://github.com/linux-surface/iptsd/compare/v2...v3

Changelog: https://github.com/linux-surface/iptsd/releases/tag/v3
---
 pkgs/applications/misc/iptsd/default.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/iptsd/default.nix b/pkgs/applications/misc/iptsd/default.nix
index b6885374ef06..d4294a985a70 100644
--- a/pkgs/applications/misc/iptsd/default.nix
+++ b/pkgs/applications/misc/iptsd/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "iptsd";
-  version = "2";
+  version = "3";
 
   src = fetchFromGitHub {
     owner = "linux-surface";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-zTXTyDgSa1akViDZlYLtJk1yCREGCSJKxzF+HZAWx0c=";
+    repo = "iptsd";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-3z3A9qywmsSW1tlJ6LePC5wudM/FITTAFyuPkbHlid0=";
   };
 
   nativeBuildInputs = [
@@ -47,13 +47,12 @@ stdenv.mkDerivation rec {
   # Original installs udev rules and service config into global paths
   postPatch = ''
     substituteInPlace etc/meson.build \
-      --replace "install_dir: unitdir" "install_dir: '$out/etc/systemd/system'" \
-      --replace "install_dir: rulesdir" "install_dir: '$out/etc/udev/rules.d'"
-    substituteInPlace etc/systemd/iptsd-find-service \
-      --replace "iptsd-find-hidraw" "$out/bin/iptsd-find-hidraw" \
-      --replace "systemd-escape" "${lib.getExe' systemd "systemd-escape"}"
+      --replace-fail "install_dir: unitdir" "install_dir: '$out/etc/systemd/system'" \
+      --replace-fail "install_dir: rulesdir" "install_dir: '$out/etc/udev/rules.d'"
+    substituteInPlace etc/scripts/iptsd-find-service \
+      --replace-fail "systemd-escape" "${lib.getExe' systemd "systemd-escape"}"
     substituteInPlace etc/udev/50-iptsd.rules.in \
-      --replace "/bin/systemd-escape" "${lib.getExe' systemd "systemd-escape"}"
+      --replace-fail "/bin/systemd-escape" "${lib.getExe' systemd "systemd-escape"}"
   '';
 
   mesonFlags = [

From c0111a90bbaadf53926b803e41d6dca49dff4763 Mon Sep 17 00:00:00 2001
From: techknowlogick <techknowlogick@gitea.com>
Date: Thu, 12 Sep 2024 00:40:57 -0400
Subject: [PATCH 100/241] kubernetes-helm: 3.15.4 -> 3.16.1

Diff: https://github.com/helm/helm/compare/v3.15.4...v3.16.1
---
 pkgs/applications/networking/cluster/helm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index 2ebc58852727..c5f161db0914 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -9,15 +9,15 @@
 
 buildGoModule rec {
   pname = "kubernetes-helm";
-  version = "3.15.4";
+  version = "3.16.1";
 
   src = fetchFromGitHub {
     owner = "helm";
     repo = "helm";
     rev = "v${version}";
-    sha256 = "sha256-hFQX9v37cXJ4wv1aQnBOBlmVWUiZuKrjCJ/R4dzUa/4=";
+    sha256 = "sha256-OTG4xPgK1WT/HUWjQZ1a7X126+PUo02yFnEAnd6MTU8=";
   };
-  vendorHash = "sha256-lR/6n+EH4Nhs1Q/BqEkMlugM74NtEtT+SKQQHc6+Zjk=";
+  vendorHash = "sha256-rNp2aah6lAMZd07HXF2w0h7wfPc+TuRHl/jQpgqY5Sk=";
 
   subPackages = [ "cmd/helm" ];
   ldflags = [

From cb13eac2d061d6121947ba566543a0048440f905 Mon Sep 17 00:00:00 2001
From: liam-murphy14 <liam.murphy137@gmail.com>
Date: Sat, 14 Sep 2024 20:59:58 -0700
Subject: [PATCH 101/241] python3Packages.nodriver 0.36 -> 0.37

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

diff --git a/pkgs/development/python-modules/nodriver/default.nix b/pkgs/development/python-modules/nodriver/default.nix
index 3d17b64b4772..b91737a2d745 100644
--- a/pkgs/development/python-modules/nodriver/default.nix
+++ b/pkgs/development/python-modules/nodriver/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage {
   pname = "nodriver";
-  version = "0.36";
+  version = "0.37";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ultrafunkamsterdam";
     repo = "nodriver";
-    rev = "e630abfc5dce2023966a61cec739348b18bd465d";
-    hash = "sha256-pUWvHcsEPbRob5DDXBFOzqonSWigNPnPUHIu9omzYII=";
+    rev = "1bb6003c7f0db4d3ec05fdf3fc8c8e0804260103";
+    hash = "sha256-8q+9RX9ugrT6/fjlTSIecVcR6lPdZwg7nF+cSTSLlEc=";
   };
 
   disabled = pythonOlder "3.9";

From c73fab3d8bd36ac982f509908fe56916863d9f54 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Sep 2024 04:03:28 +0000
Subject: [PATCH 102/241] dnf5: 5.2.5.0 -> 5.2.6.0

---
 pkgs/tools/package-management/dnf5/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/dnf5/default.nix b/pkgs/tools/package-management/dnf5/default.nix
index b0cbba31bfce..1258813dffbc 100644
--- a/pkgs/tools/package-management/dnf5/default.nix
+++ b/pkgs/tools/package-management/dnf5/default.nix
@@ -32,7 +32,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dnf5";
-  version = "5.2.5.0";
+  version = "5.2.6.0";
 
   outputs = [
     "out"
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "rpm-software-management";
     repo = "dnf5";
     rev = finalAttrs.version;
-    hash = "sha256-zH+TDtVMEsgKZR0EA+G8SB1PZyiTfhnG7n6lupeoWyI=";
+    hash = "sha256-tzGpZ6Pip6SIak0L3npoh31TxVJJ0mn+jVkeNGq24N0=";
   };
 
   nativeBuildInputs =

From 500d8592e3534bb681db444c2004d5a80b4b264f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 14 Sep 2024 20:50:46 -0700
Subject: [PATCH 103/241] nextcloud-client: 3.13.4 -> 3.14.0

Diff: https://github.com/nextcloud-releases/desktop/compare/v3.13.4...v3.14.0

Changelog: https://github.com/nextcloud/desktop/releases/tag/v3.14.0
---
 ...e-autostart-entry-do-not-use-an-abso.patch |  2 +-
 .../networking/nextcloud-client/default.nix   | 21 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch b/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch
index d3bac6af08d2..312a0d089f60 100644
--- a/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch
+++ b/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch
@@ -16,7 +16,7 @@ index 887213f09..c66468306 100644
             << QLatin1String("Name=") << guiName << QLatin1Char('\n')
             << QLatin1String("GenericName=") << QLatin1String("File Synchronizer\n")
 -           << QLatin1String("Exec=\"") << executablePath << "\" --background\n"
-+           << QLatin1String("Exec=") << "nextcloud --background" << endl
++           << QLatin1String("Exec=") << "nextcloud --background\n"
             << QLatin1String("Terminal=") << "false\n"
             << QLatin1String("Icon=") << APPLICATION_ICON_NAME << QLatin1Char('\n')
             << QLatin1String("Categories=") << QLatin1String("Network\n")
diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix
index d4d5d2bb21f5..40e1b8f10107 100644
--- a/pkgs/applications/networking/nextcloud-client/default.nix
+++ b/pkgs/applications/networking/nextcloud-client/default.nix
@@ -4,20 +4,20 @@
 , cmake
 , extra-cmake-modules
 , inotify-tools
+, kdePackages
 , libcloudproviders
 , librsvg
 , libsecret
 , openssl
 , pcre
 , pkg-config
+, qt5compat
 , qtbase
 , qtkeychain
+, qtsvg
 , qttools
 , qtwebengine
 , qtwebsockets
-, qtquickcontrols2
-, qtgraphicaleffects
-, plasma5Packages
 , sphinx
 , sqlite
 , xdg-utils
@@ -26,15 +26,15 @@
 
 stdenv.mkDerivation rec {
   pname = "nextcloud-client";
-  version = "3.13.4";
+  version = "3.14.0";
 
   outputs = [ "out" "dev" ];
 
   src = fetchFromGitHub {
     owner = "nextcloud-releases";
     repo = "desktop";
-    rev = "v${version}";
-    hash = "sha256-anQwIqWtHdKFfUuCekiyrdg9xzxcs5bVJ0VDMtyVfw8=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-/jRD0swNs59xugsXLbesGcTtyGdc/y/iwiDVoErW+d4=";
   };
 
   patches = [
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   postPatch = ''
     for file in src/libsync/vfs/*/CMakeLists.txt; do
       substituteInPlace $file \
-        --replace "PLUGINDIR" "KDE_INSTALL_PLUGINDIR"
+        --replace-fail "PLUGINDIR" "KDE_INSTALL_PLUGINDIR"
     done
   '';
 
@@ -61,17 +61,17 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     inotify-tools
+    kdePackages.kio
     libcloudproviders
     libsecret
     openssl
     pcre
-    plasma5Packages.kio
+    qt5compat
     qtbase
     qtkeychain
+    qtsvg
     qttools
     qtwebengine
-    qtquickcontrols2
-    qtgraphicaleffects
     qtwebsockets
     sqlite
   ];
@@ -93,6 +93,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
+    changelog = "https://github.com/nextcloud/desktop/releases/tag/v${version}";
     description = "Nextcloud themed desktop client";
     homepage = "https://nextcloud.com";
     license = licenses.gpl2Plus;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 153f1675d545..599432ea927c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10572,7 +10572,7 @@ with pkgs;
   };
 
 
-  nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { };
+  nextcloud-client = qt6Packages.callPackage ../applications/networking/nextcloud-client { };
 
   nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { };
 

From 066125b6632f0f81791a91856d3a56246eee2ccf Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Sat, 14 Sep 2024 21:28:09 -0700
Subject: [PATCH 104/241] doc/stdenv/stdenv: document runHook function

Not quite satisfied with this, but it's better than nothing.
---
 doc/stdenv/stdenv.chapter.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md
index f776ca8d8dab..ce4ec2541f34 100644
--- a/doc/stdenv/stdenv.chapter.md
+++ b/doc/stdenv/stdenv.chapter.md
@@ -1136,6 +1136,12 @@ Example removing all references to the compiler in the output:
 }
 ```
 
+### `runHook` \<hook\> {#fun-runHook}
+
+Execute \<hook\> and the values in the array associated with it. The array's name is determined by removing `Hook` from the end of \<hook\> and appending `Hooks`.
+
+For example, `runHook postHook` would run the hook `postHook` and all of the values contained in the `postHooks` array, if it exists.
+
 ### `substitute` \<infile\> \<outfile\> \<subs\> {#fun-substitute}
 
 Performs string substitution on the contents of \<infile\>, writing the result to \<outfile\>. The substitutions in \<subs\> are of the following form:

From 5abd5977243abca519f1abc6a1f598011bf632bc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 15 Sep 2024 09:50:03 +0200
Subject: [PATCH 105/241] python312Packages.datafusion: 38.0.1 -> 40.1.0

Diff: https://github.com/apache/arrow-datafusion-python/compare/refs/tags/38.0.1...40.1.0

Changelog: https://github.com/apache/arrow-datafusion-python/blob/40.1.0/CHANGELOG.md
---
 .../python-modules/datafusion/default.nix          | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/datafusion/default.nix b/pkgs/development/python-modules/datafusion/default.nix
index 6343937d0d1e..e73d37c4486c 100644
--- a/pkgs/development/python-modules/datafusion/default.nix
+++ b/pkgs/development/python-modules/datafusion/default.nix
@@ -11,6 +11,7 @@
   pyarrow,
   Security,
   SystemConfiguration,
+  typing-extensions,
 }:
 
 let
@@ -33,7 +34,7 @@ in
 
 buildPythonPackage rec {
   pname = "datafusion";
-  version = "38.0.1";
+  version = "40.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -41,13 +42,13 @@ buildPythonPackage rec {
     owner = "apache";
     repo = "arrow-datafusion-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-rBS6i2HqpdhnhZZfO0ywL/e4a+rnUZkHzezKd8PuG80=";
+    hash = "sha256-5WOSlx4XW9zO6oTY16lWQElShLv0ubflVPfSSEGrFgg=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     name = "datafusion-cargo-deps";
     inherit src;
-    hash = "sha256-M2ZNAFWdsnN9C4+YbqFxZVH9fHR10Bimf1Xzrd9oy9E=";
+    hash = "sha256-hN03tbnH77VsMDxSMddMHIH00t7lUs5h8rTHbiMIExw=";
   };
 
   nativeBuildInputs = with rustPlatform; [
@@ -63,13 +64,18 @@ buildPythonPackage rec {
       SystemConfiguration
     ];
 
-  propagatedBuildInputs = [ pyarrow ];
+  dependencies = [
+    pyarrow
+    typing-extensions
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook
     numpy
   ];
+
   pythonImportsCheck = [ "datafusion" ];
+
   pytestFlagsArray = [
     "--pyargs"
     pname

From 4af71f27b60894d6408c8f3dde01803e59ca6a0f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 15 Sep 2024 10:21:15 +0200
Subject: [PATCH 106/241] python312Packages.django-appconf: 1.0.5 -> 1.0.6

Diff: https://github.com/django-compressor/django-appconf/compare/refs/tags/v1.0.5...1.0.6

Changelog: https://github.com/django-compressor/django-appconf/blob/v1.0.6/docs/changelog.rst
---
 .../python-modules/django-appconf/default.nix | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/django-appconf/default.nix b/pkgs/development/python-modules/django-appconf/default.nix
index 2715638ed959..4c9712305ea0 100644
--- a/pkgs/development/python-modules/django-appconf/default.nix
+++ b/pkgs/development/python-modules/django-appconf/default.nix
@@ -1,27 +1,30 @@
 {
   lib,
   buildPythonPackage,
-  fetchFromGitHub,
-  pythonOlder,
   django,
+  fetchFromGitHub,
   python,
+  pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "django-appconf";
-  version = "1.0.5";
-  format = "setuptools";
+  version = "1.0.6";
+  pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "django-compressor";
     repo = "django-appconf";
-    rev = "v${version}";
-    hash = "sha256-nS4Hwp/NYg1XGvZO1tiE9mzJA7WFifyvgAjyp3YpqS4=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-H9MwX5LtHkYN6TshP7rRKlX/iOJZHbQVsZeki95yks4=";
   };
 
-  propagatedBuildInputs = [ django ];
+  build-system = [ setuptools ];
+
+  dependencies = [ django ];
 
   preCheck = ''
     # prove we're running tests against installed package, not build dir
@@ -30,13 +33,18 @@ buildPythonPackage rec {
 
   checkPhase = ''
     runHook preCheck
+
     ${python.interpreter} -m django test --settings=tests.test_settings
+
     runHook postCheck
   '';
 
+  pythonImportsCheck = [ "appconf" ];
+
   meta = with lib; {
     description = "Helper class for handling configuration defaults of packaged apps gracefully";
     homepage = "https://django-appconf.readthedocs.org/";
+    changelog = "https://github.com/django-compressor/django-appconf/blob/v${version}/docs/changelog.rst";
     license = licenses.bsd2;
     maintainers = with maintainers; [ desiderius ];
   };

From fc384517f18073666e8fb70c86c84a188e1b4512 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 15 Sep 2024 10:26:21 +0200
Subject: [PATCH 107/241] python312Packages.django-celery-beat: 2.6.0 -> 2.7.0

Diff: https://github.com/celery/django-celery-beat/compare/refs/tags/v2.6.0...v2.7.0

Changelog: https://github.com/celery/django-celery-beat/releases/tag/v2.7.0
---
 .../django-celery-beat/default.nix             | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/django-celery-beat/default.nix b/pkgs/development/python-modules/django-celery-beat/default.nix
index df4cc45bb0f4..64127acc6923 100644
--- a/pkgs/development/python-modules/django-celery-beat/default.nix
+++ b/pkgs/development/python-modules/django-celery-beat/default.nix
@@ -5,7 +5,7 @@
   cron-descriptor,
   django-timezone-field,
   ephem,
-  fetchPypi,
+  fetchFromGitHub,
   pytest-django,
   pytest-timeout,
   pytestCheckHook,
@@ -17,21 +17,23 @@
 
 buildPythonPackage rec {
   pname = "django-celery-beat";
-  version = "2.6.0";
+  version = "2.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-91stEpcx8SFL6Dg+GPrmv+rNtV3/shFs6EkiLAEG+a0=";
+  src = fetchFromGitHub {
+    owner = "celery";
+    repo = "django-celery-beat";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-XWcmKQXNw8eoGkld77E3rHpR9ofa1i2qO/JI8Hnpi9M=";
   };
 
-  nativeBuildInputs = [ setuptools ];
-
   pythonRelaxDeps = [ "django" ];
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     cron-descriptor
     python-crontab
     celery

From b92e287f3943e6a4aa1459c8eeaad14e0f95eef9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 15 Sep 2024 14:32:33 +0200
Subject: [PATCH 108/241] python311Packages.llama-index-vector-stores-postgres:
 0.2.2 -> 0.2.5

---
 .../llama-index-vector-stores-postgres/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix
index f0a5aa3ac07e..9a93709fb11c 100644
--- a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix
+++ b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-vector-stores-postgres";
-  version = "0.2.2";
+  version = "0.2.5";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_vector_stores_postgres";
     inherit version;
-    hash = "sha256-0QTT8eLkQb6Wjs+I2IbfJ8c4/vOJwQu4u1xOy4iDOCc=";
+    hash = "sha256-JLJygIsklBM9B3mOeQP8fu6YuHo104rvJKNj83eAQc4=";
   };
 
   pythonRemoveDeps = [ "psycopg2-binary" ];

From 726668fb7a6d57ed9fd4a9971833c000abd1d030 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 15 Sep 2024 14:32:52 +0200
Subject: [PATCH 109/241] python311Packages.llama-index-graph-stores-neo4j:
 0.3.1 -> 0.3.2

---
 .../python-modules/llama-index-graph-stores-neo4j/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix
index e74cb94aa181..62fe9f466002 100644
--- a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix
+++ b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-graph-stores-neo4j";
-  version = "0.3.1";
+  version = "0.3.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_graph_stores_neo4j";
     inherit version;
-    hash = "sha256-v4rtGi47qyV6cDXfQcKuGrES9IjG/Se5zpnhktuoNHc=";
+    hash = "sha256-O/iTlpbREmN1tbojbaqZ7gLAN2JdKmKEzhKCnpth6S0=";
   };
 
   build-system = [ poetry-core ];

From 129e7b2f93ec65c37e03d82930237846880b110c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 15 Sep 2024 14:33:17 +0200
Subject: [PATCH 110/241] 
 python311Packages.llama-index-indices-managed-llama-cloud: 0.3.0 -> 0.3.1

---
 .../llama-index-indices-managed-llama-cloud/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix
index e35110322bb3..5df8e8d96046 100644
--- a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix
+++ b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-indices-managed-llama-cloud";
-  version = "0.3.0";
+  version = "0.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_indices_managed_llama_cloud";
     inherit version;
-    hash = "sha256-AqHQtBP/+1UCLn6E4FeIzLGMvc9Uz+wEZthMVlUJ+uY=";
+    hash = "sha256-9ifxAtFZBfFWGFIrbsKJWM2G17mzebmXLa7YkQU0LR0=";
   };
 
   build-system = [ poetry-core ];

From 284899bc1e5214c9dee0601229b2cc9262d53de4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 15 Sep 2024 14:33:34 +0200
Subject: [PATCH 111/241] python311Packages.llama-index-embeddings-ollama:
 0.3.0 -> 0.3.1

---
 .../python-modules/llama-index-embeddings-ollama/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix b/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix
index e82f1a8c7fdc..3f309d4ec12d 100644
--- a/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix
+++ b/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-embeddings-ollama";
-  version = "0.3.0";
+  version = "0.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_embeddings_ollama";
     inherit version;
-    hash = "sha256-Q5pc0R473lBPrWqICF6UIX0mp4akY2SBqXBS7MIkB7Y=";
+    hash = "sha256-Wj51+hS+fisagpN0FsiAIE3JbhsdJibcW96T8CHntUA=";
   };
 
   build-system = [ poetry-core ];

From 4948c5778d0b9a0b51d5194b3f86eb0b7b190229 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 15 Sep 2024 14:33:54 +0200
Subject: [PATCH 112/241] python311Packages.llama-index-embeddings-openai:
 0.2.4 -> 0.2.5

---
 .../python-modules/llama-index-embeddings-openai/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix b/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix
index a8de8757d500..24d78be21ef9 100644
--- a/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix
+++ b/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-embeddings-openai";
-  version = "0.2.4";
+  version = "0.2.5";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_embeddings_openai";
     inherit version;
-    hash = "sha256-CeJf+5Rt0fld8VAXI23kV4GoONzmVJhVnQdTxy7/5hc=";
+    hash = "sha256-AEfdcddHBoZF7XKMKTEqqRtlu+TGFCGAA0xk38XG9ug=";
   };
 
   build-system = [ poetry-core ];

From fabf9da67096f6111feeb3f79cac83564e4dfecb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 15 Sep 2024 14:34:09 +0200
Subject: [PATCH 113/241] python311Packages.llama-index-llms-ollama: 0.3.1 ->
 0.3.2

---
 .../python-modules/llama-index-llms-ollama/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix
index ce0e80e407db..27fb27b54028 100644
--- a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix
+++ b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-llms-ollama";
-  version = "0.3.1";
+  version = "0.3.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_llms_ollama";
     inherit version;
-    hash = "sha256-8fHR/p6H0LN5BZno0lEz6et+hgRVGYJ9wIHfNLXvcDQ=";
+    hash = "sha256-t0W9a3vZAEI9IttLIcza/WwjvjG/0C8jdwahejCPipw=";
   };
 
   build-system = [ poetry-core ];

From c295aba037f75e103689d5561992fd3bdba04397 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 15 Sep 2024 14:34:26 +0200
Subject: [PATCH 114/241] python311Packages.llama-index-llms-openai: 0.2.3 ->
 0.2.7

---
 .../python-modules/llama-index-llms-openai/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix
index bc51a9068072..723ff4069f27 100644
--- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix
+++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-llms-openai";
-  version = "0.2.3";
+  version = "0.2.7";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_llms_openai";
     inherit version;
-    hash = "sha256-6Rc7QwMxeRxqWp3xZ5ZDeuSjriR/1ODygffL5ZJYsHo=";
+    hash = "sha256-pwmiazL4JwzoYhMZQTcqv3ZMwPgbBxMTOEjH7/x9MPs=";
   };
 
   pythonRemoveDeps = [

From 672b82d38b803dde115e1f095d81ab703770f70e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 15 Sep 2024 14:34:42 +0200
Subject: [PATCH 115/241] 
 python311Packages.llama-index-multi-modal-llms-openai: 0.2.0 -> 0.2.1

---
 .../llama-index-multi-modal-llms-openai/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix
index fd18de972e8a..aa71aea79b97 100644
--- a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix
+++ b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-multi-modal-llms-openai";
-  version = "0.2.0";
+  version = "0.2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_multi_modal_llms_openai";
     inherit version;
-    hash = "sha256-gRlrcwN0zIjSg/h5Q1fQvWZka5pNqlwJz1dhkDC0aWw=";
+    hash = "sha256-G1vmkdX6KGH9S1oHGIPclNgts+HH/2hthN2EBIo1THs=";
   };
 
   build-system = [ poetry-core ];

From e74dff45e1d2504f8e79c6d9caff76f5e2f0ea75 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 15 Sep 2024 14:35:02 +0200
Subject: [PATCH 116/241] python311Packages.llama-parse: 0.5.3 -> 0.5.5

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

diff --git a/pkgs/development/python-modules/llama-parse/default.nix b/pkgs/development/python-modules/llama-parse/default.nix
index 1d89a7904167..1f45758dcd32 100644
--- a/pkgs/development/python-modules/llama-parse/default.nix
+++ b/pkgs/development/python-modules/llama-parse/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "llama-parse";
-  version = "0.5.3";
+  version = "0.5.5";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_parse";
     inherit version;
-    hash = "sha256-UjwldGujOM1OGYAGzbtkQtUBzJyiR7wkU3C87UQNgL0=";
+    hash = "sha256-ILAOCbFNG1ehsEDkvWFDbVH0Nza3tRADBypNBbA170Q=";
   };
 
   build-system = [ poetry-core ];

From cb6ec7a2a03a3c04071c631ba2aa1ab74f95f074 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 15 Sep 2024 14:36:18 +0200
Subject: [PATCH 117/241] python311Packages.llama-index-core: 0.11.8 -> 0.11.9

Diff: https://github.com/run-llama/llama_index/compare/refs/tags/v0.11.8...v0.11.9

Changelog: https://github.com/run-llama/llama_index/blob/0.11.9/CHANGELOG.md
---
 pkgs/development/python-modules/llama-index-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix
index afed83d8e762..8da8f5e2d224 100644
--- a/pkgs/development/python-modules/llama-index-core/default.nix
+++ b/pkgs/development/python-modules/llama-index-core/default.nix
@@ -47,7 +47,7 @@ in
 
 buildPythonPackage rec {
   pname = "llama-index-core";
-  version = "0.11.8";
+  version = "0.11.9";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -56,7 +56,7 @@ buildPythonPackage rec {
     owner = "run-llama";
     repo = "llama_index";
     rev = "refs/tags/v${version}";
-    hash = "sha256-xm5QIenvEAmFhGeJJ9FczXat1wuv2Qw99m38ZsmmucU=";
+    hash = "sha256-IebrdKC73Rwj4AgN26Ga3qqMEAeuVDMmFhDqQ9VIWIw=";
   };
 
   sourceRoot = "${src.name}/${pname}";

From 17d63d3a3726e42110c9f72a23feb82f859ffd1b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 15 Sep 2024 14:38:12 +0200
Subject: [PATCH 118/241] python312Packages.opower: 0.7.0 -> 0.8.0

Diff: https://github.com/tronikos/opower/compare/refs/tags/v0.7.0...v0.8.0

Changelog: https://github.com/tronikos/opower/releases/tag/v0.8.0
---
 pkgs/development/python-modules/opower/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix
index 64c19060ca4d..cdebc992b2fb 100644
--- a/pkgs/development/python-modules/opower/default.nix
+++ b/pkgs/development/python-modules/opower/default.nix
@@ -4,6 +4,7 @@
   aiozoneinfo,
   arrow,
   buildPythonPackage,
+  cryptography,
   fetchFromGitHub,
   pyotp,
   python-dotenv,
@@ -14,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "opower";
-  version = "0.7.0";
+  version = "0.8.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -23,7 +24,7 @@ buildPythonPackage rec {
     owner = "tronikos";
     repo = "opower";
     rev = "refs/tags/v${version}";
-    hash = "sha256-H1OOj/KYwHAh6SAmwejAaQFLR/mJ92vm0+cLaTqdSWI=";
+    hash = "sha256-gDd2Ht8SgUkqD1t5AY/zg/J/YG5Gyje8gbPp+5rP+M0=";
   };
 
   build-system = [ setuptools ];
@@ -32,6 +33,7 @@ buildPythonPackage rec {
     aiohttp
     aiozoneinfo
     arrow
+    cryptography
     pyotp
   ];
 

From bec7b80e56095ada44ff27a87258e96aaba830ba Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 15 Sep 2024 14:39:33 +0200
Subject: [PATCH 119/241] python312Packages.publicsuffixlist: 1.0.2.20240913 ->
 1.0.2.20240915

Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20240915-gha/CHANGES.md
---
 pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index ac8aadb71d2b..d2b48a98306e 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20240913";
+  version = "1.0.2.20240915";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-H7+HSF0XKfAOA8LI+/O3Ke495Yhrwb2LWAz4bd2FC18=";
+    hash = "sha256-fUo6D2QF1TMpC04Em97V1QDKN4mBq5bJzLbOT5xmZVM=";
   };
 
   build-system = [ setuptools ];

From 38b17d6753e8d9fe51b903635a8406736cdba177 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 15 Sep 2024 14:40:00 +0200
Subject: [PATCH 120/241] python312Packages.pyexploitdb: 0.2.34 -> 0.2.35

Changelog: https://github.com/GoVanguard/pyExploitDb/blob/master/ChangeLog.md
---
 pkgs/development/python-modules/pyexploitdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix
index 963e06ea0061..68352b43aa74 100644
--- a/pkgs/development/python-modules/pyexploitdb/default.nix
+++ b/pkgs/development/python-modules/pyexploitdb/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pyexploitdb";
-  version = "0.2.34";
+  version = "0.2.35";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pyExploitDb";
     inherit version;
-    hash = "sha256-5vWR6LNJknxVQ5Mmgw+c4clXhVQsHc68R1MMdzdsMgM=";
+    hash = "sha256-lwsLP29lQmb7MJYPrOfgspdj4qepx7TirEksMASqrb4=";
   };
 
   build-system = [ setuptools ];

From 8f175c4bf3827a7b10fbb023ce2d926bfcd7bf9b Mon Sep 17 00:00:00 2001
From: Terje Larsen <terlar@gmail.com>
Date: Sun, 15 Sep 2024 16:15:00 +0200
Subject: [PATCH 121/241] google-cloud-sdk: 485.0.0 -> 492.0.0

---
 .../admin/google-cloud-sdk/components.json    | 941 ++++++++++--------
 pkgs/tools/admin/google-cloud-sdk/data.nix    |  22 +-
 2 files changed, 558 insertions(+), 405 deletions(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/components.json b/pkgs/tools/admin/google-cloud-sdk/components.json
index 8e306436fee6..ce7b7672b0ec 100644
--- a/pkgs/tools/admin/google-cloud-sdk/components.json
+++ b/pkgs/tools/admin/google-cloud-sdk/components.json
@@ -5,7 +5,7 @@
         "checksum": "5a65179c291bc480696ca323d2f8c4874985458303eff8f233e16cdca4e88e6f",
         "contents_checksum": "038c999c7a7d70d5133eab7dc5868c4c3d0358431dad250f9833306af63016c8",
         "size": 800,
-        "source": "components/google-cloud-sdk-alpha-20240719191136.tar.gz",
+        "source": "components/google-cloud-sdk-alpha-20240906153039.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -15,6 +15,7 @@
         "description": "Alpha version of gcloud commands.",
         "display_name": "gcloud Alpha Commands"
       },
+      "gdu_only": false,
       "id": "alpha",
       "is_configuration": false,
       "is_hidden": false,
@@ -22,8 +23,8 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20240719191136,
-        "version_string": "2024.07.19"
+        "build_number": 20240906153039,
+        "version_string": "2024.09.06"
       }
     },
     {
@@ -38,6 +39,7 @@
         "description": "Configure kubectl with OIDC credentials for Anthos clusters.",
         "display_name": "anthos-auth"
       },
+      "gdu_only": false,
       "id": "anthos-auth",
       "is_configuration": false,
       "is_hidden": false,
@@ -74,6 +76,7 @@
         "description": "Configure kubectl with OIDC credentials for Anthos clusters.",
         "display_name": "anthos-auth (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "anthos-auth-darwin-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -107,6 +110,7 @@
         "description": "Configure kubectl with OIDC credentials for Anthos clusters.",
         "display_name": "anthos-auth (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "anthos-auth-darwin-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -140,6 +144,7 @@
         "description": "Configure kubectl with OIDC credentials for Anthos clusters.",
         "display_name": "anthos-auth (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "anthos-auth-linux-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -173,6 +178,7 @@
         "description": "Configure kubectl with OIDC credentials for Anthos clusters.",
         "display_name": "anthos-auth (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "anthos-auth-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -206,6 +212,7 @@
         "description": "Configure kubectl with OIDC credentials for Anthos clusters.",
         "display_name": "anthos-auth (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "anthos-auth-windows-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -239,6 +246,7 @@
         "description": "The cli for Anthos infrastructure.",
         "display_name": "anthoscli"
       },
+      "gdu_only": false,
       "id": "anthoscli",
       "is_configuration": false,
       "is_hidden": true,
@@ -276,6 +284,7 @@
         "description": "The cli for Anthos infrastructure.",
         "display_name": "anthoscli (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "anthoscli-darwin-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -309,6 +318,7 @@
         "description": "The cli for Anthos infrastructure.",
         "display_name": "anthoscli (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "anthoscli-darwin-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -342,6 +352,7 @@
         "description": "The cli for Anthos infrastructure.",
         "display_name": "anthoscli (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "anthoscli-darwin-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -375,6 +386,7 @@
         "description": "The cli for Anthos infrastructure.",
         "display_name": "anthoscli (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "anthoscli-linux-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -408,6 +420,7 @@
         "description": "The cli for Anthos infrastructure.",
         "display_name": "anthoscli (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "anthoscli-linux-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -441,6 +454,7 @@
         "description": "The cli for Anthos infrastructure.",
         "display_name": "anthoscli (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "anthoscli-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -474,6 +488,7 @@
         "description": "The cli for Anthos infrastructure.",
         "display_name": "anthoscli (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "anthoscli-windows-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -507,6 +522,7 @@
         "description": "The cli for Anthos infrastructure.",
         "display_name": "anthoscli (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "anthoscli-windows-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -541,6 +557,7 @@
         "description": "Provides the tools to develop Go applications on App Engine.",
         "display_name": "App Engine Go Extensions"
       },
+      "gdu_only": false,
       "id": "app-engine-go",
       "is_configuration": false,
       "is_hidden": false,
@@ -580,6 +597,7 @@
         "description": "Provides the tools to develop Go applications on App Engine.",
         "display_name": "App Engine Go Extensions (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "app-engine-go-darwin-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -615,6 +633,7 @@
         "description": "Provides the tools to develop Go applications on App Engine.",
         "display_name": "App Engine Go Extensions (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "app-engine-go-darwin-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -650,6 +669,7 @@
         "description": "Provides the tools to develop Go applications on App Engine.",
         "display_name": "App Engine Go Extensions (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "app-engine-go-linux-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -685,6 +705,7 @@
         "description": "Provides the tools to develop Go applications on App Engine.",
         "display_name": "App Engine Go Extensions (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "app-engine-go-linux-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -720,6 +741,7 @@
         "description": "Provides the tools to develop Go applications on App Engine.",
         "display_name": "App Engine Go Extensions (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "app-engine-go-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -755,6 +777,7 @@
         "description": "Provides the tools to develop Go applications on App Engine.",
         "display_name": "App Engine Go Extensions (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "app-engine-go-windows-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -790,6 +813,7 @@
         "description": "Provides the tools to develop Go applications on App Engine.",
         "display_name": "App Engine Go Extensions (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "app-engine-go-windows-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -822,6 +846,7 @@
         "description": "Provides the gRPC Python library for App Engine.",
         "display_name": "gRPC Python library"
       },
+      "gdu_only": false,
       "id": "app-engine-grpc",
       "is_configuration": false,
       "is_hidden": true,
@@ -860,6 +885,7 @@
         "description": "Provides the gRPC Python library for App Engine.",
         "display_name": "gRPC Python library (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "app-engine-grpc-darwin-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -895,6 +921,7 @@
         "description": "Provides the gRPC Python library for App Engine.",
         "display_name": "gRPC Python library (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "app-engine-grpc-linux-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -930,6 +957,7 @@
         "description": "Provides the gRPC Python library for App Engine.",
         "display_name": "gRPC Python library (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "app-engine-grpc-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -965,6 +993,7 @@
         "description": "Provides the gRPC Python library for App Engine.",
         "display_name": "gRPC Python library (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "app-engine-grpc-windows-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -1000,6 +1029,7 @@
         "description": "Provides the gRPC Python library for App Engine.",
         "display_name": "gRPC Python library (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "app-engine-grpc-windows-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -1034,6 +1064,7 @@
         "description": "Provides the tools required to develop Java applications using gcloud.",
         "display_name": "gcloud app Java Extensions"
       },
+      "gdu_only": false,
       "id": "app-engine-java",
       "is_configuration": false,
       "is_hidden": false,
@@ -1062,6 +1093,7 @@
         "description": "Provides the tools required to develop Python and PHP applications using gcloud.",
         "display_name": "gcloud app Python Extensions"
       },
+      "gdu_only": false,
       "id": "app-engine-python",
       "is_configuration": false,
       "is_hidden": false,
@@ -1089,6 +1121,7 @@
         "description": "Extra libraries for the App Engine Python Extensions.",
         "display_name": "gcloud app Python Extensions (Extra Libraries)"
       },
+      "gdu_only": false,
       "id": "app-engine-python-extras",
       "is_configuration": false,
       "is_hidden": false,
@@ -1113,6 +1146,7 @@
         "description": "Provides appctl executable.",
         "display_name": "Appctl"
       },
+      "gdu_only": false,
       "id": "appctl",
       "is_configuration": false,
       "is_hidden": false,
@@ -1149,6 +1183,7 @@
         "description": "Provides appctl executable.",
         "display_name": "Appctl (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "appctl-darwin-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -1182,6 +1217,7 @@
         "description": "Provides appctl executable.",
         "display_name": "Appctl (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "appctl-darwin-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -1215,6 +1251,7 @@
         "description": "Provides appctl executable.",
         "display_name": "Appctl (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "appctl-linux-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -1248,6 +1285,7 @@
         "description": "Provides appctl executable.",
         "display_name": "Appctl (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "appctl-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -1281,6 +1319,7 @@
         "description": "Provides appctl executable.",
         "display_name": "Appctl (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "appctl-windows-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -1314,6 +1353,7 @@
         "description": "Provides appctl executable.",
         "display_name": "Appctl (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "appctl-windows-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -1337,7 +1377,7 @@
         "checksum": "707d412854a14450b4fddee199d258e75946fe51b44eb2980c8cd7e274c15760",
         "contents_checksum": "0b4e9d8e6394dc841aece07ca4da91920a460cbd7ec22495be4a2b4f46635b4d",
         "size": 797,
-        "source": "components/google-cloud-sdk-beta-20240719191136.tar.gz",
+        "source": "components/google-cloud-sdk-beta-20240906153039.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1347,6 +1387,7 @@
         "description": "Beta version of gcloud commands.",
         "display_name": "gcloud Beta Commands"
       },
+      "gdu_only": false,
       "id": "beta",
       "is_configuration": false,
       "is_hidden": false,
@@ -1354,8 +1395,8 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20240719191136,
-        "version_string": "2024.07.19"
+        "build_number": 20240906153039,
+        "version_string": "2024.09.06"
       }
     },
     {
@@ -1374,6 +1415,7 @@
         "description": "Provides a tool for local Cloud Bigtable emulation.",
         "display_name": "Cloud Bigtable Emulator"
       },
+      "gdu_only": true,
       "id": "bigtable",
       "is_configuration": false,
       "is_hidden": false,
@@ -1412,6 +1454,7 @@
         "description": "Provides a tool for local Cloud Bigtable emulation.",
         "display_name": "Cloud Bigtable Emulator (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "bigtable-darwin-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -1446,6 +1489,7 @@
         "description": "Provides a tool for local Cloud Bigtable emulation.",
         "display_name": "Cloud Bigtable Emulator (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "bigtable-darwin-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -1480,6 +1524,7 @@
         "description": "Provides a tool for local Cloud Bigtable emulation.",
         "display_name": "Cloud Bigtable Emulator (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "bigtable-darwin-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -1514,6 +1559,7 @@
         "description": "Provides a tool for local Cloud Bigtable emulation.",
         "display_name": "Cloud Bigtable Emulator (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "bigtable-linux-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -1548,6 +1594,7 @@
         "description": "Provides a tool for local Cloud Bigtable emulation.",
         "display_name": "Cloud Bigtable Emulator (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "bigtable-linux-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -1582,6 +1629,7 @@
         "description": "Provides a tool for local Cloud Bigtable emulation.",
         "display_name": "Cloud Bigtable Emulator (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "bigtable-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -1616,6 +1664,7 @@
         "description": "Provides a tool for local Cloud Bigtable emulation.",
         "display_name": "Cloud Bigtable Emulator (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "bigtable-windows-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -1650,6 +1699,7 @@
         "description": "Provides a tool for local Cloud Bigtable emulation.",
         "display_name": "Cloud Bigtable Emulator (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "bigtable-windows-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -1670,10 +1720,10 @@
     },
     {
       "data": {
-        "checksum": "64bb21d9904b8d0a8659268dcd8ad837f242dfb9a68520aa1a4961e148ebf978",
-        "contents_checksum": "afc3a525e40185957652ca0fc81d466d989c3af243425644d2863734acc583e5",
-        "size": 1808321,
-        "source": "components/google-cloud-sdk-bq-20240712142834.tar.gz",
+        "checksum": "c91813747b4cbf22e9c990f63f8b89bd46de6af218d97df44361cee0eebb3b87",
+        "contents_checksum": "e3475baccea8625d97cf47f22fc6a4940db9fb24c72b63e52595ffcf5d26a005",
+        "size": 1818208,
+        "source": "components/google-cloud-sdk-bq-20240816183020.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1685,6 +1735,7 @@
         "description": "Provides the bq tool for interacting with the BigQuery service.",
         "display_name": "BigQuery Command Line Tool"
       },
+      "gdu_only": false,
       "id": "bq",
       "is_configuration": false,
       "is_hidden": false,
@@ -1692,16 +1743,16 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20240712142834,
-        "version_string": "2.1.7"
+        "build_number": 20240816183020,
+        "version_string": "2.1.8"
       }
     },
     {
       "data": {
-        "checksum": "81d6fafb672c791a58b6d2cecbcb8a78ca1a1c7e885d359bcf3ec11ebf138ea0",
-        "contents_checksum": "fcd529ea7485a8621ac5d217ac7e7793cc8acabe5ba4c2c6f222b402580e5578",
-        "size": 2026,
-        "source": "components/google-cloud-sdk-bq-nix-20240106004423.tar.gz",
+        "checksum": "f23b0a9dd4e356357f860ac8bc3236fe4be5dd67059140d6b9f007828766fe74",
+        "contents_checksum": "fc38f20f30fa43f46aef337aaab843d7f747a4282bb10768321f03b6e1dd7cd0",
+        "size": 1914,
+        "source": "components/google-cloud-sdk-bq-nix-20240830134514.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1712,6 +1763,7 @@
         "description": "Provides the bq tool for interacting with the BigQuery service.",
         "display_name": "BigQuery Command Line Tool (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "bq-nix",
       "is_configuration": false,
       "is_hidden": true,
@@ -1726,16 +1778,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240106004423,
-        "version_string": "2.0.101"
+        "build_number": 20240830134514,
+        "version_string": "2.1.8"
       }
     },
     {
       "data": {
-        "checksum": "3bfb69819bbca110fa33474612db6ec6bfb20d2c2334ff41ac21b6f7179441f7",
-        "contents_checksum": "543b11ef740e32b7013fdecdc0ea02fa076e16972dec18155647fb3f0682d743",
-        "size": 4104,
-        "source": "components/google-cloud-sdk-bq-win-20240503145345.tar.gz",
+        "checksum": "b243aaa62a46e457e684066bcfd7ff777b983e0fe7555b29470a11e4dc55d669",
+        "contents_checksum": "76399a5b63559f930cd71c4f2f9c49ef4cefdeb998d7ef9609d7b714fb32926c",
+        "size": 3999,
+        "source": "components/google-cloud-sdk-bq-win-20240830134514.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1746,6 +1798,7 @@
         "description": "Provides the bq tool for interacting with the BigQuery service.",
         "display_name": "BigQuery Command Line Tool (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "bq-win",
       "is_configuration": false,
       "is_hidden": true,
@@ -1757,108 +1810,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240503145345,
-        "version_string": "2.1.4"
-      }
-    },
-    {
-      "dependencies": [
-        "bundled-python-windows-x86",
-        "bundled-python-windows-x86_64",
-        "bundled-python3",
-        "core"
-      ],
-      "details": {
-        "description": "Provides stand-alone Python 2.7 install.",
-        "display_name": "Bundled Python 2.7"
-      },
-      "id": "bundled-python",
-      "is_configuration": false,
-      "is_hidden": true,
-      "is_required": false,
-      "platform": {
-        "architectures": [
-          "x86",
-          "x86_64"
-        ],
-        "operating_systems": [
-          "WINDOWS"
-        ]
-      },
-      "platform_required": false,
-      "version": {
-        "build_number": 0,
-        "version_string": "2.7.13"
-      }
-    },
-    {
-      "data": {
-        "checksum": "8b179d2ffd01bd29d3252feb638de41662ad853f4a109143c45cfbeb221d466b",
-        "contents_checksum": "649ff2cbb21688bb04ccf2c6366bff8008975f7b94848fcfd0e2200dfaca442e",
-        "size": 12763722,
-        "source": "components/google-cloud-sdk-bundled-python-windows-x86-20200605144945.tar.gz",
-        "type": "tar"
-      },
-      "dependencies": [
-        "bundled-python",
-        "bundled-python3",
-        "core"
-      ],
-      "details": {
-        "description": "Provides stand-alone Python 2.7 install.",
-        "display_name": "Bundled Python 2.7 (Platform Specific)"
-      },
-      "id": "bundled-python-windows-x86",
-      "is_configuration": false,
-      "is_hidden": true,
-      "is_required": false,
-      "platform": {
-        "architectures": [
-          "x86"
-        ],
-        "operating_systems": [
-          "WINDOWS"
-        ]
-      },
-      "platform_required": false,
-      "version": {
-        "build_number": 20200605144945,
-        "version_string": "2.7.13"
-      }
-    },
-    {
-      "data": {
-        "checksum": "6345eae40bebdbbce12f0ccf75161a32c040cd017d43aa697a1cf38a237a3a6f",
-        "contents_checksum": "29e7c3624d567ef8f63fad1f6863391b6e0577dc7f9034433ece3fc6949363bc",
-        "size": 13965732,
-        "source": "components/google-cloud-sdk-bundled-python-windows-x86_64-20200605144945.tar.gz",
-        "type": "tar"
-      },
-      "dependencies": [
-        "bundled-python",
-        "bundled-python3",
-        "core"
-      ],
-      "details": {
-        "description": "Provides stand-alone Python 2.7 install.",
-        "display_name": "Bundled Python 2.7 (Platform Specific)"
-      },
-      "id": "bundled-python-windows-x86_64",
-      "is_configuration": false,
-      "is_hidden": true,
-      "is_required": false,
-      "platform": {
-        "architectures": [
-          "x86_64"
-        ],
-        "operating_systems": [
-          "WINDOWS"
-        ]
-      },
-      "platform_required": false,
-      "version": {
-        "build_number": 20200605144945,
-        "version_string": "2.7.13"
+        "build_number": 20240830134514,
+        "version_string": "2.1.8"
       }
     },
     {
@@ -1871,6 +1824,7 @@
         "description": "Provides stand-alone Python 3.11 install.",
         "display_name": "Bundled Python 3.11"
       },
+      "gdu_only": false,
       "id": "bundled-python3",
       "is_configuration": false,
       "is_hidden": true,
@@ -1887,7 +1841,7 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "3.11.8"
+        "version_string": "3.11.9"
       }
     },
     {
@@ -1896,9 +1850,10 @@
         "core"
       ],
       "details": {
-        "description": "Provides stand-alone Python 3.11.8 installation for UNIX.",
+        "description": "Provides stand-alone Python 3.11.9 installation for UNIX.",
         "display_name": "Bundled Python 3.11"
       },
+      "gdu_only": false,
       "id": "bundled-python3-unix",
       "is_configuration": false,
       "is_hidden": false,
@@ -1914,15 +1869,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "3.11.8"
+        "version_string": "3.11.9"
       }
     },
     {
       "data": {
-        "checksum": "fb1f862cee4cbc9231d9da6be07dc616b9d5f036c7484afced3e0792ed685915",
-        "contents_checksum": "39e7f47fac5b5738596d5b43c8dda500b684cfe85f14f0c7cd37f024e9b7da7c",
-        "size": 77646096,
-        "source": "components/google-cloud-sdk-bundled-python3-unix-linux-x86_64-20240712142834.tar.gz",
+        "checksum": "abfd98bebfbc56c467215ded622ab9ad41e5c5f66b9a00c9c857d08d0880ce40",
+        "contents_checksum": "01f79ef8ab21aca5ee4c57fe2fe8fc7588c87d99842dc1259114fe000659fc91",
+        "size": 77768547,
+        "source": "components/google-cloud-sdk-bundled-python3-unix-linux-x86_64-20240806142304.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1930,9 +1885,10 @@
         "core"
       ],
       "details": {
-        "description": "Provides stand-alone Python 3.11.8 installation for UNIX.",
+        "description": "Provides stand-alone Python 3.11.9 installation for UNIX.",
         "display_name": "Bundled Python 3.11 (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "bundled-python3-unix-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -1947,16 +1903,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240712142834,
-        "version_string": "3.11.8"
+        "build_number": 20240806142304,
+        "version_string": "3.11.9"
       }
     },
     {
       "data": {
-        "checksum": "6b42a2592dc79efb45b3848f58de62866d9fba0d033a8e91aa919be047ee3cb6",
-        "contents_checksum": "6cce2af1b3947deeff09b5adce78ef1c6b39716ce2ef27c58b48c14408b2e3a0",
-        "size": 20457544,
-        "source": "components/google-cloud-sdk-bundled-python3-windows-x86-20240315155000.tar.gz",
+        "checksum": "11577b12f66f642f20530a1d14193c32f2942701d20dc52472dae31e555c737e",
+        "contents_checksum": "d42ff2a914095d101dd3009ca855353baf0f9ad9737b07821bc3470c67fd9fb3",
+        "size": 20675117,
+        "source": "components/google-cloud-sdk-bundled-python3-windows-x86-20240830134514.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1967,6 +1923,7 @@
         "description": "Provides stand-alone Python 3.11 install.",
         "display_name": "Bundled Python 3.11 (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "bundled-python3-windows-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -1981,16 +1938,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240315155000,
-        "version_string": "3.11.8"
+        "build_number": 20240830134514,
+        "version_string": "3.11.9"
       }
     },
     {
       "data": {
-        "checksum": "22a2f8a7370780239ed00ef8771729318b3301e498afba74ef27f300d3b29ec1",
-        "contents_checksum": "9b781d6ff139270cd317f233e448c88d2b54ef3d05970b2c765540485acf1451",
-        "size": 22664923,
-        "source": "components/google-cloud-sdk-bundled-python3-windows-x86_64-20240315155000.tar.gz",
+        "checksum": "70bf9529f62e655b4560293970920aeeb707496a1fff9b729faefc93b9f7c444",
+        "contents_checksum": "f1f45ca6b66efb29c16a23f8dbbe8496901faac1705a8f3b33bac5a881efe6ec",
+        "size": 23018167,
+        "source": "components/google-cloud-sdk-bundled-python3-windows-x86_64-20240830134514.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2001,6 +1958,7 @@
         "description": "Provides stand-alone Python 3.11 install.",
         "display_name": "Bundled Python 3.11 (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "bundled-python3-windows-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -2015,8 +1973,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240315155000,
-        "version_string": "3.11.8"
+        "build_number": 20240830134514,
+        "version_string": "3.11.9"
       }
     },
     {
@@ -2034,6 +1992,7 @@
         "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.",
         "display_name": "Cloud Bigtable Command Line Tool"
       },
+      "gdu_only": true,
       "id": "cbt",
       "is_configuration": false,
       "is_hidden": false,
@@ -2053,15 +2012,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "1.21.0"
+        "version_string": "1.22.0"
       }
     },
     {
       "data": {
-        "checksum": "3d1713cc5a17d36f806a7313ec68032373c6ef71179e19f383fcc0274aee88a9",
-        "contents_checksum": "dcf1b9502101268ce05abe93970b1f63b56beb325e2e1d9f33f4414cae4aec10",
-        "size": 17871065,
-        "source": "components/google-cloud-sdk-cbt-darwin-arm-20240624182041.tar.gz",
+        "checksum": "161d9918c898e422c4f36838c13e515b92208428e8c4a602d8cb1e492fcdb16e",
+        "contents_checksum": "69ce6ab3b44bb669e61529c82927c17af971148620814edc11162d5255c94654",
+        "size": 18821500,
+        "source": "components/google-cloud-sdk-cbt-darwin-arm-20240823153932.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2071,6 +2030,7 @@
         "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.",
         "display_name": "Cloud Bigtable Command Line Tool (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "cbt-darwin-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -2085,8 +2045,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240624182041,
-        "version_string": "1.21.0"
+        "build_number": 20240823153932,
+        "version_string": "1.22.0"
       }
     },
     {
@@ -2104,6 +2064,7 @@
         "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.",
         "display_name": "Cloud Bigtable Command Line Tool (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "cbt-darwin-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -2124,10 +2085,10 @@
     },
     {
       "data": {
-        "checksum": "4437e990cf658b31aa184e4e5d2b06a6b0b6b08ff98bb84f7877dbc8e3c69ed7",
-        "contents_checksum": "51fb420da739dde8534ee1bbe419aee62520db2b8e7393ad4bbc1fc8b41defe4",
-        "size": 18668186,
-        "source": "components/google-cloud-sdk-cbt-darwin-x86_64-20240624182041.tar.gz",
+        "checksum": "0da4f23648181eedb850e055c907812fefc1dfde9cce2dee471050f645171382",
+        "contents_checksum": "0ab6622f1c0045d078cfffc74e035f85c57cefc8f03e455a5b0aba841fe5d517",
+        "size": 19603578,
+        "source": "components/google-cloud-sdk-cbt-darwin-x86_64-20240823153932.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2137,6 +2098,7 @@
         "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.",
         "display_name": "Cloud Bigtable Command Line Tool (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "cbt-darwin-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -2151,16 +2113,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240624182041,
-        "version_string": "1.21.0"
+        "build_number": 20240823153932,
+        "version_string": "1.22.0"
       }
     },
     {
       "data": {
-        "checksum": "0dab71da969b9cf86f79793773e30406e2f6913774660083378235627c007b94",
-        "contents_checksum": "c928b188894801fa7d2367712fcbcb7c788d0650d975bbf36e60d19799a91101",
-        "size": 17394282,
-        "source": "components/google-cloud-sdk-cbt-linux-arm-20240624182041.tar.gz",
+        "checksum": "90720349954a12b375f2506d62754f942c788e2fcf5fce9b2e1d3329a1bede0c",
+        "contents_checksum": "224babcc9767c1e4bd974887dc9c961b19dca6fd888b6ad9c73bf5c1886e4d91",
+        "size": 18178427,
+        "source": "components/google-cloud-sdk-cbt-linux-arm-20240823153932.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2170,6 +2132,7 @@
         "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.",
         "display_name": "Cloud Bigtable Command Line Tool (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "cbt-linux-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -2184,16 +2147,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240624182041,
-        "version_string": "1.21.0"
+        "build_number": 20240823153932,
+        "version_string": "1.22.0"
       }
     },
     {
       "data": {
-        "checksum": "911a85bb4a86bda2d13d00ecec45a9d48ca105ad2d8f14c32dd98f7da65522ee",
-        "contents_checksum": "fd7dc528702f1f66086d83867737b3813ccfcc958cd841602afd7228b3231d41",
-        "size": 17275734,
-        "source": "components/google-cloud-sdk-cbt-linux-x86-20240624182041.tar.gz",
+        "checksum": "d246c378b7614a7ac7c47bf4d7e11c54869335b7e2d37f27a781e794d23c2824",
+        "contents_checksum": "4d824111595e4b11d0e2533428277cba49663a9e76b18cd6f2d5925223a7721d",
+        "size": 17979307,
+        "source": "components/google-cloud-sdk-cbt-linux-x86-20240823153932.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2203,6 +2166,7 @@
         "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.",
         "display_name": "Cloud Bigtable Command Line Tool (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "cbt-linux-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -2217,16 +2181,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240624182041,
-        "version_string": "1.21.0"
+        "build_number": 20240823153932,
+        "version_string": "1.22.0"
       }
     },
     {
       "data": {
-        "checksum": "f1395612e02e4a10c8b381d388af26dc6463ade27bdf1fb8135fff82ce1f7f7a",
-        "contents_checksum": "7c5b9a2019d706ba0bfbf32f030472e6bc8630cfc72f14fbdbf3904eaf2a9dee",
-        "size": 18570041,
-        "source": "components/google-cloud-sdk-cbt-linux-x86_64-20240624182041.tar.gz",
+        "checksum": "b05c7bd1d24a0f60663d1bfc4133096c42beb251f5cfc389ffe72aa807cee025",
+        "contents_checksum": "01c561c96c2eebd9924d161eccc8806b385f047da0369f6e598aca93cd5ea44c",
+        "size": 19333762,
+        "source": "components/google-cloud-sdk-cbt-linux-x86_64-20240823153932.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2236,6 +2200,7 @@
         "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.",
         "display_name": "Cloud Bigtable Command Line Tool (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "cbt-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -2250,16 +2215,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240624182041,
-        "version_string": "1.21.0"
+        "build_number": 20240823153932,
+        "version_string": "1.22.0"
       }
     },
     {
       "data": {
-        "checksum": "53cb4fc8f903c3deb266f48a364f0591e5ba38e4e9640a18c205c4c01da95e10",
-        "contents_checksum": "506dfe72815e11ff50d4f4c21dbb91b3c7fd8908e0fe598888599c4d18a1a86b",
-        "size": 17698876,
-        "source": "components/google-cloud-sdk-cbt-windows-x86-20240624182041.tar.gz",
+        "checksum": "e85042dc647c143a66d0dcebb827a6ee13f6e00d98dc24d49b6194602d6fdd74",
+        "contents_checksum": "7293621c8b8c3dcf5db0f3885932ca6f8ff0af51ea2c9b594db28bd282fcddca",
+        "size": 18404340,
+        "source": "components/google-cloud-sdk-cbt-windows-x86-20240823153932.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2269,6 +2234,7 @@
         "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.",
         "display_name": "Cloud Bigtable Command Line Tool (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "cbt-windows-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -2283,16 +2249,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240624182041,
-        "version_string": "1.21.0"
+        "build_number": 20240823153932,
+        "version_string": "1.22.0"
       }
     },
     {
       "data": {
-        "checksum": "fefefe5120b24b0e685c281b8ffafb49566c117f5b1b74b6f44e0a56d35e72a9",
-        "contents_checksum": "ce6d3970696fcabd56d9e569030353d03d312e6e819163766a38af9aafbd825b",
-        "size": 18831679,
-        "source": "components/google-cloud-sdk-cbt-windows-x86_64-20240624182041.tar.gz",
+        "checksum": "3254d3680eb76946c43afe61181295864aa3f31f0e94c27c286f4221563a829b",
+        "contents_checksum": "a5fe7eba35090d213a194c34b610c8443778d238e6278ded7119fa350646b7a7",
+        "size": 19605578,
+        "source": "components/google-cloud-sdk-cbt-windows-x86_64-20240823153932.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2302,6 +2268,7 @@
         "description": "Provides the cbt tool for interacting with the Cloud Bigtable service.",
         "display_name": "Cloud Bigtable Command Line Tool (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "cbt-windows-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -2316,8 +2283,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240624182041,
-        "version_string": "1.21.0"
+        "build_number": 20240823153932,
+        "version_string": "1.22.0"
       }
     },
     {
@@ -2330,6 +2297,7 @@
         "description": "Provides cloud-build-local executable.  See https://github.com/GoogleCloudPlatform/cloud-build-local",
         "display_name": "Google Cloud Build Local Builder"
       },
+      "gdu_only": true,
       "id": "cloud-build-local",
       "is_configuration": false,
       "is_hidden": true,
@@ -2365,6 +2333,7 @@
         "description": "Provides cloud-build-local executable.  See https://github.com/GoogleCloudPlatform/cloud-build-local",
         "display_name": "Google Cloud Build Local Builder (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "cloud-build-local-darwin-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -2398,6 +2367,7 @@
         "description": "Provides cloud-build-local executable.  See https://github.com/GoogleCloudPlatform/cloud-build-local",
         "display_name": "Google Cloud Build Local Builder (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "cloud-build-local-linux-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -2431,6 +2401,7 @@
         "description": "Provides cloud-build-local executable.  See https://github.com/GoogleCloudPlatform/cloud-build-local",
         "display_name": "Google Cloud Build Local Builder (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "cloud-build-local-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -2464,6 +2435,7 @@
         "description": "Provides a local emulator of Cloud Datastore.",
         "display_name": "Cloud Datastore Emulator"
       },
+      "gdu_only": false,
       "id": "cloud-datastore-emulator",
       "is_configuration": false,
       "is_hidden": false,
@@ -2477,10 +2449,10 @@
     },
     {
       "data": {
-        "checksum": "0f7a96ab1d83ba0e4f53149c6cfc555dfd80be065a4ca966b101feb27fd2061a",
-        "contents_checksum": "2a20a45ed2b832217af8be6ab9155a3aa718ae60eed21acc19a93aee536884f6",
-        "size": 47379482,
-        "source": "components/google-cloud-sdk-cloud-firestore-emulator-20240524155722.tar.gz",
+        "checksum": "708013ee1eb1fc34fc1b33e8b562e7c276e95749685050f347af0002d96be9ef",
+        "contents_checksum": "c26bdf735c3b31bec987291b9716851c02326e1ce5d425f2bdf78bc675dc1955",
+        "size": 48564778,
+        "source": "components/google-cloud-sdk-cloud-firestore-emulator-20240816183020.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2490,6 +2462,7 @@
         "description": "Provides a local emulator of Cloud Firestore.",
         "display_name": "Cloud Firestore Emulator"
       },
+      "gdu_only": false,
       "id": "cloud-firestore-emulator",
       "is_configuration": false,
       "is_hidden": false,
@@ -2497,8 +2470,8 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20240524155722,
-        "version_string": "1.19.7"
+        "build_number": 20240816183020,
+        "version_string": "1.19.8"
       }
     },
     {
@@ -2513,6 +2486,7 @@
         "description": "Provides cloud-run-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-run-proxy",
         "display_name": "Cloud Run Proxy"
       },
+      "gdu_only": false,
       "id": "cloud-run-proxy",
       "is_configuration": false,
       "is_hidden": false,
@@ -2549,6 +2523,7 @@
         "description": "Provides cloud-run-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-run-proxy",
         "display_name": "Cloud Run Proxy (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "cloud-run-proxy-darwin-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -2582,6 +2557,7 @@
         "description": "Provides cloud-run-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-run-proxy",
         "display_name": "Cloud Run Proxy (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "cloud-run-proxy-darwin-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -2615,6 +2591,7 @@
         "description": "Provides cloud-run-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-run-proxy",
         "display_name": "Cloud Run Proxy (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "cloud-run-proxy-linux-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -2648,6 +2625,7 @@
         "description": "Provides cloud-run-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-run-proxy",
         "display_name": "Cloud Run Proxy (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "cloud-run-proxy-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -2681,6 +2659,7 @@
         "description": "Provides cloud-run-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-run-proxy",
         "display_name": "Cloud Run Proxy (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "cloud-run-proxy-windows-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -2708,6 +2687,7 @@
         "description": "Provides a local emulator of Cloud Spanner.",
         "display_name": "Cloud Spanner Emulator"
       },
+      "gdu_only": false,
       "id": "cloud-spanner-emulator",
       "is_configuration": false,
       "is_hidden": false,
@@ -2723,15 +2703,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "1.5.19"
+        "version_string": "1.5.23"
       }
     },
     {
       "data": {
-        "checksum": "348756460ed8945f115b3f07163f36ea220595f13b0ec6f47ee803266f0f4b3d",
-        "contents_checksum": "ab4a339f052251c4c217f41ea0a69332477a47baaa688f664cddbfbca67b246e",
-        "size": 38355144,
-        "source": "components/google-cloud-sdk-cloud-spanner-emulator-linux-x86_64-20240624182041.tar.gz",
+        "checksum": "ac8b8cce33466c5ddd1b73904a9982eb3fba3a138224b4e95d416f7c03af8b39",
+        "contents_checksum": "8b30e0ca4efc137855976e4feaf16e7a720253039c6d95b35e9a8f106cea5cd2",
+        "size": 38917279,
+        "source": "components/google-cloud-sdk-cloud-spanner-emulator-linux-x86_64-20240830134514.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2742,6 +2722,7 @@
         "description": "Provides a local emulator of Cloud Spanner.",
         "display_name": "Cloud Spanner Emulator (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "cloud-spanner-emulator-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -2756,8 +2737,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240624182041,
-        "version_string": "1.5.19"
+        "build_number": 20240830134514,
+        "version_string": "1.5.23"
       }
     },
     {
@@ -2774,6 +2755,7 @@
         "description": "Provides cloud-sql-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-sql-proxy",
         "display_name": "Cloud SQL Proxy v2"
       },
+      "gdu_only": false,
       "id": "cloud-sql-proxy",
       "is_configuration": false,
       "is_hidden": false,
@@ -2811,6 +2793,7 @@
         "description": "Provides cloud-sql-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-sql-proxy",
         "display_name": "Cloud SQL Proxy v2 (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "cloud-sql-proxy-darwin-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -2844,6 +2827,7 @@
         "description": "Provides cloud-sql-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-sql-proxy",
         "display_name": "Cloud SQL Proxy v2 (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "cloud-sql-proxy-darwin-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -2877,6 +2861,7 @@
         "description": "Provides cloud-sql-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-sql-proxy",
         "display_name": "Cloud SQL Proxy v2 (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "cloud-sql-proxy-linux-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -2910,6 +2895,7 @@
         "description": "Provides cloud-sql-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-sql-proxy",
         "display_name": "Cloud SQL Proxy v2 (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "cloud-sql-proxy-linux-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -2943,6 +2929,7 @@
         "description": "Provides cloud-sql-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-sql-proxy",
         "display_name": "Cloud SQL Proxy v2 (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "cloud-sql-proxy-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -2976,6 +2963,7 @@
         "description": "Provides cloud-sql-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-sql-proxy",
         "display_name": "Cloud SQL Proxy v2 (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "cloud-sql-proxy-windows-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -3009,6 +2997,7 @@
         "description": "Provides cloud-sql-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-sql-proxy",
         "display_name": "Cloud SQL Proxy v2 (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "cloud-sql-proxy-windows-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -3041,6 +3030,7 @@
         "description": "Provides cloud_sql_proxy executable. See https://github.com/GoogleCloudPlatform/cloudsql-proxy",
         "display_name": "Cloud SQL Proxy"
       },
+      "gdu_only": true,
       "id": "cloud_sql_proxy",
       "is_configuration": false,
       "is_hidden": true,
@@ -3078,6 +3068,7 @@
         "description": "Provides cloud_sql_proxy executable. See https://github.com/GoogleCloudPlatform/cloudsql-proxy",
         "display_name": "Cloud SQL Proxy (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "cloud_sql_proxy-darwin-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -3111,6 +3102,7 @@
         "description": "Provides cloud_sql_proxy executable. See https://github.com/GoogleCloudPlatform/cloudsql-proxy",
         "display_name": "Cloud SQL Proxy (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "cloud_sql_proxy-darwin-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -3144,6 +3136,7 @@
         "description": "Provides cloud_sql_proxy executable. See https://github.com/GoogleCloudPlatform/cloudsql-proxy",
         "display_name": "Cloud SQL Proxy (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "cloud_sql_proxy-linux-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -3177,6 +3170,7 @@
         "description": "Provides cloud_sql_proxy executable. See https://github.com/GoogleCloudPlatform/cloudsql-proxy",
         "display_name": "Cloud SQL Proxy (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "cloud_sql_proxy-linux-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -3210,6 +3204,7 @@
         "description": "Provides cloud_sql_proxy executable. See https://github.com/GoogleCloudPlatform/cloudsql-proxy",
         "display_name": "Cloud SQL Proxy (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "cloud_sql_proxy-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -3243,6 +3238,7 @@
         "description": "Provides cloud_sql_proxy executable. See https://github.com/GoogleCloudPlatform/cloudsql-proxy",
         "display_name": "Cloud SQL Proxy (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "cloud_sql_proxy-windows-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -3276,6 +3272,7 @@
         "description": "Provides cloud_sql_proxy executable. See https://github.com/GoogleCloudPlatform/cloudsql-proxy",
         "display_name": "Cloud SQL Proxy (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "cloud_sql_proxy-windows-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -3306,6 +3303,7 @@
         "description": "Google Cloud Config Connector. See https://cloud.google.com/config-connector/docs/overview",
         "display_name": "config-connector"
       },
+      "gdu_only": true,
       "id": "config-connector",
       "is_configuration": false,
       "is_hidden": false,
@@ -3342,6 +3340,7 @@
         "description": "Google Cloud Config Connector. See https://cloud.google.com/config-connector/docs/overview",
         "display_name": "config-connector (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "config-connector-darwin-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -3375,6 +3374,7 @@
         "description": "Google Cloud Config Connector. See https://cloud.google.com/config-connector/docs/overview",
         "display_name": "config-connector (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "config-connector-darwin-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -3408,6 +3408,7 @@
         "description": "Google Cloud Config Connector. See https://cloud.google.com/config-connector/docs/overview",
         "display_name": "config-connector (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "config-connector-linux-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -3441,6 +3442,7 @@
         "description": "Google Cloud Config Connector. See https://cloud.google.com/config-connector/docs/overview",
         "display_name": "config-connector (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "config-connector-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -3474,6 +3476,7 @@
         "description": "Google Cloud Config Connector. See https://cloud.google.com/config-connector/docs/overview",
         "display_name": "config-connector (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "config-connector-windows-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -3494,10 +3497,10 @@
     },
     {
       "data": {
-        "checksum": "ae3adb2a9e4ccfba6b0d55457ba91e349a8cbeec5d667556c1e4a21109420394",
-        "contents_checksum": "8e708148fcae335c224df37c7c45ff44278fa12bb0b9d42ef396c61962ee6309",
-        "size": 20088401,
-        "source": "components/google-cloud-sdk-core-20240719191136.tar.gz",
+        "checksum": "c6f0d392c3c760bb03ce0d47f88011ec19f77e319319f6b9e468d92aa9be0b50",
+        "contents_checksum": "fd08abc11ea832085782f21f3e16a6aae190c0f899bd05dff8b127feb96005a9",
+        "size": 20816315,
+        "source": "components/google-cloud-sdk-core-20240906153039.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -3511,6 +3514,7 @@
         "description": "Handles all core functionality for the Google Cloud CLI.",
         "display_name": "Google Cloud CLI Core Libraries"
       },
+      "gdu_only": false,
       "id": "core",
       "is_configuration": false,
       "is_hidden": false,
@@ -3518,16 +3522,16 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20240719191136,
-        "version_string": "2024.07.19"
+        "build_number": 20240906153039,
+        "version_string": "2024.09.06"
       }
     },
     {
       "data": {
-        "checksum": "b7f76cd9c7f391d8504d31fba7c180b7c3028646c0efda8fafdb1abd13056917",
-        "contents_checksum": "35b7e083b5dc365a7f2ff9fac444ad23ddfae564c22296c502183ee4eb9fab00",
-        "size": 2410,
-        "source": "components/google-cloud-sdk-core-nix-20240106004423.tar.gz",
+        "checksum": "197ac1b099e234bdc6e470083357fb6da39359bf43cea591acbb49812650a987",
+        "contents_checksum": "de33f987aac09df44d040f88a497a83c34d5fe5a94af0c8245264e4fdcb95ea6",
+        "size": 2306,
+        "source": "components/google-cloud-sdk-core-nix-20240830134514.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -3540,6 +3544,7 @@
         "description": "Handles all core functionality for the Google Cloud CLI.",
         "display_name": "Google Cloud CLI Core Libraries (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "core-nix",
       "is_configuration": false,
       "is_hidden": true,
@@ -3554,8 +3559,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240106004423,
-        "version_string": "2024.01.06"
+        "build_number": 20240830134514,
+        "version_string": "2024.08.30"
       }
     },
     {
@@ -3576,6 +3581,7 @@
         "description": "Handles all core functionality for the Google Cloud CLI.",
         "display_name": "Google Cloud CLI Core Libraries (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "core-win",
       "is_configuration": false,
       "is_hidden": true,
@@ -3605,6 +3611,7 @@
         "description": "Provides docker-credential-gcr executable. See https://github.com/GoogleCloudPlatform/docker-credential-gcr",
         "display_name": "Google Container Registry's Docker credential helper"
       },
+      "gdu_only": false,
       "id": "docker-credential-gcr",
       "is_configuration": false,
       "is_hidden": false,
@@ -3642,6 +3649,7 @@
         "description": "Provides docker-credential-gcr executable. See https://github.com/GoogleCloudPlatform/docker-credential-gcr",
         "display_name": "Google Container Registry's Docker credential helper (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "docker-credential-gcr-darwin-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -3675,6 +3683,7 @@
         "description": "Provides docker-credential-gcr executable. See https://github.com/GoogleCloudPlatform/docker-credential-gcr",
         "display_name": "Google Container Registry's Docker credential helper (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "docker-credential-gcr-darwin-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -3708,6 +3717,7 @@
         "description": "Provides docker-credential-gcr executable. See https://github.com/GoogleCloudPlatform/docker-credential-gcr",
         "display_name": "Google Container Registry's Docker credential helper (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "docker-credential-gcr-linux-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -3741,6 +3751,7 @@
         "description": "Provides docker-credential-gcr executable. See https://github.com/GoogleCloudPlatform/docker-credential-gcr",
         "display_name": "Google Container Registry's Docker credential helper (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "docker-credential-gcr-linux-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -3774,6 +3785,7 @@
         "description": "Provides docker-credential-gcr executable. See https://github.com/GoogleCloudPlatform/docker-credential-gcr",
         "display_name": "Google Container Registry's Docker credential helper (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "docker-credential-gcr-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -3807,6 +3819,7 @@
         "description": "Provides docker-credential-gcr executable. See https://github.com/GoogleCloudPlatform/docker-credential-gcr",
         "display_name": "Google Container Registry's Docker credential helper (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "docker-credential-gcr-windows-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -3840,6 +3853,7 @@
         "description": "Provides docker-credential-gcr executable. See https://github.com/GoogleCloudPlatform/docker-credential-gcr",
         "display_name": "Google Container Registry's Docker credential helper (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "docker-credential-gcr-windows-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -3869,6 +3883,7 @@
         "description": "The enterprise-certificate-proxy component is used for certificate based access to Google Cloud resources. See https://github.com/googleapis/enterprise-certificate-proxy for more information.",
         "display_name": "enterprise-certificate-proxy"
       },
+      "gdu_only": true,
       "id": "enterprise-certificate-proxy",
       "is_configuration": false,
       "is_hidden": false,
@@ -3905,6 +3920,7 @@
         "description": "The enterprise-certificate-proxy component is used for certificate based access to Google Cloud resources. See https://github.com/googleapis/enterprise-certificate-proxy for more information.",
         "display_name": "enterprise-certificate-proxy (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "enterprise-certificate-proxy-darwin-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -3938,6 +3954,7 @@
         "description": "The enterprise-certificate-proxy component is used for certificate based access to Google Cloud resources. See https://github.com/googleapis/enterprise-certificate-proxy for more information.",
         "display_name": "enterprise-certificate-proxy (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "enterprise-certificate-proxy-darwin-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -3971,6 +3988,7 @@
         "description": "The enterprise-certificate-proxy component is used for certificate based access to Google Cloud resources. See https://github.com/googleapis/enterprise-certificate-proxy for more information.",
         "display_name": "enterprise-certificate-proxy (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "enterprise-certificate-proxy-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -4004,6 +4022,7 @@
         "description": "The enterprise-certificate-proxy component is used for certificate based access to Google Cloud resources. See https://github.com/googleapis/enterprise-certificate-proxy for more information.",
         "display_name": "enterprise-certificate-proxy (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "enterprise-certificate-proxy-windows-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -4030,6 +4049,7 @@
         "description": "Default set of gcloud commands.",
         "display_name": "Default set of gcloud commands"
       },
+      "gdu_only": false,
       "id": "gcloud",
       "is_configuration": false,
       "is_hidden": true,
@@ -4055,6 +4075,7 @@
         "description": "Command line tool that calculates CRC32C hashes on local files.",
         "display_name": "Google Cloud CRC32C Hash Tool"
       },
+      "gdu_only": false,
       "id": "gcloud-crc32c",
       "is_configuration": false,
       "is_hidden": false,
@@ -4092,6 +4113,7 @@
         "description": "Command line tool that calculates CRC32C hashes on local files.",
         "display_name": "Google Cloud CRC32C Hash Tool (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "gcloud-crc32c-darwin-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -4125,6 +4147,7 @@
         "description": "Command line tool that calculates CRC32C hashes on local files.",
         "display_name": "Google Cloud CRC32C Hash Tool (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "gcloud-crc32c-darwin-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -4158,6 +4181,7 @@
         "description": "Command line tool that calculates CRC32C hashes on local files.",
         "display_name": "Google Cloud CRC32C Hash Tool (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "gcloud-crc32c-linux-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -4191,6 +4215,7 @@
         "description": "Command line tool that calculates CRC32C hashes on local files.",
         "display_name": "Google Cloud CRC32C Hash Tool (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "gcloud-crc32c-linux-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -4224,6 +4249,7 @@
         "description": "Command line tool that calculates CRC32C hashes on local files.",
         "display_name": "Google Cloud CRC32C Hash Tool (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "gcloud-crc32c-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -4257,6 +4283,7 @@
         "description": "Command line tool that calculates CRC32C hashes on local files.",
         "display_name": "Google Cloud CRC32C Hash Tool (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "gcloud-crc32c-windows-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -4290,6 +4317,7 @@
         "description": "Command line tool that calculates CRC32C hashes on local files.",
         "display_name": "Google Cloud CRC32C Hash Tool (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "gcloud-crc32c-windows-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -4310,10 +4338,10 @@
     },
     {
       "data": {
-        "checksum": "c0c348262e6e0cf59e569551ea49f32397af64456c4b177cde10769837affdcb",
-        "contents_checksum": "cbe989aff03e61af3e43395fa240ddc702451d928eb10a2ccffa713b27180d12",
-        "size": 17417303,
-        "source": "components/google-cloud-sdk-gcloud-deps-20240712142834.tar.gz",
+        "checksum": "97b7d739d37f7189c1630cccd1567aa9ce2f429a469b96178fbda7bce0972704",
+        "contents_checksum": "cbf91e06fc39d3cd7df3cf5ed31a77c84a3eb2ba6eb5ae9dcc34aacc8f5d0cd0",
+        "size": 17424388,
+        "source": "components/google-cloud-sdk-gcloud-deps-20240806142304.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4329,6 +4357,7 @@
         "description": "Set of third_party gcloud cli dependencies.",
         "display_name": "gcloud cli dependencies"
       },
+      "gdu_only": false,
       "id": "gcloud-deps",
       "is_configuration": false,
       "is_hidden": true,
@@ -4336,8 +4365,8 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20240712142834,
-        "version_string": "2024.07.12"
+        "build_number": 20240806142304,
+        "version_string": "2024.08.06"
       }
     },
     {
@@ -4356,6 +4385,7 @@
         "description": "Set of third_party gcloud cli dependencies.",
         "display_name": "gcloud cli dependencies (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "gcloud-deps-darwin-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -4390,6 +4420,7 @@
         "description": "Set of third_party gcloud cli dependencies.",
         "display_name": "gcloud cli dependencies (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "gcloud-deps-darwin-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -4424,6 +4455,7 @@
         "description": "Set of third_party gcloud cli dependencies.",
         "display_name": "gcloud cli dependencies (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "gcloud-deps-linux-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -4458,6 +4490,7 @@
         "description": "Set of third_party gcloud cli dependencies.",
         "display_name": "gcloud cli dependencies (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "gcloud-deps-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -4492,6 +4525,7 @@
         "description": "Set of third_party gcloud cli dependencies.",
         "display_name": "gcloud cli dependencies (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "gcloud-deps-windows-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -4526,6 +4560,7 @@
         "description": "Set of third_party gcloud cli dependencies.",
         "display_name": "gcloud cli dependencies (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "gcloud-deps-windows-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -4553,6 +4588,7 @@
         "description": "Man pages for gcloud commands.",
         "display_name": "Man pages"
       },
+      "gdu_only": false,
       "id": "gcloud-man-pages",
       "is_configuration": false,
       "is_hidden": true,
@@ -4573,10 +4609,10 @@
     },
     {
       "data": {
-        "checksum": "146b28c492f0d9d9b61dddf900e283d8574780c50b371454186be6059de9090c",
-        "contents_checksum": "0949914541210ca57cdf03cdc92a1d46421148628fc886fbaef65e5a2e16cd0c",
-        "size": 7076612,
-        "source": "components/google-cloud-sdk-gcloud-man-pages-nix-20240719191136.tar.gz",
+        "checksum": "f2d1e365ef5004a9e099f63b863ef4bf99e48b5d1b3c5ae8f10dfe3525642c8d",
+        "contents_checksum": "6d327392f385c820f2f937c0a1b1da6649fd9c7cadd9c43540b4e4668cc41fd5",
+        "size": 7235706,
+        "source": "components/google-cloud-sdk-gcloud-man-pages-nix-20240906153039.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4587,6 +4623,7 @@
         "description": "Man pages for gcloud commands.",
         "display_name": "Man pages (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "gcloud-man-pages-nix",
       "is_configuration": false,
       "is_hidden": true,
@@ -4601,7 +4638,7 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240719191136,
+        "build_number": 20240906153039,
         "version_string": ""
       }
     },
@@ -4619,6 +4656,7 @@
         "description": "The auth plugin for Kubectl on GKE.",
         "display_name": "gke-gcloud-auth-plugin"
       },
+      "gdu_only": false,
       "id": "gke-gcloud-auth-plugin",
       "is_configuration": false,
       "is_hidden": false,
@@ -4656,6 +4694,7 @@
         "description": "The auth plugin for Kubectl on GKE.",
         "display_name": "gke-gcloud-auth-plugin (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "gke-gcloud-auth-plugin-darwin-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -4689,6 +4728,7 @@
         "description": "The auth plugin for Kubectl on GKE.",
         "display_name": "gke-gcloud-auth-plugin (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "gke-gcloud-auth-plugin-darwin-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -4722,6 +4762,7 @@
         "description": "The auth plugin for Kubectl on GKE.",
         "display_name": "gke-gcloud-auth-plugin (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "gke-gcloud-auth-plugin-linux-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -4755,6 +4796,7 @@
         "description": "The auth plugin for Kubectl on GKE.",
         "display_name": "gke-gcloud-auth-plugin (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "gke-gcloud-auth-plugin-linux-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -4788,6 +4830,7 @@
         "description": "The auth plugin for Kubectl on GKE.",
         "display_name": "gke-gcloud-auth-plugin (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "gke-gcloud-auth-plugin-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -4821,6 +4864,7 @@
         "description": "The auth plugin for Kubectl on GKE.",
         "display_name": "gke-gcloud-auth-plugin (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "gke-gcloud-auth-plugin-windows-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -4854,6 +4898,7 @@
         "description": "The auth plugin for Kubectl on GKE.",
         "display_name": "gke-gcloud-auth-plugin (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "gke-gcloud-auth-plugin-windows-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -4889,6 +4934,7 @@
         "description": "Provides the gsutil tool for interacting with Google Cloud Storage.",
         "display_name": "Cloud Storage Command Line Tool"
       },
+      "gdu_only": true,
       "id": "gsutil",
       "is_configuration": false,
       "is_hidden": false,
@@ -4902,10 +4948,10 @@
     },
     {
       "data": {
-        "checksum": "0e203c936ca846514c498e1bf3f18ecfd8f4e031eb65f1f915812fa31824d246",
-        "contents_checksum": "023019da3e1594d499efe2047aa7069fd138fba4022da534f245de4a9b25597c",
-        "size": 2042,
-        "source": "components/google-cloud-sdk-gsutil-nix-20240106004423.tar.gz",
+        "checksum": "a896e2401419d2767ad444547bc89e80d08af925b282383035de8cb75ebe6bc0",
+        "contents_checksum": "9fea4d1cb560bfc47fc80d4982fd886b4c283530b79fbd90bc1955003169996c",
+        "size": 1928,
+        "source": "components/google-cloud-sdk-gsutil-nix-20240830134514.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4916,6 +4962,7 @@
         "description": "Provides the gsutil tool for interacting with Google Cloud Storage.",
         "display_name": "Cloud Storage Command Line Tool (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "gsutil-nix",
       "is_configuration": false,
       "is_hidden": true,
@@ -4930,16 +4977,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240106004423,
-        "version_string": "5.27"
+        "build_number": 20240830134514,
+        "version_string": "5.30"
       }
     },
     {
       "data": {
-        "checksum": "8b63a83d67b850db7e46f468c9a5370bcdf67aa826c39e5d686c1154e378cf27",
-        "contents_checksum": "0f40962ad671c9f7eb0c6d0d9fe2ea0cfa406fa550764864959335988172d5e6",
-        "size": 4160,
-        "source": "components/google-cloud-sdk-gsutil-win-20240226203415.tar.gz",
+        "checksum": "5498449c9d5918d70aee2f40072fd493f5b5fcc2f86dccfbf71537e01b8a874b",
+        "contents_checksum": "5a3078a14d39ea2176019f1b6942be3ff8d0cee80501cc30f1ca5065b5069e89",
+        "size": 4050,
+        "source": "components/google-cloud-sdk-gsutil-win-20240830134514.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4950,6 +4997,7 @@
         "description": "Provides the gsutil tool for interacting with Google Cloud Storage.",
         "display_name": "Cloud Storage Command Line Tool (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "gsutil-win",
       "is_configuration": false,
       "is_hidden": true,
@@ -4961,8 +5009,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240226203415,
-        "version_string": "5.27"
+        "build_number": 20240830134514,
+        "version_string": "5.30"
       }
     },
     {
@@ -4973,6 +5021,7 @@
         "description": "Performs database migrations to Cloud Spanner databases.",
         "display_name": "Cloud Spanner Migration Tool"
       },
+      "gdu_only": true,
       "id": "harbourbridge",
       "is_configuration": false,
       "is_hidden": false,
@@ -5006,6 +5055,7 @@
         "description": "Performs database migrations to Cloud Spanner databases.",
         "display_name": "Cloud Spanner Migration Tool (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "harbourbridge-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -5035,6 +5085,7 @@
         "description": "Support tool for Cloud Service Mesh.",
         "display_name": "istioctl"
       },
+      "gdu_only": true,
       "id": "istioctl",
       "is_configuration": false,
       "is_hidden": false,
@@ -5070,6 +5121,7 @@
         "description": "Support tool for Cloud Service Mesh.",
         "display_name": "istioctl (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "istioctl-darwin-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -5103,6 +5155,7 @@
         "description": "Support tool for Cloud Service Mesh.",
         "display_name": "istioctl (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "istioctl-darwin-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -5136,6 +5189,7 @@
         "description": "Support tool for Cloud Service Mesh.",
         "display_name": "istioctl (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "istioctl-linux-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -5169,6 +5223,7 @@
         "description": "Support tool for Cloud Service Mesh.",
         "display_name": "istioctl (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "istioctl-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -5198,6 +5253,7 @@
         "description": "Kubernetes Platform Toolkit for packaging, customizing and applying Resource configuration.",
         "display_name": "kpt"
       },
+      "gdu_only": false,
       "id": "kpt",
       "is_configuration": false,
       "is_hidden": false,
@@ -5215,15 +5271,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "1.0.0-beta.50"
+        "version_string": "1.0.0-beta.55"
       }
     },
     {
       "data": {
-        "checksum": "ae0dad6460ee54cc820b57ff6f384d294c30cadf42e834dc45f2e288ad627e19",
-        "contents_checksum": "74e9c5f7088cbd6c7824a18eddc4721889ebcdf50bb1958dca7557f3c1646cbe",
-        "size": 14487151,
-        "source": "components/google-cloud-sdk-kpt-darwin-arm-20240510142152.tar.gz",
+        "checksum": "12466bd606acf151837e299eebbbe0bc85e82f63d0f8793f4f4710de729b5ece",
+        "contents_checksum": "6c7cd9f04e3f0ac68148649e204c91d7c8d43bc7c539ba00f1b033f02d3723f5",
+        "size": 15062248,
+        "source": "components/google-cloud-sdk-kpt-darwin-arm-20240830134514.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5233,6 +5289,7 @@
         "description": "Kubernetes Platform Toolkit for packaging, customizing and applying Resource configuration.",
         "display_name": "kpt (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "kpt-darwin-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -5247,16 +5304,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240510142152,
-        "version_string": "1.0.0-beta.50"
+        "build_number": 20240830134514,
+        "version_string": "1.0.0-beta.55"
       }
     },
     {
       "data": {
-        "checksum": "e80ffcb2338f17d70bcf5e0d77b049817ad154851f8a68c5a4a112ee3f1fa3e5",
-        "contents_checksum": "2ccd31d47996bb1e7ad06ef860c2099a88be1b8a9deba0afbd12b9a1bce83e38",
-        "size": 15556773,
-        "source": "components/google-cloud-sdk-kpt-darwin-x86_64-20240510142152.tar.gz",
+        "checksum": "bb96aec242c9e0f3d8347465e5b5d3e2ef60cec1b07033b54adc9793b67f17c2",
+        "contents_checksum": "8ea274e558d477e1765078ec05300460543be2284e5215297250045637008337",
+        "size": 16143447,
+        "source": "components/google-cloud-sdk-kpt-darwin-x86_64-20240830134514.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5266,6 +5323,7 @@
         "description": "Kubernetes Platform Toolkit for packaging, customizing and applying Resource configuration.",
         "display_name": "kpt (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "kpt-darwin-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -5280,16 +5338,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240510142152,
-        "version_string": "1.0.0-beta.50"
+        "build_number": 20240830134514,
+        "version_string": "1.0.0-beta.55"
       }
     },
     {
       "data": {
-        "checksum": "eeb8b320e5d50954c584f84fd0b5d46549ccf7a402628362cdaca39e141bc132",
-        "contents_checksum": "b52727552507224193bd48871158707738f0582138f4dc6e0eb0a3f83231d61a",
-        "size": 13818240,
-        "source": "components/google-cloud-sdk-kpt-linux-arm-20240510142152.tar.gz",
+        "checksum": "e7229a7400d0cab563be434c79dc9a9b329782393d5bc589eeaf7707ee1a4d6e",
+        "contents_checksum": "9294394a5ec967b657a2a93fca6514b9d6c10046212ff0c5ddba5137aa9b6359",
+        "size": 14370245,
+        "source": "components/google-cloud-sdk-kpt-linux-arm-20240830134514.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5299,6 +5357,7 @@
         "description": "Kubernetes Platform Toolkit for packaging, customizing and applying Resource configuration.",
         "display_name": "kpt (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "kpt-linux-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -5313,16 +5372,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240510142152,
-        "version_string": "1.0.0-beta.50"
+        "build_number": 20240830134514,
+        "version_string": "1.0.0-beta.55"
       }
     },
     {
       "data": {
-        "checksum": "db9b4541f14732e4569bcba320a989b8e54660d53088f45b265d234175bdd8e4",
-        "contents_checksum": "0f56e5d3cee14e5f8e6091938a4ed755de5dd4520643f65b11c2515f94c30631",
-        "size": 15264863,
-        "source": "components/google-cloud-sdk-kpt-linux-x86_64-20240510142152.tar.gz",
+        "checksum": "e14a80527f5e457b7a1cea93fecc331975021540da2bbdfa41c2fff9a6a89fa9",
+        "contents_checksum": "32f1578bfd060d897070aa309a3c94f4afd7d48bd3b14079a1faedba7d3e78af",
+        "size": 15847524,
+        "source": "components/google-cloud-sdk-kpt-linux-x86_64-20240830134514.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5332,6 +5391,7 @@
         "description": "Kubernetes Platform Toolkit for packaging, customizing and applying Resource configuration.",
         "display_name": "kpt (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "kpt-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -5346,16 +5406,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240510142152,
-        "version_string": "1.0.0-beta.50"
+        "build_number": 20240830134514,
+        "version_string": "1.0.0-beta.55"
       }
     },
     {
       "data": {
-        "checksum": "c93afe5174d13a67852539bed4a2de80df4d9e27e9267d6d37d78ea4732fcf97",
-        "contents_checksum": "244cd00939229a06b9d7a79582dc2839313cf95d58bc3ecc2e410af35b3f0c30",
-        "size": 35803,
-        "source": "components/google-cloud-sdk-kubectl-20240624182041.tar.gz",
+        "checksum": "50be8a89de9beb056eb1cfa1dcf3be6f5d4481c9835cecd1a544892431fb18ba",
+        "contents_checksum": "da6c76d1c9106266d9c671daec55382f363073c50df1aa8fc4ab8359313e8df9",
+        "size": 36077,
+        "source": "components/google-cloud-sdk-kubectl-20240906153039.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5372,6 +5432,7 @@
         "description": "Provides kubectl executables.",
         "display_name": "kubectl"
       },
+      "gdu_only": true,
       "id": "kubectl",
       "is_configuration": false,
       "is_hidden": false,
@@ -5379,16 +5440,16 @@
       "platform": {},
       "platform_required": true,
       "version": {
-        "build_number": 20240624182041,
-        "version_string": "1.27.15"
+        "build_number": 20240906153039,
+        "version_string": "1.29.8"
       }
     },
     {
       "data": {
-        "checksum": "ba31d657e3125d1a71e5712ec8fa44f5ea9ee6047ac45b82f1db7a5e6ad907e7",
-        "contents_checksum": "f55f74a6ae18d7dfc667e2d3e2731bbf49e92cbd9e992c84c05ed8617a2ae575",
-        "size": 76290494,
-        "source": "components/google-cloud-sdk-kubectl-darwin-arm-20240624182041.tar.gz",
+        "checksum": "d6cef1c5037200c59575bc4d754697516ab724b2a1ffd2ae69d48b6d2815748c",
+        "contents_checksum": "1c5f8dc2dcd52e87029b548dca4fbefcf0b479928db492989a68de7356d1e373",
+        "size": 89999194,
+        "source": "components/google-cloud-sdk-kubectl-darwin-arm-20240906153039.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5399,6 +5460,7 @@
         "description": "Provides kubectl executables.",
         "display_name": "kubectl (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "kubectl-darwin-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -5413,16 +5475,16 @@
       },
       "platform_required": true,
       "version": {
-        "build_number": 20240624182041,
-        "version_string": "1.27.15"
+        "build_number": 20240906153039,
+        "version_string": "1.29.8"
       }
     },
     {
       "data": {
-        "checksum": "885fcd0694e94f99f23a48dfcf648c4bfd984bd5691e97986992f9c6e1532779",
-        "contents_checksum": "0aa804ed82d0e4667e774f7b14741d5ef499e5120e5b8f2b90252644b5ae37db",
-        "size": 80432565,
-        "source": "components/google-cloud-sdk-kubectl-darwin-x86_64-20240624182041.tar.gz",
+        "checksum": "8ec00d2aaa807e7f0e82d71f854eb580c9a258ab8d4f93ee9a37ee0e46a54a89",
+        "contents_checksum": "99c0104f597b97d7c4dd2980e26012a8dca357d2c0635fa33032130b6ab6eba2",
+        "size": 96458011,
+        "source": "components/google-cloud-sdk-kubectl-darwin-x86_64-20240906153039.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5433,6 +5495,7 @@
         "description": "Provides kubectl executables.",
         "display_name": "kubectl (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "kubectl-darwin-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -5447,16 +5510,16 @@
       },
       "platform_required": true,
       "version": {
-        "build_number": 20240624182041,
-        "version_string": "1.27.15"
+        "build_number": 20240906153039,
+        "version_string": "1.29.8"
       }
     },
     {
       "data": {
-        "checksum": "3ad4928265226167ffaa197b18270a61d27a858ad42e5f9079513689d70345ec",
-        "contents_checksum": "f17c7860507b5248c5face0cda8a95ab2c015b13f90a6fd6e274748887eb3c65",
-        "size": 73474381,
-        "source": "components/google-cloud-sdk-kubectl-linux-arm-20240624182041.tar.gz",
+        "checksum": "c7ccd999f9460f86d082a8184008dba4d0c214b6e36a54971416ad42aa2fd818",
+        "contents_checksum": "2069a0a95ba5f5dace729eab30cd9e5cec04471b6f11e45054149e4c707cf246",
+        "size": 89797670,
+        "source": "components/google-cloud-sdk-kubectl-linux-arm-20240906153039.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5467,6 +5530,7 @@
         "description": "Provides kubectl executables.",
         "display_name": "kubectl (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "kubectl-linux-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -5481,16 +5545,16 @@
       },
       "platform_required": true,
       "version": {
-        "build_number": 20240624182041,
-        "version_string": "1.27.15"
+        "build_number": 20240906153039,
+        "version_string": "1.29.8"
       }
     },
     {
       "data": {
-        "checksum": "e3b28906976e1579dff93dc777fa348e21392d354ba3a493aec56e9a56798b91",
-        "contents_checksum": "6179b9854bb4e63cda81b2c236fa97650891e5c25291a5292311edcd1eab10f9",
-        "size": 71255708,
-        "source": "components/google-cloud-sdk-kubectl-linux-x86-20240624182041.tar.gz",
+        "checksum": "919e327769b9d64fad073cd1247361e09ef122d68668f25c13374eca8b542591",
+        "contents_checksum": "ff23c2f812e986e587268c16978a5cf895527d410126014c8c71a65504da6aae",
+        "size": 87267435,
+        "source": "components/google-cloud-sdk-kubectl-linux-x86-20240906153039.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5501,6 +5565,7 @@
         "description": "Provides kubectl executables.",
         "display_name": "kubectl (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "kubectl-linux-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -5515,16 +5580,16 @@
       },
       "platform_required": true,
       "version": {
-        "build_number": 20240624182041,
-        "version_string": "1.27.15"
+        "build_number": 20240906153039,
+        "version_string": "1.29.8"
       }
     },
     {
       "data": {
-        "checksum": "9b98bb6004218eff092eaaf57e600c6820641ba00f2855577a61852590c7ed27",
-        "contents_checksum": "a3c7d039ffa798e43a3acb15670156e837d4f868e76627601f910177bcea481b",
-        "size": 76953404,
-        "source": "components/google-cloud-sdk-kubectl-linux-x86_64-20240624182041.tar.gz",
+        "checksum": "acd8e6c36f56c935677e33376836d2469f59ddc546bfa235f6441818b4986719",
+        "contents_checksum": "02d9faf3daf528f37465d9c598ea74cc63c44b794bf8e73be21bc7976ee2add3",
+        "size": 94553450,
+        "source": "components/google-cloud-sdk-kubectl-linux-x86_64-20240906153039.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5535,6 +5600,7 @@
         "description": "Provides kubectl executables.",
         "display_name": "kubectl (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "kubectl-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -5549,8 +5615,8 @@
       },
       "platform_required": true,
       "version": {
-        "build_number": 20240624182041,
-        "version_string": "1.27.15"
+        "build_number": 20240906153039,
+        "version_string": "1.29.8"
       }
     },
     {
@@ -5565,6 +5631,7 @@
         "description": "Configure kubectl with OIDC credentials for GKE clusters.",
         "display_name": "kubectl-oidc"
       },
+      "gdu_only": false,
       "id": "kubectl-oidc",
       "is_configuration": false,
       "is_hidden": false,
@@ -5601,6 +5668,7 @@
         "description": "Configure kubectl with OIDC credentials for GKE clusters.",
         "display_name": "kubectl-oidc (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "kubectl-oidc-darwin-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -5634,6 +5702,7 @@
         "description": "Configure kubectl with OIDC credentials for GKE clusters.",
         "display_name": "kubectl-oidc (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "kubectl-oidc-darwin-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -5667,6 +5736,7 @@
         "description": "Configure kubectl with OIDC credentials for GKE clusters.",
         "display_name": "kubectl-oidc (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "kubectl-oidc-linux-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -5700,6 +5770,7 @@
         "description": "Configure kubectl with OIDC credentials for GKE clusters.",
         "display_name": "kubectl-oidc (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "kubectl-oidc-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -5733,6 +5804,7 @@
         "description": "Configure kubectl with OIDC credentials for GKE clusters.",
         "display_name": "kubectl-oidc (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "kubectl-oidc-windows-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -5753,10 +5825,10 @@
     },
     {
       "data": {
-        "checksum": "391b6fb5860780874a4b6c5c2443c047c43b99aa451347184c2c0bad1bb097b8",
-        "contents_checksum": "38c0ad032e37fd6ea90f5ab1eeaba408719851d3e4cf84927d039d60071c304f",
-        "size": 74873955,
-        "source": "components/google-cloud-sdk-kubectl-windows-x86-20240624182041.tar.gz",
+        "checksum": "c552401d07580f144bb88cf124efef640952bd0d3b999268bef4b51b60ce2a72",
+        "contents_checksum": "97784429e8310675e3646fcc8ee828e5acccdc6e91ab41ad8266367afc8abb2d",
+        "size": 91686040,
+        "source": "components/google-cloud-sdk-kubectl-windows-x86-20240906153039.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5767,6 +5839,7 @@
         "description": "Provides kubectl executables.",
         "display_name": "kubectl (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "kubectl-windows-x86",
       "is_configuration": false,
       "is_hidden": true,
@@ -5783,16 +5856,16 @@
       },
       "platform_required": true,
       "version": {
-        "build_number": 20240624182041,
-        "version_string": "1.27.15"
+        "build_number": 20240906153039,
+        "version_string": "1.29.8"
       }
     },
     {
       "data": {
-        "checksum": "6fccb2f163c0d27639adccf8671ca76103759337f6b6954a809fef0262c6d1e2",
-        "contents_checksum": "86d9c6193f04f54bea5e57823e44a36a76034597560c1631b74b2a3730b257c9",
-        "size": 78995215,
-        "source": "components/google-cloud-sdk-kubectl-windows-x86_64-20240624182041.tar.gz",
+        "checksum": "9f671bbf981cea2e789521bd9f1b961da83faa15cd1e8de48df71677c57c62cd",
+        "contents_checksum": "d621d95d0ca9c2a129921bfed462fe23673d13582d1215428c6fe3b5220899e2",
+        "size": 97077963,
+        "source": "components/google-cloud-sdk-kubectl-windows-x86_64-20240906153039.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5803,6 +5876,7 @@
         "description": "Provides kubectl executables.",
         "display_name": "kubectl (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "kubectl-windows-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -5819,8 +5893,8 @@
       },
       "platform_required": true,
       "version": {
-        "build_number": 20240624182041,
-        "version_string": "1.27.15"
+        "build_number": 20240906153039,
+        "version_string": "1.29.8"
       }
     },
     {
@@ -5834,6 +5908,7 @@
         "description": "Provides kustomize executable.",
         "display_name": "Kustomize"
       },
+      "gdu_only": true,
       "id": "kustomize",
       "is_configuration": false,
       "is_hidden": false,
@@ -5869,6 +5944,7 @@
         "description": "Provides kustomize executable.",
         "display_name": "Kustomize (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "kustomize-darwin-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -5902,6 +5978,7 @@
         "description": "Provides kustomize executable.",
         "display_name": "Kustomize (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "kustomize-darwin-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -5935,6 +6012,7 @@
         "description": "Provides kustomize executable.",
         "display_name": "Kustomize (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "kustomize-linux-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -5968,6 +6046,7 @@
         "description": "Provides kustomize executable.",
         "display_name": "Kustomize (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "kustomize-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -5997,6 +6076,7 @@
         "description": "Locally extract packages/versions from a container image.",
         "display_name": "On-Demand Scanning API extraction helper"
       },
+      "gdu_only": false,
       "id": "local-extract",
       "is_configuration": false,
       "is_hidden": false,
@@ -6014,15 +6094,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "1.5.9"
+        "version_string": "1.5.10"
       }
     },
     {
       "data": {
-        "checksum": "da75d4bc8029de5f57c456d46850b526fb40c6b5ce5c39a5f6838a62a5d62b6d",
-        "contents_checksum": "244bace62dc969078d250aa556781b4a001ab9c2c07e2059b5cb9b89b6335355",
-        "size": 14360355,
-        "source": "components/google-cloud-sdk-local-extract-darwin-arm-20230811080439.tar.gz",
+        "checksum": "c8799272d05b6ce12c720930ef36d31d39614fd67d7cf3941ddf4a12728e403a",
+        "contents_checksum": "cc395271db8f50967615252a23c4e4048b6b212deef3107a426a929a871a56b0",
+        "size": 20826459,
+        "source": "components/google-cloud-sdk-local-extract-darwin-arm-20240806142304.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6032,6 +6112,7 @@
         "description": "Locally extract packages/versions from a container image.",
         "display_name": "On-Demand Scanning API extraction helper (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "local-extract-darwin-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -6046,16 +6127,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230811080439,
-        "version_string": "1.5.9"
+        "build_number": 20240806142304,
+        "version_string": "1.5.10"
       }
     },
     {
       "data": {
-        "checksum": "9ca57a302a039eb4eed4154d51750d2377bf1632540e098bc8c961668f671c51",
-        "contents_checksum": "67b9d72612c32ef0e106f4195e2b0f9b176c8d27ba3f70f5cbad8bdb3699742b",
-        "size": 14810125,
-        "source": "components/google-cloud-sdk-local-extract-darwin-x86_64-20230811080439.tar.gz",
+        "checksum": "a4691be369a9934a6bb931dcac1960e29f0cd90c151e5217dc6418d1265d87ba",
+        "contents_checksum": "0683c4693a7a0247162b974d10a918730d0f29335b43a3f2517e3dde3903d38c",
+        "size": 22218924,
+        "source": "components/google-cloud-sdk-local-extract-darwin-x86_64-20240806142304.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6065,6 +6146,7 @@
         "description": "Locally extract packages/versions from a container image.",
         "display_name": "On-Demand Scanning API extraction helper (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "local-extract-darwin-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -6079,16 +6161,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230811080439,
-        "version_string": "1.5.9"
+        "build_number": 20240806142304,
+        "version_string": "1.5.10"
       }
     },
     {
       "data": {
-        "checksum": "e56993257f15b873e140f378521b91d502b81da666cbe19e3c7462db6c890341",
-        "contents_checksum": "7e86ea8bb9426bf5387982bfaa08889171b2ed43eafa4784031c254d665fd6b5",
-        "size": 14144939,
-        "source": "components/google-cloud-sdk-local-extract-linux-arm-20230811080439.tar.gz",
+        "checksum": "6276cfd32895ac4c35f74b4de91a0db22d2e00895ee1845ea5e0aacf261d3c8e",
+        "contents_checksum": "e9e37b4e1c05b9ba02e5b4c753fa0d62d0ae0687476ec673d8bcf4ecacd2ff1e",
+        "size": 24267243,
+        "source": "components/google-cloud-sdk-local-extract-linux-arm-20240806142304.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6098,6 +6180,7 @@
         "description": "Locally extract packages/versions from a container image.",
         "display_name": "On-Demand Scanning API extraction helper (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "local-extract-linux-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -6112,16 +6195,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230811080439,
-        "version_string": "1.5.9"
+        "build_number": 20240806142304,
+        "version_string": "1.5.10"
       }
     },
     {
       "data": {
-        "checksum": "5306d5786c058f82802cd764703b5a4b017da3fab1576dcde2ba9431fe7fbdd7",
-        "contents_checksum": "2d0fdc7c90af3a3e2a94685041a74e5c99f0c9010954f8ea18522d868e47a0cf",
-        "size": 15052723,
-        "source": "components/google-cloud-sdk-local-extract-linux-x86_64-20230811080439.tar.gz",
+        "checksum": "7b24b0e38088808f36a3816002a0c64f2f324e3e52ee0a15f3dba6a5be9e2365",
+        "contents_checksum": "338812d02a01b26ed57d789dd8e03c406f031939fa7f99813e285340ad6bb950",
+        "size": 25822714,
+        "source": "components/google-cloud-sdk-local-extract-linux-x86_64-20240806142304.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6131,6 +6214,7 @@
         "description": "Locally extract packages/versions from a container image.",
         "display_name": "On-Demand Scanning API extraction helper (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "local-extract-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -6145,8 +6229,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230811080439,
-        "version_string": "1.5.9"
+        "build_number": 20240806142304,
+        "version_string": "1.5.10"
       }
     },
     {
@@ -6161,6 +6245,7 @@
         "description": "Provides log streaming services.",
         "display_name": "Log Streaming"
       },
+      "gdu_only": false,
       "id": "log-streaming",
       "is_configuration": false,
       "is_hidden": false,
@@ -6197,6 +6282,7 @@
         "description": "Provides log streaming services.",
         "display_name": "Log Streaming (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "log-streaming-darwin-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -6230,6 +6316,7 @@
         "description": "Provides log streaming services.",
         "display_name": "Log Streaming (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "log-streaming-darwin-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -6263,6 +6350,7 @@
         "description": "Provides log streaming services.",
         "display_name": "Log Streaming (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "log-streaming-linux-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -6296,6 +6384,7 @@
         "description": "Provides log streaming services.",
         "display_name": "Log Streaming (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "log-streaming-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -6329,6 +6418,7 @@
         "description": "Provides log streaming services.",
         "display_name": "Log Streaming (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "log-streaming-windows-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -6347,6 +6437,33 @@
         "version_string": "0.3.0"
       }
     },
+    {
+      "data": {
+        "checksum": "93cf97d2cc5a48abbcb1716204408a7484ed8f6bd91505931893529a5b6a36f3",
+        "contents_checksum": "43417665b73406183120cc305950ab0dcf288ac116d1421b0e804fda66ca114b",
+        "size": 401984136,
+        "source": "components/google-cloud-sdk-managed-flink-client-20240906153039.tar.gz",
+        "type": "tar"
+      },
+      "dependencies": [
+        "core"
+      ],
+      "details": {
+        "description": "Provides the Managed Flink Client.",
+        "display_name": "Managed Flink Client"
+      },
+      "gdu_only": false,
+      "id": "managed-flink-client",
+      "is_configuration": false,
+      "is_hidden": false,
+      "is_required": false,
+      "platform": {},
+      "platform_required": false,
+      "version": {
+        "build_number": 20240906153039,
+        "version_string": "0.5.0"
+      }
+    },
     {
       "dependencies": [
         "minikube-darwin-arm",
@@ -6359,6 +6476,7 @@
         "description": "Provides minikube executable. See https://kubernetes.io/docs/tasks/tools/install-minikube/",
         "display_name": "Minikube"
       },
+      "gdu_only": false,
       "id": "minikube",
       "is_configuration": false,
       "is_hidden": false,
@@ -6395,6 +6513,7 @@
         "description": "Provides minikube executable. See https://kubernetes.io/docs/tasks/tools/install-minikube/",
         "display_name": "Minikube (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "minikube-darwin-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -6428,6 +6547,7 @@
         "description": "Provides minikube executable. See https://kubernetes.io/docs/tasks/tools/install-minikube/",
         "display_name": "Minikube (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "minikube-darwin-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -6461,6 +6581,7 @@
         "description": "Provides minikube executable. See https://kubernetes.io/docs/tasks/tools/install-minikube/",
         "display_name": "Minikube (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "minikube-linux-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -6494,6 +6615,7 @@
         "description": "Provides minikube executable. See https://kubernetes.io/docs/tasks/tools/install-minikube/",
         "display_name": "Minikube (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "minikube-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -6527,6 +6649,7 @@
         "description": "Provides minikube executable. See https://kubernetes.io/docs/tasks/tools/install-minikube/",
         "display_name": "Minikube (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "minikube-windows-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -6554,6 +6677,7 @@
         "description": "Provides nomos executable.",
         "display_name": "Nomos CLI"
       },
+      "gdu_only": false,
       "id": "nomos",
       "is_configuration": false,
       "is_hidden": false,
@@ -6570,15 +6694,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "1.18.2-rc.2"
+        "version_string": "1.19.0-rc.2"
       }
     },
     {
       "data": {
-        "checksum": "78bfc25756970074fa09b214f9d924f9cf698fe5a0d44e2853f40e5cafb25275",
-        "contents_checksum": "93404e52e62716c64c088035390ded4d5ea12e3328ed319b1ca18b67ad88880e",
-        "size": 31591559,
-        "source": "components/google-cloud-sdk-nomos-darwin-x86_64-20240628141907.tar.gz",
+        "checksum": "7205bfba3075a21470186c514f6c50cb23f11f103bf183ec2b1f464d368bf4a6",
+        "contents_checksum": "661eae8fea9a42c5349bb1f854152826ac92ee3417cf3bc93be1bd0cf73c5397",
+        "size": 32860717,
+        "source": "components/google-cloud-sdk-nomos-darwin-x86_64-20240830134514.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6588,6 +6712,7 @@
         "description": "Provides nomos executable.",
         "display_name": "Nomos CLI (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "nomos-darwin-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -6602,16 +6727,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240628141907,
-        "version_string": "1.18.2-rc.2"
+        "build_number": 20240830134514,
+        "version_string": "1.19.0-rc.2"
       }
     },
     {
       "data": {
-        "checksum": "7fe7d46c755eb5a94df3d7c0031a0ab3b6b95124c6120be0b832c16047685db5",
-        "contents_checksum": "85aab3cdb4ff4c6112b285a57f69b59a3b88663e167e5de19e0d16b0b3e14123",
-        "size": 31771575,
-        "source": "components/google-cloud-sdk-nomos-linux-x86_64-20240628141907.tar.gz",
+        "checksum": "2cf330716594c16056ac1ec05ab35332916246049deac4a3f1ecfbc79372a5c0",
+        "contents_checksum": "caf842840469999dbaa20826097e49cb99f1361c8f626442f0a5c5cc049dc3d4",
+        "size": 32725719,
+        "source": "components/google-cloud-sdk-nomos-linux-x86_64-20240830134514.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6621,6 +6746,7 @@
         "description": "Provides nomos executable.",
         "display_name": "Nomos CLI (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "nomos-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -6635,8 +6761,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240628141907,
-        "version_string": "1.18.2-rc.2"
+        "build_number": 20240830134514,
+        "version_string": "1.19.0-rc.2"
       }
     },
     {
@@ -6651,6 +6777,7 @@
         "description": "Package a Go module zip file from Go source code.",
         "display_name": "Artifact Registry Go Module Package Helper"
       },
+      "gdu_only": false,
       "id": "package-go-module",
       "is_configuration": false,
       "is_hidden": false,
@@ -6687,6 +6814,7 @@
         "description": "Package a Go module zip file from Go source code.",
         "display_name": "Artifact Registry Go Module Package Helper (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "package-go-module-darwin-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -6720,6 +6848,7 @@
         "description": "Package a Go module zip file from Go source code.",
         "display_name": "Artifact Registry Go Module Package Helper (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "package-go-module-darwin-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -6753,6 +6882,7 @@
         "description": "Package a Go module zip file from Go source code.",
         "display_name": "Artifact Registry Go Module Package Helper (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "package-go-module-linux-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -6786,6 +6916,7 @@
         "description": "Package a Go module zip file from Go source code.",
         "display_name": "Artifact Registry Go Module Package Helper (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "package-go-module-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -6819,6 +6950,7 @@
         "description": "Package a Go module zip file from Go source code.",
         "display_name": "Artifact Registry Go Module Package Helper (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "package-go-module-windows-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -6848,6 +6980,7 @@
         "description": "Kubernetes Resource Model (KRM) package management tools utilites & commands.",
         "display_name": "pkg"
       },
+      "gdu_only": true,
       "id": "pkg",
       "is_configuration": false,
       "is_hidden": false,
@@ -6868,6 +7001,7 @@
         "description": "PowerShell cmdlets for the Google Cloud Platform.",
         "display_name": "Cloud Tools for PowerShell"
       },
+      "gdu_only": true,
       "id": "powershell",
       "is_configuration": false,
       "is_hidden": true,
@@ -6899,6 +7033,7 @@
         "description": "PowerShell cmdlets for the Google Cloud Platform.",
         "display_name": "Cloud Tools for PowerShell (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "powershell-windows",
       "is_configuration": false,
       "is_hidden": true,
@@ -6929,6 +7064,7 @@
         "description": "Provides the Pub/Sub emulator.",
         "display_name": "Cloud Pub/Sub Emulator"
       },
+      "gdu_only": false,
       "id": "pubsub-emulator",
       "is_configuration": false,
       "is_hidden": false,
@@ -6953,6 +7089,7 @@
         "description": "Provides skaffold executable.  See https://skaffold.dev/",
         "display_name": "Skaffold"
       },
+      "gdu_only": true,
       "id": "skaffold",
       "is_configuration": false,
       "is_hidden": false,
@@ -6971,15 +7108,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "2.11.1"
+        "version_string": "2.13.1"
       }
     },
     {
       "data": {
-        "checksum": "53c4ab91c11e5cbd68568f8599906e6e5192f3b4019e9761fddfdc45f9af7845",
-        "contents_checksum": "d24345e52dde87a54de371fe79441dd90afe4fe3079bebce79c4f7043f8ac506",
-        "size": 23881902,
-        "source": "components/google-cloud-sdk-skaffold-darwin-arm-20240412130805.tar.gz",
+        "checksum": "7a338bc422bbf435ff4fbd8a769bc35e47ae26194f3dc652ba4ee2728429b3aa",
+        "contents_checksum": "b61a508672f19d73c913cf3973d0bafbd7fa56a6cef5a807742ba584b57264ba",
+        "size": 24031362,
+        "source": "components/google-cloud-sdk-skaffold-darwin-arm-20240806142304.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6990,6 +7127,7 @@
         "description": "Provides skaffold executable.  See https://skaffold.dev/",
         "display_name": "Skaffold (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "skaffold-darwin-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -7004,16 +7142,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240412130805,
-        "version_string": "2.11.1"
+        "build_number": 20240806142304,
+        "version_string": "2.13.1"
       }
     },
     {
       "data": {
-        "checksum": "b7dcae5f81e8a66ecf964d9a7e6c009be0be26770daa64470c344a0824a70d6c",
-        "contents_checksum": "a1845e050a4fc99ce6bd24c4c8e30e9c7fe0baa7ca6d89ade4a9ac945a1335fd",
-        "size": 26019391,
-        "source": "components/google-cloud-sdk-skaffold-darwin-x86_64-20240412130805.tar.gz",
+        "checksum": "2e12912b0b0528a9c409c5a7a811eb01a84ffccacc16e9fea55e837e73d6cf18",
+        "contents_checksum": "fd07e94d1480dc716155bb69e4246955269238a63402a8b949341e9de6266d4a",
+        "size": 26180225,
+        "source": "components/google-cloud-sdk-skaffold-darwin-x86_64-20240806142304.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -7024,6 +7162,7 @@
         "description": "Provides skaffold executable.  See https://skaffold.dev/",
         "display_name": "Skaffold (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "skaffold-darwin-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -7038,16 +7177,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240412130805,
-        "version_string": "2.11.1"
+        "build_number": 20240806142304,
+        "version_string": "2.13.1"
       }
     },
     {
       "data": {
-        "checksum": "0f285235cc2840a8e62d5e8591015c709287ebf01bd8f95b204a5b4d4b019b2a",
-        "contents_checksum": "061859c0ad969a5cb9a3bcd0b34760963c8c842b9902f9b22e97df4e94ff7a65",
-        "size": 23133354,
-        "source": "components/google-cloud-sdk-skaffold-linux-arm-20240412130805.tar.gz",
+        "checksum": "afe03c599a2c8d0767c94c13a3ff21dc142181e6def87956e9c0633a065424b2",
+        "contents_checksum": "6da2c1a02fc63d511f51caeac0c75559038a818fad104dd62848b50637033f50",
+        "size": 23278809,
+        "source": "components/google-cloud-sdk-skaffold-linux-arm-20240806142304.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -7058,6 +7197,7 @@
         "description": "Provides skaffold executable.  See https://skaffold.dev/",
         "display_name": "Skaffold (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "skaffold-linux-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -7072,16 +7212,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240412130805,
-        "version_string": "2.11.1"
+        "build_number": 20240806142304,
+        "version_string": "2.13.1"
       }
     },
     {
       "data": {
-        "checksum": "3e7164c21840917c2f565998cdbd20be3972ba5cc09ddad31f01cbd0233c34f6",
-        "contents_checksum": "99c37298757f59403dc8b7b080419ccb62bdb23fb88f559bd31b603cb9a2b4d6",
-        "size": 25252692,
-        "source": "components/google-cloud-sdk-skaffold-linux-x86_64-20240412130805.tar.gz",
+        "checksum": "700eb9d7d19b3e7a7113dfb591ede160f34f680886bcc9a0dff9e05a8a87e833",
+        "contents_checksum": "32f596987708c2f1a815df44988c164e7166367a793a893c15bb9b40f8e9a7fd",
+        "size": 25410249,
+        "source": "components/google-cloud-sdk-skaffold-linux-x86_64-20240806142304.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -7092,6 +7232,7 @@
         "description": "Provides skaffold executable.  See https://skaffold.dev/",
         "display_name": "Skaffold (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "skaffold-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -7106,16 +7247,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240412130805,
-        "version_string": "2.11.1"
+        "build_number": 20240806142304,
+        "version_string": "2.13.1"
       }
     },
     {
       "data": {
-        "checksum": "8f864d4189e19ce50bcb52ba61802d70e4e83bb18b13ff32ded5086a7c867fe5",
-        "contents_checksum": "c340681db503b83f07f4ac5ea4f00c4c8db288eaaf6e19ddf6e4b52c29d13e48",
-        "size": 25741614,
-        "source": "components/google-cloud-sdk-skaffold-windows-x86_64-20240412130805.tar.gz",
+        "checksum": "ae5c5bc9cb9867c6ff8b6692e24c67114635c9a0d6b79c21be7b29bf7568dc37",
+        "contents_checksum": "e5187da844977624d9662c4c9880f818fa464b72bdc5635b073f8ed4f21e715b",
+        "size": 25902993,
+        "source": "components/google-cloud-sdk-skaffold-windows-x86_64-20240806142304.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -7126,6 +7267,7 @@
         "description": "Provides skaffold executable.  See https://skaffold.dev/",
         "display_name": "Skaffold (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "skaffold-windows-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -7140,8 +7282,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240412130805,
-        "version_string": "2.11.1"
+        "build_number": 20240806142304,
+        "version_string": "2.13.1"
       }
     },
     {
@@ -7152,6 +7294,7 @@
         "description": "Performs database migrations to Cloud Spanner databases.",
         "display_name": "Spanner migration tool"
       },
+      "gdu_only": true,
       "id": "spanner-migration-tool",
       "is_configuration": false,
       "is_hidden": false,
@@ -7167,15 +7310,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "3.2.5"
+        "version_string": "3.4.0"
       }
     },
     {
       "data": {
-        "checksum": "85b90a0016541d6aae62795404aacc7088e0b1701e9f57493bdb4f29c5210fc5",
-        "contents_checksum": "a5b9958d7ad96d243c7fd5d67ec93d8a4b8a62b668435c18d25b9ce4eb72e185",
-        "size": 24696653,
-        "source": "components/google-cloud-sdk-spanner-migration-tool-linux-x86_64-20240517151541.tar.gz",
+        "checksum": "c8a78c4159e296efc6e314c0850d114a16d3b2c96eb469ffabb88433399abbdc",
+        "contents_checksum": "a8df1dea184fd979baf978cc05b811f95a46e852e27163f472f26328a331ceb0",
+        "size": 25645658,
+        "source": "components/google-cloud-sdk-spanner-migration-tool-linux-x86_64-20240806142304.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -7185,6 +7328,7 @@
         "description": "Performs database migrations to Cloud Spanner databases.",
         "display_name": "Spanner migration tool (Platform Specific)"
       },
+      "gdu_only": true,
       "id": "spanner-migration-tool-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -7199,8 +7343,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20240517151541,
-        "version_string": "3.2.5"
+        "build_number": 20240806142304,
+        "version_string": "3.4.0"
       }
     },
     {
@@ -7211,6 +7355,7 @@
         "description": "Provides Windows command line ssh tools.",
         "display_name": "Windows command line ssh tools"
       },
+      "gdu_only": false,
       "id": "ssh-tools",
       "is_configuration": false,
       "is_hidden": true,
@@ -7241,6 +7386,7 @@
         "description": "Provides Windows command line ssh tools.",
         "display_name": "Windows command line ssh tools (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "ssh-tools-windows",
       "is_configuration": false,
       "is_hidden": true,
@@ -7268,6 +7414,7 @@
         "description": "Tools for working with Terraform data",
         "display_name": "Terraform Tools"
       },
+      "gdu_only": false,
       "id": "terraform-tools",
       "is_configuration": false,
       "is_hidden": false,
@@ -7304,6 +7451,7 @@
         "description": "Tools for working with Terraform data",
         "display_name": "Terraform Tools (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "terraform-tools-darwin-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -7337,6 +7485,7 @@
         "description": "Tools for working with Terraform data",
         "display_name": "Terraform Tools (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "terraform-tools-darwin-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -7370,6 +7519,7 @@
         "description": "Tools for working with Terraform data",
         "display_name": "Terraform Tools (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "terraform-tools-linux-arm",
       "is_configuration": false,
       "is_hidden": true,
@@ -7403,6 +7553,7 @@
         "description": "Tools for working with Terraform data",
         "display_name": "Terraform Tools (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "terraform-tools-linux-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -7436,6 +7587,7 @@
         "description": "Tools for working with Terraform data",
         "display_name": "Terraform Tools (Platform Specific)"
       },
+      "gdu_only": false,
       "id": "terraform-tools-windows-x86_64",
       "is_configuration": false,
       "is_hidden": true,
@@ -7456,10 +7608,10 @@
     },
     {
       "data": {
-        "checksum": "ed0feffc4e67046a2d15e3f524dc4f7c7278eaf571e06e38031842b357b55879",
-        "contents_checksum": "67a9405c609b6bc0567cfb517d77d2e591a801d3dc482824190fc1ca4f8643cb",
-        "size": 57601363,
-        "source": "components/google-cloud-sdk-tests-20240719191136.tar.gz",
+        "checksum": "93cc6bf1d627b67ea9afc82965a3680b978a8589ac9403112b190ff367de185d",
+        "contents_checksum": "b7a09d5ef025bd69f43cd7986f578e8481f46a50f25b80fd4b7e6ce7b7c039e5",
+        "size": 58125954,
+        "source": "components/google-cloud-sdk-tests-20240906153039.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -7469,6 +7621,7 @@
         "description": "Collection of tests used to verity Google Cloud CLI",
         "display_name": "Google Cloud CLI tests"
       },
+      "gdu_only": true,
       "id": "tests",
       "is_configuration": false,
       "is_hidden": true,
@@ -7476,8 +7629,8 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20240719191136,
-        "version_string": "2024.07.19"
+        "build_number": 20240906153039,
+        "version_string": "2024.09.06"
       }
     }
   ],
@@ -7496,11 +7649,11 @@
   ],
   "post_processing_command": "components post-process",
   "release_notes_url": "RELEASE_NOTES",
-  "revision": 20240719191136,
+  "revision": 20240906153039,
   "schema_version": {
     "no_update": false,
     "url": "https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz",
     "version": 3
   },
-  "version": "485.0.0"
+  "version": "492.0.0"
 }
diff --git a/pkgs/tools/admin/google-cloud-sdk/data.nix b/pkgs/tools/admin/google-cloud-sdk/data.nix
index 04713f6ae395..3dd28394e0ba 100644
--- a/pkgs/tools/admin/google-cloud-sdk/data.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/data.nix
@@ -1,32 +1,32 @@
 # DO NOT EDIT! This file is generated automatically by update.sh
 { }:
 {
-  version = "485.0.0";
+  version = "492.0.0";
   googleCloudSdkPkgs = {
     x86_64-linux =
       {
-        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-485.0.0-linux-x86_64.tar.gz";
-        sha256 = "17y6gbn0qnmrmawijg9l3kgygd8mbg57rgf5fcx05x57m7jy07v7";
+        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-492.0.0-linux-x86_64.tar.gz";
+        sha256 = "00vdmq7j67b6wdkz17wbh06lfzdq9yw4532p5jygbbg469smi8av";
       };
     x86_64-darwin =
       {
-        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-485.0.0-darwin-x86_64.tar.gz";
-        sha256 = "0zh6z567dm6a75xi8mz724xg7xw9n7xzp3kbaj01qmvwmri7rahi";
+        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-492.0.0-darwin-x86_64.tar.gz";
+        sha256 = "0hg24ffqcwy3xg7wjjgg6y00djwcb46866msach9s2q419cvz2z0";
       };
     aarch64-linux =
       {
-        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-485.0.0-linux-arm.tar.gz";
-        sha256 = "0mw80qs8qzjyjlbirqzpc9r22dv5m6i90v3p016na4w4hgc15v33";
+        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-492.0.0-linux-arm.tar.gz";
+        sha256 = "11ygy5qjx81nxlkgkyxwcd1z0ippkrshdxg7bfjgpw9c17zx3mp0";
       };
     aarch64-darwin =
       {
-        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-485.0.0-darwin-arm.tar.gz";
-        sha256 = "1x6s521iad1mzi7af0874qh421ldyxc1dd3952ayxi2zm8misg63";
+        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-492.0.0-darwin-arm.tar.gz";
+        sha256 = "0y1f7bg0ji0vvaik7dlyhkqlgix89xj96dhsps51hal6m92dibpb";
       };
     i686-linux =
       {
-        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-485.0.0-linux-x86.tar.gz";
-        sha256 = "05b9lg3gnqknx8y5smz2msr61803zib827283bsf7zmmr7bnignh";
+        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-492.0.0-linux-x86.tar.gz";
+        sha256 = "1f7fbfzyq8ycsn1whvrrncq7gycv4aswhgca8f8d1bpjcmcshs2n";
       };
   };
 }

From 35e48f01ead0f6a68905b0b9be60ae60d94e79eb Mon Sep 17 00:00:00 2001
From: Saturn745 <gitcommits.8lvon@passinbox.com>
Date: Sun, 15 Sep 2024 07:27:10 -0700
Subject: [PATCH 122/241] netbird: 0.29.0 -> 0.29.2

---
 pkgs/tools/networking/netbird/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix
index 366d1374bde3..85e8d7e725e8 100644
--- a/pkgs/tools/networking/netbird/default.nix
+++ b/pkgs/tools/networking/netbird/default.nix
@@ -2,7 +2,7 @@
 , lib
 , nixosTests
 , nix-update-script
-, buildGoModule
+, buildGo123Module
 , fetchFromGitHub
 , installShellFiles
 , pkg-config
@@ -29,18 +29,18 @@ let
       signal = "netbird-signal";
     };
 in
-buildGoModule rec {
+buildGo123Module rec {
   pname = "netbird";
-  version = "0.29.0";
+  version = "0.29.2";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "netbird";
     rev = "v${version}";
-    hash = "sha256-wzAvu8G1VJ/JLLxHwe4po/DkuLoAixLOx6XVatQThm8=";
+    hash = "sha256-/KKnrxWguPfUysKIUdxYMTrceD6EgdAYQ6QsOjBMKpA";
   };
 
-  vendorHash = "sha256-YvfzqKjNxs2xaK0YSw3fNKluF3kIKu2KNSHhaLewNIw=";
+  vendorHash = "sha256-CD34U+Z8bUKN0Z4nxIVC+mYDp71Q8q1bmUypRDGgb3U=";
 
   nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;
 
@@ -110,7 +110,7 @@ buildGoModule rec {
     changelog = "https://github.com/netbirdio/netbird/releases/tag/v${version}";
     description = "Connect your devices into a single secure private WireGuard®-based mesh network with SSO/MFA and simple access controls";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ vrifox ];
+    maintainers = with maintainers; [ vrifox saturn745 ];
     mainProgram = "netbird";
   };
 }

From c607f9fbcc7952a6dd0e92d6d470aa4647425e19 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 15 Sep 2024 18:20:37 +0300
Subject: [PATCH 123/241] musescore: Switch to the more minimalist
 wrapGAppsNoGuiHook

---
 pkgs/applications/audio/musescore/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index cfb50546b705..b756ca5dfde2 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , fetchpatch
 , cmake
-, wrapGAppsHook3
+, wrapGAppsNoGuiHook
 , wrapQtAppsHook
 , pkg-config
 , ninja
@@ -103,7 +103,9 @@ in stdenv'.mkDerivation (finalAttrs: {
   dontWrapGApps = true;
 
   nativeBuildInputs = [
-    wrapGAppsHook3
+    # Just to make it not crash when looking up Gschemas when opening external
+    # files
+    wrapGAppsNoGuiHook
     wrapQtAppsHook
     cmake
     qttools

From 78c9f7a866c3a647ef017a03a7f6145104053764 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Sep 2024 15:28:21 +0000
Subject: [PATCH 124/241] python312Packages.pick: 2.3.2 -> 2.4.0

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

diff --git a/pkgs/development/python-modules/pick/default.nix b/pkgs/development/python-modules/pick/default.nix
index 171c639afefc..5d26864fac79 100644
--- a/pkgs/development/python-modules/pick/default.nix
+++ b/pkgs/development/python-modules/pick/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "pick";
-  version = "2.3.2";
+  version = "2.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "wong2";
     repo = "pick";
     rev = "refs/tags/v${version}";
-    hash = "sha256-6bkV9XEum5kbANqv/Xth+taCUl4nmuWskucq4jmV+Lc=";
+    hash = "sha256-SnH37n0MCjO60IU6kUPxJkIC5vBCVGZXBhFfwvRI/tQ=";
   };
 
   build-system = [ poetry-core ];

From de18194d1ec5abd5f1186da885200ebbfabc998a Mon Sep 17 00:00:00 2001
From: Luca Tagliavini <luca@teapot.ovh>
Date: Fri, 6 Sep 2024 22:14:46 +0200
Subject: [PATCH 125/241] beets: make the autobpm plugin depend on librosa

---
 pkgs/tools/audio/beets/builtin-plugins.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/audio/beets/builtin-plugins.nix b/pkgs/tools/audio/beets/builtin-plugins.nix
index ebb58191a3ca..2b9ee3bc5d03 100644
--- a/pkgs/tools/audio/beets/builtin-plugins.nix
+++ b/pkgs/tools/audio/beets/builtin-plugins.nix
@@ -128,6 +128,11 @@
     testPaths = [ ];
   };
   autobpm = {
+    propagatedBuildInputs = with python3Packages; [
+      librosa
+      # An optional dependency of librosa, needed for beets' autobpm
+      resampy
+    ];
     testPaths = [ ];
   };
   listenbrainz = {

From 90aee059a22a7e003147f13adb4fa9bf596c4108 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Sep 2024 15:51:16 +0000
Subject: [PATCH 126/241] sn0int: 0.26.0 -> 0.26.1

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

diff --git a/pkgs/by-name/sn/sn0int/package.nix b/pkgs/by-name/sn/sn0int/package.nix
index 43eadd2c3940..974f6a298d1e 100644
--- a/pkgs/by-name/sn/sn0int/package.nix
+++ b/pkgs/by-name/sn/sn0int/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "sn0int";
-  version = "0.26.0";
+  version = "0.26.1";
 
   src = fetchFromGitHub {
     owner = "kpcyrd";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-ze4OFKUuc/t6tXgmoWFFDjpAQraSY6RIekkcDBctPJo=";
+    hash = "sha256-tiJLwlxZ9ndircgkH23ew+3QJeuuqt93JahAtFPcuG8=";
   };
 
-  cargoHash = "sha256-PAKmoifqB1YC02fVF2SRbXAAGrMcB+Wlvr3FwuqmPVU=";
+  cargoHash = "sha256-3FrUlv6UxULsrvgyV5mlry9j3wFMiXZVoxk6z6pRM3I=";
 
   nativeBuildInputs = [
     pkg-config

From 90914ee74f4fa0faf7b13adf063497d019c037cb Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 15 Sep 2024 17:55:06 +0200
Subject: [PATCH 127/241] qpdfview: fix build

With structuredAttrs support in 1bcca7d66b0a052b703d029c4593434b84136455
this broke, because the following line turns qmakeFlags from a string
into an array:

  qmakeFlags+=(...)

It will then be handled slightly different when it's an array, so that
all the xxx_INSTALL_PATH variables are passed as a *single* argument,
which breaks the build.

Resolves #342087
---
 pkgs/applications/office/qpdfview/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/office/qpdfview/default.nix b/pkgs/applications/office/qpdfview/default.nix
index 56bd5f126afa..7d44c684fd99 100644
--- a/pkgs/applications/office/qpdfview/default.nix
+++ b/pkgs/applications/office/qpdfview/default.nix
@@ -40,6 +40,9 @@ mkDerivation rec {
     ghostscript
   ];
 
+  # needed for qmakeFlags+=( below
+  __structuredAttrs = true;
+
   preConfigure = ''
     lrelease qpdfview.pro
     qmakeFlags+=(*.pro)

From 1f01aa701c01636b1e29c32342cb25f88a266820 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Sep 2024 16:04:44 +0000
Subject: [PATCH 128/241] python312Packages.pynmeagps: 1.0.39 -> 1.0.41

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

diff --git a/pkgs/development/python-modules/pynmeagps/default.nix b/pkgs/development/python-modules/pynmeagps/default.nix
index f697e347852e..562e5ab869e4 100644
--- a/pkgs/development/python-modules/pynmeagps/default.nix
+++ b/pkgs/development/python-modules/pynmeagps/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "pynmeagps";
-  version = "1.0.39";
+  version = "1.0.41";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "semuconsulting";
     repo = "pynmeagps";
     rev = "refs/tags/v${version}";
-    hash = "sha256-aBNvrqGDCUOn3wiTwqmanUQzBuiPNDSguZhlznYXUkY=";
+    hash = "sha256-c80OACBwohlTBGvBZValv+AMOKLd32PrPf/JzqETjDU=";
   };
 
   postPatch = ''

From 16923867291060d6aeeb6b65e616845817c73859 Mon Sep 17 00:00:00 2001
From: Adam Stephens <adam@valkor.net>
Date: Sun, 15 Sep 2024 12:15:16 -0400
Subject: [PATCH 129/241] waylock: 1.1.0 -> 1.2.1

---
 pkgs/by-name/wa/waylock/build.zig.zon.nix | 12 ++++++------
 pkgs/by-name/wa/waylock/package.nix       |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/wa/waylock/build.zig.zon.nix b/pkgs/by-name/wa/waylock/build.zig.zon.nix
index a0d4d9ac0971..2ee83bc20cec 100644
--- a/pkgs/by-name/wa/waylock/build.zig.zon.nix
+++ b/pkgs/by-name/wa/waylock/build.zig.zon.nix
@@ -4,17 +4,17 @@
 
 linkFarm "zig-packages" [
   {
-    name = "1220840390382c88caf9b0887f6cebbba3a7d05960b8b2ee6d80567b2950b71e5017";
+    name = "1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242";
     path = fetchzip {
-      url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.1.0.tar.gz";
-      hash = "sha256-xilmsDGWlkfpTiGff+/nb76jx87ANdr4zqYy6rKOBMg=";
+      url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz";
+      hash = "sha256-dvit+yvc0MnipqWjxJdfIsA6fJaJZOaIpx4w4woCxbE=";
     };
   }
   {
-    name = "1220b0f8f822c1625af7aae4cb3ab2c4ec1a4c0e99ef32867b2a8d88bb070b3e7f6d";
+    name = "1220c90b2228d65fd8427a837d31b0add83e9fade1dcfa539bb56fd06f1f8461605f";
     path = fetchzip {
-      url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.1.0.tar.gz";
-      hash = "sha256-VLEx8nRgmJZWgLNBRqrR7bZEkW0m5HTRv984HKwoIfA=";
+      url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.2.0.tar.gz";
+      hash = "sha256-T+EZiStBfmxFUjaX05WhYkFJ8tRok/UQtpc9QY9NxZk=";
     };
   }
 ]
diff --git a/pkgs/by-name/wa/waylock/package.nix b/pkgs/by-name/wa/waylock/package.nix
index fe5d024585a3..42e5df06185c 100644
--- a/pkgs/by-name/wa/waylock/package.nix
+++ b/pkgs/by-name/wa/waylock/package.nix
@@ -10,12 +10,12 @@
   wayland,
   wayland-scanner,
   wayland-protocols,
-  zig_0_12,
+  zig_0_13,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "waylock";
-  version = "1.1.0";
+  version = "1.2.1";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
     repo = "waylock";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-U8xJucLpmeLdmSUc+AVSH/mlv6UOXsxotJPTMK7lnkA=";
+    hash = "sha256-i1Nd39666xrkzi7r08ZRIXJXvK9wmzb8zdmvmWEQaHE=";
   };
 
   deps = callPackage ./build.zig.zon.nix { };
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     scdoc
     wayland-scanner
-    zig_0_12.hook
+    zig_0_13.hook
   ];
 
   buildInputs = [

From 44a2013436290f6ac442f07c76111402748d7a98 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Sep 2024 16:42:00 +0000
Subject: [PATCH 130/241] vulkan-caps-viewer: 3.41 -> 3.42

---
 pkgs/tools/graphics/vulkan-caps-viewer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix
index 2305e7c1bab5..0c60a11db88b 100644
--- a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix
+++ b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vulkan-caps-viewer";
-  version = "3.41";
+  version = "3.42";
 
   src = fetchFromGitHub {
     owner = "SaschaWillems";
     repo = "VulkanCapsViewer";
     rev = version;
-    hash = "sha256-CAPteS1zjS6a+/6ZFUZD1WA7dcK8yM4qodVF8PGpTfY=";
+    hash = "sha256-gGP+A8CfmXaAf5WEKYCU6ud93pzjeh9tU37SP0/TIzw=";
     # Note: this derivation strictly requires vulkan-header to be the same it was developed against.
     # To help us, they've put it in a git-submodule.
     # The result will work with any vulkan-loader version.

From 7e7813b835a6502977b8ed2449674f51077e1fa8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Sep 2024 17:04:50 +0000
Subject: [PATCH 131/241] python312Packages.plugwise: 1.3.1 -> 1.4.0

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

diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix
index 5814c24e14b1..df9072936676 100644
--- a/pkgs/development/python-modules/plugwise/default.nix
+++ b/pkgs/development/python-modules/plugwise/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "plugwise";
-  version = "1.3.1";
+  version = "1.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "plugwise";
     repo = "python-plugwise";
     rev = "refs/tags/v${version}";
-    hash = "sha256-lwg+iyYRW1eFjMxBDQf6MFXlLbo81jGRpQSh3rUqGKY=";
+    hash = "sha256-CVgcqyg5DDtEJxE/oen5MJP+mV4B+Sq0uopEZTOCfV0=";
   };
 
   postPatch = ''

From 823ad293421c2944fd3de2a1e448f1a6a2a3e687 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Sep 2024 18:03:49 +0000
Subject: [PATCH 132/241] python312Packages.django-modeltranslation: 0.19.8 ->
 0.19.9

---
 .../python-modules/django-modeltranslation/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-modeltranslation/default.nix b/pkgs/development/python-modules/django-modeltranslation/default.nix
index 1ede02a766a6..3b7cd55b494c 100644
--- a/pkgs/development/python-modules/django-modeltranslation/default.nix
+++ b/pkgs/development/python-modules/django-modeltranslation/default.nix
@@ -13,7 +13,7 @@
 let
   # 0.18.12 was yanked from PyPI, it refers to this issue:
   # https://github.com/deschler/django-modeltranslation/issues/701
-  version = "0.19.8";
+  version = "0.19.9";
 in
 buildPythonPackage {
   pname = "django-modeltranslation";
@@ -23,7 +23,7 @@ buildPythonPackage {
     owner = "deschler";
     repo = "django-modeltranslation";
     rev = "refs/tags/v${version}";
-    hash = "sha256-23htGjPtupmg/oSO/5SuxOfbDmRQKrqx2/lvfqYp7dA=";
+    hash = "sha256-2GTz+niXfEsi++KyL6+HtwdzO1YFhpKQsDK3F8GAl4A=";
   };
 
   disabled = pythonOlder "3.6";

From 986eb22a8ab683c5da7bd4c27f1debf0818abf67 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Sep 2024 18:19:50 +0000
Subject: [PATCH 133/241] silverbullet: 0.9.2 -> 0.9.4

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

diff --git a/pkgs/by-name/si/silverbullet/package.nix b/pkgs/by-name/si/silverbullet/package.nix
index cd66ed474f7f..de86e6a7ec1c 100644
--- a/pkgs/by-name/si/silverbullet/package.nix
+++ b/pkgs/by-name/si/silverbullet/package.nix
@@ -7,11 +7,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "silverbullet";
-  version = "0.9.2";
+  version = "0.9.4";
 
   src = fetchurl {
     url = "https://github.com/silverbulletmd/silverbullet/releases/download/${finalAttrs.version}/silverbullet.js";
-    hash = "sha256-USk15jzTLcy+t8IzLEAySRZJMlIompugIpqAJTcoxho=";
+    hash = "sha256-J0fy1e/ObpujBNSRKA55oU30kXNfus+5P2ebggEN6Dw=";
   };
 
   dontUnpack = true;

From 00c62e5b25c737ec96c81452340e7cd3ee58e4cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Sep 2024 18:31:26 +0000
Subject: [PATCH 134/241] simdutf: 5.4.15 -> 5.5.0

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

diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix
index 42ee43f22ae3..8e841ac44636 100644
--- a/pkgs/by-name/si/simdutf/package.nix
+++ b/pkgs/by-name/si/simdutf/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "simdutf";
-  version = "5.4.15";
+  version = "5.5.0";
 
   src = fetchFromGitHub {
     owner = "simdutf";
     repo = "simdutf";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-oIrrI0Z5x1AvT9y0Ldg8zrkFJj1PZtebhJaL2UtEoB8=";
+    hash = "sha256-LEXx/b0DJZ9xxQX9+4YHjQCLFp2aXCE78Z6iPlXJjAw=";
   };
 
   # Fix build on darwin

From 7d430f6ae78e85d554bab7fa49750c67422b3f5b Mon Sep 17 00:00:00 2001
From: Reinis Taukulis <reinis.taukulis@gmail.com>
Date: Sun, 15 Sep 2024 19:23:21 +0300
Subject: [PATCH 135/241] maintainers: add ttrei

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b0479a90f03d..1d622d19fb9d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -21429,6 +21429,12 @@
     githubId = 4044033;
     name = "Thomas Sowell";
   };
+  ttrei = {
+    email = "reinis.taukulis@gmail.com";
+    github = "ttrei";
+    githubId = 27609929;
+    name = "Reinis Taukulis";
+  };
   ttuegel = {
     email = "ttuegel@mailbox.org";
     github = "ttuegel";

From 52175e6441a404d8783c1b04e436a5660ecfdde5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Sep 2024 19:19:25 +0000
Subject: [PATCH 136/241] pachyderm: 2.11.1 -> 2.11.2

---
 pkgs/applications/networking/cluster/pachyderm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix
index 24888e39f485..dee29c2fd9c2 100644
--- a/pkgs/applications/networking/cluster/pachyderm/default.nix
+++ b/pkgs/applications/networking/cluster/pachyderm/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "pachyderm";
-  version = "2.11.1";
+  version = "2.11.2";
 
   src = fetchFromGitHub {
     owner = "pachyderm";
     repo = "pachyderm";
     rev = "v${version}";
-    hash = "sha256-dg93x73Lg0JGE/q67ae+ugLrVXDRftsZRLslaPryui8=";
+    hash = "sha256-CNYFaUZBUwa+RF4JFXSmsdHalCPeowM4FYeWBojOOjA=";
   };
 
   vendorHash = "sha256-d2MSMucGMGGPLE0wh8Y27AUVPkeyOCkCa0JSPawYQmc=";

From 17f8866661943b04d0ee68d234cba6f15da7cd97 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Sep 2024 19:55:17 +0000
Subject: [PATCH 137/241] screenly-cli: 1.0.0 -> 1.0.1

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

diff --git a/pkgs/by-name/sc/screenly-cli/package.nix b/pkgs/by-name/sc/screenly-cli/package.nix
index af8d94274122..9cc2cd511ef8 100644
--- a/pkgs/by-name/sc/screenly-cli/package.nix
+++ b/pkgs/by-name/sc/screenly-cli/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "screenly-cli";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "screenly";
     repo = "cli";
     rev = "refs/tags/v${version}";
-    hash = "sha256-th/V0hyTMcraJHbRM5VoSM19oE6CKqIQ3qdM86TR4vE=";
+    hash = "sha256-7Y9n6qo5kqaV8xHYn4BFbPBF/7mCV9DJJTSz4dqrgPc=";
   };
 
-  cargoHash = "sha256-sv59Yu+oSxp/IVePokHrXD4FI+bZcz6aERSTLScYaLk=";
+  cargoHash = "sha256-4fPC/BW2irA1iTKkxBhPOsxzS4uSfM3vOXhrx/7qRxg=";
 
   nativeBuildInputs = [
     pkg-config

From acff7907ed35a1aa418f3a849544e894b5dd1b72 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 15 Sep 2024 22:10:56 +0200
Subject: [PATCH 138/241] SDL1: fix building for musl with GCC 14

---
 pkgs/by-name/sd/SDL1/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/sd/SDL1/package.nix b/pkgs/by-name/sd/SDL1/package.nix
index 8ce29877438a..7abff886d509 100644
--- a/pkgs/by-name/sd/SDL1/package.nix
+++ b/pkgs/by-name/sd/SDL1/package.nix
@@ -72,7 +72,8 @@ stdenv.mkDerivation (finalAttrs: {
   # Please try revert the change that introduced this comment when updating SDL.
   ] ++ lib.optional stdenv.isDarwin "--disable-x11-shared"
     ++ lib.optional (!x11Support) "--without-x"
-    ++ lib.optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib";
+    ++ lib.optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib"
+    ++ lib.optional stdenv.hostPlatform.isMusl "CFLAGS=-DICONV_INBUF_NONCONST";
 
   patches = [
     ./find-headers.patch

From 132400377c8b6bea76f649ee26aac2f35d703e40 Mon Sep 17 00:00:00 2001
From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com>
Date: Sun, 15 Sep 2024 22:26:07 +0200
Subject: [PATCH 139/241] fantomas: 6.3.13 -> 6.3.15

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

diff --git a/pkgs/by-name/fa/fantomas/package.nix b/pkgs/by-name/fa/fantomas/package.nix
index 17b55284a031..49536d8e39ae 100644
--- a/pkgs/by-name/fa/fantomas/package.nix
+++ b/pkgs/by-name/fa/fantomas/package.nix
@@ -2,9 +2,9 @@
 
 buildDotnetGlobalTool {
   pname = "fantomas";
-  version = "6.3.13";
+  version = "6.3.15";
 
-  nugetHash = "sha256-ZVNYG0GtFlNYLE1J8Ts4GEfJlEgoMaQwGdHdCX3ru50=";
+  nugetHash = "sha256-Gjw7MxjUNckMWSfnOye4UTe5fZWnor6RHCls3PNsuG8=";
 
   meta = with lib; {
     description = "F# source code formatter";

From 1acbc708787e8dbc2c1a4421c7b90c57059d6a7b Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sun, 15 Sep 2024 14:38:11 -0600
Subject: [PATCH 140/241] scrcpy: 2.6.1 -> 2.7

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

diff --git a/pkgs/by-name/sc/scrcpy/package.nix b/pkgs/by-name/sc/scrcpy/package.nix
index 347f2559c962..06779e7c761d 100644
--- a/pkgs/by-name/sc/scrcpy/package.nix
+++ b/pkgs/by-name/sc/scrcpy/package.nix
@@ -16,12 +16,12 @@
 }:
 
 let
-  version = "2.6.1";
+  version = "2.7";
   prebuilt_server = fetchurl {
     name = "scrcpy-server";
     inherit version;
     url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}";
-    hash = "sha256-ynq1Cy4loOWvdZnDA4PjZZg/pbgI5lzi4cG7pb/o3Ds=";
+    hash = "sha256-ojxWWfNsJg8QXAItJ7yz6v/6JgcOe6qe2mbQE3ehrbo=";
   };
 in
 stdenv.mkDerivation rec {
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     owner = "Genymobile";
     repo = "scrcpy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-p5OQKi6JEam+bmtMKUY9WsQlI7tpExsIZQgGdgOj2sE=";
+    hash = "sha256-OBMm/GkiIdZaJd9X62vY4M6FVKiHTBwqRtH220bYej4=";
   };
 
   #   display.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly.

From 8605bedf8684fe74b82ca2a98dca1b6672576025 Mon Sep 17 00:00:00 2001
From: Reinis Taukulis <reinis.taukulis@gmail.com>
Date: Mon, 16 Sep 2024 00:25:12 +0300
Subject: [PATCH 141/241] maintainers: add arrnphm

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 1d622d19fb9d..e2c77c10fe81 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -345,6 +345,12 @@
     githubId = 22131756;
     name = "Aaqa Ishtyaq";
   };
+  aarnphm = {
+    email = "contact@aarnphm.xyz";
+    github = "aarnphm";
+    githubId = 29749331;
+    name = "Aaron Pham";
+  };
   aaronarinder = {
     email = "aaronarinder@gmail.com";
     github = "aaronArinder";

From 678de7fd6a35904429ee8c511a2f7f2b218d0add Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 15 Sep 2024 23:31:29 +0200
Subject: [PATCH 142/241] python312Packages.python-bidi: add missing dependency
 libiconv to fix darwin build

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

diff --git a/pkgs/development/python-modules/python-bidi/default.nix b/pkgs/development/python-modules/python-bidi/default.nix
index 0c35e6579696..f2b52b1cbc70 100644
--- a/pkgs/development/python-modules/python-bidi/default.nix
+++ b/pkgs/development/python-modules/python-bidi/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   rustPlatform,
+  libiconv,
   pytestCheckHook,
 }:
 
@@ -24,6 +25,8 @@ buildPythonPackage rec {
     hash = "sha256-34R8T8cXiX1iRx/Zb51Eb/nf0wLpN38hz0VnsmzPzws=";
   };
 
+  buildInputs = [ libiconv ];
+
   build-system = [
     rustPlatform.cargoSetupHook
     rustPlatform.maturinBuildHook
@@ -35,11 +38,11 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/MeirKriheli/python-bidi";
     description = "Pure python implementation of the BiDi layout algorithm";
     mainProgram = "pybidi";
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ freezeboy ];
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ freezeboy ];
   };
 }

From 49ba09a9276d0fa34a388067d0421af9b3d064ff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Sep 2024 22:03:40 +0000
Subject: [PATCH 143/241] micronaut: 4.6.1 -> 4.6.2

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

diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix
index e99eb82398d5..2ef6fed04189 100644
--- a/pkgs/development/tools/micronaut/default.nix
+++ b/pkgs/development/tools/micronaut/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "micronaut";
-  version = "4.6.1";
+  version = "4.6.2";
 
   src = fetchzip {
     url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip";
-    sha256 = "sha256-hIjFKYuA5OBHQuNu4BzGhO1USs3adLeQvCv3I/2WkGs=";
+    sha256 = "sha256-y+/qdZ9Kl6rVoziss+UipkU4/QSqZuD7J3efWdWNfl8=";
   };
 
   nativeBuildInputs = [ makeWrapper installShellFiles ];

From ea61eda12fd99227347c7c58258bb20c2fa4ce0f Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 16 Sep 2024 00:39:50 +0200
Subject: [PATCH 144/241] rectangle: 0.82 -> 0.83

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

diff --git a/pkgs/by-name/re/rectangle/package.nix b/pkgs/by-name/re/rectangle/package.nix
index 503358c565ed..4b0ccc0109aa 100644
--- a/pkgs/by-name/re/rectangle/package.nix
+++ b/pkgs/by-name/re/rectangle/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "rectangle";
-  version = "0.82";
+  version = "0.83";
 
   src = fetchurl {
     url = "https://github.com/rxhanson/Rectangle/releases/download/v${version}/Rectangle${version}.dmg";
-    hash = "sha256-Uwo98Mf7Ce6vbRRoNSsxtJh1zS5/p8Sicd/vcjczmVk=";
+    hash = "sha256-R364m1X0NQky/W9NzszUzP+2f06ZqBuJKh5m2uOXLmo=";
   };
 
   sourceRoot = ".";

From 39e923ed0bc0084ae0e2e22cb7a9e4ffa1963ac1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Sep 2024 23:01:05 +0000
Subject: [PATCH 145/241] coder: 2.14.2 -> 2.14.3

---
 pkgs/development/tools/coder/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/coder/default.nix b/pkgs/development/tools/coder/default.nix
index 47d35842ac95..c1c1f2fe30fe 100644
--- a/pkgs/development/tools/coder/default.nix
+++ b/pkgs/development/tools/coder/default.nix
@@ -14,12 +14,12 @@ let
 
   channels = {
     stable = {
-      version = "2.14.2";
+      version = "2.14.3";
       hash = {
-        x86_64-linux = "sha256-Qglz8F80QICwWOVwDELegewYHkPhhrTEuGKJgiw2mYg=";
-        x86_64-darwin = "sha256-uyslQIAXOROSdtyiLSUcxEwYzK+iDup8/jRI74QGcEo=";
-        aarch64-linux = "sha256-rzTBfO8+DSxJjhjIhl8qNji8bWe/EGZ4dG17D8wjlkA=";
-        aarch64-darwin = "sha256-+lFWz6qDuhtDNn7DID/lmpqltpEwftVP3U+2CseVMnY=";
+        x86_64-linux = "sha256-CDQmixywYDLj3ABqTEnaUftITSFGA/wGAfe0IFoU64g=";
+        x86_64-darwin = "sha256-TDpoby2lBw8W6zJrHgF/AQFQL+j9dv3d21VLsiSd1sk=";
+        aarch64-linux = "sha256-L+2YOMgH1cCl4o1VFZk1dC258/XStgiH9lr9PEQOPSo=";
+        aarch64-darwin = "sha256-hG3HsJ+DIjwB5ehT+Hd3EZduvjNXYTZLYbAYCRWWiQ8=";
       };
     };
     mainline = {

From 47d79939962694aabe0c178751a0bd490f639a44 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Sep 2024 23:50:11 +0000
Subject: [PATCH 146/241] yamlscript: 0.1.74 -> 0.1.75

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

diff --git a/pkgs/by-name/ya/yamlscript/package.nix b/pkgs/by-name/ya/yamlscript/package.nix
index 0a27a3cfd54a..4e5f29bd9f98 100644
--- a/pkgs/by-name/ya/yamlscript/package.nix
+++ b/pkgs/by-name/ya/yamlscript/package.nix
@@ -2,11 +2,11 @@
 
 buildGraalvmNativeImage rec {
   pname = "yamlscript";
-  version = "0.1.74";
+  version = "0.1.75";
 
   src = fetchurl {
     url = "https://github.com/yaml/yamlscript/releases/download/${version}/yamlscript.cli-${version}-standalone.jar";
-    hash = "sha256-kAuUXOc3QQ9gxBO+HKZDGm5Y4H/lKeFzyiDlz+GMjv8=";
+    hash = "sha256-GdnrEHVdJmwcs6l1Fw3pXJ8hS+spcNpDQ346d6F0OTM=";
   };
 
   executable = "ys";

From 23387d86b905d1d990167f774fc7c25b7ac951cf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 16 Sep 2024 02:33:02 +0200
Subject: [PATCH 147/241] python312Packages.psycopg: 3.2.1 -> 3.2.2

https://github.com/psycopg/psycopg/blob/3.2.2/docs/news.rst#current-release
---
 pkgs/development/python-modules/psycopg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix
index b1b69bc3526a..e74f113f3c84 100644
--- a/pkgs/development/python-modules/psycopg/default.nix
+++ b/pkgs/development/python-modules/psycopg/default.nix
@@ -35,13 +35,13 @@
 
 let
   pname = "psycopg";
-  version = "3.2.1";
+  version = "3.2.2";
 
   src = fetchFromGitHub {
     owner = "psycopg";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-jQMIgfMyQpd9bD3F1IhPff39BrFaBD6U7Exryna+Acw=";
+    hash = "sha256-Udysl00lB6rxmQByME6PI3KL4tlzIZ0/CZNWLVKssS8=";
   };
 
   patches = [

From 445c2764867ba413cb2ad9650c752b647a8e8a79 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Sep 2024 01:20:14 +0000
Subject: [PATCH 148/241] altair: 7.3.5 -> 7.3.6

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

diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/development/tools/altair-graphql-client/default.nix
index 8fee54eebb84..60fde1605700 100644
--- a/pkgs/development/tools/altair-graphql-client/default.nix
+++ b/pkgs/development/tools/altair-graphql-client/default.nix
@@ -2,11 +2,11 @@
 
 let
   pname = "altair";
-  version = "7.3.5";
+  version = "7.3.6";
 
   src = fetchurl {
     url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage";
-    sha256 = "sha256-Cqtb48OabU2rGbbZIEfLS2J3o3UMkt1U75U8JU097rs=";
+    sha256 = "sha256-jXFEpcmv8bkm7Yyo2GUwoakMlAwArCoZ1jIDeyF87Ms=";
   };
 
   appimageContents = appimageTools.extract { inherit pname version src; };

From 13cdb0775b87afce1a70d95f75200cb1cdac2751 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Mon, 16 Sep 2024 09:42:12 +0800
Subject: [PATCH 149/241] emacsPackages.eglot: only build info manual when
 needed

---
 .../elisp-packages/elpa-common-overrides.nix  | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix
index 1b33f0455316..56cdd8ad733e 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix
@@ -54,19 +54,21 @@ in
     }
   );
 
-  # TODO delete this when we get upstream fix https://debbugs.gnu.org/cgi/bugreport.cgi?bug=73241
-  eglot = super.eglot.overrideAttrs (old: {
-    postInstall =
-      old.postInstall or ""
-      + ''
-        local info_file=eglot.info
-        pushd $out/share/emacs/site-lisp/elpa/eglot-*
-        # specify output info file to override the one defined in eglot.texi
-        makeinfo --output=$info_file eglot.texi
-        install-info $info_file dir
-        popd
-      '';
-  });
+  eglot = super.eglot.overrideAttrs (
+    finalAttrs: previousAttrs: {
+      postInstall =
+        previousAttrs.postInstall or ""
+        # old versions do not include an info manual
+        + lib.optionalString (lib.versionAtLeast "1.17.0.20240829.5352" finalAttrs.version) ''
+          local info_file=eglot.info
+          pushd $out/share/emacs/site-lisp/elpa/eglot-*
+          # specify output info file to override the one defined in eglot.texi
+          makeinfo --output=$info_file eglot.texi
+          install-info $info_file dir
+          popd
+        '';
+    }
+  );
 
   jinx = super.jinx.overrideAttrs (old: {
     dontUnpack = false;

From 395d3350e4628550d067d713f514361f916df1e6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 16 Sep 2024 11:42:22 +1000
Subject: [PATCH 150/241] ircdog: 0.5.4 -> 0.5.5 (#342181)

https://github.com/ergochat/ircdog/releases/tag/v0.5.5
---
 pkgs/applications/networking/irc/ircdog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/irc/ircdog/default.nix b/pkgs/applications/networking/irc/ircdog/default.nix
index 1ff1f0413d2b..c2b1d5b2ee53 100644
--- a/pkgs/applications/networking/irc/ircdog/default.nix
+++ b/pkgs/applications/networking/irc/ircdog/default.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "ircdog";
-  version = "0.5.4";
+  version = "0.5.5";
 
   src = fetchFromGitHub {
     owner = "goshuirc";
     repo = "ircdog";
     rev = "refs/tags/v${version}";
-    hash = "sha256-X8DTwudgQyQQIpXCG7d+tdXMV33HG6ETzHsvIp3KFDo=";
+    hash = "sha256-maF53Z0FHAhGmnOnMsX0dDnmckPNBY4Bcm4OBM/x4hQ=";
   };
 
   vendorHash = null;

From 93424a6ca57b33f118a9f46f3ec6683f4f998c34 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sun, 15 Sep 2024 15:43:10 -0300
Subject: [PATCH 151/241] emacs.pkgs.gn-mode-from-sources: init

---
 .../gn-mode-from-sources/package.nix          | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs/elisp-packages/manual-packages/gn-mode-from-sources/package.nix

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/gn-mode-from-sources/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/gn-mode-from-sources/package.nix
new file mode 100644
index 000000000000..adae6e51625e
--- /dev/null
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/gn-mode-from-sources/package.nix
@@ -0,0 +1,28 @@
+{
+  lib,
+  gn,
+  melpaBuild,
+}:
+
+melpaBuild {
+  pname = "gn-mode-from-sources";
+  ename = "gn-mode";
+  version = "0-unstable-${gn.version}";
+  inherit (gn) src;
+
+  files = ''("misc/emacs/gn-mode.el")'';
+
+  # Fixes the malformed header error
+  postPatch = ''
+    substituteInPlace misc/emacs/gn-mode.el \
+      --replace-fail ";;; gn-mode.el - " ";;; gn-mode.el --- "
+  '';
+
+  ignoreCompilationError = false;
+
+  meta = {
+    inherit (gn.meta) homepage license;
+    maintainers = with lib.maintainers; [ ];
+    description = "Major mode for editing GN files; taken from GN sources";
+  };
+}

From 18a45a613d89f993a355fe4f7f58323e2e6603d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Sep 2024 02:16:47 +0000
Subject: [PATCH 152/241] mubeng: 0.17.0 -> 0.18.0

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

diff --git a/pkgs/tools/networking/mubeng/default.nix b/pkgs/tools/networking/mubeng/default.nix
index a2ea2b5dab49..9289285b2446 100644
--- a/pkgs/tools/networking/mubeng/default.nix
+++ b/pkgs/tools/networking/mubeng/default.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "mubeng";
-  version = "0.17.0";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "kitabisa";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-xfoYUcnCwrJ3SM+Xr+dsf4NnisN5K4UehT9T2US5p/s=";
+    hash = "sha256-V+0XPuMM2Jg2LEpWzxRNLZ44YRoEnf/Fvbj51p9hwL4=";
   };
 
   vendorHash = "sha256-TZDQCvcwsCa08bBBb8Zs8W0OFDYb+ZWN85+VCelFgyc=";

From b247b04351921e86bda3f30a4edfd6859a78cab7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Sep 2024 02:16:47 +0000
Subject: [PATCH 153/241] mediamtx: 1.9.0 -> 1.9.1

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

diff --git a/pkgs/servers/mediamtx/default.nix b/pkgs/servers/mediamtx/default.nix
index ef30a8772f9a..58c3bab2b160 100644
--- a/pkgs/servers/mediamtx/default.nix
+++ b/pkgs/servers/mediamtx/default.nix
@@ -15,16 +15,16 @@ in
 buildGoModule rec {
   pname = "mediamtx";
   # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION
-  version = "1.9.0";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "bluenviron";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-iCUCQLMWB0cH9SuudP1KvSD1X58hvYgE30nIh2FpKlY=";
+    hash = "sha256-DCt0P0DHlWFAQ5i4+7U5+Q2XcCPlSZrlj+Ljcyg/Wj0=";
   };
 
-  vendorHash = "sha256-TiI02M6k1zN/iWJntOfc9EY5xFo3ESOtdDSumxYmSU0=";
+  vendorHash = "sha256-YKNNQPEdO8K7Lpm/S86GKD3QcNcyvwZSrBspZJMJ78Y=";
 
   postPatch = ''
     cp ${hlsJs} internal/servers/hls/hls.min.js

From 18754779c8c1fe1537c4fc86bdb37b8d34f5796e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Sep 2024 02:16:57 +0000
Subject: [PATCH 154/241] python312Packages.command-runner: 1.6.0 -> 1.7.0

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

diff --git a/pkgs/development/python-modules/command-runner/default.nix b/pkgs/development/python-modules/command-runner/default.nix
index 945400c19481..2ef03194928c 100644
--- a/pkgs/development/python-modules/command-runner/default.nix
+++ b/pkgs/development/python-modules/command-runner/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "command-runner";
-  version = "1.6.0";
+  version = "1.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "netinvent";
     repo = "command_runner";
     rev = "refs/tags/v${version}";
-    hash = "sha256-QzqkcF2/YExK/dz+b0Uk0Af/rAXRMuRIeEynyFgDql8=";
+    hash = "sha256-rdbZtqNndtIxrLA90eWzR6dB8EyFrBALduBUkOVq4oE=";
   };
 
   build-system = [ setuptools ];

From 4d0986e5ffa56ec4705db6d9aa4509dbaec32d4a Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 16 Sep 2024 12:36:39 +1000
Subject: [PATCH 155/241] hydra: add unstableGitUpdater

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

diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix
index dc125a94c67f..e6e4f551f56b 100644
--- a/pkgs/by-name/hy/hydra/package.nix
+++ b/pkgs/by-name/hy/hydra/package.nix
@@ -44,6 +44,7 @@
 , glibcLocales
 , fetchFromGitHub
 , nixosTests
+, unstableGitUpdater
 }:
 
 let
@@ -232,6 +233,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     inherit nix perlDeps;
     tests.basic = nixosTests.hydra.hydra;
+    updateScript = unstableGitUpdater {};
   };
 
   meta = with lib; {

From f5507819243685adf72372b37d7e37bb032bc85b Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 16 Sep 2024 02:37:35 +0000
Subject: [PATCH 156/241] hydra: 0-unstable-2024-08-27 -> 0-unstable-2024-09-15

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

diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix
index e6e4f551f56b..ca09fcee4868 100644
--- a/pkgs/by-name/hy/hydra/package.nix
+++ b/pkgs/by-name/hy/hydra/package.nix
@@ -124,13 +124,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "hydra";
-  version = "0-unstable-2024-08-27";
+  version = "0-unstable-2024-09-15";
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "hydra";
-    rev = "2d79b0a4da9e2a8ff97c1173aa56fe92e1f4629b";
-    hash = "sha256-ZU8/LzdZ0nbUxVxTsRZyMpTGEtps9oG0Yx2cpS9J8I4=";
+    rev = "b6f44b5cd020d95c405e149e4c3a0e9dc785e31a";
+    hash = "sha256-dXDOX6IvAeznNoh73P2QWstBJ/jqfzEKjgNvdfsGTuY=";
   };
 
   buildInputs = [

From f15b995651e06bdc2730368856659dabdeee6ae7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Sep 2024 03:03:57 +0000
Subject: [PATCH 157/241] spacectl: 1.0.1 -> 1.5.0

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

diff --git a/pkgs/by-name/sp/spacectl/package.nix b/pkgs/by-name/sp/spacectl/package.nix
index 7afba8a8abd7..7fe0fc2bbf0a 100644
--- a/pkgs/by-name/sp/spacectl/package.nix
+++ b/pkgs/by-name/sp/spacectl/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "spacectl";
-  version = "1.0.1";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "spacelift-io";
     repo = "spacectl";
     rev = "v${version}";
-    hash = "sha256-w49nsPzEWfYeYxWNOl4VrWdQvL3zGafLxL5kUH4YaqM=";
+    hash = "sha256-wEu7AmFn1782XTKKb7JxQWn/ZSHrQbuZ/SDldn6pUNo=";
   };
 
-  vendorHash = "sha256-hVAQaM8Xank+l283D1Tq9TA/yiOiLGO7/3IyZkXj15Q=";
+  vendorHash = "sha256-SYfXG6YM0Q2rCnoTM2tYvE17uBCD8yQiW/5DTCxMPWo=";
 
   meta = {
     homepage = "https://github.com/spacelift-io/spacectl";

From d0b62bdafb2488801d169c1156f493faa8fc0aff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Sep 2024 03:04:01 +0000
Subject: [PATCH 158/241] python312Packages.tesla-fleet-api: 0.7.4 -> 0.7.5

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

diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix
index 1efd28a3041e..e8a8169a7304 100644
--- a/pkgs/development/python-modules/tesla-fleet-api/default.nix
+++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tesla-fleet-api";
-  version = "0.7.4";
+  version = "0.7.5";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "Teslemetry";
     repo = "python-tesla-fleet-api";
     rev = "refs/tags/v${version}";
-    hash = "sha256-lZuluzOiqqeDFf+DrX0/KNbsUKanUn2xglp3HW0ITso=";
+    hash = "sha256-9klPi+nscylkhvWRSqegT7aCBSH2/wc39u6aNJwpicU=";
   };
 
   build-system = [ setuptools ];

From fe05a75ac72863863a1de9fe9ed35126bd92ddb5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Sep 2024 03:57:14 +0000
Subject: [PATCH 159/241] nu_scripts: 0-unstable-2024-08-30 ->
 0-unstable-2024-09-11

---
 pkgs/shells/nushell/nu_scripts/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/nushell/nu_scripts/default.nix b/pkgs/shells/nushell/nu_scripts/default.nix
index 08bfedea2806..48f81d678852 100644
--- a/pkgs/shells/nushell/nu_scripts/default.nix
+++ b/pkgs/shells/nushell/nu_scripts/default.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "nu_scripts";
-  version = "0-unstable-2024-08-30";
+  version = "0-unstable-2024-09-11";
 
   src = fetchFromGitHub {
     owner = "nushell";
     repo = pname;
-    rev = "614b0733104a7753ed7d775224fe5918877b71de";
-    hash = "sha256-EmlwDTEby2PAOQBUAhjiBJ8ymVW3H23V78dFaF8DQKw=";
+    rev = "d04eea634a3ac35d481fa26c35271dfe175bf3e2";
+    hash = "sha256-uHD8j98WubyvtbtOqTdfGmeRJ7zoVDVZ9+CJzmB6vF0=";
   };
 
   installPhase = ''

From a780c7a12287934bfeeb24811b69d45fe08ca8d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Sep 2024 04:01:54 +0000
Subject: [PATCH 160/241] nb-cli: 1.4.1 -> 1.4.2

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

diff --git a/pkgs/by-name/nb/nb-cli/package.nix b/pkgs/by-name/nb/nb-cli/package.nix
index 5362c16e3ae2..12d6456359c3 100644
--- a/pkgs/by-name/nb/nb-cli/package.nix
+++ b/pkgs/by-name/nb/nb-cli/package.nix
@@ -8,13 +8,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "nb-cli";
-  version = "1.4.1";
+  version = "1.4.2";
   pyproject = true;
 
   src = fetchPypi {
     pname = "nb_cli";
     inherit version;
-    hash = "sha256-kI3Uy79mv0b+h5wjrRN3My9jOFzryhkStieqaG0YFvM=";
+    hash = "sha256-HZey1RVpx/fHNxdEue1LczYbwYUxEb3i3fHpkKHhn+8=";
   };
 
   build-system = [

From 1eff86395c900dd17a5899a3eb325b81d9744f98 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Mon, 16 Sep 2024 13:02:09 +0900
Subject: [PATCH 161/241] thunderbird-bin-unwrapped: 128.1.0esr -> 128.2.0esr

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

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 75f82b2118fe..76a3f313009c 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,665 +1,665 @@
 {
-  version = "128.1.0esr";
+  version = "128.2.0esr";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/af/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/af/thunderbird-128.2.0esr.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "f7caede50674b6714f95a267ee31cb8a31d60a3820b8ea516b5c88f82730e1a6";
+      sha256 = "f4b3a3087afc240c9c1b4439316b1f0fda190143cca1da0d0c10d537ec47fdf2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/ar/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/ar/thunderbird-128.2.0esr.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "75deca12178b9f7c474b57b37a027ebed6a4bb10d6eb8b608c89674cf857b7c1";
+      sha256 = "d49d17d785de3f9145f5640e3c835a1cd6ec7b205868be4c0a598160835bfe25";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/ast/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/ast/thunderbird-128.2.0esr.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "6c9d1834a477ae2a072fe210515209cf542ac5899226f431a401b4987b2e827b";
+      sha256 = "7d2e82951778bf97279fe5c1eb9a36010af6d28ac3eaaaec7cff6da26cb51593";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/be/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/be/thunderbird-128.2.0esr.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "d3ef3a02f45fd5629dde08063a723ae422a484be87d57bdda8c3cc9d7bec00b6";
+      sha256 = "e77107193165eb5050286965e752b326fa15f33cc891e011f01ab09b90e92d91";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/bg/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/bg/thunderbird-128.2.0esr.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "fd0257f2d3167a55b5577942cc72e251ff9f856be0a7dcbcfe7c2128cb87213f";
+      sha256 = "f64b546fe7803e808a82de46f9bd118b897004afdfb10baa2de9a190e3572ce0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/br/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/br/thunderbird-128.2.0esr.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "cac04ec5e0635a38e568d306c2b47158b893b6c8e54b4a533cf51d351b76242f";
+      sha256 = "a64ed5e163431a5fccfa452a565b109badbc80556cbe13bf00285afdb6fa1c1f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/ca/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/ca/thunderbird-128.2.0esr.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "9fd607242f7d568e6ad3b49e87b4b6a71b9a807f6aa4fc96b84ea4e42e29d896";
+      sha256 = "b0fb10db25845009c25e1bdbb408a1cc6935dd742c8cc1acd7c398bff4a600d0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/cak/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/cak/thunderbird-128.2.0esr.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "e81b6472ab864af62b4c4090013c7f3615c9594bc84bdfb3b7fb36f78f394e6c";
+      sha256 = "74a8c917565f27eced4b9ec952fee871da7e51c2323e509225227ccdb231cb79";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/cs/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/cs/thunderbird-128.2.0esr.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "f672b08496915f71c00cf9df0b214aea30b9db7f396340dc98ef5402780ee997";
+      sha256 = "63537a0b0efff24f47e9e8ea35bd28a55c6b96917c06a2dfa141d8f107f3194c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/cy/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/cy/thunderbird-128.2.0esr.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "6c002ffcc742fd0a01ec160ae8729a05d11267e17d32269c3fc6c03b3bf37d64";
+      sha256 = "fd459d4fcd1c6143f7a03ae3069073f4e4b8d097733d504dd0221069520fcc6e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/da/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/da/thunderbird-128.2.0esr.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "dee1fe8dfff06a276e4cb3018cd1a60ede76ee5baf09e34cf715912bc26c52a4";
+      sha256 = "7b75d5ab21254ef75a96217d715fc0a951ab38e8da61c2411820daea4b2ab979";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/de/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/de/thunderbird-128.2.0esr.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "d7fa4df3f309a06e53c8d3336d337e14c7e19f9b64d6b4b424eb6212d2d511e0";
+      sha256 = "cb05aa781c9cb360b23c597ab4566954e2506c01e214b14b0f7e863b2d5cadc0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/dsb/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/dsb/thunderbird-128.2.0esr.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "796db274ba2945d2212cf0015d0100465a754322fff4dd80d3d660b655bc64ab";
+      sha256 = "0d79340c7ae3af1e3be717ec92fe1ee14a53a680991ee2fb092dc9d4894b62c3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/el/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/el/thunderbird-128.2.0esr.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "2bbfef60b2c46da6d338ce7f0822e4261ed6a85253eaa3073a0ae94e88a53565";
+      sha256 = "58049b7f1224ed79f63e053c1dabf795f851e6441c09044e6b7272074cbaeb15";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/en-CA/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/en-CA/thunderbird-128.2.0esr.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "0b589335683709ec57c272f2cfa1caae530718c8a6e57aafec1ed7933a8896e1";
+      sha256 = "338d69c084b4a9dcf93b0536417ab8a3dfa258647229e74e2f6b487a3d381900";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/en-GB/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/en-GB/thunderbird-128.2.0esr.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "a02fe116c48a0afcceab7a40b70c3537037bd28fda6f5d1c649486d3307fdb8b";
+      sha256 = "cc87b7ea712cc7f426129245a32d26724047932c12c4f5ac262e52ca551d7378";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/en-US/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/en-US/thunderbird-128.2.0esr.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "f6f383c86f60c96b0bf2e338ab363d0d72f6e53e972429203c1920939fd8509a";
+      sha256 = "4200c48e8b57bddde15c7ad6757077e560d2f52a29da1902a35bcce945e751aa";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/es-AR/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/es-AR/thunderbird-128.2.0esr.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "752e6409c562de5cd25f73c519f016a4602df937f317b91028512a4a9ead4c77";
+      sha256 = "a1cf08ad3e0a80b90814c779e031a97aa9dba9797b02acf8c2e45fb1e994d54f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/es-ES/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/es-ES/thunderbird-128.2.0esr.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "aaa9b5e1ef3f642675c5804ba62a11e387762edc9b0dff9c8204e32b6cc9fe19";
+      sha256 = "2e0a4a2d9001c587b9f61478de6611a94de912ab8fe1ed3bace2959f3bfb57ee";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/es-MX/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/es-MX/thunderbird-128.2.0esr.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "5812b135c2655d72e099de4a2fdf72293e3f89bf8cd1fa7b96a5dca40157ea6f";
+      sha256 = "e47fb45e3c8e05a0027bff1bf2b9a9fe07b73c28144beeceef5fe40b40fbd5a0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/et/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/et/thunderbird-128.2.0esr.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "ee02e5e31281fd38f62d6e48fffbfe9435779089613d98d738eebf0288bc96cb";
+      sha256 = "c45c5801a736a578c06993f3e061e0df5c798fefc49f415d5ed1196c93d3b07f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/eu/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/eu/thunderbird-128.2.0esr.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "6a9988e9b67d8582fb4b9c456afd383c8b464c7cfb2a14e065baa38fb774ca94";
+      sha256 = "f709c4440888772dca99dd6cc667a9d72d20a6e1eb5c84dfbb0a7a8e488a6f74";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/fi/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/fi/thunderbird-128.2.0esr.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "55aa8e6f0782fdc8a41cb26288d84bfbdd6b88661d4e398b0b121ba6539b586c";
+      sha256 = "e6f32dfc0095065326ce886f0ccc46259a13ae4339f609b2519f74226cf88e02";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/fr/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/fr/thunderbird-128.2.0esr.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "ace271f70d85aef98649e72d230417821ac7b457a985000851c6a2def90b7199";
+      sha256 = "92ba3a5b2ebddd5e6f60c52e948f3336360e69fb3c21ca97f5629f16b6c74158";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/fy-NL/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/fy-NL/thunderbird-128.2.0esr.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "404d0c3e9bd086ed00209f40ec31ddd2f65ce8f05c246099f67ac1cfd4ccf18f";
+      sha256 = "7f905d1e7d17dd314f3e58286bdac0f4fcfacdddf1df809dd95a80a992f3ac03";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/ga-IE/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/ga-IE/thunderbird-128.2.0esr.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "c787eb2ad7490b18537a5dbf18c05a77479d9a38e46697f40db0b325c89197ac";
+      sha256 = "10421949c685172e8c842fa99ab11ee249a4e8357b9595a10d9a93659d5f45b5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/gd/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/gd/thunderbird-128.2.0esr.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "11c0bbfe4c0ee4c29e00755659cd3eec2c89fd002c35ca9dcf9a36d8e36637e4";
+      sha256 = "8861ac36c0c65b00e15fbe3ecb6b288c612b4226bc06d688189548e95abe46f7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/gl/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/gl/thunderbird-128.2.0esr.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "f3dc0ba2f53249baa82a85f47370e7d2d33144549099c58685c8e2b629fbd188";
+      sha256 = "44259d867c523488b62c06b41a340e5efdceda7e42faa98564643249c6409110";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/he/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/he/thunderbird-128.2.0esr.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "0fc4eb9da6f9b1fb833662aeeb6e3bc68ee111ec4b95a249b697f43e3b6bfd0d";
+      sha256 = "56b6152345ae31bf2e721aa1c4256493214969d1e6237bb3d861b784d0ff61d1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/hr/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/hr/thunderbird-128.2.0esr.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "4c19e84f14610515371c00e4bfdf0d1a9c6d93326767d2a049e18a3286ac4f86";
+      sha256 = "64c7bf327329149f0f8f0138db5759fd0d2f032d58ea795b95f23c44e6cd2124";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/hsb/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/hsb/thunderbird-128.2.0esr.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "f908d18d7ce4997d46ad05e61b54c002f6039cdda67a4b06df1b2e21b9b01994";
+      sha256 = "b23577fb06f2813a6b8a0a0e8b76d029ec0d129758814696de4b5679e8b46d3f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/hu/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/hu/thunderbird-128.2.0esr.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "1ef3b469e5cc01b78d0f9b0397cbfdb08a115b040d5ff5b93f6b7ef22e53ce7c";
+      sha256 = "9f2a7bb6990dfdd7b35922132701ead5505343ad53b12ef44743fffef8d4878e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/hy-AM/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/hy-AM/thunderbird-128.2.0esr.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "ee4072bb5bc8ef35d4a95d8e0f00b7ece382246b3343da889022da71961f56a5";
+      sha256 = "176130e7a7701022fdb308edfa8504c432639794e2582c214807d9496583de95";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/id/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/id/thunderbird-128.2.0esr.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "3267e6e36c93ed79c2cd4171d037d2b5016d9b66d0da60e078d980930c7ee872";
+      sha256 = "80d9b02e4125d1e8f59cb7384c2ea6559c77a517675c84e286f8574d86459aeb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/is/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/is/thunderbird-128.2.0esr.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "8807acfc9b004d6010087424bb7742de208625b177ba340eabf395a35c5dc5f1";
+      sha256 = "677d0f4bc43d2efefc1fb052706cf7307ccf7b8bd529c76c1860e6f121daaf2e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/it/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/it/thunderbird-128.2.0esr.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "7a65820f86686e1a8f3176533839a41fa361eb8d5ae7d25eb3ba25552469303e";
+      sha256 = "f7160c5183922bdcecdaf87100b1556081072dc31c2436690ac707e47511d36b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/ja/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/ja/thunderbird-128.2.0esr.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "3715455a068e1917905080d346e684237f15ea98cd3aef4b8cca4cb1f1a66beb";
+      sha256 = "9b1144c1911f0186d4ad6b1b4526d55aad0a6de2157e02cd8bf593c827ac28f3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/ka/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/ka/thunderbird-128.2.0esr.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "a4920bd4c5013bd4e8574515f6064358c85036a666620bc15bb23ed891b309bf";
+      sha256 = "1dbc9c8419f6f7d131c00851d54bab714ca30f75be97529bf5f679a859014050";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/kab/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/kab/thunderbird-128.2.0esr.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "0b9879b77e8efc4a40b1e11b93a0c45be7c4d195a523bc202261f33dbd138d1d";
+      sha256 = "fe5fbf0b7c3e5f10846a0ab019baf5ddddc7b7bbb04b32e56cfca6bde5d92fb6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/kk/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/kk/thunderbird-128.2.0esr.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "4da60f136c95c915eeb6047d647d1aad066e9194620ccfa6b0d2d649a2bc539b";
+      sha256 = "77055d3004bbe6fce489cb4ea8c9e6f75d19ad35d0015caceb24920d372036f3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/ko/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/ko/thunderbird-128.2.0esr.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "9d497d4e26bddc96a7f4b2cd7b21a54a7c159ae4245e7f10e0534cb73ee9d0db";
+      sha256 = "1711d530249728789931831680cb3062c1da2addd90482a195d27ccb2d69cb33";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/lt/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/lt/thunderbird-128.2.0esr.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "25e2f903fb2d894eeada038728f43e2e195e0997e13d7e961bb8429a442041e7";
+      sha256 = "e3fd07e0bf2c1c6586b5826c92e4aa2341faea04791e686c8e6213a0d0f4e00c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/lv/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/lv/thunderbird-128.2.0esr.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "3a85ba4e1b15d9d2400d1000b1215356c4b6674e21cd8abe6957860cff108c77";
+      sha256 = "432cce43817a60790d8295c49b6e04b5d595811a3bf5024d733302ea755ab1c3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/ms/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/ms/thunderbird-128.2.0esr.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "e136424aec855ff15f43fb4082cf3270928d3de5cfd65af25cacfbb7c1fd2262";
+      sha256 = "110ea1d59a3d00d45198505ecb15100d9cbcc77bfba69fb9000ecdfcc9db1d4c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/nb-NO/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/nb-NO/thunderbird-128.2.0esr.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "3332ae00538d48b2842a66ad4a7383c021bd0f4d4f01845229e8a3d10330f0c3";
+      sha256 = "7d7bac855a4e27055e0a8561172cde744058e74aa8233554504d87dfc68f29f6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/nl/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/nl/thunderbird-128.2.0esr.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "4278329ed3b2fb58f15def543c27cc6bbe67e70d8b7c38e09ea37091b3a2e04d";
+      sha256 = "4820f08e4979e9eddc4182fea39d023defcb450e7edac9c8a2d3b09c62669959";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/nn-NO/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/nn-NO/thunderbird-128.2.0esr.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "6816386d06eb3faa8d6ee533157153f5f3ff1cc9f9fbc1ab871baa32d3e5de3b";
+      sha256 = "835b1befa30afa3d8cd50f4cd9a2922cb63815ac1c9b240c491d114f4e8542cf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/pa-IN/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/pa-IN/thunderbird-128.2.0esr.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "eb8fe69a9a88593f1c4cf953a4066cd0c79c8f61c270f65177ef5de196481744";
+      sha256 = "cee9b2f3aee4e978772222f2946c99986ce36695f34e51708cae928bc66ab6ef";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/pl/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/pl/thunderbird-128.2.0esr.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "c7e97e39ca32dc0369da1e2cbbb714b3b2614e552c932e328d9ec01c28dcfa88";
+      sha256 = "ba29593feccd45c43605c6aaaddaa99afd25308e810e6059ca873a162a054eae";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/pt-BR/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/pt-BR/thunderbird-128.2.0esr.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "5cbf7fddd22b227ef57b9902273820be8ab518511a9a4305941a178fcaadc5d6";
+      sha256 = "5e1bb94d66d757a62e093835f91b097586980702985931813d2825bf7b90f5c6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/pt-PT/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/pt-PT/thunderbird-128.2.0esr.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "23bae7cbb8528b607ea8b7e8d5fba51edd85682e50e823525b7d88633cba67cb";
+      sha256 = "f437bdc00cc4cd70995000c4a23dc7407f8b0b42dd42d3e536e95ea6d79f0ebf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/rm/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/rm/thunderbird-128.2.0esr.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "3e47ef468d5608badb81a085a4bdb4e5e471698afd613430b36b55203b6392a2";
+      sha256 = "b068a55935501994c69390b2d45b3592e2d3f7fb8e270fb058aec8882a353e90";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/ro/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/ro/thunderbird-128.2.0esr.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "dc819bba617164a42f4564584a727a33cff2fb9c9fa6795f154d0ba836700016";
+      sha256 = "6f6fce04d2676a21dad81a77f0b875a3730e996810f249452fd49d277d13b39a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/ru/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/ru/thunderbird-128.2.0esr.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "92b8d9dfbd033c00ae7860d4d3912e713c193b75bb533088b1eac1ae4d5cb131";
+      sha256 = "2044141931cb4735ef1236b8c000aeed718266cbbd3c28b5d3fd3ddda4f64317";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/sk/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/sk/thunderbird-128.2.0esr.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "694460056e16866c1b807864c6ea0593d01d45157178adfb3f29ad8277554491";
+      sha256 = "bdf6d92e16397237d5c9168d3d5f14d0ffc8df04e9b435a5f1e7a49138cf593f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/sl/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/sl/thunderbird-128.2.0esr.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "41451768b19248de4827ced8f13fe794401405016adbdf15c80929544c619216";
+      sha256 = "21aa9cd554c5a5d6f23f433c4697e47e3fca90d957f9a413d3b7aeb030055544";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/sq/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/sq/thunderbird-128.2.0esr.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "9ee7df88f187862c039c75a68d7fe9e509b4a88c94cfe69adb1b00bbc11b7dbf";
+      sha256 = "f8bfdbb24d67341cd5d3e88012883835a2d48f18e0d6efe33c1b726431bc279b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/sr/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/sr/thunderbird-128.2.0esr.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "d4d6ac39c1296ea136f7dc7f85655aa26a3e9bea9499d38be171ba419cc3d146";
+      sha256 = "f906ca1bd4391ccad57eed53d247d32fd62b3328a005e034e5f76e74ea37aa4b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/sv-SE/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/sv-SE/thunderbird-128.2.0esr.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "ffed8cf698a067490ec9749c66dc8829bdea9f217d7762c3a0d02bace29e9e3a";
+      sha256 = "697c1c80cc743f5446c3d6744cfac640bf5968d9b8322697546af9a4cffe6517";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/th/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/th/thunderbird-128.2.0esr.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "537d70eb286b63faa280c0547059ce0df8c1fc70775f82c3e7865c589005ee0e";
+      sha256 = "62bf8a81688e3405ebde85623df7cbb9c87a41ed0b86ef32f791c1a3b383c185";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/tr/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/tr/thunderbird-128.2.0esr.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "e079b676a41c5d7a2011965f7e42bfbc75ef8f85521ea94bafd01bda0dfb28ba";
+      sha256 = "af3b01def0092f1abd3dc7517ac68e41d92fa816ff0ee0045a14fffd257dc732";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/uk/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/uk/thunderbird-128.2.0esr.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "0f899cf16ecb4f10456b271ef98672b3c7f043d3dd50190c1140fb4ae4701e1e";
+      sha256 = "0b5c83c3e28b59c7feeba5ce953b0b60d115f33f567e7942d450c804e4f0d236";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/uz/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/uz/thunderbird-128.2.0esr.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "3a2cbcd225ec53410dec278d28f08a9af8d23a852304b00325411aa3fefb7134";
+      sha256 = "45091cbd6336995b86d3e2b5e0ef82792dc5484a90ca94de905526d3122853c2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/vi/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/vi/thunderbird-128.2.0esr.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "456a2eed712a8853bfd014cc556aa1caddcedb0159f8d2fc63d6ee61d5b8bcbc";
+      sha256 = "448a8ed43b80448994b918f3f91c3de3698b106f578b776efbaa7b4e4c4d3fc1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/zh-CN/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/zh-CN/thunderbird-128.2.0esr.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "f55e16ecdb55927efff18ac94a6703f86972642a2310948604c2573d281ed2d0";
+      sha256 = "53cbdf5039e2f6d724b45ecf948c63af367e7df4f7766e628fb945fce33734f8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-x86_64/zh-TW/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/zh-TW/thunderbird-128.2.0esr.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "e62968e0457ca8691fb6e474c3b945202912ed019b99caaf7f786ce56e94399a";
+      sha256 = "147e2983179d906c7878a889a4e05be792fb54336f029b7c4c7f26f115ed9217";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/af/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/af/thunderbird-128.2.0esr.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "6872446b235915fddcffcf9024e83424159977f25c1c9435274c795356645621";
+      sha256 = "282558d2d07b3c44de23c5684771e8f2eab9f67f5fef844f569f84474687da04";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/ar/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/ar/thunderbird-128.2.0esr.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "0dc5ca84ac378cb187b629ea9e138080f5fdef33ad80e2293ae092a742d7a73e";
+      sha256 = "972d674e174433e6dd91627942a1d2e3e06b16c9fcc5288b9ab1f92a0a2526f8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/ast/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/ast/thunderbird-128.2.0esr.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "9b2744787c0e3d2f26d86cea92d79202f4905a4ccae52128507a38a1e6d803be";
+      sha256 = "bb7c12421185c2a1db8e94bcd7d0c7b9d461272652ab22fa5a05f08e83a226c3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/be/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/be/thunderbird-128.2.0esr.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "29e667cfb4a280399da8805e1cdf5f924d40ec544b5f6e1450d8b6b0e5417f43";
+      sha256 = "0a731f7c5caa910719d3efbf8d65a8d7149a3195631263de13e0ccdc51eb5268";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/bg/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/bg/thunderbird-128.2.0esr.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "dcb4ea76cbadbc4693e5bb480513b55216c0456fd757a9819f95e385a38274ed";
+      sha256 = "af55dd242ea2edceb2b7faabcf26f1c976efb9f8b5ff76d5b07cfbd9c6eb55d5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/br/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/br/thunderbird-128.2.0esr.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "606d741e05d8769f3dafd72540a29e5a98fde968e5c83152554adb705178f1db";
+      sha256 = "b5b249a78710ba4c7d1bc696fccfa7a63a517d537ac4f011ba7a22f2d3fffb0a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/ca/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/ca/thunderbird-128.2.0esr.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "77585d968f7a34c10f54244c64997094dd22bf1b86d7fd72f36699ba65a11363";
+      sha256 = "2dc876760e6520cd3ace249943e37d363f98388e799c0e0fb2d51e751404de40";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/cak/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/cak/thunderbird-128.2.0esr.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "99b192e2153fba6d39c609dc59078956603079d3af0758a203c9c179d3814aba";
+      sha256 = "836350ae188d39899231a26d7e10eaa029559c83a3395b7c74536d37f73d795f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/cs/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/cs/thunderbird-128.2.0esr.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "92bb4fb6261e695c3122c5797edf92084e844a509ed3b77199927f408e780c8d";
+      sha256 = "1b3bdd19f3e880bab7428e831f490c0ce69fe1db20b8699402e956f09b77c5ff";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/cy/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/cy/thunderbird-128.2.0esr.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "2736bbdb40c174ba13be89efb36c77da6842d32a8f589e7e72085e9d5ae0dc0c";
+      sha256 = "b1153a70b2bcf6e9f0deaaaf175a5085921f7d1e1a1f319136c94ce57bef54ed";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/da/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/da/thunderbird-128.2.0esr.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "6a1cebef252ab884cf56824045ca6699ba092526ee2c8944f7041fbaa3ec8316";
+      sha256 = "a2eb8ba6175dd4b7336ab05fe4834527a31ab5e13abb0381f187e91f836031e3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/de/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/de/thunderbird-128.2.0esr.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "21fc083977e9bee76118ae38e05cffcf5f77e3c2916f1dba4c6762060603a04e";
+      sha256 = "1c23af1559f2e8f090cc651c827d4130e74f7141daae585ddc43c0287b8b0e0a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/dsb/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/dsb/thunderbird-128.2.0esr.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "74361c681c861a3e298b494feda3d51489881a8da614726d3d539bafb6eca5bd";
+      sha256 = "341d6a892f5b79836bb18fcd97df1b2fab695791a50af6ded0d966f1d0439008";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/el/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/el/thunderbird-128.2.0esr.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "22f9f3dc25c4de5ea33e98ccdf9743540d04dc6bc6b501da638db31531ee9464";
+      sha256 = "8eb920d8e41cc1ca8607580f124061f9c10a549377b591ac5cfb53b2859248d9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/en-CA/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/en-CA/thunderbird-128.2.0esr.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "bac464a25326ae1062fac17430911a34a89f0c8fffc3c7b2032f1cc146dd9b29";
+      sha256 = "ca2c7d3eee2129e3da7bc4a7d25db4b867c23408084a9438c4a600c1d35c9853";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/en-GB/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/en-GB/thunderbird-128.2.0esr.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "b41780d9a1aa4e801f905a87b11763305b32bd0fa50b0c3c23876b5833bb7b73";
+      sha256 = "f8f1aeddf0b5711e10ae4a4d785380230a9f8871d73baebe95ae43f3bf4b2a45";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/en-US/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/en-US/thunderbird-128.2.0esr.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "89a8f5019cf334a1cfd957f1dc9a4bf53eccf5ff0b23ef2db6058756453f3b68";
+      sha256 = "c89cda02e8a17ff8e455085ef22c1a14f8d42217239e68133ab0d3076a4df170";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/es-AR/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/es-AR/thunderbird-128.2.0esr.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "042d331b9f57dd7074c3a7c50e1b038eb8e3f08881b149bb9af6c5146c92f374";
+      sha256 = "30b6d06405cdc824d2ea2e8ae3352403d631e02d182621035c9c4b89a2f5d3e8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/es-ES/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/es-ES/thunderbird-128.2.0esr.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "46b136ade4bb3dcb1be7fcb18924693786930d6218c84d86e92f8f004cb2db4f";
+      sha256 = "4a52ee0cad2c6adb85a5e847b71761fa931f2baa34f310c2135249a1f74d1e81";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/es-MX/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/es-MX/thunderbird-128.2.0esr.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "2242396853b6568562cf8c6864b90be994773a1139cb91ea7d65c61ee0dcbb0b";
+      sha256 = "5e3ee38af26a47df39c542da9cad4f0f5fcd761b93cc25aa3b3e484afea342a2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/et/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/et/thunderbird-128.2.0esr.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "6bd30efd3e297214dd0ab0cd5fa8c4b21791674ff8c86bff7f5a38a692fb7a10";
+      sha256 = "bad8263e3754045770662250327c14ea50a11d46d786fcf0d41f761e0cc2c60f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/eu/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/eu/thunderbird-128.2.0esr.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "8a69d159cb93c3bb441b2b33a4b3251eba02bc10025ff29b39cdb54817cf930f";
+      sha256 = "8433875ae5b054541f6fc70ef566482acabc9f013a0010d4d3125c09acbd4e2c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/fi/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/fi/thunderbird-128.2.0esr.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "676004498bfb20b8b1fad723bb254ca210cd2bd6ee3141df41e0460fb5dcba2a";
+      sha256 = "4a077df147a2a27eff7cae97bf33c1d2ed92c11f6f6f6e71307bda9951137fe7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/fr/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/fr/thunderbird-128.2.0esr.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "7dcb30ece74cf8e0fcda595cb44d84b43059fc00939da120372e908bd158f1e8";
+      sha256 = "4373edef98045ff52146a9899159f4d0614cefc0a49740c538ea52692097d45b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/fy-NL/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/fy-NL/thunderbird-128.2.0esr.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "394b3e2d5e7fb772c45c94cd38849e181cb414362bac279abdc545bc920917d0";
+      sha256 = "0397b53ac71755e8ce65a946d3aa1eb2d025ee3e211857d31519f13d560e99f7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/ga-IE/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/ga-IE/thunderbird-128.2.0esr.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "58f1dfa592cd1d02e782bb832a2eeecb69c5438000a2700f3b1b0a5d6c25ed52";
+      sha256 = "ea0f51dce8b5f51cb857c112eda213599a0cf85f03de718c3cccb575afe8c311";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/gd/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/gd/thunderbird-128.2.0esr.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "e385995eceac9f84dbffb561851784a5c7c4b1560994631f9d6e31c9c09ed50f";
+      sha256 = "4f2f2d90b84349889b93be998eadff420dc547b36ed2e232c3cdf6a4269a7c1e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/gl/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/gl/thunderbird-128.2.0esr.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "1bccd0f5870159883b3b77226050b8475d61252c581bcebe89067da9a110d0b6";
+      sha256 = "8737b1b7a116da2e2a7054c579d5898ecca15abff78a179d86734ea9a58e717e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/he/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/he/thunderbird-128.2.0esr.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "2652f6723d7aa4b6abf517fa23d493deabde1f37891d7ce8e190f04bc72d550f";
+      sha256 = "2260a9384ac575b3232dc5ceed92e76d56ffd44072784d26f4efaa30a7c4d33c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/hr/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/hr/thunderbird-128.2.0esr.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "a941a94afc2692c3329b22afe40cbcd2b6c3bfb964178bf66f699f5dd0ee3ce5";
+      sha256 = "30ffe91315ac17eaecbe112d4f7db5482c464843c80dcf45f2cb7739b6f957c2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/hsb/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/hsb/thunderbird-128.2.0esr.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "2eea4f3167ffdcbdb3e6712c2ac67d03c6f84cf8fc611e854491c5d2d7759ada";
+      sha256 = "4ab8a3ad84614e9b5efeb953e34a7258cdad035235d4de1e802351c04d135889";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/hu/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/hu/thunderbird-128.2.0esr.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "c0811928b99556f2de5876fc22520bfdf1d38ecf97c8e7ded2bb882b85cbbe33";
+      sha256 = "e710ec3beb0656fb14962cfae06b29be24d30f5c2cefd1cbb4e8e09471193d54";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/hy-AM/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/hy-AM/thunderbird-128.2.0esr.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "29bb49dadf3bcc501d829c451cc1c541f103ab27c58bb94a50af6deb63dc139e";
+      sha256 = "18941e2454d60b17aeebdc95aad7854b989e71c4e928b0147c0beb36eff54f3f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/id/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/id/thunderbird-128.2.0esr.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "eda238b6f688bff2396d4aed23c3a24929883a6bfe814873b44fd256f1cffc19";
+      sha256 = "029c210861312a5d2d3c59f69b692692b133296b27d125367ac2cc2419e0a8d5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/is/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/is/thunderbird-128.2.0esr.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "6b5f7cec11eadddc310140dfc109c801e1d10e711b41d3a132d55bce91923402";
+      sha256 = "bdc4447638fc299cf5974adf5ca268d6d4a46f6d1b22b51e54b2de46f1c266c8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/it/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/it/thunderbird-128.2.0esr.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "c24f656d53c604cd06a05388d03e93c424bd831c355b75ef64f1072f307d2305";
+      sha256 = "b3a39203e13635e59b6f58fbd053ebe630c5da786325c48f62f2493e00237d32";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/ja/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/ja/thunderbird-128.2.0esr.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "810b09ed1875094440eb966e5b2e91afef8becaa62901806310235d0c6cde253";
+      sha256 = "d684e3c5423710c07f5f6918257acabff6ee3c7fa685fb19269f482a6c6f9c61";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/ka/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/ka/thunderbird-128.2.0esr.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "924e98fbf30c7e05d2d5d65fc9908e9a9ef69113ef8f9a19becda6a5e110cced";
+      sha256 = "5363ebecae103a8b5d37dbd0011e6bdc284e28beb4a32dae17314d3ab420cd22";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/kab/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/kab/thunderbird-128.2.0esr.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "304fc281009a152c4c9987d332d8d295e151de889a52bb760ad1027fab257e4d";
+      sha256 = "06a8be9cd3cdd3a7b6dd1c9d854a92858c3bde93a1ec49986a9e9325d883527a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/kk/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/kk/thunderbird-128.2.0esr.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "dc0e71b08952382d816f2d814bb0e5d8b9f0ca94043bdd482338b08fbc08f401";
+      sha256 = "48f9e2bb1efd842fa78cd593305771b43c80d25bbc5ae3336123af43a50a8676";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/ko/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/ko/thunderbird-128.2.0esr.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "979378c1aae8a61b6cd0a091a44c65169cddb10d9e8e8fc0629dbdfe284c6427";
+      sha256 = "09c25ebf06fb2524b3717f17a63c4ffc95925a626d0f102ce926108ba1fb4f0e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/lt/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/lt/thunderbird-128.2.0esr.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "a3deb9c4288291d8ebf1597e931fd997329c0b3e703f7856dc79d2f0da8b0627";
+      sha256 = "721c02bd8e8016494d7a32465cb69cac923fb8ba48bd32dbedde6c7e3d88a1be";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/lv/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/lv/thunderbird-128.2.0esr.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "618a9034c7d4a16be49f8ff69732a54350a57398b7d453258809502fcc13d560";
+      sha256 = "2f60dcfa5fbadb856aeb15b3542f27952469aa8b333fcb91d3d1e7f69cb9b3a2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/ms/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/ms/thunderbird-128.2.0esr.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "7c8a8b9afa8a34c3372b2cb45350ef6aa45d4635ad8a41f3a9b480a49c5d925e";
+      sha256 = "cdf054772acb4130e300ba0aac0e803298387e775af0d890476239e3d7be7c05";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/nb-NO/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/nb-NO/thunderbird-128.2.0esr.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "4aea3cc49dfda9e4415f918577d398a93f7bf603f809f63181a2d25272614c63";
+      sha256 = "1c56b63aff8096f946388498eee83ba509c46b2f8a609665eded59f13b729d22";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/nl/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/nl/thunderbird-128.2.0esr.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "261bf62d63b066811d586305ffc923ae83c78e5ae17ca445cdc5b3f96bc3a06d";
+      sha256 = "d93de2c117308f4843d9c9377ad336730834132ce823d2d0a1f49c40160c0933";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/nn-NO/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/nn-NO/thunderbird-128.2.0esr.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "60def136f945da719dd5809764ad726c0c0158b82f358599757a009aa0fcc90d";
+      sha256 = "4f183fe49f3725defcd1c2b4ae65bd95a5ff135b5f2ba0ef348fdecf04c2f7d4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/pa-IN/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/pa-IN/thunderbird-128.2.0esr.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "c2c2d4a5dada97059408382cc70a87bcf5455af05a7476dccfa07d11574da695";
+      sha256 = "f9c8787bd95bdedc4e21fb9ee13b2d4ce7bb051bc3890d104b805b5f859ab922";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/pl/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/pl/thunderbird-128.2.0esr.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "eab954d862710fd80254b5106ff5daa9f94d3a1a4b145b4dfc2b665854356fe0";
+      sha256 = "f536ba3b737d23dc9e0b0f9bf6d0bef06c08c35f37ae92e8f56ce49760422614";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/pt-BR/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/pt-BR/thunderbird-128.2.0esr.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "ca5bac344bcc1ba4471221a0a51611ddc69319d508ce558d43d0e09541891e48";
+      sha256 = "5d7a8b873affd479fcefbe88db6677fdbe616ad67031ccf7fdeee4e740e99653";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/pt-PT/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/pt-PT/thunderbird-128.2.0esr.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "cc60009903fef2a55059b42fa50c08d68b75187691b339ce0caeecc6dd22bea8";
+      sha256 = "999f812b3ca0cec36503a425b0d756555bc159e2a1cd952a06d65034d28aa0f9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/rm/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/rm/thunderbird-128.2.0esr.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "37c112550593f33eab61427b60f2450d22b35c3419ddc811fc91dc485cc13a17";
+      sha256 = "081809c7c14f8056db296ff3ac97e2a9aaaf56302a40ffb8ede62d83e17fc944";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/ro/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/ro/thunderbird-128.2.0esr.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "60f1aa505c5fe359795722f552546c39b65a9615676d889f2946a001f4897840";
+      sha256 = "61ffe80eb8d740dda615ced1365b96f6a453947cd174bc3e96577538e3ffb8b3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/ru/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/ru/thunderbird-128.2.0esr.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "e7f6ed6889366a6bd925dd5becf567ff4caa61b8f66549ec18478ece1bbc2848";
+      sha256 = "c71adef5e11819e3cb7d8ba9c4081058e76f5e3a07e57f8e6c66dd4baf53945c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/sk/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/sk/thunderbird-128.2.0esr.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "327afe61acc5a1ee0a8b73e88393c98d1970d594bb45295ffe50b042ff515764";
+      sha256 = "28f2ead6651a8fd9d2e75ad3eca88161e93aa13b0ab4e4efa22a5b4e0f77804d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/sl/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/sl/thunderbird-128.2.0esr.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "42e721f86d33aa897e13c3881ed7157194fbdcf3e8f19e7e38767605c957427e";
+      sha256 = "ace141250862bd1ed339e2a808c059e453ee48cc655e1fec00539c44c12fc77a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/sq/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/sq/thunderbird-128.2.0esr.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "e00555fb3e07cc211053ab7532bed98b1bc0d33165cc9f407f8aece16a472a4b";
+      sha256 = "4463332d93d5f055a39aefefee061c496e4df909c5f605e561bdad524df0ec8b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/sr/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/sr/thunderbird-128.2.0esr.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "de2c3ae4976ebe92b08bdcc5d8f22e51112b9b5e09c3e16b4bdebfc13829c54e";
+      sha256 = "c6b2bc17a929cce1f829809870cbee9be414c0847ce00a51afa923977a1e0bb7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/sv-SE/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/sv-SE/thunderbird-128.2.0esr.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "59148b62f82f6bf64a06e6bff89118bb6f34f41c0be05c634765f19b6fb16888";
+      sha256 = "71241892935c67e156ea3b37e46056896ac9e60ec90f328ff6fbde1d3fc15bff";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/th/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/th/thunderbird-128.2.0esr.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "2fb1973f1dd26dc1c25fc73dedd911f47c7664df09f58fa12fd822e995f89fa1";
+      sha256 = "23a404e4f2ad01295a8a6b8439e6a4a733b4ee26eeb709c71ef76a6fb859a244";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/tr/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/tr/thunderbird-128.2.0esr.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "0d99bf6f23a52442a09248c46a88523fbe629a95af74dcb45f0c18cade169c90";
+      sha256 = "e418a2be53df374d9ea08fd64a890dbe076e420d9b0e2db3dd58035433801d57";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/uk/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/uk/thunderbird-128.2.0esr.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "172909dfa64f1659edb440fbc1e2ff2d45ae690dfb859bad63b645cfafe3f16f";
+      sha256 = "0185113bbdda3bf7fc03578ff8cd7c2cabf691608d3ff67e598bb669c60690fb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/uz/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/uz/thunderbird-128.2.0esr.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "7804f6b2270e6cde60ec996e3ff4c1ecf6b9c7b3e16b05caddf000a270e8c7d4";
+      sha256 = "dda399a258e14ce9f38b5b1c4b9c366c52ed0d3158ae8eda45da3e28648bba6e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/vi/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/vi/thunderbird-128.2.0esr.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "ce35721456873a1619379623c505f825d82b558c20c220ff29c16514f5f11619";
+      sha256 = "fadfa641fd7363d82856b2957645a619c9f8f582c9bda78b6a74a825729aec91";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/zh-CN/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/zh-CN/thunderbird-128.2.0esr.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "9e6bee2ab2c647e55fff98509cda69fd61e721bcab83c35df91dfffba6f5edbe";
+      sha256 = "667e7244f358e12973df794afd4077bb1ceb7e4cbaee88f0832cb2c25d151d1d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.1.0esr/linux-i686/zh-TW/thunderbird-128.1.0esr.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/zh-TW/thunderbird-128.2.0esr.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "f395a5e9cc54ddf0d883e10d129f0111c992f33fba46981622832665f491480b";
+      sha256 = "becf451ca9483fb8a8d0b9d76942eac71df2d4ea063ff8f5411e84d9b8392898";
     }
     ];
 }

From 67c153055962db5808c447f1ddaa37d0160ab178 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Sep 2024 04:26:35 +0000
Subject: [PATCH 162/241] libvmi: 0.14.0-unstable-2024-08-06 ->
 0.14.0-unstable-2024-09-04

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

diff --git a/pkgs/by-name/li/libvmi/package.nix b/pkgs/by-name/li/libvmi/package.nix
index 4dc844bd802f..a4a5dfd19b4c 100644
--- a/pkgs/by-name/li/libvmi/package.nix
+++ b/pkgs/by-name/li/libvmi/package.nix
@@ -24,14 +24,14 @@
 
 let
   pname = "libvmi";
-  version = "0.14.0-unstable-2024-08-06";
+  version = "0.14.0-unstable-2024-09-04";
   libVersion = "0.0.15";
 
   src = fetchFromGitHub {
     owner = "libvmi";
     repo = "libvmi";
-    rev = "bdb9ffb8f1f70b425454bc41da2be353cc6cbf5c";
-    hash = "sha256-5K+9Qq5vGeYYy8kqWIeO25iNJoD/HvtyircH6odr/qA=";
+    rev = "033a0ec5468c29a93888385fd722798a2ca639b7";
+    hash = "sha256-NPcOqmTO4EligGsOTfyO6Bc1duyAoMuX85ICVIOWFE8=";
   };
 in
 

From 467e802f223b7d13d12c9a7ae3495eef8a31b11a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 16 Sep 2024 00:00:48 +0200
Subject: [PATCH 163/241] python312Packages.pyhanko: mark as broken on darwin

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

diff --git a/pkgs/development/python-modules/pyhanko/default.nix b/pkgs/development/python-modules/pyhanko/default.nix
index 947f3911ce3d..0e98b38b46a9 100644
--- a/pkgs/development/python-modules/pyhanko/default.nix
+++ b/pkgs/development/python-modules/pyhanko/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   aiohttp,
   asn1crypto,
   buildPythonPackage,
@@ -122,5 +123,8 @@ buildPythonPackage rec {
     changelog = "https://github.com/MatthiasValvekens/pyHanko/blob/v${version}/docs/changelog.rst";
     license = licenses.mit;
     maintainers = [ ];
+    # Most tests fail with:
+    # OSError: One or more parameters passed to a function were not valid.
+    broken = stdenv.isDarwin;
   };
 }

From 1a26606a23ca152309d689f77b2c45c47678e37a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 16 Sep 2024 07:26:03 +0200
Subject: [PATCH 164/241] python312Packages.pyhanko: minor cleaning

---
 .../python-modules/pyhanko/default.nix        | 55 ++++++++++---------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/python-modules/pyhanko/default.nix b/pkgs/development/python-modules/pyhanko/default.nix
index 0e98b38b46a9..f8cf0d88cbf2 100644
--- a/pkgs/development/python-modules/pyhanko/default.nix
+++ b/pkgs/development/python-modules/pyhanko/default.nix
@@ -1,33 +1,40 @@
 {
   lib,
   stdenv,
-  aiohttp,
-  asn1crypto,
   buildPythonPackage,
-  certomancer,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  asn1crypto,
   click,
   cryptography,
-  defusedxml,
-  fetchFromGitHub,
-  fonttools,
-  freezegun,
-  oscrypto,
-  pillow,
   pyhanko-certvalidator,
-  pytest-aiohttp,
-  pytestCheckHook,
-  python-barcode,
-  python-pae,
-  python-pkcs11,
-  pythonOlder,
   pyyaml,
   qrcode,
   requests,
-  requests-mock,
-  setuptools,
   tzlocal,
+
+  # optional-dependencies
+  oscrypto,
+  defusedxml,
+  fonttools,
   uharfbuzz,
+  pillow,
+  python-barcode,
+  python-pkcs11,
+  aiohttp,
   xsdata,
+
+  # tests
+  certomancer,
+  freezegun,
+  pytest-aiohttp,
+  pytestCheckHook,
+  python-pae,
+  requests-mock,
 }:
 
 buildPythonPackage rec {
@@ -35,8 +42,6 @@ buildPythonPackage rec {
   version = "0.25.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "MatthiasValvekens";
     repo = "pyHanko";
@@ -57,7 +62,7 @@ buildPythonPackage rec {
     tzlocal
   ];
 
-  passthru.optional-dependencies = {
+  optional-dependencies = {
     extra-pubkey-algs = [ oscrypto ];
     xmp = [ defusedxml ];
     opentype = [
@@ -77,11 +82,11 @@ buildPythonPackage rec {
     aiohttp
     certomancer
     freezegun
-    python-pae
     pytest-aiohttp
-    requests-mock
     pytestCheckHook
-  ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies);
+    python-pae
+    requests-mock
+  ] ++ lib.flatten (lib.attrValues optional-dependencies);
 
   disabledTestPaths = [
     # ModuleNotFoundError: No module named 'csc_dummy'
@@ -116,12 +121,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pyhanko" ];
 
-  meta = with lib; {
+  meta = {
     description = "Sign and stamp PDF files";
     mainProgram = "pyhanko";
     homepage = "https://github.com/MatthiasValvekens/pyHanko";
     changelog = "https://github.com/MatthiasValvekens/pyHanko/blob/v${version}/docs/changelog.rst";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     maintainers = [ ];
     # Most tests fail with:
     # OSError: One or more parameters passed to a function were not valid.

From f7ea454899506cb9f8fe432c80edc41669aa7354 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 16 Sep 2024 07:45:57 +0200
Subject: [PATCH 165/241] mupdf: mark as broken when using python

---
 pkgs/applications/misc/mupdf/default.nix            | 3 +++
 pkgs/development/python-modules/pymupdf/default.nix | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index 7af43038e61a..b54d9dd86157 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -212,5 +212,8 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ fpletz ];
     platforms = platforms.unix;
     mainProgram = "mupdf";
+    # ImportError: cannot import name '_mupdf' from partially initialized module 'mupdf'
+    # (most likely due to a circular import)
+    broken = enablePython;
   };
 }
diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix
index 5495d50eec85..f54a8b7a8462 100644
--- a/pkgs/development/python-modules/pymupdf/default.nix
+++ b/pkgs/development/python-modules/pymupdf/default.nix
@@ -194,8 +194,5 @@ buildPythonPackage rec {
     license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [ teto ];
     platforms = lib.platforms.unix;
-    # ImportError: cannot import name '_mupdf' from partially initialized module 'mupdf'
-    # (most likely due to a circular import)
-    broken = true;
   };
 }

From 1cdbe4dd988324faf63fb3625880abd2b53ec7d7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Sep 2024 05:52:49 +0000
Subject: [PATCH 166/241] python312Packages.pdfplumber: 0.11.1 -> 0.11.4

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

diff --git a/pkgs/development/python-modules/pdfplumber/default.nix b/pkgs/development/python-modules/pdfplumber/default.nix
index b42070e32170..47e0dd303d46 100644
--- a/pkgs/development/python-modules/pdfplumber/default.nix
+++ b/pkgs/development/python-modules/pdfplumber/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "pdfplumber";
-  version = "0.11.1";
+  version = "0.11.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "jsvine";
     repo = "pdfplumber";
     rev = "refs/tags/v${version}";
-    hash = "sha256-5A1hjmC6GCS0Uqq5AiCEGqDTwASbJBX0pJGNNyvP3+4=";
+    hash = "sha256-62S5DMQwSgehl0BcjeRaTocko8xg72pQQ5YLoL3+QbU=";
   };
 
   postPatch = ''

From 9cc1be682a445f40cc28d7746b3e36beba5ada1c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Sep 2024 05:52:58 +0000
Subject: [PATCH 167/241] maa-assistant-arknights: 5.5.11452 -> 5.6.1

---
 pkgs/by-name/ma/maa-assistant-arknights/pin.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ma/maa-assistant-arknights/pin.json b/pkgs/by-name/ma/maa-assistant-arknights/pin.json
index a764b8eca34f..1b4b051d3d4d 100644
--- a/pkgs/by-name/ma/maa-assistant-arknights/pin.json
+++ b/pkgs/by-name/ma/maa-assistant-arknights/pin.json
@@ -1,10 +1,10 @@
 {
   "stable": {
-    "version": "5.5.11452",
-    "hash": "sha256-SIOzKgxuVKnMnjybY0LValAOBKso+XishfDVK5JfVPs="
+    "version": "5.6.1",
+    "hash": "sha256-g2xa1xFzGtbzwECw9tXKeq0izuPwRr+a8+AUvBGq+xc="
   },
   "beta": {
-    "version": "5.5.11452",
-    "hash": "sha256-SIOzKgxuVKnMnjybY0LValAOBKso+XishfDVK5JfVPs="
+    "version": "5.6.1",
+    "hash": "sha256-g2xa1xFzGtbzwECw9tXKeq0izuPwRr+a8+AUvBGq+xc="
   }
 }

From 8a23ff488f1abbc88a940a82a0faa91d1fb01c60 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Sep 2024 05:53:09 +0000
Subject: [PATCH 168/241] ceph-csi: 3.12.1 -> 3.12.2

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

diff --git a/pkgs/by-name/ce/ceph-csi/package.nix b/pkgs/by-name/ce/ceph-csi/package.nix
index efa9a7496119..55ff6cda52fb 100644
--- a/pkgs/by-name/ce/ceph-csi/package.nix
+++ b/pkgs/by-name/ce/ceph-csi/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ceph-csi";
-  version = "3.12.1";
+  version = "3.12.2";
 
   src = fetchFromGitHub {
     owner = "ceph";
     repo = "ceph-csi";
     rev = "v${version}";
-    hash = "sha256-ujshfbqOyyOZUYuR5edLPGOKlteu1gxmn0xo+QzZLVM=";
+    hash = "sha256-AyGdXPszvYO/ocfcWKeRaUXgwB0IHFVG9uc+c2iaEvA=";
   };
 
   preConfigure = ''

From a37bd24e4450158db255e91e3f644f4d986b893a Mon Sep 17 00:00:00 2001
From: Henner Zeller <h.zeller@acm.org>
Date: Sun, 15 Sep 2024 23:00:19 -0700
Subject: [PATCH 169/241] coin3d: fix hash 4.0.3

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

diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix
index 6b7bdaa83071..3261a848e3a6 100644
--- a/pkgs/development/libraries/coin3d/default.nix
+++ b/pkgs/development/libraries/coin3d/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "coin3d";
     repo = "coin";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-EeLfIu+InGy56zqjhbNle4hPjQmzwqzHA4ODBMjb9kg=";
+    hash = "sha256-dUFmcUOdNc3ZFtr+Hnh3Q3OY/JA/WxmiRJiU2RFSSus=";
   };
 
   nativeBuildInputs = [ cmake ];

From c9a24933acf7df12208de23d036b3f86ae5edaa3 Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Mon, 16 Sep 2024 14:42:01 +0800
Subject: [PATCH 170/241] fcitx5-pinyin-moegirl: 20240809 -> 20240909

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

diff --git a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix
index f65017a3ad4a..7f1abd017617 100644
--- a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix
+++ b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix
@@ -6,11 +6,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "fcitx5-pinyin-moegirl";
-  version = "20240809";
+  version = "20240909";
 
   src = fetchurl {
     url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict";
-    hash = "sha256-2jSKzDgjxuz0/Agqefy4JrScmqM7SXnIuZlLMkqAGT0=";
+    hash = "sha256-+e4azEWHYSh3Gy9Xa+Y8E7f7rAA8YlWlbvbva9kNXCI=";
   };
 
   dontUnpack = true;

From ed9023524d014a71102203a139b4aa47da5a4fc9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Sep 2024 06:42:15 +0000
Subject: [PATCH 171/241] rtorrent: 0.9.8-unstable-2024-08-31 ->
 0.9.8-unstable-2024-09-07

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

diff --git a/pkgs/by-name/rt/rtorrent/package.nix b/pkgs/by-name/rt/rtorrent/package.nix
index 281904eaeeac..2a0d94a412a8 100644
--- a/pkgs/by-name/rt/rtorrent/package.nix
+++ b/pkgs/by-name/rt/rtorrent/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation {
   pname = "rakshasa-rtorrent";
-  version = "0.9.8-unstable-2024-08-31";
+  version = "0.9.8-unstable-2024-09-07";
 
   src = fetchFromGitHub {
     owner = "rakshasa";
     repo = "rtorrent";
-    rev = "4e246a401f2572d6c8a3295cbe0335baa316cd24";
-    hash = "sha256-tq/0Vq+rIyCn1UQlyo7lcTSVf6WW1I8MTfxiAwQYD/o=";
+    rev = "9a93281ded3f6c6bb40593f9bbd3597683cff263";
+    hash = "sha256-dbZ0Q6v6vu8rlr7p1rPc3Cx/9R53OelkoTNsdAVQAxE=";
   };
 
   outputs = [ "out" "man" ];

From 0dd1d6c79bd41fdecb2c5b69ea78bc7dcd833988 Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Mon, 16 Sep 2024 14:45:33 +0800
Subject: [PATCH 172/241] fcitx5-pinyin-zhwiki: 20240509 -> 20240909

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

diff --git a/pkgs/by-name/fc/fcitx5-pinyin-zhwiki/package.nix b/pkgs/by-name/fc/fcitx5-pinyin-zhwiki/package.nix
index c28c18ae63c5..347d70e480f5 100644
--- a/pkgs/by-name/fc/fcitx5-pinyin-zhwiki/package.nix
+++ b/pkgs/by-name/fc/fcitx5-pinyin-zhwiki/package.nix
@@ -6,11 +6,11 @@
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "fcitx5-pinyin-zhwiki";
   version = "0.2.5";
-  date = "20240509";
+  date = "20240909";
 
   src = fetchurl {
     url = "https://github.com/felixonmars/fcitx5-pinyin-zhwiki/releases/download/${finalAttrs.version}/zhwiki-${finalAttrs.date}.dict";
-    hash = "sha256-uRpKPq+/xJ8akKB8ol/JRF79VfDIQ8L4SxLDXzpfPxg=";
+    hash = "sha256-djXrwl1MmiAf0U5Xvm4S7Fk2fKNRm5jtc94KUYIrcm8=";
   };
 
   dontUnpack = true;

From aee7fc23795ae796a43224109828781cc2b722a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Sep 2024 07:42:05 +0000
Subject: [PATCH 173/241] smbmap: 1.10.4 -> 1.10.5

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

diff --git a/pkgs/tools/security/smbmap/default.nix b/pkgs/tools/security/smbmap/default.nix
index 1e91764db609..e0175d3e9ec0 100644
--- a/pkgs/tools/security/smbmap/default.nix
+++ b/pkgs/tools/security/smbmap/default.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "smbmap";
-  version = "1.10.4";
+  version = "1.10.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ShawnDEvans";
     repo = "smbmap";
     rev = "refs/tags/v${version}";
-    hash = "sha256-CU0pio+R8JI/vQi13mOmiEeWC+r4EuLwWOQYLnm4Oao=";
+    hash = "sha256-xeQ3o0Pt4eDeMnSJKdEJfHhA0oPiD7tmX9TQAb3b9I8=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];

From c6ab3b3ae800e0aed84301a4e825c0ea73698e9a Mon Sep 17 00:00:00 2001
From: Maxime Brunet <max@brnt.mx>
Date: Sat, 14 Sep 2024 10:02:18 -0700
Subject: [PATCH 174/241] llm-ls: fix build with rust 1.80 and on darwin

---
 .../llm-ls/fix-time-compilation-failure.patch | 97 +++++++++++++++++++
 pkgs/by-name/ll/llm-ls/package.nix            | 30 +++++-
 2 files changed, 123 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/by-name/ll/llm-ls/fix-time-compilation-failure.patch

diff --git a/pkgs/by-name/ll/llm-ls/fix-time-compilation-failure.patch b/pkgs/by-name/ll/llm-ls/fix-time-compilation-failure.patch
new file mode 100644
index 000000000000..bb7b2b2cb5d3
--- /dev/null
+++ b/pkgs/by-name/ll/llm-ls/fix-time-compilation-failure.patch
@@ -0,0 +1,97 @@
+From cb0a3da737d933614bcd011e91048f2009036d09 Mon Sep 17 00:00:00 2001
+From: a-kenji <aks.kenji@protonmail.com>
+Date: Wed, 14 Aug 2024 09:29:18 +0200
+Subject: [PATCH] Fix `time` compilation failure
+
+This allows `llm-ls` to be compiled with `rustc --version`: 1.80, using
+the Cargo.lock file.
+
+Reference: https://github.com/rust-lang/rust/issues/127343
+---
+ Cargo.lock | 34 ++++++++++++++++++++++++++--------
+ 1 file changed, 26 insertions(+), 8 deletions(-)
+
+diff --git a/Cargo.lock b/Cargo.lock
+index 1806f0be28f65ab1283954c5a72ae20594044624..e8328e602e50fd5e47ba55c5dc9c7881a308a0a5 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -487,9 +487,12 @@ dependencies = [
+ 
+ [[package]]
+ name = "deranged"
+-version = "0.3.8"
++version = "0.3.11"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946"
++checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
++dependencies = [
++ "powerfmt",
++]
+ 
+ [[package]]
+ name = "derive_builder"
+@@ -1210,6 +1213,12 @@ dependencies = [
+  "winapi",
+ ]
+ 
++[[package]]
++name = "num-conv"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
++
+ [[package]]
+ name = "num_cpus"
+ version = "1.16.0"
+@@ -1403,6 +1412,12 @@ version = "0.3.27"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
+ 
++[[package]]
++name = "powerfmt"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
++
+ [[package]]
+ name = "ppv-lite86"
+ version = "0.2.17"
+@@ -2033,12 +2048,14 @@ dependencies = [
+ 
+ [[package]]
+ name = "time"
+-version = "0.3.28"
++version = "0.3.36"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48"
++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+ dependencies = [
+  "deranged",
+  "itoa",
++ "num-conv",
++ "powerfmt",
+  "serde",
+  "time-core",
+  "time-macros",
+@@ -2046,16 +2063,17 @@ dependencies = [
+ 
+ [[package]]
+ name = "time-core"
+-version = "0.1.1"
++version = "0.1.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
++checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+ 
+ [[package]]
+ name = "time-macros"
+-version = "0.2.14"
++version = "0.2.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572"
++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+ dependencies = [
++ "num-conv",
+  "time-core",
+ ]
+ 
diff --git a/pkgs/by-name/ll/llm-ls/package.nix b/pkgs/by-name/ll/llm-ls/package.nix
index a7f5a4b7f183..b1e759d29a55 100644
--- a/pkgs/by-name/ll/llm-ls/package.nix
+++ b/pkgs/by-name/ll/llm-ls/package.nix
@@ -1,8 +1,13 @@
 { lib
+, stdenv
 , rustPlatform
 , fetchFromGitHub
+, fetchpatch
 , pkg-config
-, openssl
+, libiconv
+, darwin
+, testers
+, llm-ls
 }:
 
 let
@@ -19,13 +24,31 @@ rustPlatform.buildRustPackage {
     hash = "sha256-ICMM2kqrHFlKt2/jmE4gum1Eb32afTJkT3IRoqcjJJ8=";
   };
 
-  cargoHash = "sha256-Fat67JxTYIkxkdwGNAyTfnuLt8ofUGVJ2609sbn1frU=";
+  cargoHash = "sha256-m/w9aJZCCh1rgnHlkGQD/pUDoWn2/WRVt5X4pFx9nC4=";
+
+  cargoPatches = [
+    # https://github.com/huggingface/llm-ls/pull/102
+    ./fix-time-compilation-failure.patch
+    (fetchpatch {
+      name = "fix-version.patch";
+      url = "https://github.com/huggingface/llm-ls/commit/479401f3a5173f2917a888c8068f84e29b7dceed.patch?full_index=1";
+      hash = "sha256-4gXasfMqlrrP8II+FiV/qGfO7a9qFkDQMiax7yEua5E=";
+    })
+  ];
 
   buildAndTestSubdir = "crates/llm-ls";
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [ openssl ];
+  buildInputs = [
+    libiconv
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Security
+  ];
+
+  passthru.tests.version = testers.testVersion {
+    package = llm-ls;
+  };
 
   meta = with lib; {
     description = "LSP server leveraging LLMs for code completion (and more?)";
@@ -33,7 +56,6 @@ rustPlatform.buildRustPackage {
     license = licenses.asl20;
     maintainers = with maintainers; [ jfvillablanca ];
     platforms = platforms.all;
-    badPlatforms = platforms.darwin;
     mainProgram = "llm-ls";
   };
 }

From 71b1f2d98dcd732df2832da97d86015eeebfd016 Mon Sep 17 00:00:00 2001
From: Pierre Roux <pierre.roux@onera.fr>
Date: Fri, 13 Sep 2024 12:44:28 +0200
Subject: [PATCH 175/241] coqPackages.mtac2: init at 1.4-coq8.19

---
 .../development/coq-modules/mtac2/default.nix | 22 +++++++++++++++++++
 .../coq-modules/unicoq/default.nix            | 20 +++++++++++++++++
 pkgs/top-level/coq-packages.nix               |  2 ++
 3 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/coq-modules/mtac2/default.nix
 create mode 100644 pkgs/development/coq-modules/unicoq/default.nix

diff --git a/pkgs/development/coq-modules/mtac2/default.nix b/pkgs/development/coq-modules/mtac2/default.nix
new file mode 100644
index 000000000000..8c2a96b4d781
--- /dev/null
+++ b/pkgs/development/coq-modules/mtac2/default.nix
@@ -0,0 +1,22 @@
+{ lib, mkCoqDerivation, coq, unicoq, version ? null }:
+
+mkCoqDerivation {
+  pname = "Mtac2";
+  owner = "Mtac2";
+  inherit version;
+  defaultVersion = with lib.versions; lib.switch coq.version [
+    { case = range "8.19" "8.19"; out = "1.4-coq${coq.coq-version}"; }
+  ] null;
+  release."1.4-coq8.19".sha256 = "sha256-G9eK0eLyECdT20/yf8yyz7M8Xq2WnHHaHpxVGP0yTtU=";
+  releaseRev = v: "v${v}";
+  mlPlugin = true;
+  propagatedBuildInputs = [ unicoq ];
+  meta = with lib; {
+    description = "Typed tactic language for Coq";
+    license = licenses.mit;
+  };
+  preBuild = ''
+    coq_makefile -f _CoqProject -o Makefile
+    patchShebangs tests/sf-5/configure.sh
+  '';
+}
diff --git a/pkgs/development/coq-modules/unicoq/default.nix b/pkgs/development/coq-modules/unicoq/default.nix
new file mode 100644
index 000000000000..c3167e4a9d7d
--- /dev/null
+++ b/pkgs/development/coq-modules/unicoq/default.nix
@@ -0,0 +1,20 @@
+{ lib, mkCoqDerivation, coq, version ? null }:
+
+mkCoqDerivation {
+  pname = "unicoq";
+  owner = "unicoq";
+  inherit version;
+  defaultVersion = with lib.versions; lib.switch coq.version [
+    { case = range "8.19" "8.19"; out = "1.6-${coq.coq-version}"; }
+  ] null;
+  release."1.6-8.19".sha256 = "sha256-fDk60B8AzJwiemxHGgWjNu6PTu6NcJoI9uK7Ww2AT14=";
+  releaseRev = v: "v${v}";
+  mlPlugin = true;
+  meta = with lib; {
+    description = "An enhanced unification algorithm for Coq";
+    license = licenses.mit;
+  };
+  preBuild = ''
+    coq_makefile -f _CoqProject -o Makefile
+  '';
+}
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 8ab66479fd1f..8e78e3fe75e7 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -115,6 +115,7 @@ let
       metacoq-safechecker  = self.metacoq.safechecker;
       metacoq-erasure      = self.metacoq.erasure;
       metalib = callPackage ../development/coq-modules/metalib { };
+      mtac2 = callPackage ../development/coq-modules/mtac2 {};
       multinomials = callPackage ../development/coq-modules/multinomials {};
       odd-order = callPackage ../development/coq-modules/odd-order { };
       paco = callPackage ../development/coq-modules/paco {};
@@ -138,6 +139,7 @@ let
       tlc = callPackage ../development/coq-modules/tlc {};
       topology = callPackage ../development/coq-modules/topology {};
       trakt = callPackage ../development/coq-modules/trakt {};
+      unicoq = callPackage ../development/coq-modules/unicoq {};
       vcfloat = callPackage ../development/coq-modules/vcfloat (lib.optionalAttrs
         (lib.versions.range "8.16" "8.18" self.coq.version) {
           interval = self.interval.override { version = "4.9.0"; };

From 26e9f44340cb52473e1f02edc4d7d02fdfb7d4cd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 16 Sep 2024 10:11:13 +0200
Subject: [PATCH 176/241] mubeng: refactor

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

diff --git a/pkgs/tools/networking/mubeng/default.nix b/pkgs/tools/networking/mubeng/default.nix
index 9289285b2446..66344f42f35c 100644
--- a/pkgs/tools/networking/mubeng/default.nix
+++ b/pkgs/tools/networking/mubeng/default.nix
@@ -9,8 +9,8 @@ buildGoModule rec {
 
   src = fetchFromGitHub {
     owner = "kitabisa";
-    repo = pname;
-    rev = "v${version}";
+    repo = "mubeng";
+    rev = "refs/tags/v${version}";
     hash = "sha256-V+0XPuMM2Jg2LEpWzxRNLZ44YRoEnf/Fvbj51p9hwL4=";
   };
 
@@ -19,14 +19,14 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X ktbs.dev/mubeng/common.Version=${version}"
+    "-X=ktbs.dev/mubeng/common.Version=${version}"
   ];
 
   meta = with lib; {
     description = "Proxy checker and IP rotator";
     homepage = "https://github.com/kitabisa/mubeng";
     changelog = "https://github.com/kitabisa/mubeng/releases/tag/v${version}";
-    license = with licenses; [ asl20 ];
+    license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
     mainProgram = "mubeng";
   };

From 68784b40efddab24a7119776ad85ade7c6fccf31 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Fri, 13 Sep 2024 10:16:48 +0200
Subject: [PATCH 177/241] warzone2100: 4.5.2 -> 4.5.3

---
 pkgs/games/warzone2100/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix
index 02c60c157976..45b2123e443a 100644
--- a/pkgs/games/warzone2100/default.nix
+++ b/pkgs/games/warzone2100/default.nix
@@ -46,11 +46,11 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   inherit pname;
-  version  = "4.5.2";
+  version  = "4.5.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/warzone2100/releases/${finalAttrs.version}/warzone2100_src.tar.xz";
-    hash = "sha256-J8IJH2/A2OO7YP9moWOM77qDW7TdZ40MLVv/y0xDAms=";
+    hash = "sha256-7tSfLkVth9nbGSwn1uNWeFrHx5ac+jaO3Gk9Bb+hLIk=";
   };
 
   buildInputs = [

From 3d75de3f2582e3fcb7ac050a038cb542da7c1dbd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Sep 2024 08:19:28 +0000
Subject: [PATCH 178/241] cargo-nextest: 0.9.77 -> 0.9.78

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

diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix
index ef49f94e1066..cb3465a592f9 100644
--- a/pkgs/development/tools/rust/cargo-nextest/default.nix
+++ b/pkgs/development/tools/rust/cargo-nextest/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-nextest";
-  version = "0.9.77";
+  version = "0.9.78";
 
   src = fetchFromGitHub {
     owner = "nextest-rs";
     repo = "nextest";
     rev = "cargo-nextest-${version}";
-    hash = "sha256-4wqWCa3HHctKSaSYiiLBa9PM6cWyr0H7blI9BWGLTuI=";
+    hash = "sha256-nQIq/WCbB3iWxDdD13tthvmndYhccttcOeXWJ7Dri+0=";
   };
 
-  cargoHash = "sha256-9XOkXK5sH+Qo8omS8V8FMgnh+oqLZL4paqoL9UOPevA=";
+  cargoHash = "sha256-XGDPxak2jVKkGyhPMpW4KxzyMd5aaIj1Hguw+XEM7w8=";
 
   cargoBuildFlags = [ "-p" "cargo-nextest" ];
   cargoTestFlags = [ "-p" "cargo-nextest" ];

From a751025715dbeab372cdbbfb9d19f6d261ed957a Mon Sep 17 00:00:00 2001
From: SomeoneSerge <else@someonex.net>
Date: Sun, 8 Sep 2024 02:46:50 +0000
Subject: [PATCH 179/241] maintainers: update SomeoneSerge

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index eabddaab16c0..0f8e4c7318bb 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -19701,11 +19701,11 @@
     name = "Kylie McClain";
   };
   SomeoneSerge = {
-    email = "sergei.kozlukov@aalto.fi";
+    email = "else+nixpkgs@someonex.net";
     matrix = "@ss:someonex.net";
     github = "SomeoneSerge";
     githubId = 9720532;
-    name = "Sergei K";
+    name = "Else Someone";
   };
   sontek = {
     email = "sontek@gmail.com";

From 1d3e242fc8d3d04b4fa85b448fc41667df06c4b9 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 16 Sep 2024 11:42:31 +0300
Subject: [PATCH 180/241] musescore: 4.4.1 -> 4.4.2

Diff: https://github.com/musescore/MuseScore/compare/v4.4.1...v4.4.2
---
 pkgs/applications/audio/musescore/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index cfb50546b705..7c7963d7049e 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -50,13 +50,13 @@ let
   } else portaudio;
 in stdenv'.mkDerivation (finalAttrs: {
   pname = "musescore";
-  version = "4.4.1";
+  version = "4.4.2";
 
   src = fetchFromGitHub {
     owner = "musescore";
     repo = "MuseScore";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-eLtpLgXSc8L5y1Mg3s1wrxr09+/vBxNqJEtl9IoKYSM=";
+    sha256 = "sha256-wgujiFvaWejSEXTbq/Re/7Ca1jIqso2uZej3Lb3V4I8=";
   };
   patches = [
     # https://github.com/musescore/MuseScore/pull/24326

From be9c27343cab29e82806e10380e010ed2b790452 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Sep 2024 08:45:48 +0000
Subject: [PATCH 181/241] emacsPackages.lsp-bridge: 0-unstable-2024-09-05 ->
 0-unstable-2024-09-11

---
 .../elisp-packages/manual-packages/lsp-bridge/default.nix   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
index adca228ca3e2..cf4614caec3a 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
@@ -29,13 +29,13 @@ let
 in
 melpaBuild {
   pname = "lsp-bridge";
-  version = "0-unstable-2024-09-05";
+  version = "0-unstable-2024-09-11";
 
   src = fetchFromGitHub {
     owner = "manateelazycat";
     repo = "lsp-bridge";
-    rev = "bd0cea9639bb902d22ec05189681eef1f1df7e17";
-    hash = "sha256-QBtYSZAmdRhZqaR0/y0A1Q8fx62+owfdRiIVZOgWxkQ=";
+    rev = "fb64891c2585f9fc0b7f2062cc2b98321aa4e4ca";
+    hash = "sha256-ChpZhFEKvN+1oYHbQKBUMbTjk/U++kCDnImMVtcYVBc=";
   };
 
   patches = [

From 97f0874c1f0278a864d32ec7972abe439d949abf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Sep 2024 08:57:11 +0000
Subject: [PATCH 182/241] sentry-cli: 2.35.0 -> 2.36.1

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

diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix
index a39447e070ed..2adcaf4dc462 100644
--- a/pkgs/development/tools/sentry-cli/default.nix
+++ b/pkgs/development/tools/sentry-cli/default.nix
@@ -11,13 +11,13 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "sentry-cli";
-  version = "2.35.0";
+  version = "2.36.1";
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-cli";
     rev = version;
-    sha256 = "sha256-o93re2owDozZt5GdnoofRS6erfJH+69rxoEUsDZ2zmM=";
+    sha256 = "sha256-kmrSoUrhBJPgIAcMg73Ne4r8Wkx+SXiiNXbtfVp0Q88=";
   };
   doCheck = false;
 
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ];
   nativeBuildInputs = [ installShellFiles pkg-config ];
 
-  cargoHash = "sha256-7bgME43pdW9Oe8olOq2OdswyapBg5b7zKFrjmubWyMc=";
+  cargoHash = "sha256-fzQfU3xlRwV/GI69+sd7zz4okbNHbFAskJPgI1X0KQo=";
 
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd sentry-cli \

From 2f227e4ff5f7ebd5223952c611492f9ace76bf7e Mon Sep 17 00:00:00 2001
From: Reinis Taukulis <reinis.taukulis@gmail.com>
Date: Sun, 15 Sep 2024 22:10:39 +0300
Subject: [PATCH 183/241] vimPlugins.avante-nvim: Init at 2024-09-15

---
 .../vim/plugins/avante-nvim/Cargo.lock        | 1638 +++++++++++++++++
 .../vim/plugins/avante-nvim/default.nix       |   75 +
 .../editors/vim/plugins/overrides.nix         |    8 +
 3 files changed, 1721 insertions(+)
 create mode 100644 pkgs/applications/editors/vim/plugins/avante-nvim/Cargo.lock
 create mode 100644 pkgs/applications/editors/vim/plugins/avante-nvim/default.nix

diff --git a/pkgs/applications/editors/vim/plugins/avante-nvim/Cargo.lock b/pkgs/applications/editors/vim/plugins/avante-nvim/Cargo.lock
new file mode 100644
index 000000000000..78470b2a3191
--- /dev/null
+++ b/pkgs/applications/editors/vim/plugins/avante-nvim/Cargo.lock
@@ -0,0 +1,1638 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "adler2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+
+[[package]]
+name = "autocfg"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
+[[package]]
+name = "avante-templates"
+version = "0.1.0"
+dependencies = [
+ "minijinja",
+ "mlua",
+ "serde",
+]
+
+[[package]]
+name = "avante-tokenizers"
+version = "0.1.0"
+dependencies = [
+ "mlua",
+ "tiktoken-rs",
+ "tokenizers",
+]
+
+[[package]]
+name = "base64"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+
+[[package]]
+name = "base64"
+version = "0.21.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "bit-set"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
+dependencies = [
+ "bit-vec",
+]
+
+[[package]]
+name = "bit-vec"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "bstr"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c"
+dependencies = [
+ "memchr",
+ "regex-automata",
+ "serde",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "cc"
+version = "1.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6"
+dependencies = [
+ "shlex",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "console"
+version = "0.15.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
+dependencies = [
+ "encode_unicode",
+ "lazy_static",
+ "libc",
+ "unicode-width",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "crc32fast"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
+[[package]]
+name = "darling"
+version = "0.20.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "derive_builder"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b"
+dependencies = [
+ "derive_builder_macro",
+]
+
+[[package]]
+name = "derive_builder_core"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "derive_builder_macro"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc"
+dependencies = [
+ "derive_builder_core",
+ "syn",
+]
+
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
+[[package]]
+name = "encode_unicode"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
+
+[[package]]
+name = "erased-serde"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d"
+dependencies = [
+ "serde",
+ "typeid",
+]
+
+[[package]]
+name = "errno"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "esaxx-rs"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "fancy-regex"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7493d4c459da9f84325ad297371a6b2b8a162800873a22e3b6b6512e61d18c05"
+dependencies = [
+ "bit-set",
+ "regex",
+]
+
+[[package]]
+name = "fancy-regex"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2"
+dependencies = [
+ "bit-set",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+
+[[package]]
+name = "flate2"
+version = "1.0.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "libc",
+ "wasi",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "hf-hub"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b780635574b3d92f036890d8373433d6f9fc7abb320ee42a5c25897fc8ed732"
+dependencies = [
+ "dirs",
+ "indicatif",
+ "log",
+ "native-tls",
+ "rand",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "ureq",
+]
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[package]]
+name = "idna"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "indicatif"
+version = "0.17.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
+dependencies = [
+ "console",
+ "instant",
+ "number_prefix",
+ "portable-atomic",
+ "unicode-width",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "itertools"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+
+[[package]]
+name = "js-sys"
+version = "0.3.70"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "libc"
+version = "0.2.158"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.6.0",
+ "libc",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
+[[package]]
+name = "macro_rules_attribute"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13"
+dependencies = [
+ "macro_rules_attribute-proc_macro",
+ "paste",
+]
+
+[[package]]
+name = "macro_rules_attribute-proc_macro"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568"
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "memo-map"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38d1115007560874e373613744c6fba374c17688327a71c1476d1a5954cc857b"
+
+[[package]]
+name = "minijinja"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d7d3e3a3eece1fa4618237ad41e1de855ced47eab705cec1c9a920e1d1c5aad"
+dependencies = [
+ "aho-corasick",
+ "memo-map",
+ "self_cell",
+ "serde",
+ "serde_json",
+ "unicase",
+ "unicode-ident",
+ "v_htmlescape",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+dependencies = [
+ "adler2",
+]
+
+[[package]]
+name = "mlua"
+version = "0.10.0-beta.1"
+source = "git+https://github.com/mlua-rs/mlua.git?branch=main#1634c43f0afaf7a71dc555cb6b3624250e5ff209"
+dependencies = [
+ "bstr",
+ "erased-serde",
+ "mlua-sys",
+ "mlua_derive",
+ "num-traits",
+ "parking_lot",
+ "rustc-hash 2.0.0",
+ "serde",
+ "serde-value",
+]
+
+[[package]]
+name = "mlua-sys"
+version = "0.6.2"
+source = "git+https://github.com/mlua-rs/mlua.git?branch=main#1634c43f0afaf7a71dc555cb6b3624250e5ff209"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "pkg-config",
+]
+
+[[package]]
+name = "mlua_derive"
+version = "0.9.3"
+source = "git+https://github.com/mlua-rs/mlua.git?branch=main#1634c43f0afaf7a71dc555cb6b3624250e5ff209"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "monostate"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d208407d7552cd041d8cdb69a1bc3303e029c598738177a3d87082004dc0e1e"
+dependencies = [
+ "monostate-impl",
+ "serde",
+]
+
+[[package]]
+name = "monostate-impl"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7ce64b975ed4f123575d11afd9491f2e37bbd5813fbfbc0f09ae1fbddea74e0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "native-tls"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
+dependencies = [
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "number_prefix"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "onig"
+version = "6.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f"
+dependencies = [
+ "bitflags 1.3.2",
+ "libc",
+ "once_cell",
+ "onig_sys",
+]
+
+[[package]]
+name = "onig_sys"
+version = "69.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7"
+dependencies = [
+ "cc",
+ "pkg-config",
+]
+
+[[package]]
+name = "openssl"
+version = "0.10.66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "foreign-types",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "ordered-float"
+version = "2.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+
+[[package]]
+name = "portable-atomic"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "rayon"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-cond"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "059f538b55efd2309c9794130bc149c6a553db90e9d99c2030785c82f0bd7df9"
+dependencies = [
+ "either",
+ "itertools 0.11.0",
+ "rayon",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
+dependencies = [
+ "getrandom",
+ "libredox",
+ "thiserror",
+]
+
+[[package]]
+name = "regex"
+version = "1.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+
+[[package]]
+name = "ring"
+version = "0.17.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom",
+ "libc",
+ "spin",
+ "untrusted",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustc-hash"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+
+[[package]]
+name = "rustix"
+version = "0.38.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f"
+dependencies = [
+ "bitflags 2.6.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rustls"
+version = "0.23.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
+dependencies = [
+ "log",
+ "once_cell",
+ "ring",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+
+[[package]]
+name = "rustls-webpki"
+version = "0.102.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56"
+dependencies = [
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+
+[[package]]
+name = "schannel"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "security-framework"
+version = "2.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+dependencies = [
+ "bitflags 2.6.0",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "self_cell"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a"
+
+[[package]]
+name = "serde"
+version = "1.0.209"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde-value"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c"
+dependencies = [
+ "ordered-float",
+ "serde",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.209"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.127"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
+[[package]]
+name = "spm_precompiled"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5851699c4033c63636f7ea4cf7b7c1f1bf06d0cc03cfb42e711de5a5c46cf326"
+dependencies = [
+ "base64 0.13.1",
+ "nom",
+ "serde",
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
+[[package]]
+name = "syn"
+version = "2.0.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.63"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.63"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tiktoken-rs"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c314e7ce51440f9e8f5a497394682a57b7c323d0f4d0a6b1b13c429056e0e234"
+dependencies = [
+ "anyhow",
+ "base64 0.21.7",
+ "bstr",
+ "fancy-regex 0.12.0",
+ "lazy_static",
+ "parking_lot",
+ "rustc-hash 1.1.0",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "tokenizers"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8a24d7f7d6be5b9d1377418b893ab1808af0074f5d1bb2c64784452ddd2aa70"
+dependencies = [
+ "aho-corasick",
+ "derive_builder",
+ "esaxx-rs",
+ "fancy-regex 0.13.0",
+ "getrandom",
+ "hf-hub",
+ "itertools 0.12.1",
+ "lazy_static",
+ "log",
+ "macro_rules_attribute",
+ "monostate",
+ "onig",
+ "paste",
+ "rand",
+ "rayon",
+ "rayon-cond",
+ "regex",
+ "regex-syntax",
+ "serde",
+ "serde_json",
+ "spm_precompiled",
+ "thiserror",
+ "unicode-normalization-alignments",
+ "unicode-segmentation",
+ "unicode_categories",
+]
+
+[[package]]
+name = "typeid"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e"
+
+[[package]]
+name = "unicase"
+version = "2.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
+dependencies = [
+ "version_check",
+]
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-normalization-alignments"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43f613e4fa046e69818dd287fdc4bc78175ff20331479dab6e1b0f98d57062de"
+dependencies = [
+ "smallvec",
+]
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+
+[[package]]
+name = "unicode_categories"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
+
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
+[[package]]
+name = "ureq"
+version = "2.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a"
+dependencies = [
+ "base64 0.22.1",
+ "flate2",
+ "log",
+ "native-tls",
+ "once_cell",
+ "rustls",
+ "rustls-pki-types",
+ "serde",
+ "serde_json",
+ "url",
+ "webpki-roots",
+]
+
+[[package]]
+name = "url"
+version = "2.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+]
+
+[[package]]
+name = "v_htmlescape"
+version = "0.15.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e8257fbc510f0a46eb602c10215901938b5c2a7d5e70fc11483b1d3c9b5b18c"
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+
+[[package]]
+name = "webpki-roots"
+version = "0.26.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
diff --git a/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix
new file mode 100644
index 000000000000..0572977f207b
--- /dev/null
+++ b/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix
@@ -0,0 +1,75 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  openssl,
+  stdenv,
+  vimUtils,
+  darwin,
+}:
+
+let
+  version = "2024-09-15";
+
+  src = fetchFromGitHub {
+    owner = "yetone";
+    repo = "avante.nvim";
+    rev = "f9520c4fdfed08e9cc609d6cd319b358e4ea33a5";
+    hash = "sha256-8zTDGPnhNI2rQA0uJc8gQRj4JCyg+IkO/D3oHYy4f9U=";
+  };
+
+  meta = with lib; {
+    description = "Neovim plugin designed to emulate the behaviour of the Cursor AI IDE";
+    homepage = "https://github.com/yetone/avante.nvim";
+    license = licenses.asl20;
+    maintainers = with lib.maintainers; [
+      ttrei
+      aarnphm
+    ];
+  };
+
+  avante-nvim-lib = rustPlatform.buildRustPackage {
+    pname = "avante-nvim-lib";
+    inherit version src meta;
+    cargoLock = {
+      lockFile = ./Cargo.lock;
+      outputHashes = {
+        "mlua-0.10.0-beta.1" = "sha256-ZEZFATVldwj0pmlmi0s5VT0eABA15qKhgjmganrhGBY=";
+      };
+    };
+
+    nativeBuildInputs = [
+      pkg-config
+    ];
+
+    buildInputs =
+      [
+        openssl
+      ]
+      ++ lib.optionals stdenv.isDarwin [
+        darwin.apple_sdk.frameworks.Security
+      ];
+
+    buildFeatures = [ "luajit" ];
+  };
+in
+
+vimUtils.buildVimPlugin {
+  pname = "avante.nvim";
+  inherit version src meta;
+
+  postInstall =
+    let
+      ext = stdenv.hostPlatform.extensions.sharedLibrary;
+    in
+    ''
+      mkdir -p $out/build
+      ln -s ${avante-nvim-lib}/lib/libavante_templates${ext} $out/build/avante_templates${ext}
+      ln -s ${avante-nvim-lib}/lib/libavante_tokenizers${ext} $out/build/avante_tokenizers${ext}
+    '';
+
+  doInstallCheck = true;
+  # TODO: enable after https://github.com/NixOS/nixpkgs/pull/342240 merged
+  # nvimRequireCheck = "avante";
+}
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 1cd10a93463a..73ba8152a1b2 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -154,6 +154,14 @@
     dependencies = with super; [ plenary-nvim ];
   };
 
+  avante-nvim = (callPackage ./avante-nvim { }).overrideAttrs {
+    dependencies = with self; [
+      dressing-nvim
+      nui-nvim
+      plenary-nvim
+    ];
+  };
+
   barbecue-nvim = super.barbecue-nvim.overrideAttrs {
     dependencies = with self; [ nvim-lspconfig nvim-navic nvim-web-devicons ];
     meta = {

From 577fe7c8939d2c04ed879a29120535a871414e29 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 16 Sep 2024 11:03:21 +0200
Subject: [PATCH 184/241] checkov: 3.2.253 -> 3.2.254

Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.253...3.2.254

Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.254
---
 pkgs/development/tools/analysis/checkov/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix
index 281361ae31a1..809985449b1e 100644
--- a/pkgs/development/tools/analysis/checkov/default.nix
+++ b/pkgs/development/tools/analysis/checkov/default.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "checkov";
-  version = "3.2.253";
+  version = "3.2.254";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = "checkov";
     rev = "refs/tags/${version}";
-    hash = "sha256-ARtJBQsY46pIrKzYXBfH4diMh1ECFiilY2AZlN34/vY=";
+    hash = "sha256-+3hx6MEJWDbTby0bvUSe/AGoneqJ/ojzkkpb8oF4ZIo=";
   };
 
   patches = [ ./flake8-compat-5.x.patch ];

From 418ba6732619211f09a0158347861db5a1f5e5ac Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Mon, 16 Sep 2024 11:04:03 +0200
Subject: [PATCH 185/241] qgis: 3.38.2 -> 3.38.3

---
 pkgs/applications/gis/qgis/unwrapped.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix
index 5f61e0339446..a439df3d18b9 100644
--- a/pkgs/applications/gis/qgis/unwrapped.nix
+++ b/pkgs/applications/gis/qgis/unwrapped.nix
@@ -79,14 +79,14 @@ let
     urllib3
   ];
 in mkDerivation rec {
-  version = "3.38.2";
+  version = "3.38.3";
   pname = "qgis-unwrapped";
 
   src = fetchFromGitHub {
     owner = "qgis";
     repo = "QGIS";
     rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-lArwRtHR/KAsgjpjid6YnPA9BkcG1Mg/KeIIOWN75Kg=";
+    hash = "sha256-yJFYq4t0LzBr+O2bmtBSeehQ2vfUaZIQfOY68WZcHG4=";
   };
 
   passthru = {

From 02d0336f35c5e76275b3516293a80d876b0f550d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 16 Sep 2024 11:04:34 +0200
Subject: [PATCH 186/241] python312Packages.tencentcloud-sdk-python: 3.0.1231
 -> 3.0.1232

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1231...3.0.1232

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1232/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 3de63ae5ecb4..794d11c090a3 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1231";
+  version = "3.0.1232";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-XDFAUIP/oA71dK+QMUrh9ZmusJFzrpuI+0ExW+A6FIU=";
+    hash = "sha256-aPqhdOJH+cOqohf6zvo5X5nf+Kb6HLZ+UCc3SQ13C6w=";
   };
 
   build-system = [ setuptools ];

From 85c1a1f3abad88a31caf9df40b73d98f09bfb2f5 Mon Sep 17 00:00:00 2001
From: Bojun Ren <bj.ren.coding@outlook.com>
Date: Mon, 16 Sep 2024 17:05:26 +0800
Subject: [PATCH 187/241] maintainers: add rennsax

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index eabddaab16c0..28fee4aff8f7 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -17635,6 +17635,13 @@
     github = "renesat";
     githubId = 11363539;
   };
+  rennsax = {
+    name = "Bojun Ren";
+    email = "bj.ren.coding@outlook.com";
+    github = "rennsax";
+    githubId = 93167100;
+    keys = [ { fingerprint = "9075 CEF8 9850 D261 6599  641A A2C9 36D5 B88C 139C"; } ];
+  };
   renzo = {
     email = "renzocarbonara@gmail.com";
     github = "k0001";

From dfc771e0b2c5cb64441b954952e0cb5fb5f74717 Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Mon, 16 Sep 2024 11:05:35 +0200
Subject: [PATCH 188/241] qgis: drop redundant CMAKE_BUILD_TYPE setting

CMAKE_BUILD_TYPE=Release is set by default in

https://github.com/NixOS/nixpkgs/blob/040bd3d95a6478c942fed4c22c589345bee76337/pkgs/by-name/cm/cmake/setup-hook.sh#L113
---
 pkgs/applications/gis/qgis/unwrapped.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix
index a439df3d18b9..97349b31845b 100644
--- a/pkgs/applications/gis/qgis/unwrapped.nix
+++ b/pkgs/applications/gis/qgis/unwrapped.nix
@@ -152,7 +152,6 @@ in mkDerivation rec {
   env.QT_QPA_PLATFORM_PLUGIN_PATH="${qtbase}/${qtbase.qtPluginPrefix}/platforms";
 
   cmakeFlags = [
-    "-DCMAKE_BUILD_TYPE=Release"
     "-DWITH_3D=True"
     "-DWITH_PDAL=True"
     "-DENABLE_TESTS=False"

From 69b6ec0894d056627a8e074178d39b5e917477d3 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 13 Sep 2024 09:52:40 +0200
Subject: [PATCH 189/241] waybar: 0.10.4 -> 0.11.0

Diff: https://github.com/Alexays/Waybar/compare/0.10.4...0.11.0

Changelog: https://github.com/alexays/waybar/releases/tag/0.11.0
---
 pkgs/by-name/wa/waybar/package.nix | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wa/waybar/package.nix b/pkgs/by-name/wa/waybar/package.nix
index c92d04e5a982..196e739b2aa6 100644
--- a/pkgs/by-name/wa/waybar/package.nix
+++ b/pkgs/by-name/wa/waybar/package.nix
@@ -6,6 +6,7 @@
   SDL2,
   alsa-lib,
   catch2_3,
+  fetchpatch,
   fftw,
   glib,
   gobject-introspection,
@@ -81,15 +82,27 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "waybar";
-  version = "0.10.4";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "Alexays";
     repo = "Waybar";
-    rev = finalAttrs.version;
-    hash = "sha256-/JW3WnRLpfz8j+9Zc9YkK63i8DjHrKwv9PWKIMz3MVI=";
+    rev = "refs/tags/${finalAttrs.version}";
+    hash = "sha256-3lc0voMU5RS+mEtxKuRayq/uJO09X7byq6Rm5NZohq8=";
   };
 
+  patches = [
+    # Fix a regression introduced in release 0.11.0
+    # TODO: remove this patch when updating to the next release
+    # Issue: https://github.com/Alexays/Waybar/issues/3597
+    # PR: https://github.com/Alexays/Waybar/pull/3604
+    (fetchpatch {
+      name = "fix-tray";
+      url = "https://github.com/Alexays/Waybar/commit/0d02f6877d88551ea2be0cd151c1e6354e208b1c.patch";
+      hash = "sha256-wpdK6AY+14jt85dOQy6xkh8tNGDN2F9GA9zOfAuOaIc=";
+    })
+  ];
+
   postUnpack = lib.optional cavaSupport ''
     pushd "$sourceRoot"
     cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.10.2

From 120a0059f1d6fa92e42cb2b9bacd7f809c573b44 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 16 Sep 2024 11:15:11 +0200
Subject: [PATCH 190/241] python312Packages.aiostreammagic: 2.3.0 -> 2.3.1

Diff: https://github.com/noahhusby/aiostreammagic/compare/refs/tags/2.3.0...2.3.1

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

diff --git a/pkgs/development/python-modules/aiostreammagic/default.nix b/pkgs/development/python-modules/aiostreammagic/default.nix
index 93b699d6f358..76ebb24f5c85 100644
--- a/pkgs/development/python-modules/aiostreammagic/default.nix
+++ b/pkgs/development/python-modules/aiostreammagic/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "aiostreammagic";
-  version = "2.3.0";
+  version = "2.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "noahhusby";
     repo = "aiostreammagic";
     rev = "refs/tags/${version}";
-    hash = "sha256-qfiLYl2FYT4SNv02aGQoRJPvMzBiPKj/yozdkTFOykU=";
+    hash = "sha256-IMCs4EgOign56mThQ3ljnHs7/lt5874Ni1kavkHnKws=";
   };
 
   pythonRelaxDeps = [ "websockets" ];

From 8facd83341f5e8aab9b29f254a13fbe0eeda8308 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 16 Sep 2024 11:17:29 +0200
Subject: [PATCH 191/241] python312Packages.weatherflow4py: 1.0.4 -> 1.0.6

Diff: https://github.com/jeeftor/weatherflow4py/compare/refs/tags/v1.0.4...v1.0.6

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

diff --git a/pkgs/development/python-modules/weatherflow4py/default.nix b/pkgs/development/python-modules/weatherflow4py/default.nix
index 83ea54a35e78..5ffcffcbcff9 100644
--- a/pkgs/development/python-modules/weatherflow4py/default.nix
+++ b/pkgs/development/python-modules/weatherflow4py/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "weatherflow4py";
-  version = "1.0.4";
+  version = "1.0.6";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "jeeftor";
     repo = "weatherflow4py";
     rev = "refs/tags/v${version}";
-    hash = "sha256-6LSxv1Lh9UUo0Y7I/BvxEPtIkOjIAYon32mcoS1Gxxs=";
+    hash = "sha256-NazRT/gSaxat90eA66ajjVPvN9UFNEX4y1hfOtu9UoE=";
   };
 
   build-system = [ poetry-core ];

From e32ed381ecf07fac29d2d89aa59755ffc6c33f4c Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Mon, 16 Sep 2024 14:48:35 +0530
Subject: [PATCH 192/241] uwsm: 0.18.2 -> 0.19.0

Changelog: https://github.com/Vladimir-csp/uwsm/releases/tag/v0.19.0
---
 pkgs/by-name/uw/uwsm/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/uw/uwsm/package.nix b/pkgs/by-name/uw/uwsm/package.nix
index fa5ad6f3692b..3e6db1d64791 100644
--- a/pkgs/by-name/uw/uwsm/package.nix
+++ b/pkgs/by-name/uw/uwsm/package.nix
@@ -27,13 +27,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "uwsm";
-  version = "0.18.2";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "Vladimir-csp";
     repo = "uwsm";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-/LmSc1AKNZ/VZ2rkUsOvwqpJmPgb6dThTtOu44BriQs=";
+    hash = "sha256-gptZld9BIQaujg9fGAgKD7wXjKeL5quXnSGOKn25jn8=";
   };
 
   nativeBuildInputs = [
@@ -88,6 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Universal wayland session manager";
     homepage = "https://github.com/Vladimir-csp/uwsm";
+    changelog = "https://github.com/Vladimir-csp/uwsm/releases/tag/v${finalAttrs.version}";
     mainProgram = "uwsm";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [

From e21aecdc354b406d6de6428badbfff98414dad63 Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Mon, 16 Sep 2024 11:16:09 +0200
Subject: [PATCH 193/241] qgis-ltr: 3.34.10 -> 3.34.11

---
 pkgs/applications/gis/qgis/unwrapped-ltr.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
index 446a02e584ea..1e12b435c78a 100644
--- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix
+++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
@@ -78,14 +78,14 @@ let
     urllib3
   ];
 in mkDerivation rec {
-  version = "3.34.10";
+  version = "3.34.11";
   pname = "qgis-ltr-unwrapped";
 
   src = fetchFromGitHub {
     owner = "qgis";
     repo = "QGIS";
     rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-E2Ak14h1kWdGq+JNbCeh5YJkr/S9g/0HD834MtgACSA=";
+    hash = "sha256-VNgUMEA7VKZXsLG1ZYUIlYvjwRrH8LsliGiVRMnXOM0=";
   };
 
   passthru = {

From 5c771e30e33e2fd9fc4ca035ed389976dbf63e4e Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Mon, 16 Sep 2024 11:16:55 +0200
Subject: [PATCH 194/241] qgis-ltr: drop redundant CMAKE_BUILD_TYPE setting

CMAKE_BUILD_TYPE=Release is set by default in

https://github.com/NixOS/nixpkgs/blob/040bd3d95a6478c942fed4c22c589345bee76337/pkgs/by-name/cm/cmake/setup-hook.sh#L113
---
 pkgs/applications/gis/qgis/unwrapped-ltr.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
index 1e12b435c78a..17af854eabda 100644
--- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix
+++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
@@ -151,7 +151,6 @@ in mkDerivation rec {
   env.QT_QPA_PLATFORM_PLUGIN_PATH="${qtbase}/${qtbase.qtPluginPrefix}/platforms";
 
   cmakeFlags = [
-    "-DCMAKE_BUILD_TYPE=Release"
     "-DWITH_3D=True"
     "-DWITH_PDAL=True"
     "-DENABLE_TESTS=False"

From 04e88717732460acb7ef1cce758b8a63f0cce3ec Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Mon, 16 Sep 2024 14:54:32 +0530
Subject: [PATCH 195/241] uwsm: pass python-bin meson option

enable man output dir
---
 pkgs/by-name/uw/uwsm/package.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/uw/uwsm/package.nix b/pkgs/by-name/uw/uwsm/package.nix
index 3e6db1d64791..7df5b832c746 100644
--- a/pkgs/by-name/uw/uwsm/package.nix
+++ b/pkgs/by-name/uw/uwsm/package.nix
@@ -60,12 +60,9 @@ stdenv.mkDerivation (finalAttrs: {
       "uuctl" = uuctlSupport;
       "man-pages" = true;
     })
+    (lib.mesonOption "python-bin" python.interpreter)
   ];
 
-  passthru = {
-    updateScript = nix-update-script { };
-  };
-
   postInstall =
     let
       wrapperArgs = ''
@@ -85,6 +82,15 @@ stdenv.mkDerivation (finalAttrs: {
       ''}
     '';
 
+  outputs = [
+    "out"
+    "man"
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Universal wayland session manager";
     homepage = "https://github.com/Vladimir-csp/uwsm";

From 7784c973e614ef6c5e101486e703b6c396fa05ce Mon Sep 17 00:00:00 2001
From: Rebecca Turner <rbt@sent.as>
Date: Sun, 15 Sep 2024 16:31:39 -0700
Subject: [PATCH 196/241] lowdown: patch to fix macOS and UTF-8 bugs

- Improve UTF-8 handling by not treating bytes >=0x80, which tend to be
  UTF-8 continuation bytes, as control characters.

  This leaves control characters U+0080 through U+009F in the output
  (incorrectly) but doesn't mangle other UTF-8 characters, so it's a net
  win.

  See: https://github.com/kristapsdz/lowdown/pull/140

- Don't output a newline between a `.SH` and a heading.

  This fixes `makewhatis` output on macOS and (as a result) `man`
  completions for `fish` on macOS.

  See: https://github.com/kristapsdz/lowdown/pull/138
---
 pkgs/tools/typesetting/lowdown/default.nix | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix
index 189ba55838b6..bf9e06deca34 100644
--- a/pkgs/tools/typesetting/lowdown/default.nix
+++ b/pkgs/tools/typesetting/lowdown/default.nix
@@ -1,4 +1,5 @@
 { lib, stdenv, fetchurl, fixDarwinDylibNames, which, dieHook
+, fetchpatch
 , enableShared ? !stdenv.hostPlatform.isStatic
 , enableStatic ? stdenv.hostPlatform.isStatic
 # for passthru.tests
@@ -16,6 +17,40 @@ stdenv.mkDerivation rec {
     hash = "sha512-EpAWTz7Zy+2qqJGgzLrt0tK7WEZ+hHbdyqzAmMiaqc6uNXscR88git6/UbTjvB9Yanvetvw9huSuyhcORCEIug==";
   };
 
+  patches = [
+    # Improve UTF-8 handling on macOS by not treating bytes >=0x80, which tend to be
+    # UTF-8 continuation bytes, as control characters.
+    #
+    # This leaves control characters U+0080 through U+009F in the output
+    # (incorrectly) but doesn't mangle other UTF-8 characters, so it's a net
+    # win.
+    #
+    # See: https://github.com/kristapsdz/lowdown/pull/140
+    (fetchpatch {
+      url = "https://github.com/kristapsdz/lowdown/commit/5a02866dd682363a8e4f6b344c223cfe8b597da9.diff";
+      hash = "sha256-7tGhZJQQySeBv4h6A4r69BBbQkPRX/3JTw/80A8YXjQ=";
+    })
+    (fetchpatch {
+      url = "https://github.com/kristapsdz/lowdown/commit/c033a6886e4d6efb948782fbc389fe5f673acf36.diff";
+      hash = "sha256-7DvKFerAMoPifuTn7rOX4ru888HfBkpspH1opIbzj08=";
+    })
+
+    # Don't output a newline after .SH
+    #
+    # This fixes `makewhatis` output on macOS and (as a result) `man`
+    # completions for `fish` on macOS.
+    #
+    # See: https://github.com/kristapsdz/lowdown/pull/138
+    (fetchpatch {
+      url = "https://github.com/kristapsdz/lowdown/commit/e05929a09a697de3d2eb14d0f0a087a6fae22e11.diff";
+      hash = "sha256-P03W+hFeBKwfJB+DhGCPq0DtiOiLLc+0ZvWrWqXFvVU=";
+    })
+    (fetchpatch {
+      url = "https://github.com/kristapsdz/lowdown/commit/9906f8ceac586c54eb39ae78105fd84653a89c33.diff";
+      hash = "sha256-nBnAgTb8RDe/QpUhow3lyeR7UIVJX2o4lmP78e2fw/E=";
+    })
+  ];
+
   nativeBuildInputs = [ which dieHook ]
     ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ];
 

From b3cc247b6f70de000c188eb656480e2af46722ec Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 29 Jul 2024 09:40:53 +0200
Subject: [PATCH 197/241] python312Packages.policy-sentry: 0.12.12 -> 0.13.1

Changelog: https://github.com/salesforce/policy_sentry/releases/tag/0.13.1
---
 pkgs/development/python-modules/policy-sentry/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/policy-sentry/default.nix b/pkgs/development/python-modules/policy-sentry/default.nix
index 09e909eaa142..d83761083c8a 100644
--- a/pkgs/development/python-modules/policy-sentry/default.nix
+++ b/pkgs/development/python-modules/policy-sentry/default.nix
@@ -4,6 +4,7 @@
   buildPythonPackage,
   click,
   fetchFromGitHub,
+  orjson,
   pytestCheckHook,
   pythonOlder,
   pyyaml,
@@ -14,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "policy-sentry";
-  version = "0.12.12";
+  version = "0.13.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +24,7 @@ buildPythonPackage rec {
     owner = "salesforce";
     repo = "policy_sentry";
     rev = "refs/tags/${version}";
-    hash = "sha256-1LYcUlGoSalbdo4tiNIYbdA04IHRTImhdWScpiCZk50=";
+    hash = "sha256-OUe6NAz4w9/OXWQg4W+TmEI5qiSdEp+/tspQnIISTnc=";
   };
 
   build-system = [ setuptools ];
@@ -31,8 +32,9 @@ buildPythonPackage rec {
   dependencies = [
     beautifulsoup4
     click
-    requests
+    orjson
     pyyaml
+    requests
     schema
   ];
 

From 6d93973f2a80d98f92a4a028beea69934624104d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 16 Sep 2024 11:27:34 +0200
Subject: [PATCH 198/241] python312Packages.cloudsplaining: 0.6.3 -> 0.7.0

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

diff --git a/pkgs/development/python-modules/cloudsplaining/default.nix b/pkgs/development/python-modules/cloudsplaining/default.nix
index fa8b93558fb4..284b503bb684 100644
--- a/pkgs/development/python-modules/cloudsplaining/default.nix
+++ b/pkgs/development/python-modules/cloudsplaining/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "cloudsplaining";
-  version = "0.6.3";
+  version = "0.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "salesforce";
     repo = "cloudsplaining";
     rev = "refs/tags/${version}";
-    hash = "sha256-mRWfb14zKS141cYzShXY+OoHWfs9PB1oJu3spsvv6mI=";
+    hash = "sha256-ZraWGOiJNqVSmxnllaTvpk9+rUQRFcxFIdp91gpAQW0=";
   };
 
   postPatch = ''

From 8d123c1f2232ba8aa40ec0c44e008e45c1dce6b1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 16 Sep 2024 11:29:17 +0200
Subject: [PATCH 199/241] python312Packages.cloudsplaining: update disabled

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

diff --git a/pkgs/development/python-modules/cloudsplaining/default.nix b/pkgs/development/python-modules/cloudsplaining/default.nix
index 284b503bb684..25c05cdd1e8c 100644
--- a/pkgs/development/python-modules/cloudsplaining/default.nix
+++ b/pkgs/development/python-modules/cloudsplaining/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   version = "0.7.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "salesforce";

From 5aed162d67bccdf1cb1d31c69d21f4cfec249799 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 15 Sep 2024 21:13:36 +0200
Subject: [PATCH 200/241] python312Packages.pytorch-pfn-extras: 0.7.6 -> 0.7.7

Diff:
https://github.com/pfnet/pytorch-pfn-extras/compare/refs/tags/v0.7.6...v0.7.7

Changelog:
https://github.com/pfnet/pytorch-pfn-extras/releases/tag/v0.7.7
---
 .../pytorch-pfn-extras/default.nix            | 64 ++++++++++++-------
 1 file changed, 42 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix
index f77d143f7b03..60d03910bcfb 100644
--- a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix
+++ b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix
@@ -1,40 +1,38 @@
 {
+  lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
-  lib,
-  numpy,
-  onnx,
-  packaging,
-  pytestCheckHook,
-  pythonAtLeast,
+
+  # build-system
   setuptools,
-  stdenv,
+
+  # dependencies
+  numpy,
+  packaging,
   torch,
-  torchvision,
   typing-extensions,
+
+  # tests
+  onnx,
+  pytestCheckHook,
+  torchvision,
+
+  pythonAtLeast,
+  stdenv,
 }:
 
 buildPythonPackage rec {
   pname = "pytorch-pfn-extras";
-  version = "0.7.6";
+  version = "0.7.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pfnet";
     repo = "pytorch-pfn-extras";
     rev = "refs/tags/v${version}";
-    hash = "sha256-vSon/0GxQfaRtSPsQbYAvE3s/F0HEN59VpzE3w1PnVE=";
+    hash = "sha256-0+ltkm7OH18hlpHYyZCmy1rRleF52IM2BjLoW44tJUY=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "relax-setuptools.patch";
-      url = "https://github.com/pfnet/pytorch-pfn-extras/commit/96abe38c4baa6a144d604bdd4744c55627e55440.patch";
-      hash = "sha256-85UDGcgJyQS5gINbgpNM58b3XJGvf+ArtGhwJ5EXdhk=";
-    })
-  ];
-
   build-system = [ setuptools ];
 
   dependencies = [
@@ -54,10 +52,26 @@ buildPythonPackage rec {
     # Requires CUDA access which is not possible in the nix environment.
     "-m 'not gpu and not mpi'"
     "-Wignore::DeprecationWarning"
+
+    # FutureWarning: You are using `torch.load` with `weights_only=False` (the current default value), which uses the default pickle module implicitly...
+    "-Wignore::FutureWarning"
   ];
 
   pythonImportsCheck = [ "pytorch_pfn_extras" ];
 
+  disabledTests =
+    [
+      # AssertionError: assert 4 == 0
+      # where 4 = <MagicMock id='140733587469184'>.call_count
+      "test_lr_scheduler_wait_for_first_optimizer_step"
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
+      # torch.distributed is not available on darwin
+      "test_create_distributed_evaluator"
+      "test_distributed_evaluation"
+      "test_distributed_evaluator_progress_bar"
+    ];
+
   disabledTestPaths =
     [
       # Requires optuna which is currently (2022-02-16) marked as broken.
@@ -84,6 +98,11 @@ buildPythonPackage rec {
     ]
     ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
       # torch.distributed is not available on darwin
+      "tests/pytorch_pfn_extras_tests/distributed_tests/test_distributed_validation_sampler.py"
+      "tests/pytorch_pfn_extras_tests/nn_tests/parallel_tests/test_distributed.py"
+      "tests/pytorch_pfn_extras_tests/profiler_tests/test_record.py"
+      "tests/pytorch_pfn_extras_tests/profiler_tests/test_time_summary.py"
+      "tests/pytorch_pfn_extras_tests/training_tests/extensions_tests/test_accumulate.py"
       "tests/pytorch_pfn_extras_tests/training_tests/extensions_tests/test_sharded_snapshot.py"
     ]
     ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
@@ -92,10 +111,11 @@ buildPythonPackage rec {
       "tests/pytorch_pfn_extras_tests/nn_tests/modules_tests/test_lazy_conv.py"
     ];
 
-  meta = with lib; {
+  meta = {
     description = "Supplementary components to accelerate research and development in PyTorch";
     homepage = "https://github.com/pfnet/pytorch-pfn-extras";
-    license = licenses.mit;
-    maintainers = with maintainers; [ samuela ];
+    changelog = "https://github.com/pfnet/pytorch-pfn-extras/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ samuela ];
   };
 }

From 44c966831ea8d3571295587fdca708dec0d46d32 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 15 Sep 2024 22:40:28 +0200
Subject: [PATCH 201/241] python312Packages.ffcv: mark as broken on darwin

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

diff --git a/pkgs/development/python-modules/ffcv/default.nix b/pkgs/development/python-modules/ffcv/default.nix
index d9c37657adf3..344c7257024a 100644
--- a/pkgs/development/python-modules/ffcv/default.nix
+++ b/pkgs/development/python-modules/ffcv/default.nix
@@ -17,6 +17,7 @@
   psutil,
   torchvision,
   webdataset,
+  stdenv,
 }:
 
 buildPythonPackage rec {
@@ -108,5 +109,8 @@ buildPythonPackage rec {
       samuela
       djacu
     ];
+    # OSError: dlopen(libc.so.6, 0x0006): tried: '/usr/lib/libc.so.6' (no such file, not in dyld cache),
+    # 'libc.so.6' (no such file), '/usr/local/lib/libc.so.6' (no such file), '/usr/lib/libc.so.6' (no such file, not in dyld cache)
+    broken = stdenv.isDarwin;
   };
 }

From f388ebdb19c6e0dda3e2860d76addda00a791bf4 Mon Sep 17 00:00:00 2001
From: gaykitty <126119280+gaykitty@users.noreply.github.com>
Date: Sat, 17 Aug 2024 19:08:42 -0400
Subject: [PATCH 202/241] framework-laptop-kmod: 0-unstable-2024-01-02 ->
 0-unstable-2024-09-15

add updateScript
---
 .../linux/framework-laptop-kmod/default.nix        | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/framework-laptop-kmod/default.nix b/pkgs/os-specific/linux/framework-laptop-kmod/default.nix
index c31ce1b84b6b..d0ca1a3bb1d9 100644
--- a/pkgs/os-specific/linux/framework-laptop-kmod/default.nix
+++ b/pkgs/os-specific/linux/framework-laptop-kmod/default.nix
@@ -1,19 +1,19 @@
 { lib
 , stdenv
-, linuxPackages
 , kernel
 , fetchFromGitHub
+, unstableGitUpdater
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "framework-laptop-kmod";
-  version = "0-unstable-2024-01-02";
+  version = "0-unstable-2024-09-15";
 
   src = fetchFromGitHub {
     owner = "DHowett";
     repo = "framework-laptop-kmod";
-    rev = "a9e8db9ba2959b75c1fb820ffac8fa189f0f63c3";
-    hash = "sha256-Ai/OxvkaKPltri8R0oyfmxQLUVfaj6Q8vebrhmWYhUU=";
+    rev = "6164bc3dec24b6bb2806eedd269df6a170bcc930";
+    hash = "sha256-OwtXQR0H4GNlYjVZ5UU5MEM6ZOjlV3B0x2auYawbS2U=";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
@@ -28,11 +28,15 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
+
+  passthru.updateScript = unstableGitUpdater { };
+
   meta = with lib; {
     description = "Kernel module that exposes the Framework Laptop (13, 16)'s battery charge limit and LEDs to userspace";
     homepage = "https://github.com/DHowett/framework-laptop-kmod";
     license = licenses.gpl2Only;
     maintainers = with maintainers; [ gaykitty ];
     platforms = platforms.linux;
+    broken = lib.versionOlder kernel.version "6.1";
   };
 }

From 026662eb8e2f721082fd07c4f51c8cf2e9d64752 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 14 Sep 2024 14:28:12 +0000
Subject: [PATCH 203/241] muse-sounds-manager: init at 1.1.0.587

Closes #216432
---
 .../mu/muse-sounds-manager/package.nix        | 78 +++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 pkgs/by-name/mu/muse-sounds-manager/package.nix

diff --git a/pkgs/by-name/mu/muse-sounds-manager/package.nix b/pkgs/by-name/mu/muse-sounds-manager/package.nix
new file mode 100644
index 000000000000..8466c767eda1
--- /dev/null
+++ b/pkgs/by-name/mu/muse-sounds-manager/package.nix
@@ -0,0 +1,78 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  autoPatchelfHook,
+  dpkg,
+  fontconfig,
+  zlib,
+  icu,
+  libX11,
+  libXext,
+  libXi,
+  libXrandr,
+  libICE,
+  libSM,
+  openssl,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "muse-sounds-manager";
+  version = "1.1.0.587";
+
+  # Use web.archive.org since upstream does not provide a stable (versioned) URL.
+  # To see if there are new versions on the Web Archive, visit
+  # http://web.archive.org/cdx/search/cdx?url=https://muse-cdn.com/Muse_Sounds_Manager_Beta.deb
+  # then replace the date in the URL below with date when the SHA1
+  # changes (currently A3NX3WHFZWXCHZVME2ABUL2VRENTWOD5) and replace
+  # the version above with the version in the .deb metadata (or in the
+  # settings of muse-sounds-manager).
+  src = fetchurl {
+    url = "https://web.archive.org/web/20240826143936/https://muse-cdn.com/Muse_Sounds_Manager_Beta.deb";
+    hash = "sha256-wzZAIjme1cv8+jMLiKT7kUQvCb+UhsvOnLDV4hCL3hw=";
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    dpkg
+  ];
+
+  buildInputs = [
+    fontconfig
+    stdenv.cc.cc
+    zlib
+  ] ++ runtimeDependencies;
+
+  runtimeDependencies = map lib.getLib [
+    icu
+    libX11
+    libXext
+    libXi
+    libXrandr
+    libICE
+    libSM
+    openssl
+  ];
+
+  unpackPhase = "dpkg -x $src .";
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out
+    mv usr/* opt $out/
+    substituteInPlace $out/bin/muse-sounds-manager --replace-fail /opt/ $out/opt/
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Manage Muse Sounds (Muse Hub) libraries for MuseScore";
+    homepage = "https://musescore.org/";
+    license = lib.licenses.unfree;
+    mainProgram = "muse-sounds-manager";
+    maintainers = with lib.maintainers; [ orivej ];
+    platforms = [ "x86_64-linux" ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  };
+}

From 366e1bf1dce07a8bc291e7a8979b1df829abeaf0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 16 Sep 2024 12:35:40 +0200
Subject: [PATCH 204/241] checkov: relax cloudsplaining

---
 pkgs/development/tools/analysis/checkov/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix
index 281361ae31a1..215fa38d3a51 100644
--- a/pkgs/development/tools/analysis/checkov/default.nix
+++ b/pkgs/development/tools/analysis/checkov/default.nix
@@ -23,6 +23,7 @@ python3.pkgs.buildPythonApplication rec {
     "bc-python-hcl2"
     "boto3"
     "botocore"
+    "cloudsplaining"
     "cyclonedx-python-lib"
     "dpath"
     "igraph"

From 840e9ca127fe6f6ef70a30d98772ea9603049175 Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Mon, 16 Sep 2024 13:03:44 +0200
Subject: [PATCH 205/241] fscryptctl: replace rec with finalAttrs

Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
---
 pkgs/by-name/fs/fscryptctl/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fs/fscryptctl/package.nix b/pkgs/by-name/fs/fscryptctl/package.nix
index 053be640d45b..b4ff999b3702 100644
--- a/pkgs/by-name/fs/fscryptctl/package.nix
+++ b/pkgs/by-name/fs/fscryptctl/package.nix
@@ -5,14 +5,14 @@
   pandoc,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "fscryptctl";
   version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "fscryptctl";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-5suEdSpX8alDkSnSnyiIjUmZq98eK0ZPVAtDKhOs65c=";
   };
 
@@ -39,10 +39,10 @@ stdenv.mkDerivation rec {
       As fscryptctl is intended for advanced users, you should read the kernel
       documentation for filesystem encryption before using fscryptctl.
     '';
-    inherit (src.meta) homepage;
+    inherit (finalAttrs.src.meta) homepage;
     changelog = "https://github.com/google/fscryptctl/blob/master/NEWS.md";
     license = lib.licenses.asl20;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ primeos ];
   };
-}
+})

From f78e6b8839bc908849a385ed05a8ed536194ab85 Mon Sep 17 00:00:00 2001
From: Eman Resu <ellakalle6+laptop@gmail.com>
Date: Sun, 15 Sep 2024 12:36:09 -0400
Subject: [PATCH 206/241] nautilus-open-any-terminal: add required config from
 project README so module functions intuitively

https://github.com/Stunkymonkey/nautilus-open-any-terminal/blob/bb0fe33c48770ae9774ad27034152d185def2b67/README.md#nixpkgs-nixos-
---
 nixos/modules/programs/nautilus-open-any-terminal.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/modules/programs/nautilus-open-any-terminal.nix b/nixos/modules/programs/nautilus-open-any-terminal.nix
index ff0e77607b5e..f878a9f26139 100644
--- a/nixos/modules/programs/nautilus-open-any-terminal.nix
+++ b/nixos/modules/programs/nautilus-open-any-terminal.nix
@@ -22,6 +22,12 @@ in
       nautilus-python
       nautilus-open-any-terminal
     ];
+
+    environment.sessionVariables.NAUTILUS_4_EXTENSION_DIR = "${pkgs.nautilus-python}/lib/nautilus/extensions-4";
+    environment.pathsToLink = [
+      "/share/nautilus-python/extensions"
+    ];
+
     programs.dconf = lib.optionalAttrs (cfg.terminal != null) {
       enable = true;
       profiles.user.databases = [{

From d8f973058ba5d4adc5053b78d5c6de089279ee5c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Sep 2024 11:06:39 +0000
Subject: [PATCH 207/241] build(deps): bump peter-evans/create-pull-request
 from 7.0.1 to 7.0.3

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 7.0.1 to 7.0.3.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20...6cd32fd93684475c31847837f87bb135d40a2b79)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-terraform-providers.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-terraform-providers.yml b/.github/workflows/update-terraform-providers.yml
index eadddad34307..99762a2269e2 100644
--- a/.github/workflows/update-terraform-providers.yml
+++ b/.github/workflows/update-terraform-providers.yml
@@ -46,7 +46,7 @@ jobs:
         run: |
           git clean -f
       - name: create PR
-        uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 # v7.0.1
+        uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 # v7.0.3
         with:
           body: |
             Automatic update by [update-terraform-providers](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/update-terraform-providers.yml) action.

From 00a082f90932fcc73f9a4b5195c93d58443f0548 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 16 Sep 2024 08:36:39 +0000
Subject: [PATCH 208/241] musescore: fix crash accessing uninitialized
 properties

Without this patch MuseScore crashes on my x86_64 Linux about 40% of
the times I attempt to launch it.

See https://github.com/musescore/MuseScore/pull/24714
---
 pkgs/applications/audio/musescore/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index fbfc50a1a684..ad986c55be50 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -64,6 +64,11 @@ in stdenv'.mkDerivation (finalAttrs: {
       url = "https://github.com/musescore/MuseScore/pull/24326/commits/b274f13311ad0b2bce339634a006ba22fbd3379e.patch";
       hash = "sha256-ZGmjRa01CBEIxJdJYQMhdg4A9yjWdlgn0pCPmENBTq0=";
     })
+    (fetchpatch {
+      name = "fix-crash-accessing-uninitialized-properties.patch";
+      url = "https://github.com/musescore/MuseScore/pull/24714.patch";
+      hash = "sha256-ErrCU/U+wyfD7R8kiZTifGIeuCAdKi1q7uxYsoE/OLA=";
+    })
   ];
 
   cmakeFlags = [

From 960b838a5f114e252546bdc20171b4a4ca7c1d35 Mon Sep 17 00:00:00 2001
From: Ryan Lahfa <masterancpp@gmail.com>
Date: Mon, 16 Sep 2024 13:17:33 +0200
Subject: [PATCH 209/241] CONTRIBUTING: offer clearer guidelines about blocker
 vs. non-blocker issues (#264651)

We sometimes have reviews that are blocked because of miscommunication between author
and reviewer, we make this clear so that reviewers and authors can refer to a block of
"authoritative" text to unblock their own situations.

Co-authored-by: Valentin Gagarin <valentin@gagarin.work>
---
 CONTRIBUTING.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d13585fc144d..b09cbaba14cd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -315,6 +315,22 @@ When reviewing a pull request, please always be nice and polite. Controversial c
 
 GitHub provides reactions as a simple and quick way to provide feedback to pull requests or any comments. The thumb-down reaction should be used with care and if possible accompanied with some explanation so the submitter has directions to improve their contribution.
 
+When doing a review:
+- Aim to drive the proposal to a timely conclusion.
+- Focus on the proposed changes to keep the scope of the discussion narrow.
+- Help the contributor prioritise their efforts towards getting their change merged.
+
+If you find anything related that could be improved but is not immediately required for acceptance, consider
+- Implementing the changes yourself in a follow-up pull request (and request review from the person who inspired you)
+- Tracking your idea in an issue
+- Offering the original contributor to review a follow-up pull request
+- Making concrete [suggestions](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/incorporating-feedback-in-your-pull-request) in the same pull request.
+
+For example, follow-up changes could involve refactoring code in the affected files.
+
+But please remember not to make such additional considerations a blocker, and communicate that to the contributor, for example by following the [conventional comments](https://conventionalcomments.org/) pattern.
+If the related change is essential for the contribution at hand, make clear why you think it is important to address that first.
+
 Pull request reviews should include a list of what has been reviewed in a comment, so other reviewers and mergers can know the state of the review.
 
 All the review template samples provided in this section are generic and meant as examples. Their usage is optional and the reviewer is free to adapt them to their liking.

From 53eac0b4de531381f7ae119ae61689b4e94e71bf Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 16 Sep 2024 13:34:58 +0200
Subject: [PATCH 210/241] nixos/buildbot: fix usage of escapeStr

---
 .../services/continuous-integration/buildbot/master.nix   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix
index d744b73bf158..300e4e72a01e 100644
--- a/nixos/modules/services/continuous-integration/buildbot/master.nix
+++ b/nixos/modules/services/continuous-integration/buildbot/master.nix
@@ -16,10 +16,10 @@ let
     c = BuildmasterConfig = dict(
      workers       = [${lib.concatStringsSep "," cfg.workers}],
      protocols     = { 'pb': {'port': ${toString cfg.pbPort} } },
-     title         = '${lib.escapeStr cfg.title}',
-     titleURL      = '${lib.escapeStr cfg.titleUrl}',
-     buildbotURL   = '${lib.escapeStr cfg.buildbotUrl}',
-     db            = dict(db_url='${lib.escapeStr cfg.dbUrl}'),
+     title         = '${escapeStr cfg.title}',
+     titleURL      = '${escapeStr cfg.titleUrl}',
+     buildbotURL   = '${escapeStr cfg.buildbotUrl}',
+     db            = dict(db_url='${escapeStr cfg.dbUrl}'),
      www           = dict(port=${toString cfg.port}),
      change_source = [ ${lib.concatStringsSep "," cfg.changeSource} ],
      schedulers    = [ ${lib.concatStringsSep "," cfg.schedulers} ],

From ed4a1c2451deb8199317803d6668d575d0513681 Mon Sep 17 00:00:00 2001
From: Pierre Allix <pierre.allix.work@gmail.com>
Date: Mon, 16 Sep 2024 13:34:02 +0200
Subject: [PATCH 211/241] cassandra: try using python311 packages to fix
 failing tests

---
 pkgs/servers/nosql/cassandra/generic.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix
index 4b44bdf2a697..a954345dbb0f 100644
--- a/pkgs/servers/nosql/cassandra/generic.nix
+++ b/pkgs/servers/nosql/cassandra/generic.nix
@@ -1,7 +1,7 @@
 { lib
 , stdenv
 , fetchurl
-, python3Packages
+, python311Packages
 , makeWrapper
 , gawk
 , bash
@@ -40,11 +40,11 @@ stdenv.mkDerivation rec {
     url = "mirror://apache/cassandra/${version}/apache-cassandra-${version}-bin.tar.gz";
   };
 
-  pythonPath = with python3Packages; [ cassandra-driver ];
+  pythonPath = with python311Packages; [ cassandra-driver ];
 
-  nativeBuildInputs = [ python3Packages.wrapPython ];
+  nativeBuildInputs = [ python311Packages.wrapPython ];
 
-  buildInputs = [ python3Packages.python ] ++ pythonPath;
+  buildInputs = [ python311Packages.python ] ++ pythonPath;
 
   installPhase = ''
     runHook preInstall

From 8e572a79583e9d1c2099a4c46963ec51b78389ca Mon Sep 17 00:00:00 2001
From: Zacharie Dubrulle <dubrullezacharie@gmail.com>
Date: Mon, 16 Sep 2024 13:41:35 +0200
Subject: [PATCH 212/241] gtk4-layer-shell: add `wayland-protocols` as a
 dependency to fix segfault

---
 pkgs/development/libraries/gtk4-layer-shell/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/gtk4-layer-shell/default.nix b/pkgs/development/libraries/gtk4-layer-shell/default.nix
index 35cbb026fbc3..14df22925dc0 100644
--- a/pkgs/development/libraries/gtk4-layer-shell/default.nix
+++ b/pkgs/development/libraries/gtk4-layer-shell/default.nix
@@ -7,6 +7,7 @@
 , gtk-doc
 , docbook-xsl-nons
 , docbook_xml_dtd_43
+, wayland-protocols
 , wayland-scanner
 , wayland
 , gtk4
@@ -44,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     docbook_xml_dtd_43
     vala
     wayland-scanner
+    wayland-protocols
   ];
 
   buildInputs = [

From 5ec7e325fbcb1aa6fbaaf226129a2c2694224822 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Mon, 16 Sep 2024 11:44:45 +0000
Subject: [PATCH 213/241] hdr10plus_tool: 1.6.0 -> 1.6.1

---
 pkgs/by-name/hd/hdr10plus_tool/Cargo.lock  | 1028 ++++++++++----------
 pkgs/by-name/hd/hdr10plus_tool/package.nix |    7 +-
 2 files changed, 540 insertions(+), 495 deletions(-)

diff --git a/pkgs/by-name/hd/hdr10plus_tool/Cargo.lock b/pkgs/by-name/hd/hdr10plus_tool/Cargo.lock
index d768dc8506b2..eaf881d7fc1e 100644
--- a/pkgs/by-name/hd/hdr10plus_tool/Cargo.lock
+++ b/pkgs/by-name/hd/hdr10plus_tool/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "ab_glyph"
-version = "0.2.20"
+version = "0.2.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe21446ad43aa56417a767f3e2f3d7c4ca522904de1dd640529a76e9c5c3b33c"
+checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb"
 dependencies = [
  "ab_glyph_rasterizer",
  "owned_ttf_parser",
@@ -25,28 +25,85 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
-name = "aho-corasick"
-version = "0.7.20"
+name = "adler2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
-name = "anyhow"
-version = "1.0.69"
+name = "anstream"
+version = "0.6.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.88"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356"
 
 [[package]]
 name = "assert_cmd"
-version = "2.0.8"
+version = "2.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9834fcc22e0874394a010230586367d4a3e9f11b560f469262678547e1d2575e"
+checksum = "dc1835b7f27878de8525dc71410b5a31cdcc5f230aed5ba5df968e09c201b23d"
 dependencies = [
+ "anstyle",
  "bstr",
  "doc-comment",
+ "libc",
  "predicates",
  "predicates-core",
  "predicates-tree",
@@ -55,10 +112,11 @@ dependencies = [
 
 [[package]]
 name = "assert_fs"
-version = "1.0.10"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d94b2a3f3786ff2996a98afbd6b4e5b7e890d685ccf67577f508ee2342c71cc9"
+checksum = "7efdb1fdb47602827a342857666feb372712cbc64b414172bd6b167a02927674"
 dependencies = [
+ "anstyle",
  "doc-comment",
  "globwalk",
  "predicates",
@@ -69,9 +127,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bitflags"
@@ -80,55 +138,63 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
-name = "bitstream-io"
-version = "1.6.0"
+name = "bitflags"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d28070975aaf4ef1fd0bd1f29b739c06c2cdd9972e090617fb6dca3b2cb564e"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "bitstream-io"
+version = "2.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452"
 
 [[package]]
 name = "bitvec_helpers"
-version = "3.1.2"
+version = "3.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ef6883bd86b4112b56be19de3a1628de6c4063be7be6e641d484c83069efb4a"
+checksum = "d9a6aff977a34114f146bd3379c9d170a8eafcffcdeecbb7cc3bd2470a39709a"
 dependencies = [
  "bitstream-io",
 ]
 
 [[package]]
 name = "bstr"
-version = "1.3.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1"
+checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c"
 dependencies = [
  "memchr",
- "once_cell",
  "regex-automata",
  "serde",
 ]
 
 [[package]]
 name = "bumpalo"
-version = "3.12.0"
+version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "bytemuck"
-version = "1.13.1"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
+checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
 
 [[package]]
 name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "cc"
-version = "1.0.79"
+version = "1.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476"
+dependencies = [
+ "shlex",
+]
 
 [[package]]
 name = "cfg-if"
@@ -138,28 +204,34 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.1.8"
+version = "4.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d7ae14b20b94cb02149ed21a86c423859cbe18dc7ed69845cace50e52b40a5"
+checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac"
 dependencies = [
- "bitflags",
+ "clap_builder",
  "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73"
+dependencies = [
+ "anstream",
+ "anstyle",
  "clap_lex",
- "is-terminal",
- "once_cell",
  "strsim",
- "termcolor",
  "terminal_size",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.1.8"
+version = "4.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44bec8e5c9d09e439c4335b1af0abaab56dcf3b94999a936e1bb47b9134288f0"
+checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
 dependencies = [
  "heck",
- "proc-macro-error",
  "proc-macro2",
  "quote",
  "syn",
@@ -167,21 +239,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.3.2"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "350b9cf31731f9957399229e9b2adc51eeabdfbe9d71d9a0552275fd12710d09"
-dependencies = [
- "os_str_bytes",
-]
-
-[[package]]
-name = "cmake"
-version = "0.1.49"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c"
-dependencies = [
- "cc",
-]
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
 
 [[package]]
 name = "color_quant"
@@ -190,29 +250,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
 [[package]]
-name = "console"
-version = "0.15.5"
+name = "colorchoice"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60"
+checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+
+[[package]]
+name = "console"
+version = "0.15.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
 dependencies = [
  "encode_unicode",
  "lazy_static",
  "libc",
  "unicode-width",
- "windows-sys 0.42.0",
+ "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "const-cstr"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed3d0b5ff30645a68f35ece8cea4556ca14ef8a1651455f789a099a0513532a6"
-
 [[package]]
 name = "core-foundation"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -220,17 +280,17 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.3"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "core-graphics"
-version = "0.22.3"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
+checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "core-foundation",
  "core-graphics-types",
  "foreign-types",
@@ -239,21 +299,20 @@ dependencies = [
 
 [[package]]
 name = "core-graphics-types"
-version = "0.1.1"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b"
+checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "core-foundation",
- "foreign-types",
  "libc",
 ]
 
 [[package]]
 name = "core-text"
-version = "19.2.0"
+version = "20.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25"
+checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5"
 dependencies = [
  "core-foundation",
  "core-graphics",
@@ -263,13 +322,38 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.3.2"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
 [[package]]
 name = "difflib"
 version = "0.4.0"
@@ -277,31 +361,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
 
 [[package]]
-name = "dirs-next"
-version = "2.0.0"
+name = "dirs"
+version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
 dependencies = [
- "cfg-if",
- "dirs-sys-next",
+ "dirs-sys",
 ]
 
 [[package]]
-name = "dirs-sys-next"
-version = "0.1.2"
+name = "dirs-sys"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
 dependencies = [
  "libc",
+ "option-ext",
  "redox_users",
- "winapi",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "dlib"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794"
+checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
 dependencies = [
  "libloading",
 ]
@@ -314,9 +398,9 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
 
 [[package]]
 name = "dwrote"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b"
+checksum = "2da3498378ed373237bdef1eddcc64e7be2d3ba4841f4c22a998e81cadeea83c"
 dependencies = [
  "lazy_static",
  "libc",
@@ -324,12 +408,6 @@ dependencies = [
  "wio",
 ]
 
-[[package]]
-name = "either"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
-
 [[package]]
 name = "encode_unicode"
 version = "0.3.6"
@@ -337,43 +415,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
 
 [[package]]
-name = "errno"
-version = "0.2.8"
+name = "equivalent"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "winapi",
-]
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
+name = "errno"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
 dependencies = [
- "cc",
  "libc",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "fastrand"
-version = "1.9.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+
+[[package]]
+name = "fdeflate"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
 dependencies = [
- "instant",
+ "simd-adler32",
 ]
 
 [[package]]
 name = "flate2"
-version = "1.0.25"
+version = "1.0.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
+checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
 dependencies = [
  "crc32fast",
- "miniz_oxide",
+ "miniz_oxide 0.8.0",
 ]
 
 [[package]]
@@ -387,31 +466,25 @@ dependencies = [
 
 [[package]]
 name = "float-ord"
-version = "0.2.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bad48618fdb549078c333a7a8528acb57af271d0433bdecd523eb620628364e"
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+checksum = "8ce81f49ae8a0482e4c55ea62ebbd7e5a686af544c00b9d090bba3ff9be97b3d"
 
 [[package]]
 name = "font-kit"
-version = "0.11.0"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21fe28504d371085fae9ac7a3450f0b289ab71e07c8e57baa3fb68b9e57d6ce5"
+checksum = "b64b34f4efd515f905952d91bc185039863705592c0c53ae6d979805dd154520"
 dependencies = [
- "bitflags",
+ "bitflags 2.6.0",
  "byteorder",
  "core-foundation",
  "core-graphics",
  "core-text",
- "dirs-next",
+ "dirs",
  "dwrote",
  "float-ord",
- "freetype",
+ "freetype-sys",
  "lazy_static",
  "libc",
  "log",
@@ -424,45 +497,47 @@ dependencies = [
 
 [[package]]
 name = "foreign-types"
-version = "0.3.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
 dependencies = [
+ "foreign-types-macros",
  "foreign-types-shared",
 ]
 
 [[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
+name = "foreign-types-macros"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
-[[package]]
-name = "freetype"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bee38378a9e3db1cc693b4f88d166ae375338a0ff75cb8263e1c601d51f35dc6"
+checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
- "freetype-sys",
- "libc",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
-name = "freetype-sys"
-version = "0.13.1"
+name = "foreign-types-shared"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a"
+checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
+
+[[package]]
+name = "freetype-sys"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e7edc5b9669349acfda99533e9e0bcf26a51862ab43b08ee7745c55d28eb134"
 dependencies = [
- "cmake",
+ "cc",
  "libc",
  "pkg-config",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.2.8"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
  "libc",
@@ -471,48 +546,49 @@ dependencies = [
 
 [[package]]
 name = "globset"
-version = "0.4.10"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc"
+checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19"
 dependencies = [
  "aho-corasick",
  "bstr",
- "fnv",
  "log",
- "regex",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
 name = "globwalk"
-version = "0.8.1"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc"
+checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757"
 dependencies = [
- "bitflags",
+ "bitflags 2.6.0",
  "ignore",
  "walkdir",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.12.3"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 
 [[package]]
 name = "hdr10plus"
-version = "2.1.0"
+version = "2.1.3"
 dependencies = [
  "anyhow",
  "bitvec_helpers",
  "hevc_parser",
+ "libc",
  "serde",
  "serde_json",
 ]
 
 [[package]]
 name = "hdr10plus_tool"
-version = "1.6.0"
+version = "1.6.1"
 dependencies = [
  "anyhow",
  "assert_cmd",
@@ -530,21 +606,15 @@ dependencies = [
 
 [[package]]
 name = "heck"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hevc_parser"
-version = "0.6.1"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e447b63b4e80dac36e368a9d147d7ba212b4c4b10c516312137f39cea60ff617"
+checksum = "72930110fcf33e323721aefb8effbe172dc02a669a32657b8bbf9da948b87cf5"
 dependencies = [
  "anyhow",
  "bitvec_helpers",
@@ -554,53 +624,52 @@ dependencies = [
 
 [[package]]
 name = "ignore"
-version = "0.4.20"
+version = "0.4.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492"
+checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b"
 dependencies = [
+ "crossbeam-deque",
  "globset",
- "lazy_static",
  "log",
  "memchr",
- "regex",
+ "regex-automata",
  "same-file",
- "thread_local",
  "walkdir",
  "winapi-util",
 ]
 
 [[package]]
 name = "image"
-version = "0.24.5"
+version = "0.24.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945"
+checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
 dependencies = [
  "bytemuck",
  "byteorder",
  "color_quant",
  "jpeg-decoder",
- "num-rational",
  "num-traits",
  "png",
 ]
 
 [[package]]
 name = "indexmap"
-version = "1.9.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
+checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
 dependencies = [
- "autocfg",
+ "equivalent",
  "hashbrown",
 ]
 
 [[package]]
 name = "indicatif"
-version = "0.17.3"
+version = "0.17.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cef509aa9bc73864d6756f0d34d35504af3cf0844373afe9b8669a5b8005a729"
+checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
 dependencies = [
  "console",
+ "instant",
  "number_prefix",
  "portable-atomic",
  "unicode-width",
@@ -608,107 +677,89 @@ dependencies = [
 
 [[package]]
 name = "instant"
-version = "0.1.12"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
-name = "io-lifetimes"
-version = "1.0.5"
+name = "is_terminal_polyfill"
+version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3"
-dependencies = [
- "libc",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "is-terminal"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857"
-dependencies = [
- "hermit-abi",
- "io-lifetimes",
- "rustix",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-dependencies = [
- "either",
-]
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
 [[package]]
 name = "itoa"
-version = "1.0.5"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "jpeg-decoder"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e"
+checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
 
 [[package]]
 name = "js-sys"
-version = "0.3.61"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
 dependencies = [
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.139"
+version = "0.2.158"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
 
 [[package]]
 name = "libloading"
-version = "0.7.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
+checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
  "cfg-if",
- "winapi",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.6.0",
+ "libc",
 ]
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.1.4"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
 [[package]]
 name = "log"
-version = "0.4.17"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if",
-]
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "minimal-lexical"
@@ -718,11 +769,21 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.6.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
 dependencies = [
  "adler",
+ "simd-adler32",
+]
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+dependencies = [
+ "adler2",
 ]
 
 [[package]]
@@ -741,32 +802,11 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
 
-[[package]]
-name = "num-integer"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
-dependencies = [
- "autocfg",
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
 [[package]]
 name = "num-traits"
-version = "0.2.15"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
@@ -779,23 +819,23 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "once_cell"
-version = "1.17.1"
+version = "1.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+checksum = "33ea5043e58958ee56f3e15a90aee535795cd7dfd319846288d93c5b57d85cbe"
 
 [[package]]
-name = "os_str_bytes"
-version = "6.4.1"
+name = "option-ext"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 
 [[package]]
 name = "owned_ttf_parser"
-version = "0.18.1"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e25e9fb15717794fae58ab55c26e044103aad13186fbb625893f9a3bbcc24228"
+checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90"
 dependencies = [
- "ttf-parser 0.18.1",
+ "ttf-parser 0.24.1",
 ]
 
 [[package]]
@@ -810,33 +850,24 @@ dependencies = [
 
 [[package]]
 name = "pathfinder_simd"
-version = "0.5.1"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39fe46acc5503595e5949c17b818714d26fdf9b4920eacf3b2947f0199f4a6ff"
+checksum = "5cf07ef4804cfa9aea3b04a7bbdd5a40031dbb6b4f2cbaf2b011666c80c5b4f2"
 dependencies = [
  "rustc_version",
 ]
 
-[[package]]
-name = "pest"
-version = "2.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "028accff104c4e513bad663bbcd2ad7cfd5304144404c31ed0a77ac103d00660"
-dependencies = [
- "thiserror",
- "ucd-trie",
-]
-
 [[package]]
 name = "pkg-config"
-version = "0.3.26"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
 [[package]]
 name = "plotters"
-version = "0.3.5"
-source = "git+https://github.com/plotters-rs/plotters#acf5158c6f49b8bfe8a5431c64b0867a1a8b36d1"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
 dependencies = [
  "ab_glyph",
  "font-kit",
@@ -846,20 +877,22 @@ dependencies = [
  "pathfinder_geometry",
  "plotters-backend",
  "plotters-bitmap",
- "ttf-parser 0.17.1",
+ "ttf-parser 0.20.0",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "plotters-backend"
-version = "0.3.4"
-source = "git+https://github.com/plotters-rs/plotters#acf5158c6f49b8bfe8a5431c64b0867a1a8b36d1"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
 
 [[package]]
 name = "plotters-bitmap"
-version = "0.3.3"
-source = "git+https://github.com/plotters-rs/plotters#acf5158c6f49b8bfe8a5431c64b0867a1a8b36d1"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72ce181e3f6bf82d6c1dc569103ca7b1bd964c60ba03d7e6cdfbb3e3eb7f7405"
 dependencies = [
  "image",
  "plotters-backend",
@@ -867,31 +900,32 @@ dependencies = [
 
 [[package]]
 name = "png"
-version = "0.17.7"
+version = "0.17.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638"
+checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "crc32fast",
+ "fdeflate",
  "flate2",
- "miniz_oxide",
+ "miniz_oxide 0.7.4",
 ]
 
 [[package]]
 name = "portable-atomic"
-version = "0.3.19"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26f6a7b87c2e435a3241addceeeff740ff8b7e76b74c13bf9acb17fa454ea00b"
+checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
 
 [[package]]
 name = "predicates"
-version = "2.1.5"
+version = "3.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd"
+checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97"
 dependencies = [
+ "anstyle",
  "difflib",
  "float-cmp",
- "itertools",
  "normalize-line-endings",
  "predicates-core",
  "regex",
@@ -899,133 +933,105 @@ dependencies = [
 
 [[package]]
 name = "predicates-core"
-version = "1.0.5"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72f883590242d3c6fc5bf50299011695fa6590c2c70eac95ee1bdb9a733ad1a2"
+checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931"
 
 [[package]]
 name = "predicates-tree"
-version = "1.0.7"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54ff541861505aabf6ea722d2131ee980b8276e10a1297b94e896dd8b621850d"
+checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13"
 dependencies = [
  "predicates-core",
  "termtree",
 ]
 
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
 [[package]]
 name = "proc-macro2"
-version = "1.0.51"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.23"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags",
-]
-
 [[package]]
 name = "redox_users"
-version = "0.4.3"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
  "getrandom",
- "redox_syscall",
+ "libredox",
  "thiserror",
 ]
 
 [[package]]
 name = "regex"
-version = "1.7.1"
+version = "1.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
  "aho-corasick",
  "memchr",
  "regex-syntax",
 ]
 
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-
 [[package]]
 name = "regex-syntax"
-version = "0.6.28"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
 [[package]]
 name = "rustc_version"
-version = "0.3.3"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
 dependencies = [
  "semver",
 ]
 
 [[package]]
 name = "rustix"
-version = "0.36.8"
+version = "0.38.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644"
+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
 dependencies = [
- "bitflags",
+ "bitflags 2.6.0",
  "errno",
- "io-lifetimes",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.45.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "ryu"
-version = "1.0.12"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "same-file"
@@ -1038,36 +1044,24 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "0.11.0"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver-parser"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
-dependencies = [
- "pest",
-]
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.152"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.152"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1076,27 +1070,40 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.93"
+version = "1.0.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
 dependencies = [
  "indexmap",
  "itoa",
+ "memchr",
  "ryu",
  "serde",
 ]
 
 [[package]]
-name = "strsim"
-version = "0.10.0"
+name = "shlex"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1105,56 +1112,47 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.4.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95"
+checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
 dependencies = [
  "cfg-if",
  "fastrand",
- "redox_syscall",
+ "once_cell",
  "rustix",
- "windows-sys 0.42.0",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
-dependencies = [
- "winapi-util",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "terminal_size"
-version = "0.2.5"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c9afddd2cec1c0909f06b00ef33f94ab2cc0578c4a610aa208ddfec8aa2b43a"
+checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
 dependencies = [
  "rustix",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "termtree"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8"
+checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
 [[package]]
 name = "thiserror"
-version = "1.0.38"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.38"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1162,50 +1160,34 @@ dependencies = [
 ]
 
 [[package]]
-name = "thread_local"
-version = "1.1.7"
+name = "ttf-parser"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
-dependencies = [
- "cfg-if",
- "once_cell",
-]
+checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4"
 
 [[package]]
 name = "ttf-parser"
-version = "0.17.1"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "375812fa44dab6df41c195cd2f7fecb488f6c09fbaafb62807488cefab642bff"
-
-[[package]]
-name = "ttf-parser"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633"
-
-[[package]]
-name = "ucd-trie"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
+checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.6"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.10"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
 
 [[package]]
-name = "version_check"
-version = "0.9.4"
+name = "utf8parse"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "wait-timeout"
@@ -1218,12 +1200,11 @@ dependencies = [
 
 [[package]]
 name = "walkdir"
-version = "2.3.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
 dependencies = [
  "same-file",
- "winapi",
  "winapi-util",
 ]
 
@@ -1235,19 +1216,20 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.84"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
 dependencies = [
  "cfg-if",
+ "once_cell",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.84"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
 dependencies = [
  "bumpalo",
  "log",
@@ -1260,9 +1242,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.84"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -1270,9 +1252,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.84"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1283,15 +1265,15 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.84"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
 
 [[package]]
 name = "web-sys"
-version = "0.3.61"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"
+checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -1315,11 +1297,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.5"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "winapi",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1330,84 +1312,151 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows-sys"
-version = "0.42.0"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
 name = "windows-sys"
-version = "0.45.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-targets"
-version = "0.42.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
 ]
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.42.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.42.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.42.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.42.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.42.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.42.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.42.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "wio"
@@ -1420,11 +1469,10 @@ dependencies = [
 
 [[package]]
 name = "yeslogic-fontconfig-sys"
-version = "3.2.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2bbd69036d397ebbff671b1b8e4d918610c181c5a16073b96f984a38d08c386"
+checksum = "503a066b4c037c440169d995b869046827dbc71263f6e8f3be6d77d4f3229dbd"
 dependencies = [
- "const-cstr",
  "dlib",
  "once_cell",
  "pkg-config",
diff --git a/pkgs/by-name/hd/hdr10plus_tool/package.nix b/pkgs/by-name/hd/hdr10plus_tool/package.nix
index d1ef9534e934..d7177166f946 100644
--- a/pkgs/by-name/hd/hdr10plus_tool/package.nix
+++ b/pkgs/by-name/hd/hdr10plus_tool/package.nix
@@ -9,20 +9,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "hdr10plus_tool";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "quietvoid";
     repo = "hdr10plus_tool";
     rev = "refs/tags/${version}";
-    hash = "sha256-EyKCdrilb6Ha9avEe5L4Snbufq8pEiTvr8tcdj0M6Zs=";
+    hash = "sha256-eP77LHADP9oenMACctPKU6xPzg4atC0dPOqyrFse/1s=";
   };
 
   cargoLock = {
     lockFile = ./Cargo.lock;
-    outputHashes = {
-      "plotters-0.3.5" = "sha256-cz8/chdq8C/h1q5yFcQp0Rzg89XHnQhIN1Va52p6Z2Y=";
-    };
   };
 
   nativeBuildInputs = [ pkg-config ];

From a015ebb48b86f3a9b4103eeb9787cb8918c30ffe Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 16 Sep 2024 21:45:58 +1000
Subject: [PATCH 214/241] minetest: 5.9.0 -> 5.9.1 (#342183)

---
 pkgs/games/minetest/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix
index d17be89b4721..3a49b5b90f44 100644
--- a/pkgs/games/minetest/default.nix
+++ b/pkgs/games/minetest/default.nix
@@ -42,13 +42,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "minetest";
-  version = "5.9.0";
+  version = "5.9.1";
 
   src = fetchFromGitHub {
     owner = "minetest";
     repo = "minetest";
     rev = finalAttrs.version;
-    hash = "sha256-cxbiuoD1J3WFoveUgxeR/XXdE7MMR0UEDFleDiaxnsA=";
+    hash = "sha256-0WTDhFt7GDzN4AK8U17iLkjeSMK+gOWZRq46HBTeO3w=";
   };
 
   cmakeFlags = [

From bcc99eb1974db40f4f2662cfae76f04de7d8c55c Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Sat, 14 Sep 2024 15:29:55 -0300
Subject: [PATCH 215/241] dotnet: 9.0.0-preview.7 -> 9.0.0-rc.1

---
 pkgs/development/compilers/dotnet/9/deps.nix  |  20 +-
 .../compilers/dotnet/9/release-info.json      |   6 +-
 .../compilers/dotnet/9/release.json           |  12 +-
 .../development/compilers/dotnet/packages.nix |   4 +-
 pkgs/development/compilers/dotnet/update.sh   |   6 +-
 .../compilers/dotnet/versions/9.0.nix         | 196 +++++++++---------
 pkgs/development/compilers/dotnet/vmr.nix     |  10 +-
 7 files changed, 119 insertions(+), 135 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/9/deps.nix b/pkgs/development/compilers/dotnet/9/deps.nix
index e875578b4711..0f037dae7be9 100644
--- a/pkgs/development/compilers/dotnet/9/deps.nix
+++ b/pkgs/development/compilers/dotnet/9/deps.nix
@@ -1,14 +1,10 @@
 { fetchNuGet }: [
-  (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; sha256 = "35169a2067db5037669cbd0c11b759b50b692ccc14b79095a94b505c73c89638"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-arm64.microsoft.dotnet.ilcompiler/9.0.0-preview.7.24376.15/runtime.linux-arm64.microsoft.dotnet.ilcompiler.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; })
-  (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILAsm"; sha256 = "88a997c651cee3e8e21c368214d105d431de9c4c0586ec76c4e3359212516c3d"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/9.0.0-preview.7.24376.15/runtime.linux-arm64.microsoft.netcore.ilasm.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; })
-  (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "97dc9f86b3d5aa38e373c3af5c285fe02839b7e58ad04f65f8b7dcbf052f61d6"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/9.0.0-preview.7.24376.15/runtime.linux-arm64.microsoft.netcore.ildasm.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; })
-  (fetchNuGet { hash = "sha256-3/wIVCbqYuAIODNUiA3MP1sCsjjk/6o8T9Ly3FGCm6k="; pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-x64.microsoft.dotnet.ilcompiler/9.0.0-preview.7.24376.15/runtime.linux-x64.microsoft.dotnet.ilcompiler.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; })
-  (fetchNuGet { hash = "sha256-BcAIRDlYXwot6zLZnYq2cunSGfL7kV4E7dkrIQy0FAw="; pname = "runtime.linux-x64.Microsoft.NETCore.ILAsm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/9.0.0-preview.7.24376.15/runtime.linux-x64.microsoft.netcore.ilasm.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; })
-  (fetchNuGet { hash = "sha256-fz/yPLIQq/YKNxrBBoioTsqd2tktKhHso7Lpji2Hp/k="; pname = "runtime.linux-x64.Microsoft.NETCore.ILDAsm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/9.0.0-preview.7.24376.15/runtime.linux-x64.microsoft.netcore.ildasm.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; })
-  (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; sha256 = "c225017aca3f2c4bd55faaf6dddc5b24a0b796d4ab8e8c9ba548d03e3de39e7e"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-arm64.microsoft.dotnet.ilcompiler/9.0.0-preview.7.24376.15/runtime.osx-arm64.microsoft.dotnet.ilcompiler.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; })
-  (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILAsm"; sha256 = "816e910d9d0576404e4a2935bdb41ea551abb78a8a55fc33c01de9eb89f8d109"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/9.0.0-preview.7.24376.15/runtime.osx-arm64.microsoft.netcore.ilasm.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; })
-  (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "3acf49996decbf6b32c10ae39e181055ee071979ed0561d2569db84e58f360ff"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/9.0.0-preview.7.24376.15/runtime.osx-arm64.microsoft.netcore.ildasm.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; })
-  (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; sha256 = "7942962d93494931a1ed2cf7e11a20fe407a186a94bd8cd30e18c5449f195264"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-x64.microsoft.dotnet.ilcompiler/9.0.0-preview.7.24376.15/runtime.osx-x64.microsoft.dotnet.ilcompiler.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; })
-  (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILAsm"; sha256 = "fb72e3b48e47a43498f5e11ecb7094831a6fe3552f74fffb4482af150f09e39e"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/9.0.0-preview.7.24376.15/runtime.osx-x64.microsoft.netcore.ilasm.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; })
-  (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILDAsm"; sha256 = "b732ad55b1086e76458c79bfca10991d091abe0fc86367ba7606accf497d4afe"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/9.0.0-preview.7.24376.15/runtime.osx-x64.microsoft.netcore.ildasm.9.0.0-preview.7.24376.15.nupkg"; version = "9.0.0-preview.7.24376.15"; })
+  (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILAsm"; sha256 = "a0c6f109957b1aef641201cc95da7637b3ed15d945c75edcd978e77a5054976e"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/9.0.0-rc.1.24431.7/runtime.linux-arm64.microsoft.netcore.ilasm.9.0.0-rc.1.24431.7.nupkg"; version = "9.0.0-rc.1.24431.7"; })
+  (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "96e02f1574f73caaa06f44bb0b7083e4dfcdc90f98d81e9dc94a7d1167b5b6ee"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/9.0.0-rc.1.24431.7/runtime.linux-arm64.microsoft.netcore.ildasm.9.0.0-rc.1.24431.7.nupkg"; version = "9.0.0-rc.1.24431.7"; })
+  (fetchNuGet { hash = "sha256-Cnf16Gdf6i0o9RHafH3ADxAe9rYI1BF7X7shte+gNYo="; pname = "runtime.linux-x64.Microsoft.NETCore.ILAsm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/9.0.0-rc.1.24431.7/runtime.linux-x64.microsoft.netcore.ilasm.9.0.0-rc.1.24431.7.nupkg"; version = "9.0.0-rc.1.24431.7"; })
+  (fetchNuGet { hash = "sha256-fAmxww6qryPdO4OztPXaG17wqdmMYV6I7jQgnKMbZSE="; pname = "runtime.linux-x64.Microsoft.NETCore.ILDAsm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/9.0.0-rc.1.24431.7/runtime.linux-x64.microsoft.netcore.ildasm.9.0.0-rc.1.24431.7.nupkg"; version = "9.0.0-rc.1.24431.7"; })
+  (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILAsm"; sha256 = "13fcc80223606a4b26ba78a8b82e2f2c730fc1cdc74883de0bb7a866057efcd0"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/9.0.0-rc.1.24431.7/runtime.osx-arm64.microsoft.netcore.ilasm.9.0.0-rc.1.24431.7.nupkg"; version = "9.0.0-rc.1.24431.7"; })
+  (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "5506ee2b8732e36941e3265236540346ac67e0d4597c036f347835e58379ce6f"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/9.0.0-rc.1.24431.7/runtime.osx-arm64.microsoft.netcore.ildasm.9.0.0-rc.1.24431.7.nupkg"; version = "9.0.0-rc.1.24431.7"; })
+  (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILAsm"; sha256 = "3b6cdb847784016e0d2269ee2a578b7f8de2df0eea4f31f379d74aa459d7a7cd"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/9.0.0-rc.1.24431.7/runtime.osx-x64.microsoft.netcore.ilasm.9.0.0-rc.1.24431.7.nupkg"; version = "9.0.0-rc.1.24431.7"; })
+  (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILDAsm"; sha256 = "131879f89cc784e3cbad29b8b8358da314c8ee95747dedc2683e389ba0d422a1"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/9.0.0-rc.1.24431.7/runtime.osx-x64.microsoft.netcore.ildasm.9.0.0-rc.1.24431.7.nupkg"; version = "9.0.0-rc.1.24431.7"; })
 ]
diff --git a/pkgs/development/compilers/dotnet/9/release-info.json b/pkgs/development/compilers/dotnet/9/release-info.json
index f19fad1ba4db..89a33e292fae 100644
--- a/pkgs/development/compilers/dotnet/9/release-info.json
+++ b/pkgs/development/compilers/dotnet/9/release-info.json
@@ -1,5 +1,5 @@
 {
-  "tarballHash": "sha256-DOBRHD6WnvLoCCm9PwtWqfL5CHR8xK3bU3zHsgmuDAM=",
-  "artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.100-preview.7.24380.1.centos.9-x64.tar.gz",
-  "artifactsHash": "sha256-G1gMBCUMO3BiluShVu4sjLc6nLE9V/taXwIIlSOqhJc="
+  "tarballHash": "sha256-t4BQcN1rCG5XKfsJJqnpBHzyXtCrWbQaxpJ8gBpRrVk=",
+  "artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.100-rc.1.24452.1.centos.9-x64.tar.gz",
+  "artifactsHash": "sha256-HRu23+7cJVAoTaFm0hnHk1lOC8HiBIvTs9TgWKVS8xw="
 }
diff --git a/pkgs/development/compilers/dotnet/9/release.json b/pkgs/development/compilers/dotnet/9/release.json
index 3dd633001da1..61f7c3e524a7 100644
--- a/pkgs/development/compilers/dotnet/9/release.json
+++ b/pkgs/development/compilers/dotnet/9/release.json
@@ -1,10 +1,10 @@
 {
-  "release": "9.0.0-preview.7",
+  "release": "9.0.0-rc.1",
   "channel": "9.0",
-  "tag": "v9.0.0-preview.7.24405.7",
-  "sdkVersion": "9.0.100-preview.7.24407.1",
-  "runtimeVersion": "9.0.0-preview.7.24405.7",
-  "aspNetCoreVersion": "9.0.0-preview.7.24406.2",
+  "tag": "v9.0.0-rc.1.24431.7",
+  "sdkVersion": "9.0.100-rc.1.24452.1",
+  "runtimeVersion": "9.0.0-rc.1.24431.7",
+  "aspNetCoreVersion": "9.0.0-rc.1.24452.1",
   "sourceRepository": "https://github.com/dotnet/dotnet",
-  "sourceVersion": "aecea31eada5f5506de2112d72b3bd238a5317b4"
+  "sourceVersion": "f2e150252ab0fe4f796fac30ba5ffeb22c1c4156"
 }
diff --git a/pkgs/development/compilers/dotnet/packages.nix b/pkgs/development/compilers/dotnet/packages.nix
index fc569b6b7e1f..26f33b19096f 100644
--- a/pkgs/development/compilers/dotnet/packages.nix
+++ b/pkgs/development/compilers/dotnet/packages.nix
@@ -82,9 +82,7 @@ in {
     '';
 
     passthru = {
-      inherit (vmr) icu targetRid;
-      # ilcompiler is currently broken: https://github.com/dotnet/source-build/issues/1215
-      hasILCompiler = false;
+      inherit (vmr) icu targetRid hasILCompiler;
     };
 
     meta = vmr.meta // {
diff --git a/pkgs/development/compilers/dotnet/update.sh b/pkgs/development/compilers/dotnet/update.sh
index 486ad2636a0e..3c5f29d8f046 100755
--- a/pkgs/development/compilers/dotnet/update.sh
+++ b/pkgs/development/compilers/dotnet/update.sh
@@ -264,7 +264,11 @@ sdk_packages () {
         local newpkgs=()
         local pkg
         for pkg in "${pkgs[@]}"; do
-            [[ "$pkg" = *Microsoft.NETCore.DotNetHost* ]] || newpkgs+=("$pkg")
+            case "$pkg" in
+                *Microsoft.NETCore.DotNetHost*);;
+                Microsoft.NETCore.App.Runtime.Mono.*);;
+                *) newpkgs+=("$pkg");;
+            esac
         done
         pkgs=("${newpkgs[@]}")
     fi
diff --git a/pkgs/development/compilers/dotnet/versions/9.0.nix b/pkgs/development/compilers/dotnet/versions/9.0.nix
index 3e398bb59ac6..9232daa7073c 100644
--- a/pkgs/development/compilers/dotnet/versions/9.0.nix
+++ b/pkgs/development/compilers/dotnet/versions/9.0.nix
@@ -1,148 +1,140 @@
 { buildAspNetCore, buildNetRuntime, buildNetSdk }:
 
-# v9.0 (preview)
+# v9.0 (go-live)
 
 let
   packages = { fetchNuGet }: [
-      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "9.0.0-preview.7.24406.2"; sha256 = "1jr7mhmjxc1cdxi21isz5g545yzxfv0pjxr1zrjnsfa7vanv8dyy"; })
-      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "9.0.0-preview.7.24406.2"; sha256 = "16adkc5yc1xd47q0bvg8zyhmyyqy8zli7gi8c1fmigxppyr214jr"; })
-      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-preview.7.24406.2"; sha256 = "1xqlfafqljnqnqy8524yfw7h17xby0qlqjj5fgb6bpx325v2n8rs"; })
-      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "9.0.0-preview.7.24406.2"; sha256 = "0mw4l8hb8bhb0hnx6jvz7989602qldsr1hb1xcfhw1d8xismgbii"; })
-      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "9.0.0-preview.7.24406.2"; sha256 = "17l0nkr6pgr5wi7md5kj0avvr3hgz8b67krccdmpi2x094ircl18"; })
-      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "9.0.0-preview.7.24406.2"; sha256 = "111n5jhak4lf9c5rdak0nbb6zvxzjvrvhy26k49ar6jg4narp88l"; })
-      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "9.0.0-preview.7.24406.2"; sha256 = "1bm9xqrmr4qnrsvzdq5w0fi76dndb70b3n9ampkq2gic87kl1cci"; })
-      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "9.0.0-preview.7.24406.2"; sha256 = "0gvnabw0i6vy3iir3bqwvg1vy93q5ifkpy3ax6vxlfqzf8pxrb9p"; })
-      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "9.0.0-preview.7.24406.2"; sha256 = "1qhyj7nhj4mjj4hfhmfn7pgfz17h74wzaq5366qz5ibl45xrbi6k"; })
-      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "9.0.0-preview.7.24406.2"; sha256 = "1vl88ywvl33mn9iz0x1mm8wiq7aviimpb2sjsb55dy53g4k86z4x"; })
-      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "9.0.0-preview.7.24406.2"; sha256 = "0j183nvfqf4d5sd0cza9zj273j2x744yjzv785d0xchqxlps0n2l"; })
-      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "9.0.0-preview.7.24406.2"; sha256 = "11iwchmhklaks9wf8df100p0hicwm2in88id4bb9g9syjyc7jg6v"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "9.0.0-preview.7.24405.7"; sha256 = "1aw9smdvpr0fx52zk7nr23mi2l5z7v7d6r7ycvldm7bdp44gn2w6"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0hn3kpy5wswk7ndgwzjjvnf1w92ss6lcdgy79ackfx7mn7japyw5"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0ri5pn0x6rh6g9g2m165c4wlj2hlnchjh9l5jp7q6ccnjaqkp55j"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "1kvwg5c4x849lw6dip9v9fxr3iwk6siwi80lla08jpkysshwjkwn"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0kldzbdcg3lhb4adgriq6v875cpq4b43v8nj39lr7s98q9sb5lx4"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "1hpvw1nxpinsdihp0n12ap7m66qjbhq95cls7wbg44n6nyd1yaq8"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0ax6xw2ikz95nszwwn1ra77inlyzkmdcxcbg95qc0i3clf18d33m"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0apgg5lalz2r3bgvx6sg2pd20mgnyphpgfqw21g9wqq19fyx2kn5"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "9.0.0-preview.7.24405.7"; sha256 = "0qnlq06cagbzza3di41pv9mxcl9rqhkclqrdwfy0zwz8k0a9jj7a"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "9.0.0-preview.7.24405.7"; sha256 = "025s5mss3jr7cnmsqqnv3spqv11a1240x34pwrbb50j250r7zyr3"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "1g7rsqybpaifq5vr00pak029bg6gwyi33mvxkxr2wgawfbkggf34"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "18may21khp4m55d2r4w1j2b4p5wg319c8d9z9x0d9c3qlvv4rjl6"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0mnqqz1bwfv8a5c7agcmpr4rckdlllavsv91k387jh2lc5g503cv"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "1h3kkqv33mzmng14b3h1fqqh777xck65ifmdzarma1v6r8hqw57n"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0kmdivwynf9m4al61kggv7iz6hph2sa2n9v0vyh5hrgls7k401lk"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "1zx29hrcfzv01mr37qkm5ax43g2zyd1lslb5smy8mgwyjf4nvhzs"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "1cm8ki8hkk7vmjsb7cwi61q30rjc0cjffcn95qzxppvb7rb3393y"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "9.0.0-preview.7.24405.7"; sha256 = "02v2dxs355cskcjb80k4vmxdw0g4g5v316h9rp0jmblm8kjvdnhz"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "0mb9kvi2whvbd3b2ny1z4cy93z3i6cr0b833dkn2w480hgkcksbn"; })
-      (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "0qlgx6byb3l534k5gw9jhpzcrnldcyix4gd46v3kz8a4g007bxw0"; })
-      (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "0fs86sapdib43p8pza2pb1qzdinvk8vzzh2mxhwia90mlxq9nmm3"; })
-      (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "0rcqhx7kaifcy0k3np3xar2pma8cs16d4626m4wnas0ndd6z4k6n"; })
-      (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "1zn4cam3fkzv8wr52sdrsi1bbqp8z2m1y7vs10s20f9va0k2yl7k"; })
-      (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "1lqs32l1bh74mbiyank4b2lzfvxrrm4ynj0hrlvl80hzrmq06ckm"; })
-      (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "1ah2bfaqcvwdazh4hyaxdjmlkx33kcmc722cblgasc9ybff5x41p"; })
-      (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "0i3kdgglwjq7spsynpvzc3bq9kxaa3b4jzm5zas09icqxvx7jvd5"; })
-      (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "1ayavdmw3883vdpr0lhs0kcav9f7ijnyh5h3m5ky38964bh5km8v"; })
-      (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "03a3b21cx8yyb0d85q2f24sbzqahbyx7nyq08q834372ip8hyxw0"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "9.0.0-preview.7.24405.7"; sha256 = "06iphzybm88nf890xficcjqyg5cmdp4jaiad1rikfjqn2g83gdf3"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0b4zp49xznypmv0ndh0vm2hnbkdnd0kh2i5gl3mjbmhjmmqbfwc3"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "9.0.0-preview.7.24405.7"; sha256 = "0cs2krwqxrv7rdiiqrkvlfk37x6g5j7z6pp6xm149yfs12gkxdrz"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0mzdrim92ni6pgki7cslpz3w0f3048r2840bgpirdljbdz61hlyx"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "9.0.0-preview.7.24405.7"; sha256 = "1bxzzdsdb0xh63yx2vdns9s6i44nw7z1snqmzhg229v8srcz31md"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "9.0.0-preview.7.24405.7"; sha256 = "1021rjnh4k86s30m50czgnypxxhlsdzldd3rl82915fjkj62wsy2"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0x4nm5cz6vqkyxs981y0c19crpbmlh3d70smch5mx3gipd3sy215"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0iaq2bw9mfga0c941vbkrd8lnlhzbvv62nifh2gc2nng19jwnmwl"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0fs8kwvfnhhr28lmsxa9rvncxbqi9pl74m8n3lasw413gnad59ix"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "16gw1hrnnfq4i5n0axz1nwx87nns7nsd48albdbp0c6x81rf9h1v"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "1kf3hr2bcczx2g55zxa0p0lwfwgaj8hxi58f6alswn9520f46a6c"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "162g502facbqh1kzfc6m1n2hbwvxjc247vzy2hq7i1b2ii7qqllg"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "9.0.0-preview.7.24405.7"; sha256 = "1wzv5gs7ndiw890b6hc3xa1wmk2657q8dd8jkn10vpfvz1nwm3n1"; })
-      (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "1dfjyi7fbzw0apidc27liy48zqjrgs5m88dz1221wnsnnlb5smc6"; })
-      (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.7.24405.7"; sha256 = "1pyhhj2ypi4308ylq4qpaad95c92lqrp8cif5xi7vzfvakhimmfq"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "9.0.0-preview.7.24405.7"; sha256 = "0shpgkbf94mq6nj3q8alrx7iciavm6w5sa3iyvkkm63zgls8ny32"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "1dx8rwyhxq8hnqci835vvs8zbxainp08fq99ij77nzpbi6zqhpc8"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0cnk150d4cwcwc1dfnhlyyb6rvjyhl7vrvvi6xby1g5fcvrwni30"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "9.0.0-preview.7.24405.7"; sha256 = "1labhjgjr9zgm632c76a2a7x7p17jzs0xspcbl90mw65bacy125j"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0ijcdszw57mfsacq57q7wmjnknfla5jhcj1xda9zskz7by5yrb1w"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "1511lkh212ra48mdkb0glmzs46ha4hyvw4w3amqsnldgv0cg826j"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "9.0.0-preview.7.24405.7"; sha256 = "0riza61a8x3wmpvns95d8lvfqdwlvs6ha7hja4jakxkdpjdq71p6"; })
-      (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "9.0.0-preview.7.24405.7"; sha256 = "17kvzypc53k03i65vj0841qhw6zgagpfnags7gjph6pv5drgh6a7"; })
-      (fetchNuGet { pname = "Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.7.24405.7"; sha256 = "011lklbi7ymjybihsfv5d2ldmqk3jwawcgy9119pk4igd4vzvrmd"; })
-      (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.7.24405.7"; sha256 = "191iam6az00fd1y0r5fvxwj6wc7qm2hwhm2va5f9fkwlhsq2088j"; })
-      (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.7.24405.7"; sha256 = "174pd1ja3cxxgvbd1hrk2samwmgazx2cjsi6irj2nlrc2vlh2swj"; })
-      (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.7.24405.7"; sha256 = "0p2cml2avj3qlrwyyiky6ajlbhrb14870xvnj3n4avxp9xb773bp"; })
-      (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.7.24405.7"; sha256 = "0pf46ym3kgll1vkap8f4syc2d36yfj8sb9596gm0hycv8kd5xrqj"; })
-      (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.7.24405.7"; sha256 = "1anqzv6qg7i25izxgx081237rlqd8dfvk97cybcyjaazlygjn502"; })
-      (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.7.24405.7"; sha256 = "0l5xpyibs38yh5ra9q8jl4mzj5mybmfhid1f5p9yhzrsswcp3y8s"; })
-      (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.7.24405.7"; sha256 = "0pyych7c5j7fhd4f9gsfgkz9ncdsvaj8bp61c755lj1si34aa71l"; })
-      (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "9.0.0-preview.7.24405.7"; sha256 = "1l96la9apwnpgbgsbhgkd5v56aysr15x0v26fg0xcw79ms6vgpkc"; })
-      (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.7.24405.7"; sha256 = "1ihwyj3s5rah4q59kgdj21k4varjnc1khahlwf5x76k9smc56908"; })
+      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "9.0.0-rc.1.24452.1"; sha256 = "05idm7kclnb8nw0nwv9wr40sm5fw7wk3zy2khiaiyvwf5c7klbkq"; })
+      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "9.0.0-rc.1.24452.1"; sha256 = "1pxyk6yblg9y58w4lp9nb1dwwh0yvis4lq8b5w65ikihfyarm844"; })
+      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-rc.1.24452.1"; sha256 = "1prajkaxj7j0jdf6s52pkmgxi8d8al6h7kvl9viwgqc3jqz2kib6"; })
+      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "9.0.0-rc.1.24452.1"; sha256 = "02kz3kagy2zq19vxq2rilnnc8lnal4g6l9zzsba3045daij0gp61"; })
+      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "9.0.0-rc.1.24452.1"; sha256 = "1r8577sjl8bifagq8cz7lx2jzdhhn3r668h313mz7fxwl2bqwv1a"; })
+      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "9.0.0-rc.1.24452.1"; sha256 = "1bdjl8kh80p3y51yngzvvz2kc9algsg5mx9givyapkcvj465pvhc"; })
+      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "9.0.0-rc.1.24452.1"; sha256 = "09ispgilx7ss1b43wqcy7c9k1145p622h22vg6z3c0g90i0n2qgw"; })
+      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "9.0.0-rc.1.24452.1"; sha256 = "1lnz66r42mrxyfjdv5hswwmxv14fikn5p2il512vq0rmqq3fjwg7"; })
+      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "9.0.0-rc.1.24452.1"; sha256 = "0l3wb3v7grmpipd6p40dajzc574qmffv01g68n5c5qy38fs5kicl"; })
+      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "9.0.0-rc.1.24452.1"; sha256 = "1091fxvfq9zicgrx9cnk3x7xsg4389qxnj2cbfa6fq96p6rizhi1"; })
+      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "9.0.0-rc.1.24452.1"; sha256 = "16q6865rwblb2jiqvpiasw6fcq1n4h221pi3xgjdc62vkx0k5xd0"; })
+      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "9.0.0-rc.1.24452.1"; sha256 = "01c2ya9wmf7qkpxyjlnlflihxqpi6wrfq4slp3dylyaylypgha45"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "9.0.0-rc.1.24431.7"; sha256 = "01qlklw2y6ci1mm8p4fcx4f7sx4lzx9rbn7d9pn1j85j2bb88rp9"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "0qidj6b5qymfggpgflg3173jalzmvxz662g9pkj02cd1kbm6qp5a"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "0x7vfky0ar1i3521xaai20a08j43cg2azdfghxg5dxaa1ynl53j5"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1i597rmx8ab3lbl4xkff5vnvkrikpm1zk1vd5b7bk8jyz1ls2wa2"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "008w5dlmnpc73mxk580l79a84djxnchyw8cjabh8d0255fk6p3a3"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1bcfx38p4zqbvqvp3mrjm8yzcbh88i4vwd5af90z1ikfaml6841r"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "00lhshwp5gj8ckdq276lrjp7025xhmi33vlj1284xhfvbbfam58c"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1wqqq09ixbshswx59fq6ignj88izazw1k8sqp2iarxfv0jkv8fng"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "9.0.0-rc.1.24431.7"; sha256 = "07qgqja3c1f62yfi3lqjjsyazp1hlkk41wkpk117b2xm8hw6yx4q"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "9.0.0-rc.1.24431.7"; sha256 = "0a0kmkrq99hk6sm690qwam6i0fdgzpx8yiawa6h4ylpazy8jxfxv"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "0qbaijdf4k3z71820r01z3sib5l7nlr6mjf75gil39yhd9s6slc7"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "0v56060wm998yy34pdr8cqp8vbc3m97yzsvc50rm6rkhdld44vql"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "08afgp9k7nr02jikd5xaim53qiqdn4r556v2sfmgv17mvix7vhmz"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1ldmhq12xka64hn327p503m6ji12djkjax9lnr5lcflx527k5i3f"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "13qk3ppy0ym4x81jwxa0322hlzxhhg6vkb5n0xzyzy5ks8rfqnx0"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "17f4wkf7pq1c2hacl1z53am96wg5ydq9z0gsdz5zabkyfgs4knin"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1p39yik8xx87xv3jykljxv9jsazkkgcw47ckppzfzadf6967nh2r"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "9.0.0-rc.1.24431.7"; sha256 = "0kqw9hnircqdbgpvk4m634nrn4lxj2p40a6qlscsqvw5yq06qvsz"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "05y2i9grw8my2kg2svrrmpk2zflvcqidmkyycf58p9a3bmd2xp32"; })
+      (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "00gsj3xwfpsc02rv4h75hrjq140ppr1bjqz5ics9xygj9gqrf40h"; })
+      (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "12vld4zgmlm1s73vn3csss9v81zh53xv0hhw138rrizsl8sxb0x5"; })
+      (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "09yn2lqvij53mv0w4n6fqpxhh15hp3fap1ymjjv4bv11y0gsml22"; })
+      (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "1xvhiswcni1z6czcmra2q25i6ih4pf5crfajgzb6mhvxxambk50x"; })
+      (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "02mlwynhl24avpyvllsgpmnrp6q05a3q5ia34anfs9fjxdbf31yr"; })
+      (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "1gxvgw12g617vj5gki2ag51ll4bxqfffbg5bkqjbnxig4ilh0xmi"; })
+      (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "0v7fmdv74lgybk7bvighf5i1qwhlsb44lmxmkxn6f5ijc7jd1v5a"; })
+      (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "1ql7115ihqqv09qzd23jd4ng7dnhk0vjiy892w2vnlaghkka1klr"; })
+      (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "02v6yklh3kw6xl8aacxjbsijrh0x8654hnjf3aa0qi5ffpng9czh"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; sha256 = "0bi1vrf5g26gmwv5js7rc4g5anva0m0gsinr7cvqixd2g13jl708"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1r3p996mj6hvl7gi6kffbnmm744i24smlxb9ay8hbkjmagv7pjp2"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; sha256 = "0llqrym4z3jrqf79hpl7w25vqnhrjsjmywayp5vr4c0y2bjpl3sk"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1hqfam3749yy15fyvqza54vvsx883kk0gq9fs2y78idmj0pr4g95"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "9.0.0-rc.1.24431.7"; sha256 = "109f84rqdqj5vl0fxyb7nhq5lil9s1b7l6cv5y8z4gg139dv0z38"; })
+      (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "08qm6yp5swc7zryk5qkkwbsxybn8if6zmrai280bll8ygn932594"; })
+      (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-rc.1.24431.7"; sha256 = "0n5dgj0lhxcjzy8bbzkavz2d3ixf4d1diyq4i6nysgri81kk8wd6"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "9.0.0-rc.1.24431.7"; sha256 = "10lr36pv80c31vpzpnl3jxs655xm2d2b1gj26891hzpwp0v1z9l6"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "07j0samh7jlkjphj2dlkphj0jrhs694qw2md6hr7mpinjr065ji4"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "0j1nkhmkg3p9n626j04lqr1vv3xnpnzvnhr39j4cn0ixyr7pbfqd"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "9.0.0-rc.1.24431.7"; sha256 = "1rq2ixq8r6r29mn2xi31jpck1xicgwg3zjzlvs5zdib8w7rxiznl"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "11pxn2gwss6s8rmkgzvrljjwndif3pdlpfy0l3y5fbq60rrv6gy9"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "044j6xkzylzawfjghqr5fkr63k0xhxvs7azmw8pbgh6mprmva4w9"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "9.0.0-rc.1.24431.7"; sha256 = "16izyfqy0d2mvjl45z75ymhvjyrk5njrcfv1k7h223b1c1rn8p8d"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "9.0.0-rc.1.24431.7"; sha256 = "1fvhwlyvz0fm9cd0pw7l9a64shc565yk47hp873y7dai4lsch03v"; })
+      (fetchNuGet { pname = "Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "1fnk9q8iplj70jqy490fgg67z6sx5kyblkwd8z730s9yc3jr3919"; })
+      (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "0yxnbm7p8s9s1j7rl7cmvg1j6xnxrp64qp4dsi9c5hzn0fxg3jjk"; })
+      (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "1lzfk31aq4kfaypbqrzv74vw1pw27576a1yxpdyxls84lmd10dsy"; })
+      (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "0cq9i0cfd4gg5vgywf2jvyn8mbqnwjz6gi20x7ij85bad9hanm82"; })
+      (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "0zv3brnkvn8v8ml2597vl7z1ydy71j6q7ycjkygy4l0b053870sw"; })
+      (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "0vgr2xnskksrnrwlzk0n7qrajwkmz7cyvaifb0jbcx3kyzchxiz7"; })
+      (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "0v22m76v8f5kwd5baww7l81ap33jrw4ccsz0lyki3hj2ssmzvr3i"; })
+      (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "0x8nafwsh0y0dycdpwjix1rxfkwk25irsqrbzcbqbdx3aas6jpk5"; })
+      (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "9.0.0-rc.1.24431.7"; sha256 = "1bbpncqbd2f73n8nznhi2m2i5z8n2hds0ryz616n0nzcc4y3gnkz"; })
+      (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-rc.1.24431.7"; sha256 = "08k1fzwvqyiqik98r0b03f089y4n06p5nfr73688rijgzm55l8zh"; })
   ];
 in rec {
-  release_9_0 = "9.0.0-preview.7";
+  release_9_0 = "9.0.0-rc.1";
 
   aspnetcore_9_0 = buildAspNetCore {
-    version = "9.0.0-preview.7.24406.2";
+    version = "9.0.0-rc.1.24452.1";
     srcs = {
       x86_64-linux = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/bdb8a419-432c-4f1c-b5ad-ae6e27617b5c/65b26a64e3dda62c456a7a45df73dc1e/aspnetcore-runtime-9.0.0-preview.7.24406.2-linux-x64.tar.gz";
-        sha512  = "44f86c407b501a700aaeae2ce95cf544d85c08b41cdd12cee22bfcfdd03c4f6a16e495d9f8315f5e56a66b7e6187a4fc39d899f967a65f73883e40172343275c";
+        url     = "https://download.visualstudio.microsoft.com/download/pr/da25731f-e296-4e2a-8f2b-0213d26e1799/859039cd012f8cfba53991f8f5543609/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-x64.tar.gz";
+        sha512  = "f8fd285d67bb044d631596869d6301e10a2a243c81c9a05096a66aff4fb3431529812c7482e6cf0e065e8e065fc50b16b50d7f2a495ab30077a68bd45b3ba376";
       };
       aarch64-linux = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/28370706-3338-4dd5-9992-6cd1d86ba666/354c9434538f587c3198fe57fa0d2e00/aspnetcore-runtime-9.0.0-preview.7.24406.2-linux-arm64.tar.gz";
-        sha512  = "706925fde5bb93b98e347540fe0983ce0819a2ca2520ed2d5bfc4515cb6852587a30f29852b512509b660daf8ee76ff3c8bb2d2fd78e47c6ae156e6f00cde918";
+        url     = "https://download.visualstudio.microsoft.com/download/pr/c5075cd5-2552-4f77-96ce-31450f9ff8d5/e6ff2b52e2a27a60eb3585cbca01d60b/aspnetcore-runtime-9.0.0-rc.1.24452.1-linux-arm64.tar.gz";
+        sha512  = "84610a38fb9a98eb7bd26ba89a9c4998682ec3fffb5eade5bbafbafd63cac7d9a5279618bb5b2575d27feec098da5fe6f7150c67253f3f37762601590396e122";
       };
       x86_64-darwin = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/d0813855-fdde-47df-8d71-119af034e409/40989f36db96de19bc682d62cbadd8e3/aspnetcore-runtime-9.0.0-preview.7.24406.2-osx-x64.tar.gz";
-        sha512  = "0f309d6b849ccec8e13812de9ff70fac5cc78785b71f356fc63e5070296305766892a3dfd74bae9b4775ec4449335d03d046494a416304f56e5ba7746f3316ca";
+        url     = "https://download.visualstudio.microsoft.com/download/pr/b0414fd7-20f9-4363-9dbf-072880e97b17/89584fa06e9ba1154a7e02402a28d82f/aspnetcore-runtime-9.0.0-rc.1.24452.1-osx-x64.tar.gz";
+        sha512  = "ff4a6e35b41f5200521ea4b257b293e4d48f1786ccaa9cd85b55ba96ad36036dbc149d2ff820f1dff5f2d9acf6c38b6c3540e700c2c2db5fe6d82d4f85f461ae";
       };
       aarch64-darwin = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/b2836c76-8c1d-4030-b7f6-0cd5ec1b640b/ea922caf251b0245b96ba2afd7ebb2b4/aspnetcore-runtime-9.0.0-preview.7.24406.2-osx-arm64.tar.gz";
-        sha512  = "8200af559c76f5bf12f5e0495c285a837dbe29c7ac2d6c562540f7077aa68fa65dc05205b4b219e72f78d55c20a75a514f6ccf3f53d6ecf34fd2cea0817a7ede";
+        url     = "https://download.visualstudio.microsoft.com/download/pr/0bae8dff-9440-4388-a03e-af44e20673a8/8ab257a4963967970cd59c31c213f38d/aspnetcore-runtime-9.0.0-rc.1.24452.1-osx-arm64.tar.gz";
+        sha512  = "03f7e03352d1ad2d54e9de4c1cdd7a94c2311bb36d4c6296661fab286cddebf3f57204f73892efd53f43cfb13ba73cafae95d0522c47be03203d5fb69a0ecfe9";
       };
     };
   };
 
   runtime_9_0 = buildNetRuntime {
-    version = "9.0.0-preview.7.24405.7";
+    version = "9.0.0-rc.1.24431.7";
     srcs = {
       x86_64-linux = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/41a47c9d-c08b-4abe-a2d1-920b51fe16b0/f6af3aa0615cc1625bfc77cd38e16d02/dotnet-runtime-9.0.0-preview.7.24405.7-linux-x64.tar.gz";
-        sha512  = "9ede46bc2e6f87a9f592f888562a4cdda6ffa01ca9822f6d4ae586a7c478d3e4fe6c70758a4e9ecbba86445978c68f805d1d6d6f4d37fc653a2b7510309dd5dc";
+        url     = "https://download.visualstudio.microsoft.com/download/pr/72048153-7c19-4e69-bcf3-22563060db07/cd181715a0f7cd3cec8c87b115181da9/dotnet-runtime-9.0.0-rc.1.24431.7-linux-x64.tar.gz";
+        sha512  = "9f9a85b8d9f6362ed2c2d0edefd04999181b2c386647644fbc1d9f248255387324399edb1c40bc7fa8c47adc22e2d71db5f25ce794521d59e46c40593b5f6cc5";
       };
       aarch64-linux = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/248e66b8-594d-4738-8b01-2aa045faf3fd/686e989ba0365848fb4f81f8d780812c/dotnet-runtime-9.0.0-preview.7.24405.7-linux-arm64.tar.gz";
-        sha512  = "f7440b679315c6d35b12d839a1cf52c961784d56524f52e96a7834bbda7bf4e5bfd726081148cf71fb19b3107c7b1f39681a2fae7e87f1d9fa0634b70a47f4b2";
+        url     = "https://download.visualstudio.microsoft.com/download/pr/54f6fb3b-da5b-4a2d-98f4-ae07c814a586/e5f2a5ba551ffe53ea1c2ae9b7681f0b/dotnet-runtime-9.0.0-rc.1.24431.7-linux-arm64.tar.gz";
+        sha512  = "8542bb9381e4eca6f0ebceddec68525cc59e34f7244613cf33cb2151f570c3345cb6d081c492b01070e762d3440f02d4558234532d58ff3dc919057e06b7bdac";
       };
       x86_64-darwin = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/dc29a044-d48d-43cd-a56c-2b8cba456df2/888138574a36ee8c2fe1af2e33c1119d/dotnet-runtime-9.0.0-preview.7.24405.7-osx-x64.tar.gz";
-        sha512  = "17352746d1b780272766c6ea20bdb0961f8004bafc529877644fa536bc0e7441eb48d65cd05c4eb9017249651361c773d89b1ec1c1720bd4fce0fe965614d48a";
+        url     = "https://download.visualstudio.microsoft.com/download/pr/13d7d905-549f-44e8-9062-a678a742c5fb/94c51ca9c08ef9b5cceabafc2337118f/dotnet-runtime-9.0.0-rc.1.24431.7-osx-x64.tar.gz";
+        sha512  = "f62f867eab633737c450ffb0543a726f1ba2f46a4265cb47978d88dad0c6b80a8db5ccf6f583842f85cb613b96d2f7c6806d669826f4b92b906e71d8d10e53e8";
       };
       aarch64-darwin = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/a71e7742-36b6-4f68-a573-b3437fc53a77/571d8fff000e17abd5d820cafc600b63/dotnet-runtime-9.0.0-preview.7.24405.7-osx-arm64.tar.gz";
-        sha512  = "ade75303e39c33af6d7ea10369bb87d5d446619d2ffa630db1e8342b1577efe6831d8f32316fb0e0536e56e0adb7978c4e1b75ddef9a2d1cda8657b8fc457356";
+        url     = "https://download.visualstudio.microsoft.com/download/pr/8abf3e03-1ab3-40fd-a9cf-fa22005be2e8/cb0c3c5d130ef8ae76a982860fd3606a/dotnet-runtime-9.0.0-rc.1.24431.7-osx-arm64.tar.gz";
+        sha512  = "a825fca9edde53ab6abc0efe0c44d6fb25c5c77aeb2d35b6c414d42f364453ceb069ed9db8865c2bb82523989fceb7cccbf86047699590ff756a6b9c54c21d74";
       };
     };
   };
 
   sdk_9_0_1xx = buildNetSdk {
-    version = "9.0.100-preview.7.24407.12";
+    version = "9.0.100-rc.1.24452.12";
     srcs = {
       x86_64-linux = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/84a39cad-2147-4a3e-b8fd-ec6fca0f80dd/d86fc06f750e758770f5a2237e01f5c5/dotnet-sdk-9.0.100-preview.7.24407.12-linux-x64.tar.gz";
-        sha512  = "3bc1bddb8bebbfa9e256487871c3984ebe2c9bc77b644dd25e4660f12c76042f500931135a080a97f265bc4c5504433150bde0a3ca19c3f7ad7127835076fc8e";
+        url     = "https://download.visualstudio.microsoft.com/download/pr/3b2b3c23-574b-45d7-b2b0-c67f0e935308/23ed647eb71a8f07414124422c15927d/dotnet-sdk-9.0.100-rc.1.24452.12-linux-x64.tar.gz";
+        sha512  = "e8130817b779d0104a6eee33d98d97c3fad1c336013435f47c0e9e22370172b75da37ade76e49dec7cbe696884390d2e6941cc69e2bad5593d6d1c6b41083051";
       };
       aarch64-linux = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/9dce0bb1-16ab-4670-9af4-57b6bd1c0c21/ba6055b1ad714158742dd1b2373adaed/dotnet-sdk-9.0.100-preview.7.24407.12-linux-arm64.tar.gz";
-        sha512  = "c8ae08858c9ccf16d7b4879b7201ea22bd59e97f1924d4ff2b25079168c906d88a2864e6796244b67db612a36170969fef212879aa3b2232418795c7e7e6d526";
+        url     = "https://download.visualstudio.microsoft.com/download/pr/f7739964-9e84-4bb7-9435-509458a15f9c/a95ad7f9deb8ce2fd30173dfe86f55ba/dotnet-sdk-9.0.100-rc.1.24452.12-linux-arm64.tar.gz";
+        sha512  = "f5742537128801c199a127266175066058788a26e8a603cbd26a1c16e9ef33a5d418e4790a3cea722d7de483eee8b68e0de4bb1dfdf279713369ed3b4d163a11";
       };
       x86_64-darwin = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/4a7fc24d-481e-4202-8654-06cf5fba0ebd/a4084481acd9aa803ad1ebf3cd668646/dotnet-sdk-9.0.100-preview.7.24407.12-osx-x64.tar.gz";
-        sha512  = "b410a65d69f991ea55c81e5f7ea58c98ceef309d63ddd21a7689848a4a4516cdb898f8e36702a554a51fc22420cfbffe7a662a785175bbc1ebe1c33fcf6ffbf8";
+        url     = "https://download.visualstudio.microsoft.com/download/pr/e26e36f6-746f-462c-8599-5d0a1f00e786/f1b8264ac10442b40009aa8cea46b23b/dotnet-sdk-9.0.100-rc.1.24452.12-osx-x64.tar.gz";
+        sha512  = "0d1f0718eeef006c3ecfbefeebf9df0772ec22c74db4bb635b6463b8aedfd3957274b908b51ec019ced69d3e7af4ae9252f18e87b14a4411e1089a4cc41e37d0";
       };
       aarch64-darwin = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/49e6076a-438d-44de-a34d-6ad47af02423/f20bca6b909e3bd42679c14c8288fd0f/dotnet-sdk-9.0.100-preview.7.24407.12-osx-arm64.tar.gz";
-        sha512  = "0af77ffeb27e44b2e695caabfa85254f94c77807be6d96fc6abdda1d71be266857320c5dc02d5df968da8963a52cd2aea4b4cad6dfc6540ad26b7b532bf83fd9";
+        url     = "https://download.visualstudio.microsoft.com/download/pr/930f4eb8-188f-47d5-8a26-28ca393b7d1b/c07a519e3d7e326c3f640ef72ea1193e/dotnet-sdk-9.0.100-rc.1.24452.12-osx-arm64.tar.gz";
+        sha512  = "af30b31cd937e9fc97e164b83628c2c1ecd21329b75f742d9f5232aa68427d25b5d702cc565aa860d3c738c8727790569bf66a3ed74e5cef719ae589d302846f";
       };
     };
     inherit packages;
diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix
index afaa0a5dc242..d6cfcd9035d9 100644
--- a/pkgs/development/compilers/dotnet/vmr.nix
+++ b/pkgs/development/compilers/dotnet/vmr.nix
@@ -222,14 +222,6 @@ in stdenv.mkDerivation rec {
       -r '//Target[@Name="UnpackTarballs"]/Move' -v Copy \
       eng/init-source-only.proj
 
-    # AOT is currently broken in binary SDKs, and the resulting executable is
-    # unable to find ICU
-    xmlstarlet ed \
-      --inplace \
-      -s //Project -t elem -n PropertyGroup \
-      -s \$prev -t elem -n NativeAotSupported -v false \
-      src/runtime/src/coreclr/tools/aot/ILCompiler/ILCompiler.props
-
     # error: _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror,-W#warnings]
     substituteInPlace \
       src/runtime/src/coreclr/ilasm/CMakeLists.txt \
@@ -442,6 +434,8 @@ in stdenv.mkDerivation rec {
   passthru = {
     inherit releaseManifest buildRid targetRid;
     icu = _icu;
+    # ilcompiler is currently broken: https://github.com/dotnet/source-build/issues/1215
+    hasILCompiler = lib.versionAtLeast version "9";
   };
 
   meta = with lib; {

From 89217d3cf56ef1297bddd8861e7978693d263c27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Mon, 16 Sep 2024 15:25:51 +0300
Subject: [PATCH 216/241] undocker: 1.2.2 -> 1.2.3 (#341364)

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

diff --git a/pkgs/tools/misc/undocker/default.nix b/pkgs/tools/misc/undocker/default.nix
index fb52e019ffbc..0cc9deb74df3 100644
--- a/pkgs/tools/misc/undocker/default.nix
+++ b/pkgs/tools/misc/undocker/default.nix
@@ -4,8 +4,8 @@
 , gnumake
 }:
 let
-  version = "1.2.2";
-  hash = "sha256-kBqNopcHpldU5oD6zoVjPjP84t12QFcbWBSNNgwImKg=";
+  version = "1.2.3";
+  hash = "sha256-hyP85pYtXxucAliilUt9Y2qnrfPeSjeGsYEFJndJWyA=";
   src = fetchFromGitea {
     domain = "git.jakstys.lt";
     owner = "motiejus";

From 16f21778c9fea9f331000bdb5af28a8c2638a8f9 Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Sun, 4 Aug 2024 11:12:46 -0500
Subject: [PATCH 217/241] python312Packages.textual: 0.72.0 -> 0.79.0

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

diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix
index 37aa589b29ea..db3da7694a99 100644
--- a/pkgs/development/python-modules/textual/default.nix
+++ b/pkgs/development/python-modules/textual/default.nix
@@ -4,8 +4,10 @@
   fetchFromGitHub,
   jinja2,
   markdown-it-py,
+  platformdirs,
   poetry-core,
   pytest-aiohttp,
+  pytest-xdist,
   pytestCheckHook,
   pythonOlder,
   rich,
@@ -18,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "textual";
-  version = "0.72.0";
+  version = "0.79.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -27,12 +29,13 @@ buildPythonPackage rec {
     owner = "Textualize";
     repo = "textual";
     rev = "refs/tags/v${version}";
-    hash = "sha256-iNl9bos1GBLmHRvSgqYD8b6cptmmMktXkDXQbm3xMtc=";
+    hash = "sha256-QD9iRgl6hwlFL5DLYyXL5aA/Xsvpe5/KXdEdMS+3L/8=";
   };
 
   build-system = [ poetry-core ];
 
   dependencies = [
+    platformdirs
     markdown-it-py
     rich
     typing-extensions
@@ -41,13 +44,13 @@ buildPythonPackage rec {
   optional-dependencies = {
     syntax = [
       tree-sitter
-      tree-sitter-languages
-    ];
+    ] ++ lib.optionals (!tree-sitter-languages.meta.broken) [ tree-sitter-languages ];
   };
 
   nativeCheckInputs = [
     jinja2
     pytest-aiohttp
+    pytest-xdist
     pytestCheckHook
     syrupy
     time-machine
@@ -68,6 +71,10 @@ buildPythonPackage rec {
     "test_language_binary_missing"
   ];
 
+  # Some tests in groups require state from previous tests
+  # See https://github.com/Textualize/textual/issues/4924#issuecomment-2304889067
+  pytestFlagsArray = [ "--dist=loadgroup" ];
+
   pythonImportsCheck = [ "textual" ];
 
   __darwinAllowLocalNetworking = true;

From 5dcc1253d4b39247ea2560c46de8659f3f06cf32 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 May 2024 17:20:11 +0000
Subject: [PATCH 218/241] libsForQt5.qwt: 6.2.0 -> 6.3.0

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

diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix
index 9a2a53587e48..dec84c1c4955 100644
--- a/pkgs/development/libraries/qwt/default.nix
+++ b/pkgs/development/libraries/qwt/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qwt";
-  version = "6.2.0";
+  version = "6.3.0";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://sourceforge/qwt/qwt-${version}.tar.bz2";
-    sha256 = "sha256-kZT2UTlV0P1zAPZxWBdQZEYBl6urGpL6EnpnpLC3FTA=";
+    sha256 = "sha256-3LCFiWwoquxVGMvAjA7itOYK2nrJKdgmOfYYmFGmEpo=";
   };
 
   propagatedBuildInputs = [ qtbase qtsvg qttools ];

From cf893a47d2ae3d2702631353b511101d62a3a292 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sun, 7 Jul 2024 22:21:53 +0200
Subject: [PATCH 219/241] gplates: fix build with qwt 6.3

---
 pkgs/applications/science/misc/gplates/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix
index 5c2c4cabc9f1..ae7681a7a3af 100644
--- a/pkgs/applications/science/misc/gplates/default.nix
+++ b/pkgs/applications/science/misc/gplates/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , cmake
 , doxygen
 , graphviz
@@ -42,6 +43,14 @@ in stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-3fEwm5EKK9RcRbnyUejgwfjdsXaujjZjoMbq/BbVMeM=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "qwt-6.3-compile-error-fix.patch";
+      url = "https://github.com/GPlates/GPlates/commit/c4680ebe54f4535909085feacecd66410a91ff98.patch";
+      hash = "sha256-mw5+GLayMrmcSDd1ai+0JTuY3iedHT9u2kx5Dd2wMjg=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     doxygen

From 6090dc83d055606a4f5c01e35304c330f3c76f55 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 16 Sep 2024 16:29:06 +0300
Subject: [PATCH 220/241] sdr-j-fm: use qwt6_1

---
 pkgs/applications/radio/sdr-j-fm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/radio/sdr-j-fm/default.nix b/pkgs/applications/radio/sdr-j-fm/default.nix
index 6c1dd5f4a0a1..e77ce2d88eaa 100644
--- a/pkgs/applications/radio/sdr-j-fm/default.nix
+++ b/pkgs/applications/radio/sdr-j-fm/default.nix
@@ -6,7 +6,7 @@
   wrapQtAppsHook,
   pkg-config,
   qtbase,
-  qwt,
+  qwt6_1,
   fftwFloat,
   libsamplerate,
   portaudio,
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     qtbase
-    qwt
+    qwt6_1
     fftwFloat
     libsamplerate
     portaudio

From da3e9f8b5626458b49e4dda85828b3f6f7ec7daa Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 16 Sep 2024 10:33:39 +0200
Subject: [PATCH 221/241] elogind: 246.10 -> 255.5

---
 ...ated-musl-hack-in-rlimit_nofile_safe.patch | 35 +++++++++
 pkgs/applications/misc/elogind/default.nix    | 76 +++++++++++++++++--
 2 files changed, 104 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/applications/misc/elogind/0001-Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch

diff --git a/pkgs/applications/misc/elogind/0001-Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch b/pkgs/applications/misc/elogind/0001-Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch
new file mode 100644
index 000000000000..d7de78b4a6cd
--- /dev/null
+++ b/pkgs/applications/misc/elogind/0001-Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch
@@ -0,0 +1,35 @@
+From 3a0181ab0fb6c40f613894e65009e148c6e652c9 Mon Sep 17 00:00:00 2001
+From: Alyssa Ross <hi@alyssa.is>
+Date: Mon, 16 Sep 2024 10:24:08 +0200
+Subject: [PATCH] Remove outdated musl hack in rlimit_nofile_safe
+
+This was incorrect, because RLIM_FMT is not the format specifier for uintmax_t.
+
+Since 53e84063a ("Change RLIM_FMT to '%llu' for non-glibc builds (#269)"),
+RLIM_FMT is correct for musl, so there's no longer any need for this casting
+version.
+
+Link: https://github.com/elogind/elogind/pull/288
+---
+ src/basic/rlimit-util.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c
+index 091c111df..59bdc35a0 100644
+--- a/src/basic/rlimit-util.c
++++ b/src/basic/rlimit-util.c
+@@ -428,11 +428,7 @@ int rlimit_nofile_safe(void) {
+         rl.rlim_max = MIN(rl.rlim_max, (rlim_t) read_nr_open());
+         rl.rlim_cur = MIN((rlim_t) FD_SETSIZE, rl.rlim_max);
+         if (setrlimit(RLIMIT_NOFILE, &rl) < 0)
+-#ifdef __GLIBC__ /// To be compatible with musl-libc, elogind uses an (uintmax_t) cast.
+                 return log_debug_errno(errno, "Failed to lower RLIMIT_NOFILE's soft limit to " RLIM_FMT ": %m", rl.rlim_cur);
+-#else // __GLIBC__
+-                return log_debug_errno(errno, "Failed to lower RLIMIT_NOFILE's soft limit to " RLIM_FMT ": %m", (uintmax_t)rl.rlim_cur);
+-#endif // __GLIBC__
+ 
+         return 1;
+ }
+-- 
+2.45.2
+
diff --git a/pkgs/applications/misc/elogind/default.nix b/pkgs/applications/misc/elogind/default.nix
index a8b71f34ede5..985d821837ec 100644
--- a/pkgs/applications/misc/elogind/default.nix
+++ b/pkgs/applications/misc/elogind/default.nix
@@ -1,16 +1,24 @@
 { stdenv
 , lib
 , fetchFromGitHub
+, fetchurl
+, fetchpatch
 , meson
 , ninja
 , m4
 , gperf
 , getent
+, acl
+, audit
+, dbus
 , libcap
+, libselinux
+, pam
 , gettext
 , pkg-config
 , udev
 , eudev
+, util-linux
 , libxslt
 , python3Packages
 , docbook5
@@ -27,13 +35,13 @@
 
 stdenv.mkDerivation rec {
   pname = "elogind";
-  version = "246.10";
+  version = "255.5";
 
   src = fetchFromGitHub {
     owner = "elogind";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-+Nv6FL9Yjmfxs24+2mUTP//wbjzGUq4ftgJLfuEqBJg=";
+    hash = "sha256-4KZr/NiiGVwzdDROhiX3GEQTUyIGva6ezb+xC2U3bkg=";
   };
 
   nativeBuildInputs = [
@@ -48,12 +56,63 @@ stdenv.mkDerivation rec {
     libxslt.bin # xsltproc
     docbook5 docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 docbook_xml_dtd_45 # needed for docbook without Internet
 
-    # fixes: man/meson.build:111:0: ERROR: Could not execute command "/build/source/tools/xml_helper.py".
     python3Packages.python
-    python3Packages.lxml
+    python3Packages.jinja2
   ];
 
-  buildInputs = [ libcap ] ++ (if enableSystemd then [ udev ] else [ eudev ]);
+  buildInputs = [ acl audit dbus libcap libselinux pam util-linux ]
+    ++ (if enableSystemd then [ udev ] else [ eudev ]);
+
+  postPatch = ''
+    substituteInPlace meson.build --replace-fail "install_emptydir(elogindstatedir)" ""
+  '';
+
+  patches = [
+    (fetchurl {
+      url = "https://github.com/chimera-linux/cports/raw/49d65fe38be815b9918a15ac2d2ff2b123fc559a/main/elogind/patches/strerror_r.patch";
+      hash = "sha256-amqXP12mLtrkWuAURb3/aoQeeTSRYlYqL2q2zrKbhxk=";
+    })
+    (fetchurl {
+      url = "https://github.com/chimera-linux/cports/raw/49d65fe38be815b9918a15ac2d2ff2b123fc559a/main/elogind/patches/strerror_r_1.patch";
+      hash = "sha256-tVUlmPValUPApqRX+Cqkzn7bkIILYSuCouvgRsdl9XE=";
+    })
+    (fetchpatch {
+      url = "https://github.com/chimera-linux/cports/raw/49d65fe38be815b9918a15ac2d2ff2b123fc559a/main/elogind/patches/xxx-musl-fixes.patch";
+      includes = [
+        "src/basic/cgroup-util.c"
+        "src/basic/missing_prctl.h"
+        "src/libelogind/sd-journal/journal-file.h"
+      ];
+      hash = "sha256-kY+B1t87E/TtWa83r0VoiojhRrrB667ZhUAHtHE7m28=";
+    })
+    (fetchurl {
+      url = "https://github.com/chimera-linux/cports/raw/49d65fe38be815b9918a15ac2d2ff2b123fc559a/main/elogind/patches/gshadow.patch";
+      hash = "sha256-YBy1OeWD1EluLTeUvqUvZKyrZyoUbGg1mxwqG5+VNO0=";
+    })
+    (fetchurl {
+      name = "FTW.patch";
+      url = "https://git.openembedded.org/openembedded-core/plain/meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch?id=6bc5e3f3cd882c81c972dbd27aacc1ce00e5e59a";
+      hash = "sha256-SGvP0GT43vfyHxrmvl4AbsWQz8CPmNGyH001s3lTxng=";
+    })
+    (fetchurl {
+      name = "malloc_info.patch";
+      url = "https://git.openembedded.org/openembedded-core/plain/meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch?id=6bc5e3f3cd882c81c972dbd27aacc1ce00e5e59a";
+      hash = "sha256-8aOw+BTtl5Qta8aqLmliKSHEirTjp1xLM195EmBdEDI=";
+    })
+    (fetchpatch {
+      name = "malloc_trim.patch";
+      url = "https://git.openembedded.org/openembedded-core/plain/meta/recipes-core/systemd/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch?id=6bc5e3f3cd882c81c972dbd27aacc1ce00e5e59a";
+      stripLen = 3;
+      extraPrefix = [ "src/libelogind/" ];
+      hash = "sha256-rtSnCEK+frhnlwl/UW3YHxB8MUCAq48jEzQRURpxdXk=";
+    })
+    (fetchurl {
+      name = "malloc_info.patch";
+      url = "https://git.openembedded.org/openembedded-core/plain/meta/recipes-core/systemd/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch?id=6bc5e3f3cd882c81c972dbd27aacc1ce00e5e59a";
+      hash = "sha256-ZyOCmM5LcwJ7mHiZr0lQjV4G+XMxjhsUm7g7L3OzDDM=";
+    })
+    ./0001-Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch
+  ];
 
   # Inspired by the systemd `preConfigure`.
   # Conceptually we should patch all files required during the build, but not scripts
@@ -68,8 +127,11 @@ stdenv.mkDerivation rec {
   '';
 
   mesonFlags = [
-    "-Drootprefix=${placeholder "out"}"
-    "-Dsysconfdir=${placeholder "out"}/etc"
+    (lib.mesonOption "dbuspolicydir" "${placeholder "out"}/share/dbus-1/system.d")
+    (lib.mesonOption "dbussystemservicedir" "${placeholder "out"}/share/dbus-1/system-services")
+    (lib.mesonOption "sysconfdir" "${placeholder "out"}/etc")
+    (lib.mesonBool "utmp" (!stdenv.hostPlatform.isMusl))
+    (lib.mesonEnable "xenctrl" false)
   ];
 
   meta = with lib; {

From a48fd588dead729bec3b5eed53dded9f3c1f378f Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 16 Sep 2024 13:40:36 +0000
Subject: [PATCH 222/241] musescore: do not build unit tests without doCheck

This speeds up compilation time.
---
 pkgs/applications/audio/musescore/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index 552561141720..a7c75a8e2cf9 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -83,6 +83,8 @@ in stdenv'.mkDerivation (finalAttrs: {
     # Don't bundle qt qml files, relevant really only for darwin, but we set
     # this for all platforms anyway.
     "-DMUE_COMPILE_INSTALL_QTQML_FILES=OFF"
+    # Don't build unit tests unless we are going to run them.
+    (lib.cmakeBool "MUSE_ENABLE_UNIT_TESTS" finalAttrs.finalPackage.doCheck)
   ];
 
   qtWrapperArgs = [

From ca3e16048d12997820f32af8aa035add64c60511 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 16 Sep 2024 13:56:14 +0000
Subject: [PATCH 223/241] musescore: use wrapGAppsHook3 on Linux only

Since musescore/MuseScore@685ac998 GTK3 is needed on Linux for file dialogs.

wrapGAppsNoGuiHook is not sufficient - without wrapGAppsHook3 mscore
crashes in File -> Open when XDG_DATA_DIRS is unset.
---
 pkgs/applications/audio/musescore/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index 552561141720..a28b0b4e0d65 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , fetchpatch
 , cmake
-, wrapGAppsNoGuiHook
+, wrapGAppsHook3
 , wrapQtAppsHook
 , pkg-config
 , ninja
@@ -103,14 +103,15 @@ in stdenv'.mkDerivation (finalAttrs: {
   dontWrapGApps = true;
 
   nativeBuildInputs = [
-    # Just to make it not crash when looking up Gschemas when opening external
-    # files
-    wrapGAppsNoGuiHook
     wrapQtAppsHook
     cmake
     qttools
     pkg-config
     ninja
+  ] ++ lib.optionals stdenv.isLinux [
+    # Since https://github.com/musescore/MuseScore/pull/13847/commits/685ac998
+    # GTK3 is needed for file dialogs. Fixes crash with No GSettings schemas error.
+    wrapGAppsHook3
   ];
 
   buildInputs = [

From 54722c829a074c78444bdb66ca863bae6534df68 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 16 Sep 2024 08:42:28 +0000
Subject: [PATCH 224/241] musescore: support Muse Sounds

After this change Muse Sounds are always active in MuseScore, even if
it is launched from PATH or via File -> New

Fixes #318210
---
 pkgs/applications/audio/musescore/default.nix | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index fbfc50a1a684..577aac4a6ae5 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -140,6 +140,29 @@ in stdenv'.mkDerivation (finalAttrs: {
     ln -s $out/Applications/mscore.app/Contents/MacOS/mscore $out/bin/mscore
   '';
 
+  # muse-sounds-manager installs Muse Sounds sampler libMuseSamplerCoreLib.so.
+  # It requires that argv0 of the calling process ends with "/mscore" or "/MuseScore-4".
+  # We need to ensure this in two cases:
+  #
+  # 1) when the user invokes MuseScore as "mscore" on the command line or from
+  #    the .desktop file, and the normal argv0 is "mscore" (no "/");
+  # 2) when MuseScore invokes itself via File -> New, and the normal argv0 is
+  #    the target of /proc/self/exe, which in Nixpkgs was "{...}/.mscore-wrapped"
+  #
+  # In order to achieve (2) we install the final binary as $out/libexec/mscore, and
+  # in order to achieve (1) we use makeWrapper without --inherit-argv0.
+  #
+  # wrapQtAppsHook uses wrapQtApp -> wrapProgram -> makeBinaryWrapper --inherit-argv0
+  # so we disable it and explicitly use makeQtWrapper.
+  #
+  # TODO: check if something like this is also needed for macOS.
+  dontWrapQtApps = stdenv.isLinux;
+  postFixup = lib.optionalString stdenv.isLinux ''
+    mkdir -p $out/libexec
+    mv $out/bin/mscore $out/libexec
+    makeQtWrapper $out/libexec/mscore $out/bin/mscore
+  '';
+
   # Don't run bundled upstreams tests, as they require a running X window system.
   doCheck = false;
 

From 3fc425d7fcc50b7edb57b28c6401174516405013 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 16 Sep 2024 14:50:53 +0000
Subject: [PATCH 225/241] musescore: add orivej to maintainers

---
 pkgs/applications/audio/musescore/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index 577aac4a6ae5..58abcb4ffb99 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -172,7 +172,7 @@ in stdenv'.mkDerivation (finalAttrs: {
     description = "Music notation and composition software";
     homepage = "https://musescore.org/";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ vandenoever doronbehar ];
+    maintainers = with maintainers; [ vandenoever doronbehar orivej ];
     mainProgram = "mscore";
     platforms = platforms.unix;
   };

From 6df58ccb18005c0f51fc33a0da4fee353df85aba Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 16 Sep 2024 14:00:08 +0200
Subject: [PATCH 226/241] f2fs-tools: enable parallel building

---
 pkgs/by-name/f2/f2fs-tools/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/f2/f2fs-tools/package.nix b/pkgs/by-name/f2/f2fs-tools/package.nix
index f764f7c529aa..60ec724b8ad4 100644
--- a/pkgs/by-name/f2/f2fs-tools/package.nix
+++ b/pkgs/by-name/f2/f2fs-tools/package.nix
@@ -41,6 +41,8 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/";
     description = "Userland tools for the f2fs filesystem";

From d462c989c71e7686e7e89a0252e956cb04c08856 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Tue, 27 Aug 2024 21:39:19 -0700
Subject: [PATCH 227/241] tree-sitter: 0.22.6 -> 0.23.0

Also updates all of the grammars, and adds some new repos to the script
ignore list.
---
 pkgs/development/tools/parsing/tree-sitter/default.nix |  6 +++---
 .../tree-sitter/grammars/tree-sitter-beancount.json    | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-clojure.json      | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-cmake.json        | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-cpp.json  | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-css.json  | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-cuda.json | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-dart.json | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-earthfile.json    | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-elixir.json       | 10 +++++-----
 .../grammars/tree-sitter-embedded-template.json        | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-fortran.json      | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-glimmer.json      | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-glsl.json | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-gomod.json        | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-haskell.json      | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-http.json | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-janet-simple.json | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-javascript.json   | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-jsdoc.json        | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-json.json | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-jsonnet.json      | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-julia.json        | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-just.json | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-kotlin.json       | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-lua.json  | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-make.json |  2 +-
 .../tree-sitter/grammars/tree-sitter-markdown.json     | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-nickel.json       | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-nix.json  | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-norg.json | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-nu.json   | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-perl.json | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-pgn.json  | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-php.json  | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-python.json       | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-ql-dbscheme.json  | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-ql.json   | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-query.json        | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-r.json    | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-regex.json        | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-rego.json | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-rust.json | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-scala.json        | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-scheme.json       | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-scss.json |  2 +-
 .../tree-sitter/grammars/tree-sitter-smithy.json       |  2 +-
 .../tree-sitter/grammars/tree-sitter-sparql.json       | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-sql.json  | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-talon.json        | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-templ.json        | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-tlaplus.json      | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-turtle.json       | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-wing.json | 10 +++++-----
 .../parsing/tree-sitter/grammars/tree-sitter-zig.json  | 10 +++++-----
 pkgs/development/tools/parsing/tree-sitter/update.nix  |  6 ++++++
 56 files changed, 267 insertions(+), 261 deletions(-)

diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix
index fbf5852ee47f..0caa514c913b 100644
--- a/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -27,8 +27,8 @@ let
   # 2) nix-build -A tree-sitter.updater.update-all-grammars
   # 3) Set GITHUB_TOKEN env variable to avoid api rate limit (Use a Personal Access Token from https://github.com/settings/tokens It does not need any permissions)
   # 4) run the ./result script that is output by that (it updates ./grammars)
-  version = "0.22.6";
-  hash = "sha256-jBCKgDlvXwA7Z4GDBJ+aZc52zC+om30DtsZJuHado1s=";
+  version = "0.23.0";
+  hash = "sha256-QNi2u6/jtiMo1dLYoA8Ev1OvZfa8mXCMibSD70J4vVI=";
 
   src = fetchFromGitHub {
     owner = "tree-sitter";
@@ -112,7 +112,7 @@ rustPlatform.buildRustPackage {
   pname = "tree-sitter";
   inherit src version;
 
-  cargoHash = "sha256-44FIO0kPso6NxjLwmggsheILba3r9GEhDld2ddt601g=";
+  cargoHash = "sha256-H4baEmGsQx+W9EXblt8R1CTYfkgR+dQDAsIwPVsqR68=";
 
   buildInputs =
     lib.optionals stdenv.isDarwin [ Security CoreServices ];
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json
index 86ac2bc43009..73451c3654d4 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/polarmutex/tree-sitter-beancount",
-  "rev": "6c665e7cf15d76a1687959643868a78fb381458d",
-  "date": "2024-03-09T18:30:23-05:00",
-  "path": "/nix/store/al4c5f670bl596mlp3vk1njz7w8bhq98-tree-sitter-beancount",
-  "sha256": "0cwiw69br9y8w5iysdh31i4vlvfgj79zvpkz93y1spyxx6vlylc5",
-  "hash": "sha256-hVFPt+ndXx38SH/e/dORz226SQwDNu1j4cinvJLhkTM=",
+  "rev": "321b12d0b02923c36e8cd9768afe6db5ced98e33",
+  "date": "2024-07-19T21:09:17-04:00",
+  "path": "/nix/store/v8yv84fm0n134mr5vmwbpr4cpyl71vxz-tree-sitter-beancount",
+  "sha256": "1milrdb8ka5vkypl0b44xgfdn0haydg2fz7489djcwpjkx7gfrsg",
+  "hash": "sha256-T2f3Tp/yciZbQuR8J17zCgLb3OuELECvn7uoiVbLNNY=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json
index e79396e609fb..34f5a128ce56 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/sogaiu/tree-sitter-clojure",
-  "rev": "3a1ace906c151dd631cf6f149b5083f2b60e6a9e",
-  "date": "2024-05-15T19:51:17+09:00",
-  "path": "/nix/store/naaja1ijjxpsln6fr62sd4m3sgygb309-tree-sitter-clojure",
-  "sha256": "1j41ba48sid6blnfzn6s9vsl829qxd86lr6yyrnl95m42x8q5cx4",
-  "hash": "sha256-pLOCUReklkRt9t5kalDrOAlE9U7a2O8sXaZFjYhagcg=",
+  "rev": "f4236d4da8aa92bc105d9c118746474c608e6af7",
+  "date": "2024-05-22T23:05:15+09:00",
+  "path": "/nix/store/vl1d7aql1bcvn65khrgs13rfk90q08ik-tree-sitter-clojure",
+  "sha256": "16hnb5d8shz216sv9hj5hxpg63ri86w5pf9bzi5z3f37zh7vlljj",
+  "hash": "sha256-UlK6D/xnuPFL/Cu5W7hBMQ/zbodFwrS1CeJDjVpZFpo=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json
index 89afd7990d8b..12a4b4378010 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/uyha/tree-sitter-cmake",
-  "rev": "20ffd6d3b4da1acdbf2d08204b2130a5b2f7c4b3",
-  "date": "2024-03-19T09:50:27+02:00",
-  "path": "/nix/store/2fcf8g6rryigpy6grr284qzgmqw1gkd5-tree-sitter-cmake",
-  "sha256": "16klinbjr9k5piwqvfvl48wmprk9wlypqnmihryy2wj2m2xzlyqa",
-  "hash": "sha256-Cnv6u6hCcuF9hrFafD3laeZbOSJ0u415vGWmLJeNdJo=",
+  "rev": "69d7a8b0f7493b0dbb07d54e8fea96c5421e8a71",
+  "date": "2024-06-20T12:32:15+07:00",
+  "path": "/nix/store/ldbzx710y8wy6dwca0hh8l4aa3cihbr2-tree-sitter-cmake",
+  "sha256": "10lj4f0h8bcbyl03rxgfhizj4vn6fz47jw6clfjz0c1ayxzql9av",
+  "hash": "sha256-WyWKf/cqMPClo8xwech3xm4if4Tu9TwA9YstBIEjkoI=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
index c5a2a628c4db..6fc1c58f6646 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-cpp",
-  "rev": "2369fa991eba294e9238e28280ffcd58132f94bc",
-  "date": "2024-04-30T23:37:25-04:00",
-  "path": "/nix/store/6zvwyr1034vawcvw8yra4rcjb6m7shlj-tree-sitter-cpp",
-  "sha256": "1dbb8w4dyzgp7czqnrdfyjbm6zyyxbxqmfzmrj6kd37vcxldxq5d",
-  "hash": "sha256-reDeaGf7jDaNzPW7ivvq3n9Tl/SuZYs/O/d93whHa7U=",
+  "rev": "30f973c2244f0bff444186185f475c3bd76bc3a5",
+  "date": "2024-09-02T20:54:34-04:00",
+  "path": "/nix/store/rmnzl3zg6jpqcxlya59xgyvwq53kabk3-tree-sitter-cpp",
+  "sha256": "0jd6rprbcbc6bd5rppxw21vlg8sv2h8f9bpby45bbb8w3n7ysjmg",
+  "hash": "sha256-r0rtjx0crbUK8euu5BAUW6NHdxC835tLW4YttvLNpkk=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json
index 47cf0bc2a32b..a7c098c78b98 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-css",
-  "rev": "f6be52c3d1cdb1c5e4dd7d8bce0a57497f55d6af",
-  "date": "2024-05-05T18:14:34-04:00",
-  "path": "/nix/store/iw66hs4n4wmf9mjaj4zb78diwfkb8y4d-tree-sitter-css",
-  "sha256": "1mq5yzcj16bv9jphgj0v16fsa9bzf7y204c78mf79ls2rqsanljp",
-  "hash": "sha256-V1KrNM5C03RcRYcRIPxxfyWlnQkbyAevTHuZINn3Bdc=",
+  "rev": "a68fcd1e6b03118d1e92ffa45e7ab7a39d52d3f7",
+  "date": "2024-09-02T04:29:00-04:00",
+  "path": "/nix/store/46v1b4mfmsgd7sk48n6l613vjcxpl3gg-tree-sitter-css",
+  "sha256": "1apypprrqn23ghay11w35vz31crpjdby6imjhnxq9cqj9rvhxgx3",
+  "hash": "sha256-o78Od04Ss4S7hbJG41eTN7Mw/i6Dh+AVfENYnPO9/qo=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json
index 54bbe3214f4b..4b64224bcb86 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/thehamsta/tree-sitter-cuda",
-  "rev": "4ec5afdf98041d137c25b555958a1f825c7c1272",
-  "date": "2024-04-02T22:40:43+02:00",
-  "path": "/nix/store/2n6dkgdvhfd34qa48b5824qbw1pc7899-tree-sitter-cuda",
-  "sha256": "1n840xzsx56w3hys263f216ih901jh456yxdmm0i274ijwngn38h",
-  "hash": "sha256-EA37LJeRHBFBra17UwiUASQYTRBuGKE9HNyUrn8HBNk=",
+  "rev": "cbce8aedc6fa35313a4cecd206196011a08a85c4",
+  "date": "2024-08-22T22:57:54+02:00",
+  "path": "/nix/store/4ygv7b9ap52kb03cv7mihsq86g6vgfpc-tree-sitter-cuda",
+  "sha256": "12q2zpfll8n72yccxkqjh36cmmpj2fyivkq6fghzbs9kf4mvwy12",
+  "hash": "sha256-Ini+K3Ez6fXhcwbPHb0T8tbKzIASz86YF8ciSt39Aos=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json
index 40f4c4bab4cf..57b620e57e05 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/usernobody14/tree-sitter-dart",
-  "rev": "ac0bb849ccd1a923963af47573b5e396736ff582",
-  "date": "2024-04-28T11:52:00-06:00",
-  "path": "/nix/store/7sfa8zsg3p14rm0dbgv030s86lk8fv3w-tree-sitter-dart",
-  "sha256": "0vm0yd2km73cyl2dph5qwb1fbgjjambn9mi4k7jxh495wrmk8hn8",
-  "hash": "sha256-yEI0a+YlEdjlmSTWZFdVUr7lwuK4wNsE9WycOkXzoG4=",
+  "rev": "9ac03bb2154316624fb4c41fe0f372a5f1597b43",
+  "date": "2024-09-01T14:20:26-06:00",
+  "path": "/nix/store/g3q5dd40gjm0iwf19afz3vz5amvr7dsg-tree-sitter-dart",
+  "sha256": "0nn7in0qr23vjkyk7ynyaw3rlbisx8vsvwf2yqclshdm72qabd7i",
+  "hash": "sha256-8bSlsDi1QU0Z9sLxrTfqOi6aB1fe+jP9lHuIjIGNx1o=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json
index 0241aff6a8e0..2a025287f953 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/glehmann/tree-sitter-earthfile",
-  "rev": "450546b6db9a37a178fd87aeda93a287301e9570",
-  "date": "2024-05-16T21:54:01+02:00",
-  "path": "/nix/store/9fsxiz65a2n0kyy7a10q9lqzhhdz1p6x-tree-sitter-earthfile",
-  "sha256": "0vhj9x7zr102f363l9kpgb58py3n4c3q3fl1c3b2dh5dadks0r6h",
-  "hash": "sha256-0GSgZ1OtwCbWYIG6gQcjdviLynp3JjrMcAKE/E9PEm4=",
+  "rev": "1d637f2002bb8b22d4c08d26ad2bfbc22916f3ce",
+  "date": "2024-09-07T22:41:52+02:00",
+  "path": "/nix/store/y2sjzjb5naajjzpshv4y1g38cala5sfw-tree-sitter-earthfile",
+  "sha256": "1kzl8639pm3pxvkh2flmy5azzi7r48a1mirh2iqkvjc55fv30frb",
+  "hash": "sha256-KzswtiuFyT1xFDDHGhQi+cT/VfGVOgHn7nfUm4ZB9M8=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json
index 405fd174824e..cbd66be8cf2c 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/elixir-lang/tree-sitter-elixir",
-  "rev": "de690fa8a028f122af46d9d2685679fe5f2d7d60",
-  "date": "2024-04-08T19:02:42+02:00",
-  "path": "/nix/store/q46fy2kd4gvab4bpfv3zacg4qgkfc6dz-tree-sitter-elixir",
-  "sha256": "03fg2qj0i3n1dx8abkngg4nxqwpz86m5nr7q70hp5jw5bxccxxkf",
-  "hash": "sha256-bvbOWF+Fy3IhOPhkW6pB/3LcLXnPzqVQb8GOCCQWzw0=",
+  "rev": "ac7b59b312ae5c8cc487d10366e11bda2393e31c",
+  "date": "2024-09-06T23:39:25+07:00",
+  "path": "/nix/store/nf8lwh6gamwzqnc7mvjy1mh2khx5ijcf-tree-sitter-elixir",
+  "sha256": "1kciqsj1z8f5bq46jyqscwqa94hqcdwwclg0v0i4ggn6jyxkwq41",
+  "hash": "sha256-gWA+u5fGvkci2OBRxnljGJKkMGcae2kIXsWhH6TGkc0=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
index e8722c898174..dcfb7983536d 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-embedded-template",
-  "rev": "38d5004a797298dc42c85e7706c5ceac46a3f29f",
-  "date": "2024-05-05T21:28:26-04:00",
-  "path": "/nix/store/i2kni0fn6yqgags7l329bbg3n45dc9ww-tree-sitter-embedded-template",
-  "sha256": "178cvdmlvzq2c29n0x8aganqbx3vz6w9m90gwhk63qxa2rxw5wr0",
-  "hash": "sha256-IPPCexaq42Em5A+kmrj5e/SFrXoKdWCTYAL/TWvbDJ0=",
+  "rev": "62b0a6e45900a7dff7c37da95fec20a09968ba52",
+  "date": "2024-09-02T02:11:42-04:00",
+  "path": "/nix/store/skq9pzdng2gblx99v9mxw3y90qxzs3q6-tree-sitter-embedded-template",
+  "sha256": "0sn821pbg3gay9v51i6r3xdwi985chzgn6php2svydy82ab2hiqp",
+  "hash": "sha256-F0colhLIN7+1uPAa+z5kBaXIWx/ZxFB28uqNt24QyGo=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json
index d6cc94339f43..c29e2b152a9b 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/stadelmanma/tree-sitter-fortran",
-  "rev": "f73d473e3530862dee7cbb38520f28824e7804f6",
-  "date": "2023-08-30T10:25:35+01:00",
-  "path": "/nix/store/mkvh0z39lc89c3bgd91asxjwwiwskyp8-tree-sitter-fortran",
-  "sha256": "1nvxdrzkzs1hz0fki5g7a2h7did66jghaknfakqn92fa20pagl1b",
-  "hash": "sha256-K9CnLhDKiWTxVM5OBZ80psV2oFDnlTgd+DDoP39ufds=",
+  "rev": "8f842945abefb76b9a68c0835619b37060b8f098",
+  "date": "2024-08-27T18:09:38-04:00",
+  "path": "/nix/store/j9q4x7llgyq4vc2pri7rqxjvl98anggl-tree-sitter-fortran",
+  "sha256": "1x20nldx2vi113dsy44g1dmayi0cpnm2vlhq9blbycm0cwal0xgf",
+  "hash": "sha256-7nVAFWegMr/oShjSLaq9DESvaguPEK/bCCFu0Ru1QPQ=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json
index e221099a39b8..87da016a651e 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/alexlafroscia/tree-sitter-glimmer",
-  "rev": "3e66b67efeba1a2001859f6e02d16e0bbdbf4a9b",
-  "date": "2023-10-05T16:33:40-04:00",
-  "path": "/nix/store/sizww81ylny2pnafn3d901qv15k3rlp2-tree-sitter-glimmer",
-  "sha256": "0ggxs83jq59z6vk4bvr7scfscmak41lgz038pcwczpm3hwfhasjq",
-  "hash": "sha256-WGoFHYej3s84u2iA/2ggU1WmHdMn70XmNj8VLAfS/T0=",
+  "rev": "51970d4bb249d918dbd26289cc4208bee4068004",
+  "date": "2024-08-20T13:58:19-04:00",
+  "path": "/nix/store/ff20fkmpcslz5b9883gk7q6nlri8x6qd-tree-sitter-glimmer",
+  "sha256": "135pf610rb5nppn5k5699z5azxa7zqvx17x6v5nrp7fdwsy0whg2",
+  "hash": "sha256-4kEOvObNnZtt2aaf0Df+R/Wvyk/JlFnsvbasDIJxt4w=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json
index 7faba26b25a2..0d6d9a127406 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/thehamsta/tree-sitter-glsl",
-  "rev": "8c9fb41836dc202bbbcf0e2369f256055786dedb",
-  "date": "2024-05-11T23:58:08+02:00",
-  "path": "/nix/store/knbraa6ipp3gm9b2ja01zlk1i27pswp0-tree-sitter-glsl",
-  "sha256": "1vpdfpznkh7p47wqya3bqqih2wn1nmyqx4jmyv05v88x5f138hv9",
-  "hash": "sha256-aUM0gisdoV3A9lWSjn21wXIBI8ZrKI/5IffAaf917e4=",
+  "rev": "66aec57f7119c7e8e40665b723cd7af5594f15ee",
+  "date": "2024-09-12T12:52:04+02:00",
+  "path": "/nix/store/xzxngsr3nhs1586c47iwdx9k20yaansc-tree-sitter-glsl",
+  "sha256": "0gp3bn31xz5rq52amx059r9sllk3749f1ajmbs1fkjb833f2kvqh",
+  "hash": "sha256-EO8p3BhoyemCXlWq4BI5Y1KqU04F9KpEwbn8HoZd4z4=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json
index 075059a0599d..4be7f396a7c8 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/camdencheek/tree-sitter-go-mod",
-  "rev": "bbe2fe3be4b87e06a613e685250f473d2267f430",
-  "date": "2024-01-16T04:55:23-07:00",
-  "path": "/nix/store/xi1fr4l79pnqaa7md7gk4nqvg4ccgyzy-tree-sitter-go-mod",
-  "sha256": "1clw1wyjxiicdjav5g2b9m9q7vlg5k1iy1fqwmf2yc4fxrfnmyrq",
-  "hash": "sha256-OPtqXe6OMC9c5dgFH8Msj+6DU01LvLKVbCzGLj0PnLI=",
+  "rev": "3b01edce2b9ea6766ca19328d1850e456fde3103",
+  "date": "2024-09-11T15:20:34-06:00",
+  "path": "/nix/store/waxmvqpiild2qbkqx7kmkc60g08822b3-tree-sitter-go-mod",
+  "sha256": "1vbg4fn54a7lbwcrvjdx3nrwgw5y925chbbb7sd6kwms1434yyhb",
+  "hash": "sha256-C3pPBgm68mmaPmstyIpIvvDHsx29yZ0ZX/QoUqwjb+0=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
index ed82da289c31..597e6e0c027d 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-haskell",
-  "rev": "a50070d5bb5bd5c1281740a6102ecf1f4b0c4f19",
-  "date": "2024-05-05T18:23:47+02:00",
-  "path": "/nix/store/knnf5zfxjwnml5cdbp3x6kjkw7q4nhsd-tree-sitter-haskell",
-  "sha256": "0hi72f7d4y89i6zkzg9r2j16ykxcb4vh4gwaxg9hcqa95wpv9qw6",
-  "hash": "sha256-huO0Ly9JYQbT64o/AjdZrE9vghQ5vT+/iQl50o4TJ0I=",
+  "rev": "558b997049fddcb07fc513528189c57d6129a260",
+  "date": "2024-09-02T05:58:07-04:00",
+  "path": "/nix/store/gqvq3azd0g60ghzhbqj5ghqb8q8gsvai-tree-sitter-haskell",
+  "sha256": "1jjknp2l8afggzxrp032998hw66r831069q4vy3i1hn9s4fw5y86",
+  "hash": "sha256-BvnCHdHJwhCH3wQnA8JA2RgOUUpigJv7f88pRMW1U8o=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json
index 132aca585b14..4d6137d9284d 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/ntbbloodbath/tree-sitter-http",
-  "rev": "b639716df0698940b53de81e6fcefa2b6cd30724",
-  "date": "2024-03-16T17:35:45-04:00",
-  "path": "/nix/store/ynn327dwmxxakcbfrpq94b7m6sl5301h-tree-sitter-http",
-  "sha256": "0l2yzq0j3w20m9vy9z627jgnfylk1d8crldz3n8xmhisaxwl47ia",
-  "hash": "sha256-Kh5CeVc6wtqRHb/RzFALk3pnnzzC/OR3qkDwIQH+XlA=",
+  "rev": "b88cd0c7dba0128b8f28fcb25cca13eea0d193b3",
+  "date": "2024-08-21T01:10:49+09:00",
+  "path": "/nix/store/l6knlfkxvh3dnmc2asism5qr0xdsfna4-tree-sitter-http",
+  "sha256": "0k6rkpjjzs3jxgwljya3rjnzz0cpi68bm1xfpar2kf71fydd03m6",
+  "hash": "sha256-pg7QmnfhuCmyuq6HupCJl4H/rcxDeUn563LoL+Wd2Uw=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json
index a68ad7d89d75..7673c1c21f81 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/sogaiu/tree-sitter-janet-simple",
-  "rev": "25d0687433ed0ed8e320861c2c625711ce1716f9",
-  "date": "2024-05-17T12:45:28+09:00",
-  "path": "/nix/store/ffqfh3ggcszd5lnx4gx5d2wpilsv6qz5-tree-sitter-janet-simple",
-  "sha256": "0xzqllz8gi2lb44y4hiqxk25p96yl7ysy8r6k1c11sv9gjf65ja4",
-  "hash": "sha256-RMlinHxp6xBYmCYjr/2h3qRbxOw4QuIJWVTEhz6l+Hc=",
+  "rev": "12bfab7db8a5f5b1d774ef84b5831acd34936071",
+  "date": "2024-08-27T15:31:21+09:00",
+  "path": "/nix/store/v5rcba220xk49qj3ghh9ggdpfqc91snv-tree-sitter-janet-simple",
+  "sha256": "05df573vih9p8nlqahlijgg66xr6rvzjd0g7n0qhdlzkcwd63p4x",
+  "hash": "sha256-ndxhGmfz0wYxsOeBJv/OJndj3pORQoWpRTfBuMcprhU=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
index 4e5bb91173ff..7c9b7ffbb69a 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-javascript",
-  "rev": "e88537c2703546f3f0887dd3f16898e1749cdba5",
-  "date": "2024-05-10T14:09:58-04:00",
-  "path": "/nix/store/s29hw61sfkgxs4pixpnsjbfqi1w73f06-tree-sitter-javascript",
-  "sha256": "0ly10ib6f7lj6l4za7pz8xz7pn4cjp7d5c56bf4n538zlgv136py",
-  "hash": "sha256-/poR9qMfjWKJW6aw0s6VjNh7fkf/HvUJNZIeZ1YEwVM=",
+  "rev": "b6f0624c1447bc209830b195999b78a56b10a579",
+  "date": "2024-09-02T05:16:11-04:00",
+  "path": "/nix/store/q6l4f361yzqcnsl29qhm1dcir75fk0hq-tree-sitter-javascript",
+  "sha256": "03lyqswy7h9iw2mhjlsa7an3g76hqi074c06pvdjb57h637zisf5",
+  "hash": "sha256-xen4zzDwlCXbvgYwckDE0Jw3rDpKUwmr4DHB47nGng4=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json
index d2dce87abbc4..d886cfd7e92c 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-jsdoc",
-  "rev": "49fde205b59a1d9792efc21ee0b6d50bbd35ff14",
-  "date": "2024-05-05T20:47:41-04:00",
-  "path": "/nix/store/7i5mj175rsgz6gsxji0hbchxw6mvvsjp-tree-sitter-jsdoc",
-  "sha256": "030r6ksv6v0wnlb8yi22n0blls21cipzvgi4flnjllpm9vrsxxii",
-  "hash": "sha256-Mfau8071UiotdSS+/W9kQWhKF7BCRI8WtRxss/U0GQw=",
+  "rev": "bc09606fc786ead131a301e4b7524888f2d5c517",
+  "date": "2024-09-02T04:15:15-04:00",
+  "path": "/nix/store/l1jmw9y271rl00y9lhjwscdmidl3mn31-tree-sitter-jsdoc",
+  "sha256": "080dzr7547vsapxdd7vs4id3m9mfnzqfzjzkssgyb1vpcdmrhl5m",
+  "hash": "sha256-tVCYa2N3h+Wf1vPL7/C3rqY6WiR6n9b6VXofUk7+DSA=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
index 785c855a2323..9ace481a7922 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-json",
-  "rev": "94f5c527b2965465956c2000ed6134dd24daf2a7",
-  "date": "2024-05-06T15:10:02-04:00",
-  "path": "/nix/store/nl87jvkhqfwshind35dvh204bmjkdv1h-tree-sitter-json",
-  "sha256": "14za39wy4cw0r6r2m5a1i1za9m2wcyrlmh6yi2zl15b86i3dkbyp",
-  "hash": "sha256-16/ZRjRolUC/iN7ASrNnXNSkfohBlSqyyYAz4nka6pM=",
+  "rev": "8bfdb43f47ad805bb1ce093203cfcbaa8ed2c571",
+  "date": "2024-09-02T05:26:12-04:00",
+  "path": "/nix/store/qcm8dvbv4d4i989b7c8rc11fnbfh9nr6-tree-sitter-json",
+  "sha256": "0z9nq267cx0c6dpkq3hm24jcxv37l3lhpwabxpmmpmx2f758yjyc",
+  "hash": "sha256-zEuPynGi11vr7UvxC+mgZ+zOJBEVDjxvMwx0dozANn0=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json
index 6a6114aeacb2..518f0c115f18 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/sourcegraph/tree-sitter-jsonnet",
-  "rev": "d34615fa12cc1d1cfc1f1f1a80acc9db80ee4596",
-  "date": "2023-08-15T11:57:41-04:00",
-  "path": "/nix/store/4hf1f6klnr5wd4p1va1x5v8ndmcc7z7b-tree-sitter-jsonnet",
-  "sha256": "0vw4k1hxq6dhy3ahh40h06k67h073ryxl7513cn81lb6sfgf6c4f",
-  "hash": "sha256-jjDjntNm0YAsG6Ec2n0eB8BjpgEQEAjV8LAZ3GGYhG8=",
+  "rev": "ddd075f1939aed8147b7aa67f042eda3fce22790",
+  "date": "2024-08-15T10:26:01+02:00",
+  "path": "/nix/store/l4ypaa5lbid6qk21kb4b4x6vh6ki97rq-tree-sitter-jsonnet",
+  "sha256": "1bfdjxp0h95d124bzlhlvc9b5q19cdj716aym41nyl6z5a992c9q",
+  "hash": "sha256-ODGRkirfUG8DqV6ZcGRjKeCyEtsU0r+ICK0kCG6Xza0=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json
index aa993c30c3a5..0c49037052cb 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-julia",
-  "rev": "acd5ca12cc278df7960629c2429a096c7ac4bbea",
-  "date": "2024-04-17T13:39:34-05:00",
-  "path": "/nix/store/3cjbxyngm4mbki1mydjv5q34w16kfhgp-tree-sitter-julia",
-  "sha256": "12dwy7ljhddg804jwkkzh6mn0mbjazihhsbcwn3gd5175qqr9lym",
-  "hash": "sha256-1dOUMS4nlPaG5WxpCONXclVgq4F/Ti4JQK81KOnxvIk=",
+  "rev": "3520b57e418f734f582215181ecd926a6178c90f",
+  "date": "2024-09-05T13:11:36-05:00",
+  "path": "/nix/store/4zljgvbaih9ds4kcb52qk5r1si4dpy8m-tree-sitter-julia",
+  "sha256": "0lp3js2dmmfv9bsgsjrxj4j1yaj47hmzrkhv07s9yc8cwq749yr0",
+  "hash": "sha256-IPtEDuYMMZ/0ARvO/Cs8RCofJJE9S/30StvV2oSW41I=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json
index 2d3d16425630..7181aeea0db7 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/IndianBoy42/tree-sitter-just",
-  "rev": "fd814fc6c579f68c2a642f5e0268cf69daae92d7",
-  "date": "2024-05-02T02:56:00-04:00",
-  "path": "/nix/store/4q0rpglj1sa6lay5i1fdnws2pyl8hh71-tree-sitter-just",
-  "sha256": "09faimq5mhldc91r89707fsmdfjqg6dicc2ccr6q9qn5sy0drr6a",
-  "hash": "sha256-yuTcgNfF4oRNZkwwFpt5WLpWtTvgJJRDYo3CWnCNyiU=",
+  "rev": "6648ac1c0cdadaec8ee8bcf9a4ca6ace5102cf21",
+  "date": "2024-07-30T00:40:16-04:00",
+  "path": "/nix/store/20pg64wfg1rrl33prc91z19gbpq0cai1-tree-sitter-just",
+  "sha256": "1a5n6f6ig1qsrac46w5z6ib28kifhaqz23amhf79ws7yva3i4lhi",
+  "hash": "sha256-EVISh9r+aJ6Og1UN8bGCLk4kVjS/cEOYyhqHF40ztqg=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json
index 7cf5bab4e707..44b506fed455 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/fwcd/tree-sitter-kotlin",
-  "rev": "d5dc99a9bdc3fe895e6bcd39caddcfa4820f4c03",
-  "date": "2024-05-08T00:38:43+02:00",
-  "path": "/nix/store/gj5w748yk7iyx9s7bzyqj6m9i9sx6rrv-tree-sitter-kotlin",
-  "sha256": "0lqwjg778xy561hhf90c9m8zdjmv58z5kxgy0cjgys4xqsfbfri6",
-  "hash": "sha256-Jma3nMadaP8kA/71WT4qu8r2UU0MJAdhMMV3dM6THFM=",
+  "rev": "e1a2d5ad1f61f5740677183cd4125bb071cd2f30",
+  "date": "2024-08-03T01:29:18+02:00",
+  "path": "/nix/store/jppx5kglmzyh10qmy13d5948hl68lxvc-tree-sitter-kotlin",
+  "sha256": "0bv21rcypi9dx87kgfr89mg8qfc7ik1g1fcb8am7ss17by8badwk",
+  "hash": "sha256-kze1kF8naH2qQou58MKMhzmMXk0ouzcP6i3F61kOYi8=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json
index d0bbf38f3b88..b01889fcedbb 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/MunifTanjim/tree-sitter-lua",
-  "rev": "a24dab177e58c9c6832f96b9a73102a0cfbced4a",
-  "date": "2024-03-11T11:40:44+02:00",
-  "path": "/nix/store/dia2ry7m40yxfn4l4191c0by58vb2yn8-tree-sitter-lua",
-  "sha256": "1184dazb4agqf3v55sz8i7xmynsn4rkddhbph3mgmh5qsnk88mmq",
-  "hash": "sha256-uFaEptW4wPrqgHfB1mYmVltf+4no61L2cPgpsr5qBIU=",
+  "rev": "99fc677e6971c425e8d407f59c77ab897e585c92",
+  "date": "2024-09-09T11:10:03-04:00",
+  "path": "/nix/store/iiih0sfdls1h8q7ca12y0rhc7g5jl76w-tree-sitter-lua",
+  "sha256": "0wrbxmb6j8xyckf5jw14jf97cb9fn7yhalap6xxgsag84ypfsqj3",
+  "hash": "sha256-Q2LtrifoKf16N1dRBf2xLi12kpMkcFncZL4jaVbtK3M=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json
index 04d1eeeb505e..8d116744dffa 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json
@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/alemuller/tree-sitter-make",
   "rev": "a4b9187417d6be349ee5fd4b6e77b4172c6827dd",
-  "date": "2021-12-16T17:14:17+00:00",
+  "date": "2021-12-16T17:14:17Z",
   "path": "/nix/store/v01s3lfi1w3bm433gf6zi0wb0r603906-tree-sitter-make",
   "sha256": "07gz4x12xhigar2plr3jgazb2z4f9xp68nscmvy9a7wafak9l2m9",
   "hash": "sha256-qQqapnKKH5X8rkxbZG5PjnyxvnpyZHpFVi/CLkIn/x0=",
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json
index 6f9a1b44406d..250b848c1bdf 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/MDeiml/tree-sitter-markdown",
-  "rev": "62516e8c78380e3b51d5b55727995d2c511436d8",
-  "date": "2024-03-22T11:52:05+02:00",
-  "path": "/nix/store/4hi3bz1ny9dz3yq7mr6d74gsfmcnh9rw-tree-sitter-markdown",
-  "sha256": "08wl8y8xgrr10m1p6xpmv0jbmnif30wgd2q5m28ghh1v37q2ixfp",
-  "hash": "sha256-1/Uo8Bk7QPiQqAWL9jgYLtq6JNj1dnNDBSHn15FHlCM=",
+  "rev": "1c8dea73bc0c996d92dd9ebc30dd388716b1c5db",
+  "date": "2024-09-11T16:28:36+03:00",
+  "path": "/nix/store/g4696miy9vzcw0qwd00rar36qn08jn2l-tree-sitter-markdown",
+  "sha256": "13xfyclim1yql6swbk4y12sxgvn799ldbzjl35n5rrkz7wgnwm9s",
+  "hash": "sha256-OlVuHz9/5lxsGVT+1WhKx+7XtQiezMW1odiHGinzro8=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json
index 90dff573ed1e..c89064cce770 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/nickel-lang/tree-sitter-nickel",
-  "rev": "58baf89db8fdae54a84bcf22c80ff10ee3f929ed",
-  "date": "2024-03-07T15:18:26+00:00",
-  "path": "/nix/store/z386k8b1asbadh303dpzkhydv8r4f6fz-tree-sitter-nickel",
-  "sha256": "1a62cngravp7pq3gs582larbd0my7k323s48rgidhpd7b5gkmrjs",
-  "hash": "sha256-WuY6X1mnXdjiy4joIcY8voK2sqICFf0GvudulZ9lwqg=",
+  "rev": "43433d8477b24cd13acaac20a66deda49b7e2547",
+  "date": "2024-06-04T11:09:57+01:00",
+  "path": "/nix/store/w51rb76j8kcqn49bjnb4a7wgxpa5ld72-tree-sitter-nickel",
+  "sha256": "0lad31wly0m1kri7c6kk4kqkql8746idiwkyi1lay64y5yxv8j7l",
+  "hash": "sha256-9Ei0uy+eGK9oiH7y2KIhB1E88SRzGnZinqECT3kYTVE=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
index 91c713dae026..3494856f8a38 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/cstrahan/tree-sitter-nix",
-  "rev": "b3cda619248e7dd0f216088bd152f59ce0bbe488",
-  "date": "2024-04-03T09:38:13+02:00",
-  "path": "/nix/store/5rz41r1yycp0w3s947cjs3m9d9v1082r-tree-sitter-nix",
-  "sha256": "1xh75z11d1b514qm997br8vmxalir2ah1pk7v3k1ppm28043ggr1",
-  "hash": "sha256-Ib83CECi3hvm2GfeAJXIkapeN8rrpFQxCWWFFsIvB/Y=",
+  "rev": "ceaf10eb2ae877175d58e6304f83ec6f4d704295",
+  "date": "2024-09-16T10:29:29Z",
+  "path": "/nix/store/khfiac3n03vh4r2aw5p3vmbp3449zv3z-tree-sitter-nix",
+  "sha256": "00wmm5nnm8qa08dxqaq1p3k728fqgijnmhgg8wg24shy6g5gqiyw",
+  "hash": "sha256-3Ef8yjMeaiIeR+/BamV82CFx5rgBK9wbAgqjam2plQM=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json
index 5253f32efcb1..74af23993264 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/nvim-neorg/tree-sitter-norg",
-  "rev": "aa1a1a7ded81a094cc3d5cb14bea6f34b86d8688",
-  "date": "2024-04-19T19:37:12+02:00",
-  "path": "/nix/store/pas31z7l3x16113qa7k7ywb6hbarnwvs-tree-sitter-norg",
-  "sha256": "08bsk3v61r0xhracanjv25jccqv80ahipx0mv5a1slzhcyymv8kd",
-  "hash": "sha256-baJdvWfwUx1U2RX0G6ECaGPGZBFbWsVUhh3kYPaYeiE=",
+  "rev": "d89d95af13d409f30a6c7676387bde311ec4a2c8",
+  "date": "2024-09-04T16:57:27+02:00",
+  "path": "/nix/store/5kp8p7s80rvimcqs3i8syjwsc4459nmf-tree-sitter-norg",
+  "sha256": "077rds0rq10wjywpj4hmmq9dd6qp6sfwbdjyh587laldrfl7jy6g",
+  "hash": "sha256-z3h5qMuNKnpQgV62xZ02F5vWEq4VEnm5lxwEnIFu+Rw=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json
index 5f43ea1f7ab9..025b38ddf2ff 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/nushell/tree-sitter-nu",
-  "rev": "a58513279e98dc3ff9ed149e3b4310cbb7e11068",
-  "date": "2024-04-20T10:10:30-04:00",
-  "path": "/nix/store/h4jw0skhik308krrqi7rmhw7ls4vp1rs-tree-sitter-nu",
-  "sha256": "00vpw8aai4k7bw57pyjwn6b09lb9rr1n88qc4r4nma86rl63y9ic",
-  "hash": "sha256-LCY/DM0GqWpJJgwjZEPOadEElrFc+nsKX2eSqBTidwM=",
+  "rev": "0bb9a602d9bc94b66fab96ce51d46a5a227ab76c",
+  "date": "2024-06-13T06:25:15-05:00",
+  "path": "/nix/store/z06sq7pwdmabw0jrhx221aj0xjjgz48g-tree-sitter-nu",
+  "sha256": "1bfhrvm984vqjgmlbi1kq91ywxp3mpz0mb8csg3zsfhkj8xa5483",
+  "hash": "sha256-A5GiOpITOv3H0wytCv6t43buQ8IzxEXrk3gTlOrO0K0=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json
index 385e00ceb552..14f22e9e243d 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/ganezdragon/tree-sitter-perl",
-  "rev": "93bd92a6af01113140f1a0b4c1845d22adae7ab6",
-  "date": "2024-03-29T09:45:26+05:30",
-  "path": "/nix/store/v4fhidwmxfihmkkq32a2xj75zs9fs9cd-tree-sitter-perl",
-  "sha256": "1ldbqjiyc4apls5gfc96lw6l4y53k5adk8knf1pp3ar2x2dl8v6y",
-  "hash": "sha256-3mxEm+giq3FvcHai2VSZo3hCDacmMfeKplcR5qPEq9E=",
+  "rev": "8b554de277956a96f3e618b727d0ed4d4e564676",
+  "date": "2024-05-26T14:22:34Z",
+  "path": "/nix/store/fr9iacwd8dx2pb138d1q17wk9s64xvw3-tree-sitter-perl",
+  "sha256": "1ib0vx5dqp54ycisqg2gw72dj2ygin0z4846m2jnckavs7awn6fm",
+  "hash": "sha256-1RnL1dFbTWalqIYg8oGNzwvZxOFPPKwj86Rc3ErfYMU=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json
index 433932e93683..a63896e4c319 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/rolandwalker/tree-sitter-pgn",
-  "rev": "c5b2f2346e4148702b1343ec9bcc42b4a9aa88dc",
-  "date": "2024-04-27T16:35:50-04:00",
-  "path": "/nix/store/klrbfqwbmrwpgrghr2jijy0yy4yra3c3-tree-sitter-pgn",
-  "sha256": "1p6vn84f06c38kanv6j7w5pdwxny0gc7vk357s8ykiz0wv6r8ay9",
-  "hash": "sha256-ySuUzebgx+mRPmXMfdgD3nbebuFHmm3VRIMZ4Aiy29w=",
+  "rev": "f86a119d21d01f6bf0dcd3247a366554e98dbbe5",
+  "date": "2024-09-14T21:47:45Z",
+  "path": "/nix/store/09rxvhnmdq63n4ghk00ngbdgnmqqs1k4-tree-sitter-pgn",
+  "sha256": "1ahl979ika0pyq4glz6am71hq6y360hcmwhxikn2l2gl8415701k",
+  "hash": "sha256-M4BTAkH0CSrsjB3yyiAwwxsMw6nKfPoI9heoGdNJFKo=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
index 2d45886a8df4..c7006cd0fe3d 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-php",
-  "rev": "78a78df5e06b4c13173af2a1f607c9a853d0f240",
-  "date": "2024-02-25T14:41:06-06:00",
-  "path": "/nix/store/h63hh37wn6khk4gj4v1yv37w7kxgr595-tree-sitter-php",
-  "sha256": "07022kisc2r5pfcbv0smh5gnn9v0i7jazfbvckczz15d0wwrpfip",
-  "hash": "sha256-N7qbOQethP/ZZHu5r+SJYCdrX4FVg72YuyULpuMUAhw=",
+  "rev": "a1e0befae61715d9e162529b3c2bfd961d183613",
+  "date": "2024-09-02T16:13:56-04:00",
+  "path": "/nix/store/j71y2xpajnpq7pp0rv2h0lb0w55vcjg2-tree-sitter-php",
+  "sha256": "1zpnnmrsgmb802m2zjdnfxz41fq475qk7n2pnjsbc5n61k81dgga",
+  "hash": "sha256-6r0W0AzGFra0tFfYM3E5BLtAfne2yS+qAGjVp3O19v4=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
index 688de10aa445..299aa72dadf5 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-python",
-  "rev": "71778c2a472ed00a64abf4219544edbf8e4b86d7",
-  "date": "2024-04-30T21:50:21-04:00",
-  "path": "/nix/store/xqc20db4g26sqsj0jflj4z2jm8hfmd97-tree-sitter-python",
-  "sha256": "1dmg11dbrddf55xhly813cb6ykxmyam2kjs7lyfi8k8xms03jx44",
-  "hash": "sha256-hHQ5gK4dTRSdp0fLKarytU9vFhsBeQp7Ka61vFoIr7Y=",
+  "rev": "8c65e256f971812276ff2a69a2f515c218ed7f82",
+  "date": "2024-09-02T20:40:41-04:00",
+  "path": "/nix/store/8mw7g7r8j8n8d8wssjz43nsmkhnlqd0b-tree-sitter-python",
+  "sha256": "0d51zk7znaxvwcacp5gzm2rwprk8m10wnxhk5g4q7sygbcvl2rzj",
+  "hash": "sha256-8mdBN1vP64PJKxN2y0GoaObLs6j/lcsU47sr+8/8oTQ=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json
index c213aaa449b5..81b8070b53d0 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-ql-dbscheme",
-  "rev": "afd8764736bb7ae52b6628618e8b3e7e28224ab7",
-  "date": "2024-05-07T13:58:04+02:00",
-  "path": "/nix/store/696rbv0z6i563jjqbwgdavy6kvpkja94-tree-sitter-ql-dbscheme",
-  "sha256": "1mb87h2gzv3cwswklnnk2s8xmj060j4aj3ccgic7va23n1mm6rbs",
-  "hash": "sha256-emVTa7BDqH1YfIwNqYgEBsjakRbTWjq55mzs/wQ8aNU=",
+  "rev": "1980b4b6998a1138d326f863e6168f0f2c0c544d",
+  "date": "2024-09-02T15:26:46-04:00",
+  "path": "/nix/store/s3klligl52ag14ai8n1fcwhn7k4m1wdk-tree-sitter-ql-dbscheme",
+  "sha256": "1k3qz85507xysx2msr1ns44ya3x3xxb9kxfzvpp088w6nrc6cipm",
+  "hash": "sha256-9UZmWLaGIwTu3d/1mVbvow/lCdE2ZF1F174fUAr6eMw=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json
index 6cf9f8045e67..901d037b9feb 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-ql",
-  "rev": "42becd6f8f7bae82c818fa3abb1b6ff34b552310",
-  "date": "2024-05-07T14:00:59+02:00",
-  "path": "/nix/store/dknbdl1hrgp0kicx2wx1wjnhb7bay643-tree-sitter-ql",
-  "sha256": "1gcgs87cas4qd5ppvzjfgzj2ayjnjfxbyg3gl204w8mrvciq2niq",
-  "hash": "sha256-OFqBI9u5Ik6AoG88v7qTVnol5H9O/n1vaZhoxQ7Sj70=",
+  "rev": "c73c31c89cb0019ef56fe8bc1723e7c36e0be607",
+  "date": "2024-09-02T14:59:29-04:00",
+  "path": "/nix/store/diaw28vzzry46dc5b0fra2xw263lmbhs-tree-sitter-ql",
+  "sha256": "1lnasix7vb9q7lixy5qayslzw9yk53gll8130d03h0a9vl44dw8b",
+  "hash": "sha256-C/FGCN1JAThAAyMgSt8o0yf+qfYKF98jPTitfXrUytI=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json
index 09390cce1ead..c2ab4fb278de 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/nvim-treesitter/tree-sitter-query",
-  "rev": "d25e8d183f319497b8b22a2a1585975b020da722",
-  "date": "2024-05-06T23:21:15+02:00",
-  "path": "/nix/store/bj3dsdmf608vwagc1nwwhs5z90p6swzc-tree-sitter-query",
-  "sha256": "191h311g14aah7wpibpyhpz925506c3l6qyrfra1kd8pjn1nv2vk",
-  "hash": "sha256-c4ttg5UXtRlUdtljQwczoBSR/oX+rnj5gUqR8EIYMKQ=",
+  "rev": "f767fb0ac5e711b6d44c5e0c8d1f349687a86ce0",
+  "date": "2024-05-26T11:54:30+02:00",
+  "path": "/nix/store/rr9wn6900c73csv01czjnq609nwzyhqk-tree-sitter-query",
+  "sha256": "0wi01kmvb5axavfm6jp3rd6dd9pnq551w9lgwcgs02amxp6z8ymj",
+  "hash": "sha256-snr0ze1VCaAf448mHkrB9qbWTMvjSlPdVl2VtesMIHI=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json
index c74499796fbc..4754dba33b8d 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/r-lib/tree-sitter-r",
-  "rev": "391400572538ff9854341a175ed8ab4b1e45f44b",
-  "date": "2024-05-03T14:16:03-04:00",
-  "path": "/nix/store/dkmd92q56snynssaridhzkd7rv8zckq7-tree-sitter-r",
-  "sha256": "05s0n6qvb3jsx7sv4vzsc794vdxinxf7f8d2sbf9qz3vwwm39kr8",
-  "hash": "sha256-KM80Kud7fJzc0qIhd1y3sbdN0mH6b7L16VqOtbGxQBc=",
+  "rev": "ac939363ced63a5fd39a8bd5e7891bbe06b5738d",
+  "date": "2024-09-06T16:53:09-04:00",
+  "path": "/nix/store/qj9nyda5grkjqkh23m9a3q3sgkmkgcdh-tree-sitter-r",
+  "sha256": "1jf14nvrfcznsnmxmlkbnn59bdykpsawxm5grph65p8vghi4fik7",
+  "hash": "sha256-Z0ZHInwb3WLgza/UzpW+07eVirVr0tqr1fYzl7clwck=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json
index fee52809beb5..db619e455693 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-regex",
-  "rev": "47007f195752d8e57bda80b0b6cdb2d173a9f7d7",
-  "date": "2024-05-05T20:53:57-04:00",
-  "path": "/nix/store/4vlp0kgq09yp9bnjkrsc82mh0c0mb4qa-tree-sitter-regex",
-  "sha256": "0j9shwv7j8jnkms1f8h9ddg80cj85vp1pivkdcspdifbi69q8l2z",
-  "hash": "sha256-X1CEk4nLxXY1a3PHG+4uSDKAXmsJIhd0nVYieTaHOkk=",
+  "rev": "f70251e1f1d72bd6dc1f897f956f9112f8668441",
+  "date": "2024-09-02T03:31:05-04:00",
+  "path": "/nix/store/9shrpsgb7rnk24nwc3xr1xv33wxi0ydk-tree-sitter-regex",
+  "sha256": "08i97gwvf6777h6dkvsd08s2n4pmpz2xghxpn1npn16jcpaknhhv",
+  "hash": "sha256-G0I71WXSBHttsLfD18W/9RIrNAJN79kMPOcYt/k7KSI=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json
index 0cf6618b45b7..1df81f913967 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/FallenAngel97/tree-sitter-rego",
-  "rev": "9ac75e71b2d791e0aadeef68098319d86a2a14cf",
-  "date": "2023-11-03T09:13:53+02:00",
-  "path": "/nix/store/7v3znqfnq89ik6svp70fzsin8j4ydl4s-tree-sitter-rego",
-  "sha256": "12napwjsv4hx2k4ad0p2v3mv4lhxgp894riglyqmidxxkikzma9g",
-  "hash": "sha256-L6n6Z5y9t1ixpy9mktB9HVKy69jigqbIFB2SrSW/yoo=",
+  "rev": "20b5a5958c837bc9f74b231022a68a594a313f6d",
+  "date": "2024-06-12T18:01:13+03:00",
+  "path": "/nix/store/dhpxdwhiwc6dl3gys99g3ax5jmg6s7fw-tree-sitter-rego",
+  "sha256": "0cmja3gd5nbmi251qc14hh1cbfd7i0mydx74qxs30qvix6q5a2az",
+  "hash": "sha256-XwlVsOlxYzB0x+T05iuIp7nFAoQkMByKiHXZ0t5QsjI=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
index 12519a98bf82..a682053ee93e 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-rust",
-  "rev": "9c84af007b0f144954adb26b3f336495cbb320a7",
-  "date": "2024-05-05T19:28:38-04:00",
-  "path": "/nix/store/5mmx41c8spdf25jci02lw3vmq117dksv-tree-sitter-rust",
-  "sha256": "0wjw8wz34c3h624xi0n133pv4ld1gmx4zn60xfkqgv7cmn9f42cv",
-  "hash": "sha256-mwnikq3s7Ien68DYT3p9oVGy7xjBgtiJMHAwMj5HXHI=",
+  "rev": "6b7d1fc73ded57f73b1619bcf4371618212208b1",
+  "date": "2024-09-02T05:17:41-04:00",
+  "path": "/nix/store/7qazknjwzfdl0jyc7jyqskjagw00i5wy-tree-sitter-rust",
+  "sha256": "08m0i6ar5gkz1pvz8lh2dfwjff4szzl0q0lzbqp0p5il0arxvbbh",
+  "hash": "sha256-cK3dswI0lgsuXp8CDOj/mjgnuWsCUvT3DX++kpWJoCI=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json
index 719d4ce9e2d1..c72db6775674 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-scala",
-  "rev": "b3ac6a5d959d3137e7f3146d4d9f7899872177de",
-  "date": "2024-03-12T14:34:11-04:00",
-  "path": "/nix/store/zi4bjbmxlhp003lk37pcyf5kg9m2wcf6-tree-sitter-scala",
-  "sha256": "1j2ivdm21c5db54rcff00n7bqcfrfjc91jwlfl4a2cm363hbrym2",
-  "hash": "sha256-ovq84DCjMqEIdZTLkJh02TG8jgXAOZZJWa2wIGrbUcg=",
+  "rev": "62e7506f5ec87e2daf218e3bbd317401768d9963",
+  "date": "2024-09-12T09:36:24-04:00",
+  "path": "/nix/store/kcrap980k751mp2mk59z19jcc196pk08-tree-sitter-scala",
+  "sha256": "0ybj359b21cqy1nqr1psjy244y7d672iik9a3pqxrg67cppwwn26",
+  "hash": "sha256-RljO72XHvNzxHSrNGMUx7XhChJf6hoxt8JgFsVIZcnk=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json
index 7e08f324213e..ef5caa8e43ec 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/6cdh/tree-sitter-scheme",
-  "rev": "8f9dff3d038f09934db5ea113cebc59c74447743",
-  "date": "2024-04-12T09:33:55+08:00",
-  "path": "/nix/store/myg0q8bjsdzgq712skhxk1vf2gqqr7b0-tree-sitter-scheme",
-  "sha256": "1n9f9zala2mv7bllwjb2nsh2xsr56zjh7j09vxzd77jnb10rjh20",
-  "hash": "sha256-QECZQVhWntN+3wnIA+U3JesuoLZiSU7pOrsKRdVPLtk=",
+  "rev": "63e25a4a84142ae7ee0ee01fe3a32c985ca16745",
+  "date": "2024-09-08T01:23:30+08:00",
+  "path": "/nix/store/1wk7w5vkxcwqx24qlm203z1z5rw95vn8-tree-sitter-scheme",
+  "sha256": "12p8g2mnd73lanibk16llhbx7xarlcl2ihngcibhpa4bzppcbb8l",
+  "hash": "sha256-FK3F7v2LqAtXZM/CKCijWfXTF6TUhLmiVXScZqt46Io=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json
index 0c3c6df0b6b2..6212e7a66822 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json
@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/serenadeai/tree-sitter-scss",
   "rev": "c478c6868648eff49eb04a4df90d703dc45b312a",
-  "date": "2022-02-03T21:48:21+00:00",
+  "date": "2022-02-03T21:48:21Z",
   "path": "/nix/store/s49l3jbhjni3l1d0m3xrpzml39aq9yr3-tree-sitter-scss",
   "sha256": "15r3jiv36hzx2pmjmp63am3pbc01s52z36xfraa1aw4wlx7lqnq4",
   "hash": "sha256-BFtMT6eccBWUyq6b8UXRAbB1R1XD3CrrFf1DM3aUI5c=",
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json
index 609520882b07..c95def892a1a 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json
@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/indoorvivants/tree-sitter-smithy",
   "rev": "cf8c7eb9faf7c7049839585eac19c94af231e6a0",
-  "date": "2023-01-31T21:16:56+00:00",
+  "date": "2023-01-31T21:16:56Z",
   "path": "/nix/store/y5j99bx1b6h25k1lnzs6s4gkg0mhll06-tree-sitter-smithy",
   "sha256": "0k7gfpa3pcj1ji34k0kwk1xbadkgjadfg36xfwns1fmlwzmr7jnx",
   "hash": "sha256-3cqT6+e0uqAtd92M55qSbza1eph8gklGlEGyO9R170w=",
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json
index 42199274dd42..3108dc0d129e 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/bonabeavis/tree-sitter-sparql",
-  "rev": "05f949d3c1c15e3261473a244d3ce87777374dec",
-  "date": "2021-08-16T15:50:03+02:00",
-  "path": "/nix/store/vvgvb1jcv0qrn3xj0jbf83qwi1lh2m68-tree-sitter-sparql",
-  "sha256": "012c1pi4vc6hkvllymvl2yah3ix8k4pi7997iydy949fc33aa5i8",
-  "hash": "sha256-KBalxmAukeSbjyelEy+ZqMcBlRd0V0/pntCwTeINTAQ=",
+  "rev": "d853661ca680d8ff7f8d800182d5782b61d0dd58",
+  "date": "2024-06-26T16:15:19+02:00",
+  "path": "/nix/store/cz22k5dh2fqyfmamdx1mrlwv28shnk1x-tree-sitter-sparql",
+  "sha256": "1xd0hp2m62ggka46cv2px0507yyl9d9cdqhlpglq6y1jqb5p85fh",
+  "hash": "sha256-0BV0y8IyeIPpuxTixlJL1PsDCuhXbGaImu8JU8WFoPU=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json
index 210646ac4c5e..ad70caa2684c 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/derekstride/tree-sitter-sql",
-  "rev": "7d591a1a14ce4d5caf81ae64284c2dc185544cb2",
-  "date": "2024-04-20T18:48:13+02:00",
-  "path": "/nix/store/r6sz2sa4az2p2idl3vjv90nr4zghxmxr-tree-sitter-sql",
-  "sha256": "1x4kw4fflizwb472n8sfpigqyc8y57m28mawsf999011flzg2dmp",
-  "hash": "sha256-tzbxPnUhgJSS01xVJOopHjGPX7xOIysOWfxH6hzhk/Q=",
+  "rev": "53623157a27f787cab12b2545f43ddd34f3fb5f7",
+  "date": "2024-08-09T22:12:06+02:00",
+  "path": "/nix/store/vlm9y5gcjih5scd3iyaxynr79gbfqha8-tree-sitter-sql",
+  "sha256": "1hjb75rsqnrs0ca1zq17bv4r7skmvra7jw69lk94ncjk8sbhh30w",
+  "hash": "sha256-HAwIl0ZTMkvSpMlweVTedeqTyV4n4B8UAzpbrHM5S8I=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json
index baa13c0a37dc..827afca5f9b1 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/wenkokke/tree-sitter-talon",
-  "rev": "dafc9fabf7acc1a46d51cce379cec00c07661aa7",
-  "date": "2023-11-05T13:07:41+00:00",
-  "path": "/nix/store/df67djinw8sjwf6lbfv6gdckxckv0y65-tree-sitter-talon",
-  "sha256": "1clmmb3pgvc54fsp83f2jmz6n21pmmjkb15yk9bfqlkzdm12sirw",
-  "hash": "sha256-PEctQm1/UuxWmr6ENWWtNwhrfpXCDXS1I4Xtd8eqlbI=",
+  "rev": "53fd1d6102f692ab3040f90a1fe5023b7342ff23",
+  "date": "2024-06-18T14:14:45+01:00",
+  "path": "/nix/store/bva5mf6j33icgd2rr4067i50gjjzbd10-tree-sitter-talon",
+  "sha256": "1kw7axcqpmjbcsl6h8lsvraqv58k0w76rhxcvqqx7kly4jgz1wrm",
+  "hash": "sha256-NfPwnySeztMx3qzDbA4HE5WNVd6aImioZkvWi1lXh88=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json
index 6dbe64089625..b9f7b8103f18 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/vrischmann/tree-sitter-templ",
-  "rev": "d631f60287c0904770bc41aa865e249594b52422",
-  "date": "2024-05-09T13:42:17+02:00",
-  "path": "/nix/store/5h839wwxwjmg799bp79kkcav2ld8k0jy-tree-sitter-templ",
-  "sha256": "16di98f9xnqdpzb69p8hrgisfhsz0r9p4pv342z0cvkjv5n4s0xc",
-  "hash": "sha256-rANNbNlybga+IGNfclMGX0On48sQ3WTWvw3bnhxKsZk=",
+  "rev": "0524da9e1f14b9b7d7d6d36608293f85a550b263",
+  "date": "2024-09-03T22:47:13+02:00",
+  "path": "/nix/store/6zjn6rh5mm32cislyl1bi2ad0fxsk297-tree-sitter-templ",
+  "sha256": "1lxpmp6a00l7rykrgxqdsvsm9iijz4ik3im1xd4gy92zqsj4k8g0",
+  "hash": "sha256-4KFJpMZfJP9I66HGMSP5MsZU9dYN95enz4cCoMytt9M=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json
index f50a35e3f2cb..35dc26733ba9 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tlaplus-community/tree-sitter-tlaplus",
-  "rev": "ef18145e7f985f592ad41b04004b24a590f58b71",
-  "date": "2024-05-15T18:54:24-04:00",
-  "path": "/nix/store/saczmakjnrwrvn0dad37bfva1m3mvzc5-tree-sitter-tlaplus",
-  "sha256": "0hnylz5mxsvk1q8bbv7ak4r49l2knx75ln58i4isqs7qr0a2vw6b",
-  "hash": "sha256-y/AtFMj4aKwjiahYWk63U9BEMpnq7LUQDnPrXsun3kI=",
+  "rev": "200f9dab6b23f3b9bb8f67fc811221517f56c373",
+  "date": "2024-05-17T17:21:16-04:00",
+  "path": "/nix/store/lgxqyxs5l3nilj6a1caznwgmd7fpfc4k-tree-sitter-tlaplus",
+  "sha256": "0wab31x1p74xgd32yx0jydkz0cay0pwbi8h105apqihv3pxrk350",
+  "hash": "sha256-oIyZ+x0bRnxVAQGiuPgFXjHwZ/MSdC9Ge52cG3oYS3E=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-turtle.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-turtle.json
index 6797d3fc6362..8523faec3758 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-turtle.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-turtle.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/bonabeavis/tree-sitter-turtle",
-  "rev": "085437f5cb117703b7f520dd92161140a684f092",
-  "date": "2021-08-16T15:17:50+02:00",
-  "path": "/nix/store/c90hph3wfyhjmri3qbfb5lpy1bl855zv-tree-sitter-turtle",
-  "sha256": "1l5djvz90sq9w14kfcrffdigqs61r1p8v17xpj92sxz8z3ngpgmr",
-  "hash": "sha256-ub777Pjody2SvP2EjW7IwWj8YnMuMzdJ4AlrkP6WrdA=",
+  "rev": "7f789ea7ef765080f71a298fc96b7c957fa24422",
+  "date": "2024-07-02T13:41:07+02:00",
+  "path": "/nix/store/1rscya6w8m579211nsmhhicc3rgk204h-tree-sitter-turtle",
+  "sha256": "0c3diz97lrnxqkq410s9rlmxddjqgnswyc4spdfny045xgfzp9yg",
+  "hash": "sha256-z6f73euFAG9du5owz7V9WLbWK81Jg0DwxN1metKPbTA=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json
index 0492557e1be0..940beec1353b 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/winglang/wing",
-  "rev": "d65e4c03e1b992adc76df2c2485562c8f2204462",
-  "date": "2024-05-17T04:19:16+00:00",
-  "path": "/nix/store/3pdf6cy205v9s4bf2y8r45qpvf3j1zq1-wing",
-  "sha256": "0y0w3559980ryhnnbjkxxlr6w11110fxvvqsk2wr0sijy53j07w5",
-  "hash": "sha256-hR8gR/EyapC5mBrv3R0IIQRuMu19ymUt9BmglEoZHHg=",
+  "rev": "ae30eb63ed5dba548d8935e0d3c74bfb28f0d690",
+  "date": "2024-09-16T08:46:38Z",
+  "path": "/nix/store/zczqrkbqiw0k8qd7an1bk93cksyd05nr-wing",
+  "sha256": "032j48xy59z9d80xhy14jb1vca2pxk3cv5a5myqmfnlik2c8frj2",
+  "hash": "sha256-QmaHmJiRWlexr0WVzcbsVyi2w5IkeNgBaumn4jsiUgw=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json
index 874cb0a1368a..5cbf4b7440de 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/maxxnino/tree-sitter-zig",
-  "rev": "0d08703e4c3f426ec61695d7617415fff97029bd",
-  "date": "2023-04-25T05:51:06-03:00",
-  "path": "/nix/store/fzz8x1pa11zksamgk199fw0j7dkbsz0s-tree-sitter-zig",
-  "sha256": "0whj44fl6hmcyap5bjqhy90rd6xnnxgsy3vn1z3mvq8d2mwbnxbb",
-  "hash": "sha256-a3W7eBUN4V3HD3YPr1+3tpuWQfIQy1Wu8qxCQx0hEnI=",
+  "rev": "2bac4cc6c697d46a193905fef6d003bfa0bfabfd",
+  "date": "2024-06-28T17:20:16+07:00",
+  "path": "/nix/store/3j7bnhlb5nka1c7sr965pblr2qrdsrn3-tree-sitter-zig",
+  "sha256": "1ix401wq0raz8sxp88r6wkkzrv6653yk5fi604i026yrm04n9br0",
+  "hash": "sha256-IK9kCajZGwEiASa6Mv0oxuz85+QmI3S7Rl9lgHkApMc=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix
index 4c2f2c10aee5..4c21402a4b2f 100644
--- a/pkgs/development/tools/parsing/tree-sitter/update.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/update.nix
@@ -61,6 +61,12 @@ let
     "py-tree-sitter"
     # afl fuzzing for tree sitter
     "afl-tree-sitter"
+    # this is the kotlin language bindings, tree-sitter-kotlin is the grammar
+    "kotlin-tree-sitter"
+    # this is the go language bindings, tree-sitter-go is the grammar
+    "go-tree-sitter"
+    # this is the java language bindings, tree-sitter-java is the grammar
+    "java-tree-sitter"
     # archived
     "highlight-schema"
     # website

From adb8dffe97f307fba886b8ec35d09b2e438b09c7 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 16 Sep 2024 15:29:28 +0200
Subject: [PATCH 228/241] libaom,libvmaf: pin to GCC 13 on aarch64

We got pretty lucky here.  libaom doesn't expose any public C++ ABI.
It does depend on libvmaf, which does have public C++ ABI, so it also
needs to be pinned but fortunately on aarch64 nothing else uses it, at
least by default.
---
 pkgs/top-level/all-packages.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 216836f79186..506e85b2d319 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20968,7 +20968,10 @@ with pkgs;
 
   libantlr3c = callPackage ../development/libraries/libantlr3c { };
 
-  libaom = callPackage ../development/libraries/libaom { };
+  libaom = callPackage ../development/libraries/libaom {
+    # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116737
+    stdenv = if stdenv.hostPlatform.isAarch64 && stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "14" then gcc13Stdenv else stdenv;
+  };
 
   libappindicator-gtk2 = libappindicator.override { gtkVersion = "2"; };
   libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; };
@@ -22186,7 +22189,10 @@ with pkgs;
 
   libvisual = callPackage ../development/libraries/libvisual { };
 
-  libvmaf = callPackage ../development/libraries/libvmaf { };
+  libvmaf = callPackage ../development/libraries/libvmaf {
+    # See libaom
+    stdenv = if stdenv.hostPlatform.isAarch64 && stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "14" then gcc13Stdenv else stdenv;
+  };
 
   libvncserver = callPackage ../development/libraries/libvncserver {
     inherit (darwin.apple_sdk.frameworks) Carbon;

From 53944b1be1d31f07a06137dbbf032d4cbe755966 Mon Sep 17 00:00:00 2001
From: Bojun Ren <bj.ren.coding@outlook.com>
Date: Mon, 16 Sep 2024 17:05:54 +0800
Subject: [PATCH 229/241] emacsPackages.gn-mode-from-sources: add rennsax to
 maintainers

---
 .../manual-packages/gn-mode-from-sources/package.nix            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/gn-mode-from-sources/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/gn-mode-from-sources/package.nix
index adae6e51625e..8b554081d1fd 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/gn-mode-from-sources/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/gn-mode-from-sources/package.nix
@@ -22,7 +22,7 @@ melpaBuild {
 
   meta = {
     inherit (gn.meta) homepage license;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ rennsax ];
     description = "Major mode for editing GN files; taken from GN sources";
   };
 }

From 3247731d469390d739a57041f090a71479183039 Mon Sep 17 00:00:00 2001
From: Xelden <anpiz@protonmail.com>
Date: Mon, 26 Aug 2024 16:47:39 -0500
Subject: [PATCH 230/241] maintainers: add xelden

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 73e45ec4cf31..5cdbad9b7f01 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -22167,6 +22167,12 @@
     githubId = 36407913;
     name = "Uli Baum";
   };
+  xelden = {
+    email = "anpiz@protonmail.com";
+    github = "Xelden";
+    githubId = 117323435;
+    name = "Andrés Pico";
+  };
   xfnw = {
     email = "xfnw+nixos@riseup.net";
     github = "xfnw";

From c0307f097277b8b0e5a1848b77b603539055468a Mon Sep 17 00:00:00 2001
From: Xelden <anpiz@protonmail.com>
Date: Mon, 26 Aug 2024 16:39:31 -0500
Subject: [PATCH 231/241] abctl: init at 0.13.1

---
 pkgs/by-name/ab/abctl/package.nix | 32 +++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 pkgs/by-name/ab/abctl/package.nix

diff --git a/pkgs/by-name/ab/abctl/package.nix b/pkgs/by-name/ab/abctl/package.nix
new file mode 100644
index 000000000000..226587b0b005
--- /dev/null
+++ b/pkgs/by-name/ab/abctl/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  stdenv,
+}:
+let
+  pname = "abctl";
+  version = "0.13.1";
+in
+buildGoModule {
+  inherit pname version;
+
+  src = fetchFromGitHub {
+    owner = "airbytehq";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-ZZP5wXsPtqkZd/sdj/LU8M/DYv0gjIWRspAFrp3ETH8=";
+  };
+
+  vendorHash = "sha256-uvOKH/MLIoIwYClpTIj010os9dGkkZPAVV0RYBjjzVk=";
+
+  meta = {
+    description = "Airbyte's CLI for managing local Airbyte installations";
+    homepage = "https://airbyte.com/";
+    changelog = "https://github.com/airbytehq/abctl/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ xelden ];
+    mainProgram = "abctl";
+    broken = stdenv.isDarwin;
+  };
+}

From 224510cec2a4095e3e7f23d2af20f15b68a6f8f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 16 Sep 2024 18:45:00 +0200
Subject: [PATCH 232/241] nixos/syncoid: don't prepend escapeUnitName

---
 nixos/modules/services/backup/syncoid.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/backup/syncoid.nix b/nixos/modules/services/backup/syncoid.nix
index 97d39544d5bb..4a59336fbdec 100644
--- a/nixos/modules/services/backup/syncoid.nix
+++ b/nixos/modules/services/backup/syncoid.nix
@@ -312,7 +312,7 @@ in
 
     systemd.services = lib.mapAttrs'
       (name: c:
-        lib.nameValuePair "syncoid-${lib.escapeUnitName name}" (lib.mkMerge [
+        lib.nameValuePair "syncoid-${escapeUnitName name}" (lib.mkMerge [
           {
             description = "Syncoid ZFS synchronization from ${c.source} to ${c.target}";
             after = [ "zfs.target" ];
@@ -376,15 +376,15 @@ in
               RestrictNamespaces = true;
               RestrictRealtime = true;
               RestrictSUIDSGID = true;
-              RootDirectory = "/run/syncoid/${lib.escapeUnitName name}";
+              RootDirectory = "/run/syncoid/${escapeUnitName name}";
               RootDirectoryStartOnly = true;
               BindPaths = [ "/dev/zfs" ];
               BindReadOnlyPaths = [ builtins.storeDir "/etc" "/run" "/bin/sh" ];
               # Avoid useless mounting of RootDirectory= in the own RootDirectory= of ExecStart='s mount namespace.
-              InaccessiblePaths = [ "-+/run/syncoid/${lib.escapeUnitName name}" ];
+              InaccessiblePaths = [ "-+/run/syncoid/${escapeUnitName name}" ];
               MountAPIVFS = true;
               # Create RootDirectory= in the host's mount namespace.
-              RuntimeDirectory = [ "syncoid/${lib.escapeUnitName name}" ];
+              RuntimeDirectory = [ "syncoid/${escapeUnitName name}" ];
               RuntimeDirectoryMode = "700";
               SystemCallFilter = [
                 "@system-service"

From fbe613e1f1ba0ebb44005a907608db382988cf86 Mon Sep 17 00:00:00 2001
From: Riley Bruins <ribru17@hotmail.com>
Date: Mon, 16 Sep 2024 09:46:01 -0700
Subject: [PATCH 233/241] tree-sitter-grammars.tree-sitter-wing: update source
 repo

The repo for this tree-sitter grammar was changed a while back and not
reflected here, which broke
emacsPackages.treesit-grammars.with-all-grammars. Fixes #342344.
---
 .../tools/parsing/tree-sitter/default.nix            |  3 +--
 .../tree-sitter/grammars/tree-sitter-wing.json       | 12 ++++++------
 .../development/tools/parsing/tree-sitter/update.nix |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix
index 0caa514c913b..28fda605fab6 100644
--- a/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -72,8 +72,7 @@ let
         { tree-sitter-markdown = grammars'.tree-sitter-markdown // { location = "tree-sitter-markdown"; }; } //
         { tree-sitter-markdown-inline = grammars'.tree-sitter-markdown // { language = "markdown_inline"; location = "tree-sitter-markdown-inline"; }; } //
         { tree-sitter-php = grammars'.tree-sitter-php // { location = "php"; }; } //
-        { tree-sitter-sql = grammars'.tree-sitter-sql // { generate = true; }; } //
-        { tree-sitter-wing = grammars'.tree-sitter-wing // { location = "libs/tree-sitter-wing"; generate = true; }; };
+        { tree-sitter-sql = grammars'.tree-sitter-sql // { generate = true; }; };
     in
     lib.mapAttrs build (grammars);
 
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json
index 940beec1353b..71879d700f85 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json
@@ -1,10 +1,10 @@
 {
-  "url": "https://github.com/winglang/wing",
-  "rev": "ae30eb63ed5dba548d8935e0d3c74bfb28f0d690",
-  "date": "2024-09-16T08:46:38Z",
-  "path": "/nix/store/zczqrkbqiw0k8qd7an1bk93cksyd05nr-wing",
-  "sha256": "032j48xy59z9d80xhy14jb1vca2pxk3cv5a5myqmfnlik2c8frj2",
-  "hash": "sha256-QmaHmJiRWlexr0WVzcbsVyi2w5IkeNgBaumn4jsiUgw=",
+  "url": "https://github.com/winglang/tree-sitter-wing",
+  "rev": "27b595f5ea1aa45b5f777f194c0bd121a7b0c8e3",
+  "date": "2024-09-03T18:25:03-04:00",
+  "path": "/nix/store/az77v8z742hkqm830lvhgnqi1zpx9v8d-tree-sitter-wing",
+  "sha256": "09h79hvi35riwypskhh97qz8wis2kkz27xj777fg8lldvfh5kgdh",
+  "hash": "sha256-sL1ZoNuNUvTcOUf2I/6cQkeOPj4Jwqmv5zGXETdMByY=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix
index 4c21402a4b2f..aa1504f57c7b 100644
--- a/pkgs/development/tools/parsing/tree-sitter/update.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/update.nix
@@ -423,7 +423,7 @@ let
     };
     "tree-sitter-wing" = {
       orga = "winglang";
-      repo = "wing";
+      repo = "tree-sitter-wing";
     };
     "tree-sitter-wgsl" = {
       orga = "szebniok";

From 991b21f9df4c984c337e8e696e6678dc805a3d80 Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Mon, 16 Sep 2024 12:24:20 -0300
Subject: [PATCH 234/241] python3Packages.pysimplegui: remove

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 .../python-modules/pysimplegui/default.nix    | 33 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 --
 3 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pysimplegui/default.nix

diff --git a/pkgs/development/python-modules/pysimplegui/default.nix b/pkgs/development/python-modules/pysimplegui/default.nix
deleted file mode 100644
index ac2d7482496a..000000000000
--- a/pkgs/development/python-modules/pysimplegui/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  tkinter,
-  pythonOlder,
-}:
-
-buildPythonPackage rec {
-  pname = "pysimplegui";
-  version = "5.0.5";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.6";
-
-  src = fetchPypi {
-    pname = "PySimpleGUI";
-    inherit version;
-    hash = "sha256-4B2LgWmdXAU9ACSR0F26Q9+eP3izRI+p6QS/o9m6Hfk=";
-  };
-
-  propagatedBuildInputs = [ tkinter ];
-
-  pythonImportsCheck = [ "PySimpleGUI" ];
-
-  meta = with lib; {
-    description = "Python GUIs for Humans";
-    homepage = "https://github.com/PySimpleGUI/PySimpleGUI";
-    license = licenses.unfree;
-    maintainers = with maintainers; [ lucasew ];
-    broken = true; # update to v5 broke the package, it now needs rsa and is trying to access an X11 socket?
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 2deac32df67c..f789cd32996b 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -468,6 +468,7 @@ mapAliases ({
   pyruckus = throw "pyruckus has been removed, it was deprecrated in favor of aioruckus."; # added 2023-09-07
   py_scrypt = py-scrypt; # added 2024-01-07
   pysha3 = throw "pysha3 has been removed, use safe-pysha3 instead"; # added 2023-05-20
+  pysimplegui = throw "pysimplegui update to v5 broke the package, it now needs a license key to decrypt the source code"; # added 2024-09-16
   pysmart-smartx = pysmart; # added 2021-10-22
   pySmartDL = pysmartdl; # added 2023-10-11
   pysmi-lextudio = pysmi; # added 2024-07-18
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6e673f7f6a83..5d2ecf9b584f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12109,8 +12109,6 @@ self: super: with self; {
 
   pysim = callPackage ../development/python-modules/pysim { };
 
-  pysimplegui = callPackage ../development/python-modules/pysimplegui { };
-
   pysingleton = callPackage ../development/python-modules/pysingleton { };
 
   pyslim = callPackage ../development/python-modules/pyslim { };

From 0620234cbd19d12448aed5f8ed5eb5f3681fbd86 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 16 Sep 2024 19:19:23 +0200
Subject: [PATCH 235/241] firefox-unwrapped: 130.0 -> 130.0.1

https://www.mozilla.org/en-US/firefox/130.0.1/releasenotes/
---
 pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index dd9005d9fe85..9100af611607 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -5,10 +5,10 @@
 {
   firefox = buildMozillaMach rec {
     pname = "firefox";
-    version = "130.0";
+    version = "130.0.1";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "d0d11b38d9e02fa15298ec13336bb086668b4f36b3ce9ced218a265327fd4822b9fea4303402631947ea3c20490c414de87f8df3e7c23d2e02b70f0456b9af40";
+      sha512 = "163d1ce9f671a4716686955c43ff23d9f200f6c52dfdabcbb93af6a326c24aa5096404f42447b02b5a3ad02e2f60d17271783638fe027d24865aebb3e70e97fe";
     };
 
     extraPatches = [

From cdb8bca08cf6ca145da8ca9ab57d4b8c3f98c059 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 16 Sep 2024 19:20:29 +0200
Subject: [PATCH 236/241] firefox-bin-unwrapped: 130.0 -> 130.0.1

https://www.mozilla.org/en-US/firefox/130.0.1/releasenotes/
---
 .../browsers/firefox-bin/release_sources.nix  | 826 +++++++++---------
 1 file changed, 413 insertions(+), 413 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 91c62ae3c246..6235491b27d1 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,1035 +1,1035 @@
 {
-  version = "130.0";
+  version = "130.0.1";
   sources = [
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ach/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ach/firefox-130.0.1.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "1eaadbd00104e0dc0fb29ef362fdf4a4b440ef5595d9eed7095768505f316701";
+      sha256 = "75c9cb604a7c16040bdbcc71fb63673da367b8d612dcf1e4fc8dfdac7d29dc3e";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/af/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/af/firefox-130.0.1.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "19f139b7ff3ae081fce8daaa191ea1ffc50d881c69430950ab79bba7203a1309";
+      sha256 = "3f77bd5056cce5d0cbc847d8cf4556434a9688fe471ff47a501525d2680bdc6c";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/an/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/an/firefox-130.0.1.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "f4e5d7782928c2e0cc0b00597399420eaba9141cbe4837c692fb0f5bdeeb34d7";
+      sha256 = "2b395ae966577774cd54498ba1196dc853c037f00834bd3339fdeda2af5e4129";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ar/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ar/firefox-130.0.1.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "02e1e491e89f3eadb15f2b1d29220f22ed1249371374766964103efbf888ce6b";
+      sha256 = "44737896fc8b5a25941e6e764232d422d49e37cb89295bd97a3d0bcc32e1c9a8";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ast/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ast/firefox-130.0.1.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "f630bd0e24d7cefa17af48f76744bb3f7953d59fe90fb22249c7d4c10d0b3c6a";
+      sha256 = "90962190b750519aa295ba33f91a0bb8dd7817b371377fa44bf6ff637d3ed9fc";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/az/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/az/firefox-130.0.1.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "78f5339a348fd974953e3968f9954fbff33a1c8fb17910b2937bf1d7c9448264";
+      sha256 = "e3e68f5181de8e129ca955742d8a78ce9abbcc3c7d460205c186ea024a149549";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/be/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/be/firefox-130.0.1.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "954eae8f384cac8a3ed9dab35a3867f6c1421f2c1683517f20abc166aa793d96";
+      sha256 = "8ba8916163f940bab5543305654d27e6811723848e8247be2a521abc592d3982";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/bg/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/bg/firefox-130.0.1.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "e5efbd189dbda6f40b7f1f3e931ac767b418ffc45ded2545f5188ae59610581e";
+      sha256 = "7742fb6ed71e97c110164722d3e9f62b56c74bf4dffa97cba4b418601df54da0";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/bn/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/bn/firefox-130.0.1.tar.bz2";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "ea5cdbac99328ba740b340c1f857084ce05e39bb7e6d6733ccd607df8fb131bf";
+      sha256 = "4dd8d44964e6e214e23e8b113818ec78ebd7b832c7c2929be5c988a63947be67";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/br/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/br/firefox-130.0.1.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "30dbe29c61d7ec15c061f9d373a749258a507eb955a4b9e7f8ffaf0d54819d87";
+      sha256 = "0c388c5e442dab48f04b521506a280c285efc18fd381f053ed9a40c31942070e";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/bs/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/bs/firefox-130.0.1.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "3dcae1a08bdefa21715948a4a09c4f239192bc31e822fc3144e3cdf2f05d102d";
+      sha256 = "1c25d079d81d816207eefd8d4cdd762b266223091cd588745f6bb8116ad17a2c";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ca-valencia/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ca-valencia/firefox-130.0.1.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "fb96ec8f33ab2093eeb3c2ec7995b99b2886fc84c030bec858e59fd6ded4a896";
+      sha256 = "2ff0f9c005efa96c425d3910aa1218cb8ed31109990268b58c9600a9407a21fd";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ca/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ca/firefox-130.0.1.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "769f8b17187f9f0314a08c34fd11ed0b8361d1fe3bbacf4f7a29510b19dc90d1";
+      sha256 = "ffd0077ecc8115ed7330f0eb93d5cf082333efd07fb34f5966556ddd31e590ed";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/cak/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/cak/firefox-130.0.1.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "1264ec6f4ba3d640e4fe7599b9d123711f77d44d8f954d66405dfe81b0144fd8";
+      sha256 = "804010785c24e0020e81f19b8e6a4df838cbb620eadf84e9870406dc4c76551d";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/cs/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/cs/firefox-130.0.1.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "e35491e61c1a7c95593a97420f4551624845cb3126743b56f3258cd316fa747c";
+      sha256 = "a87f19bd1ffae419af329089be50a25e59adaa77c731843ebbab52061b156de0";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/cy/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/cy/firefox-130.0.1.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "3ccbc62875713e1c8b939de0f832fc428517d0ff21dc46172dfc9125b2db8cb4";
+      sha256 = "b0ea0a4959c05249d3afc19ded0e22cbe0753a677efe40f8a7f8fd37ae147e12";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/da/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/da/firefox-130.0.1.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "5557459e2a25b0a773c74eff94bda536fae2c43b7d6db3ca8e8526a640efd547";
+      sha256 = "27e0961bac128e29441961f73bdf53f171946a8ac214e393f71a43ada8ce987b";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/de/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/de/firefox-130.0.1.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "f4b2685a642ec9f279839a9cde7b470b67bc99fae604a304f285dbb06df9625b";
+      sha256 = "64f0d066b0d1bdab956679554ed351b344d2b9d0a01c2a1b4daaa19fb9d20ea5";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/dsb/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/dsb/firefox-130.0.1.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "b0b53cc85d879ac47951437a23fe6d8990c50c9b92c71579cf6a09fc1ca4ebc8";
+      sha256 = "caca4af3f10920c7a5240ad5f1293bfb71af2a25be1a8c5ea26c1670984b2a7b";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/el/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/el/firefox-130.0.1.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "d2376da49ea868149cc2dea4876fdd17f6147935bc19f73a9c11d12ffab0d1ae";
+      sha256 = "bf6f55b5fce66819c9f9ae1cbc80e141b3e4b666bfd7ca079730406707d79fae";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/en-CA/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/en-CA/firefox-130.0.1.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "59bcfc8395db122304a81dd1fe00e4b93b4aa0f1c32c86933d9abd453043371f";
+      sha256 = "b679f0240b3d1535f9373f39b16b36e923e617291401eb07e2ac10581a7646fd";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/en-GB/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/en-GB/firefox-130.0.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "c253b01c60c74fa6f4ca29124c0919b5223990fc222fd338e8fb334282645706";
+      sha256 = "bcbc013dfee5b526e1973557e29e9a44ed5a4f435667394567f4aa46c3c167d4";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/en-US/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/en-US/firefox-130.0.1.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "d5246cea96094146cb4403df7797df3000e94d9c9b7e6101700283a347d03ef9";
+      sha256 = "3b9cd7fe7d22f0960ee5a058e3c9e6b507814958ec5a9ac691cbd5ebd0895c93";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/eo/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/eo/firefox-130.0.1.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "8013bc9d346b83fa76222d65346e6cabac25678ce50ffa35e7180f91d89c46e8";
+      sha256 = "9749369a1c623aa644c498d8668f47a793c6fa226eacd360a5e270d870615173";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/es-AR/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/es-AR/firefox-130.0.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "25a7f8dc43b5823a70dc8a918952af9b098d5c87ad6c3371eb35bbe3bc0fb984";
+      sha256 = "7a6ed7afacc50a7d10ae5befb559c849ab68aa194be5e0acd003c6c5cd9f59a0";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/es-CL/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/es-CL/firefox-130.0.1.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "337f250823e59a4687fb87bc0de5b4f899920d70c110ae898682c1d60b5cac77";
+      sha256 = "b8fa5d24f8ad928c704cf720b75d538da63212e9579de1e84474133e3548ef59";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/es-ES/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/es-ES/firefox-130.0.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "b024a13dfc82f9e633b3fe752f5ae30f05e91f1dc6714eafcf949d5603a02924";
+      sha256 = "0d2d0bac9b3f191579d31d6c69eaa384f11b8a0c3feed2cb6f811d00f0addf9c";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/es-MX/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/es-MX/firefox-130.0.1.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "1a04281437677e14e29c08ac06310c3809f76ddb81405c0693eeb1133381986c";
+      sha256 = "a4858421fb5efcf5fc6b03fdd9c265eb3575f48ae31565c186af92329da294f7";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/et/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/et/firefox-130.0.1.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "709b520fc8829f4a9c79e3387de809bd466db679250a29c6cb282ce03bef23e0";
+      sha256 = "afb3cf51ebc592be17f3a57db277014092338ea39a8944ec8d6a9d6ebe6c8919";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/eu/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/eu/firefox-130.0.1.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "75fa339c21da917e158b26a2a0806e24a4e784fa82f19d24af360ae85c8158fa";
+      sha256 = "45666a4bb058b5284276dd3953607c4174530191c2ae38d7edf84ceec230faa2";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/fa/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/fa/firefox-130.0.1.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "91c835b7cc9ad2b4537d0bd01bf93e5f4f23682b111a45ff288a04ff5e8ad8c5";
+      sha256 = "000c3fa4dcd7194a89f32759b3a60d7314170a535a52d1dff96f5a0d44e53b0e";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ff/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ff/firefox-130.0.1.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "dce24848569ec9d393284f1a464b4c003bc391e03d31b88b9896c179fe40e5f1";
+      sha256 = "179aeca43505fc09c06e99bec7fd0624da318d989531188b85498d04e395e7d8";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/fi/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/fi/firefox-130.0.1.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "828c5b47dc57a963c4a40161f1db6eaa15905a569bdf58d3ec46df011f35a5be";
+      sha256 = "d0eacceac59cb50d198ac6029fd35a77ea6933f11580bb2a343f18f5c101c530";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/fr/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/fr/firefox-130.0.1.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "f1970d473dbc781636ddd10d92ae44a9d13767eb7a1f6dbd51ab14075cc0bf81";
+      sha256 = "cfcccda257189411ee2b462cac3ce6cf88a29e93a17284400e07c7aa6ec60985";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/fur/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/fur/firefox-130.0.1.tar.bz2";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "a92064ba019f38f490e524778902a8a3432f81cb3ae9e1225f3cddb6bc0fcbe3";
+      sha256 = "435e5cb2f76c172742bd7c303f6adefeccdc0f776c385b3f10da90e131a29199";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/fy-NL/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/fy-NL/firefox-130.0.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "e2ce677721495b35b534f6cdd451ebc38f5c30c1275332a7b205d4554ceeb9d8";
+      sha256 = "f9b474e950efe6e1d46dcf7c29a254de5bf63d46f6977b7d5c66346f43b05de6";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ga-IE/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ga-IE/firefox-130.0.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "7d6374a1a42cb3a9a0e95f6bcd492c4fbe226d0025ea69d9abda63e8f95b53b3";
+      sha256 = "6d4aebf9eb334c1c02c3bba36d7b42bd388faaf605bfac5b59a26dc20892bca0";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/gd/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/gd/firefox-130.0.1.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "c7fde87c85e8c1709e29b5d8ddb06afe5398c4297c9cbf5c9fbaab8e038f72f0";
+      sha256 = "f140ea4f4ffb6d5942680fd3aae2d97be1d581510a8e0093792df9cdc4afe69d";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/gl/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/gl/firefox-130.0.1.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "cb022e389b67e2999424314a557d5d726032062979539a69bd35b1df9cd02d17";
+      sha256 = "ac3d20c642f1822b3ee4ecc42cd23a5c148f698c3bbde19d3d857fdcd8186818";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/gn/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/gn/firefox-130.0.1.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "c827b324b327c948ea169802809a9b09f4b3ee8fc9d0b7afeaf75565a8171361";
+      sha256 = "dbda1334a1d44c5a3e46dc5f7244ac27e4429ad0ee796a21bd3bfb30bb2e032c";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/gu-IN/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/gu-IN/firefox-130.0.1.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "45d3031bb4cf32834365a753e396671363981b1ddfb7135f1b996b551c435386";
+      sha256 = "e0590e806095192472c98dcaa70d460faff53ca715c8cc6f163ecd193870ebf1";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/he/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/he/firefox-130.0.1.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "fe5592a0e45a25446f6c5b9a151ccdc84de6c2dec7d743817fb205ea803d52d7";
+      sha256 = "04e5b40a4835655eaf03a3651a404fcd443300a9b9e7bb3f212c517216feef00";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/hi-IN/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/hi-IN/firefox-130.0.1.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "444b72f75c56ac24b86ce28312d1674ee471085537801728651bb9c29ba3536f";
+      sha256 = "5e171f6eb5cff927c28eac34e052354bf699761b490301273eb95bacbd579c8b";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/hr/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/hr/firefox-130.0.1.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "c3485fa6c9cd847fa530fe9e0c219216636c5f3979a334e1217a35dfd6169af6";
+      sha256 = "96c0e9e1c6d036a5ca25a2039b68d075b6fe139c97990785032cf60bedf28a97";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/hsb/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/hsb/firefox-130.0.1.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "797c00b1023d4f0d906c657c8200f3f15435b163bfadaad60f20e699612938a3";
+      sha256 = "b777a174d14e7f99d428da8811f544a3b1fccd75dac6b8519df07a71676bd0af";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/hu/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/hu/firefox-130.0.1.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "11a769e4794cca545faa04f8dcc82dbb5104412609ef0dc3405b85494abf0e5a";
+      sha256 = "00e00b71173992f0afd83c0b13ef68733e3c6c42b6e6113248720977aa75526d";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/hy-AM/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/hy-AM/firefox-130.0.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "c37f44cea3e6e12d8ba6c10f1b5dc705fcd8064583501a63ef82d1d6b5d4e97d";
+      sha256 = "dd2dce3c16401652308f1b3c3ff6020daf60b07e54fcfd959fef33d8ecb07999";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ia/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ia/firefox-130.0.1.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "efa1db0bee0a27a11da384f7cb7c678772f4f141042f3f46f7d16274cb7dde1e";
+      sha256 = "32731f851776ea6b8d3bfc1798717d4d87c86c64e5729badf23457a426043a60";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/id/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/id/firefox-130.0.1.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "754e86f1060beaab3c08e4c7a1e6e83e3740af8ef7bfa21d5b22cf1a6c03b5d3";
+      sha256 = "a2d99f609828dcff17b7cfb5f5886a88450d915d929c5e1df3d93284cbc9e03b";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/is/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/is/firefox-130.0.1.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "af32a3b1b907b03924534c380321ae74d77d2b01b68ee19b4d3d50047131fa3a";
+      sha256 = "abe7065ef5b0062d208c872cc54b148051a2af3ebc9ec30705dde66c93e128c0";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/it/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/it/firefox-130.0.1.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "8ec7df398ee4b098d95de5926d0f143146eaae890851301012538a06fd69609d";
+      sha256 = "d366547cd018afa7a2ad6cbaea2ba9fed3b4b0dbdc40abef86eb532b81137b57";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ja/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ja/firefox-130.0.1.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "b1947d19aa63873f1686b3b8d00311b75341aa08dbcf779f64219276d8ea1045";
+      sha256 = "0f6e5212a2d18698c2c141d551406e1b9755931b0d39b5e787e2a72fd5a1efee";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ka/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ka/firefox-130.0.1.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "2c3228230ff17d8250cc1599c67c90cdc0849c3df0f4388ded4686fb469439a4";
+      sha256 = "c12c8f9c43959b58208163ee2c7453bcccf1e1d78e49c070e42614758a37e2ef";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/kab/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/kab/firefox-130.0.1.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "08b9d800e8382736a59b1565b32c6d03c8a2a4ade7e51e7869a1722e25f3feb7";
+      sha256 = "e3f04b0e3a49b4cdc0a275ac76c08b01fa5087d8b772690ff2a0821137ab7a89";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/kk/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/kk/firefox-130.0.1.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "196f08f8ae82f809dbed03fa43ca138515ee8860c30f73b35f0b35fa4f969d2b";
+      sha256 = "2a9834d53c95041308952386081e5667890471d011dba248167f5d458082e835";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/km/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/km/firefox-130.0.1.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "7cd4072c8c592ad4b024c937c01d20d05ec1fde4f063d14a2879f34cfb518317";
+      sha256 = "36a9eec88a475e4979a61e6a2c6ee735429f8ac7142e96f14afa11cd6a930b86";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/kn/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/kn/firefox-130.0.1.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "1c6e433ad246d06199ef3fd8074a55bad8de0520dad3c2d147ae8580c0fb8a03";
+      sha256 = "cbe7d2a9391c7f57c632fb554ce2fb00ec18540819bb9993a8d9d539cdbca1fb";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ko/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ko/firefox-130.0.1.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "ce613895915a2a219eed9672ae70364559e7061e5dfd01edab97bf3abf00e460";
+      sha256 = "d05bde8b6620102c8ce2e5a7054ffacc6058385eb003e782a1fcf95faceb51f1";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/lij/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/lij/firefox-130.0.1.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "03580f8dfffacf9d1147791c810154295b6ccff44562acc0d2744ff1f1acce9a";
+      sha256 = "24120aef5d15de287ffaac116acc48b855677ce640890808bbd06fcbb52c1e3b";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/lt/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/lt/firefox-130.0.1.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "e1bc52dbef22e87b5d1323bffd19b04cdd235045bdae795a3d0f479776581f3f";
+      sha256 = "c31eca623d0f66419f941dc59065a5e7499d713083d63f710a3b8fc801400499";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/lv/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/lv/firefox-130.0.1.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "ffeec1f7e7e56d05c118c9abd7687c4c166e26d2f118788f5cd722c3448265cc";
+      sha256 = "f3127019c3b2d0623bece4a113d6347ba7a9bbb4d9b26750bc5c24aadd01283a";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/mk/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/mk/firefox-130.0.1.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "d8c6556e1b814cf8a5eba61b27d4ee574a2185f346738eebcc30ebeac7e9945e";
+      sha256 = "7d43691141595c2bda66331e22c2c4f90d9efb4f399f1a157a94e7f81926631e";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/mr/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/mr/firefox-130.0.1.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "9ab01195f8a18cff688c2dc033959541cb27250b250942590497d7ccad22a648";
+      sha256 = "05b7ef7b28856b95af02aef3062ab7cfd553aec7cccb01ad837552d14b8b64be";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ms/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ms/firefox-130.0.1.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "aea52d56866b6e1aa08685ae333999169f2d94d05c967c92bd57be357dd45175";
+      sha256 = "2ac03b66b00c2573a63895e8e67273c8cf9e13fbbe3d60942c9bffeee701daa0";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/my/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/my/firefox-130.0.1.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "42215d3cf8fa2a11f6b85146d27ff41be137a6872c79933cf32175c2269d7b04";
+      sha256 = "c32daaf07a5d65609fc8a74e924a87f927c633f4ff0997d36e7bda7cba7e03b9";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/nb-NO/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/nb-NO/firefox-130.0.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "2e4e702d5a543815d23b1ca6d713eb22589783cc155f284a2169d4cc9d9d3efb";
+      sha256 = "c4ca2aabe1f728f6c71f75419c4a515d7f39d4d00b79248d72c1694d07d207d1";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ne-NP/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ne-NP/firefox-130.0.1.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "c354a4020a5651807661a3ea99edd43e3a3f3be8c33390cbe15877e00168193c";
+      sha256 = "d67387b667d8af34fe4d0115cbb0823fa55d4cbc645c5325f8046e230fcbb420";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/nl/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/nl/firefox-130.0.1.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "9c7c360f73a67d1e5560ed1963a2cd49d8c15999d171bf66ce80e5f3d9c53313";
+      sha256 = "fbd04495157778a63e3b42b0f6f57aee59d6f3abd054df4d941fa571da9df60d";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/nn-NO/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/nn-NO/firefox-130.0.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "955f79942b635cc747a38409202e6d6bc9c2ab04aebfad8eff845ef5f0b301fd";
+      sha256 = "6b44d501081b5cf3f97aebc9ef443cb044174bef031a57b6d528068839cc6f8b";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/oc/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/oc/firefox-130.0.1.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "33ca7d5fb0aa43d866db02b32bf6b1eb3b90a3c6855b09986446e0765ce50b38";
+      sha256 = "598fb38e1223e38955f073df14cdd6843cd37f5f48dff9fbae0b7b31f1c2b328";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/pa-IN/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/pa-IN/firefox-130.0.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "d8350ebf24d6c232a9e67704a00ef358e5aa064a84debd60c89920ce7ef34ba8";
+      sha256 = "251801dd9e71f4b4eb4e55495f56b93fca899ba86b7547c3fd3d7bde5403fb87";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/pl/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/pl/firefox-130.0.1.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "ff192e3bf92c16a0fe56757a002480650474e5d9423e503e6a473f64328e352c";
+      sha256 = "4fb4aeea80cb89c113ed3bae7b0cece31013301e86eb17f7c573da492e488b4c";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/pt-BR/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/pt-BR/firefox-130.0.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "2256b85a6ef45bd82d1d05fa5c2fc2c3999bf2e40279e977d956cc1d8021304b";
+      sha256 = "85a71a60dd43a7d25235cca7284244b81c72693337b0e25ea6c3f99aaa5be9bb";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/pt-PT/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/pt-PT/firefox-130.0.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "eedd9081281d08a7ae5f12f3e93a1307fb4a188067e302fd06c05cdd0ff90ec3";
+      sha256 = "3d9c0dff410ff114827911cf6503f2a799538cbcff8a63d5a62300272f3e1f7e";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/rm/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/rm/firefox-130.0.1.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "9693b74ef657761a3e1dc59c68ff8a2ffbe84799ac595f69a58d29f218b1ce76";
+      sha256 = "fa4cab855af47b990036e4935e41174c240063d100e71fb4d55e3fce5f5fedc8";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ro/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ro/firefox-130.0.1.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "9c43a8168623e76a1c8d203a8a86e363bbb87e62c06e47785aead012739c193d";
+      sha256 = "cfd094d5ef3395efdcbb2ce5df933a2c8770513513b75584f3a7fa23cccbc982";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ru/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ru/firefox-130.0.1.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "3e45511d18f6aa7b5d6e439f5135cb7d6e021d1e76bccb52090698292049da14";
+      sha256 = "04b5f688bc1025c28a9b8094a12b1238b2170ce643b841b8d6fad149f3264eea";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/sat/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/sat/firefox-130.0.1.tar.bz2";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "200a26993fb9d1c15ee6adc8a92e9d2aaded09f184fdd30ecf737e87e32d52f4";
+      sha256 = "24f3ae4b197f1161772801a786696427bdbe34967fd5b4ebdb122468427559c6";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/sc/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/sc/firefox-130.0.1.tar.bz2";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "7025d2c0223dc81963848220de63b9cc0abe21e763e621a74583371b8b9bca25";
+      sha256 = "c36770c3992251cb6f3f1aacfafffc2b33c9110a46c6690d7748798058b5db61";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/sco/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/sco/firefox-130.0.1.tar.bz2";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "2d7543d911025578df15d722bdc819b6d8dbcde6bb21c064ed275f4747399749";
+      sha256 = "3c632caf75be574fe67a5e8ae828fc2e83a5989ed6ed5c6a5e0437e204aee229";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/si/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/si/firefox-130.0.1.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "81f88fa3fb430a9f4931eef8e7205859b345898f5fd59ff8ce367b14665efb0e";
+      sha256 = "0c57a8bdb77d98685f1567542f3b3df1ee0d0040d7bfcd69f856d5ca2a262a99";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/sk/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/sk/firefox-130.0.1.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "3cf17666eb44a5669845b39e18e6174605443eb0ab81de54e27500549295b6fe";
+      sha256 = "8d8e738a0a0e292509212360ded5f5e58873adafaecebe61869fc2b570b6ee89";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/skr/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/skr/firefox-130.0.1.tar.bz2";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "441ffac8d9adcc5e424cf22f7ce7d85c76f2003d438284efe024a8840aa43076";
+      sha256 = "7fbc8f9f0ffa69e16ea5857ed3cac09d979c3963907aa4d58cdf50be5392b81e";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/sl/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/sl/firefox-130.0.1.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "db45907f84504965341e8dec90f903263c658f28716f898a5fa746ecb2ef4513";
+      sha256 = "a977c311dc01a7339f51e649d8823bfafed2589b4c4a835189af08840f1b1f38";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/son/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/son/firefox-130.0.1.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "1fabfdd5f406eabf6a3d3e172669e3b41e9a6d6f0f45b13d6debbd71522a0a53";
+      sha256 = "9fcdf9c25eef650a45932855fe5bab78c83635a9aa01528ca06621eed009f641";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/sq/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/sq/firefox-130.0.1.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "bf4d1c32abb4840aba03658b6aef50b06f101acbc3cdc64cf14675eba17bf29e";
+      sha256 = "dc7a2150976e54cb8bb6cc24af79225a0aaebb21b72f3e683a7004a22732c9c5";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/sr/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/sr/firefox-130.0.1.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "ae5f3ea4be0fd90b1517d45cbae394fd107907b8c515377e7029d4f75dfb8ec4";
+      sha256 = "613bb61f90b1f1258552c447c333df8fa91c603c24b7e60267c12d29c7963327";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/sv-SE/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/sv-SE/firefox-130.0.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "3ef1dd5dfc693cc35caa161297e853ce3d15665792a867de3e0dc6d9f86a9a36";
+      sha256 = "a37d2052d88d424b3fe895d8996fa916bf551716fdb4fef679ab83f204f0df01";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/szl/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/szl/firefox-130.0.1.tar.bz2";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "cc62e4ab33b0b13d214af635df06c319fa9113e9957a04cb3f4578210e751ebc";
+      sha256 = "f0c4e6a877466a1278a441981778a2f6ff9d04d15a3509f995cb528da0e8a526";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ta/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ta/firefox-130.0.1.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "5eb712fc1b8ed584bf651b26a3cda7742ba6de01c0db81a38459b88548315d8b";
+      sha256 = "f599910e2501517e5471a84afa69f19f13583fbda93136039dc4713d9c0ba6c5";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/te/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/te/firefox-130.0.1.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "35c57b8cc5b1d1f06c0f1220acd5c79fb1c140f985d060bc79eb20e9bb9decc3";
+      sha256 = "79fe15dbbc627a7a66e810b97c8c1002ae8382f35e0529ceea035d644b6544d8";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/tg/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/tg/firefox-130.0.1.tar.bz2";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "de8348b0caebdfbe4d5d6772a46674bbda1155b110abd5eb27dcc34534db2f62";
+      sha256 = "df7dece31f772e1c99cdc2022155411842c4ef2fa05fd4c23a1dbc5688308808";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/th/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/th/firefox-130.0.1.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "d3b0846c61711b38ee969c93a7d9dd23754bd4763166c931242d2924014cce6a";
+      sha256 = "1920b228e39de818f4d252bbc07c62d85b6064126cc299c0996e6ccf5f14ada5";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/tl/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/tl/firefox-130.0.1.tar.bz2";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "4101f1fc5140f0f4a9bc583092045dcd7fd6651ca39e6410cc79b605d288fbf4";
+      sha256 = "6c6f598d524db8ab22da11b40782da29283b4a998d4877e4ea6420d720e2f1b7";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/tr/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/tr/firefox-130.0.1.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "8c39bf726f0428926d045133a3488826ddf868a785808ca42539924d917a4fdf";
+      sha256 = "f72dff83c65d08d965b6077d8fa2dba1a3316449fd87d1191073ac2ae717ad07";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/trs/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/trs/firefox-130.0.1.tar.bz2";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "f353730fe72dca60611261e41f406d28c5824d517a454a15b597c9298a11d99b";
+      sha256 = "d64868b3747be0e0d53f723e624883626254494789555a86217c3d7c00f12ee4";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/uk/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/uk/firefox-130.0.1.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "c692aa9686651288e27bf004406ff5dca87d0043f0cfd2a67bb4e8290505eeb4";
+      sha256 = "d234b14db7e149686f610db14ae6888613e6a894162f4e3d5d42f52f42615dcd";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/ur/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ur/firefox-130.0.1.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "763e8033b610d9d3ea2c450bc3595a31c444c3cbb4cddc96c14806825ad443df";
+      sha256 = "89d4b0dd62729f9a94a9758cbd9f22ae97b920533f52885921436cee6a992897";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/uz/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/uz/firefox-130.0.1.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "97bec7204d5b3f3449a400f0a351b542dc5330a27f0a3bf69d622242a22e2f81";
+      sha256 = "b70ce2ac4756354b6791f1199a1b7f0a23a3d765b7a835a7e2e22aa16c4b93f3";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/vi/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/vi/firefox-130.0.1.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "710a5730f2c7590ce56554f60303f7e1d396bc9cccd84aad48cbf7edba9f2dde";
+      sha256 = "546c912810a2d265a82160bc909be1f2d4e66a48614bffecfb8fcf1200957bf6";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/xh/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/xh/firefox-130.0.1.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "30d59622a5b03b68b74ee4316deebd9602fa8d2ceba167e7bac37babbba2d388";
+      sha256 = "0f4bbdbe66ac44de030c8c54620b2a920208f98d348cbd5540514b57ba0e61ee";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/zh-CN/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/zh-CN/firefox-130.0.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "95da22babf875ece55037e2ff83630598269302b7aeec8a18762bc928002e466";
+      sha256 = "f2f84928414b7a0a86fcf6f90e4a45a04c33861a193e851e22a1344d5410080c";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-x86_64/zh-TW/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/zh-TW/firefox-130.0.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "a39b9208dbdb105c694db0b00ee2cb44437a5212e0d1ec5b94f437df7cc1672f";
+      sha256 = "59e51bb6f0aadf1f4dff88fc074b3440a62504f6cd205e5a1961e8a99860e6f0";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ach/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ach/firefox-130.0.1.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "564dca722ab444a1912d0802e99d3977a361e26031b94401671028545e3ef675";
+      sha256 = "d0a8df5690b0e4c843ad159df9ac9173f1a761b990828da320da6fd4fe7d98b0";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/af/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/af/firefox-130.0.1.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "4ed4e6cf74a6e7d6f76f51e05c99bef42c9d80084cf6100e6c4554e843ad857d";
+      sha256 = "d16956047b544b99bfc4c33448d033ab5a9a4dc5a2845c16d07d6a12a07c1c22";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/an/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/an/firefox-130.0.1.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "0a46890f861a52441b105984510bb7cc7e37cdbb5c78a2708ef126c42daf24ac";
+      sha256 = "a1ba502fb3ee547a91f04c60280f5143fccf52c6c0daaf7bf5060a1de8f39d0e";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ar/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ar/firefox-130.0.1.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "d35972a50d304d0558ca8724a126fee8a8048abd139a3777f8cf3686c8308ba6";
+      sha256 = "6b4739f1108e8e5c6821099d17186929d6d624a96cf9fbaea60c83b381b59c88";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ast/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ast/firefox-130.0.1.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "06226e65d68dd71bb91047e6dafa627a6cca235bf3a225cef95dbf4934ed5742";
+      sha256 = "658df66afaa2e371ca734328ba3b16c3722a1c1abc62e808f125b1c070685c4d";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/az/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/az/firefox-130.0.1.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "667980fabd748a2a8c8eea4ffca9a596dc0d70e927cba87ef86f3311682f9549";
+      sha256 = "34476903ca20fddb6cba0236080d0117acbefd89580ee280aade1c71202c06ff";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/be/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/be/firefox-130.0.1.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "3a7019dfd0f3d5aac5c7b29b986a026c84b49c71338706f1b6524746642906c4";
+      sha256 = "18484534c64e0b7953735bf94258a309a8714241f02bf81552a3fbeaa1f0c04d";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/bg/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/bg/firefox-130.0.1.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "6f4a692a713111367d056d3523cc09dac82b5a52e4268c5a5cd549d725d59deb";
+      sha256 = "2780a582e59eb23f30adf7243398b33210a114fbc7a6c2ceb26b751b2c041dfd";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/bn/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/bn/firefox-130.0.1.tar.bz2";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "dac3c0184a40e4aa7222c0f4aae32bd38aed805e4f8ffeeb19d76b65d4df37f6";
+      sha256 = "fcccc86a611a46cc35082a9ca175c64bb49f605a37793605b1bb9e1db7174ea5";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/br/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/br/firefox-130.0.1.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "b9a92320b7f0b17a33b5f76ccb39133ce6a3e822365381e8384df0d407223ffd";
+      sha256 = "a466fda7d6fe2939a3785e347e29015ea9d93851b12d3e8f11f8fbd73f569389";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/bs/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/bs/firefox-130.0.1.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "ab790f5f48a9e12bd3a99e03687949c37d558f6808b8d1042878e59ab50f5b92";
+      sha256 = "c4a78377106dfa4be35d603faa9ef9665449b78ee5673b278ee2f067ff857f09";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ca-valencia/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ca-valencia/firefox-130.0.1.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "818f53e4d6790d4d3e61d7e9cd8d4e803096f7b89c138f41f240ca29f32f905f";
+      sha256 = "613283eb3058ebc2b696a9979c1332e7f569155a7a4e4b74e7a6e238d13868bb";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ca/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ca/firefox-130.0.1.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "53ce0a5ce7a99d2e485790bf9e406f1b3b17c40a8bc4318609f410492714ab54";
+      sha256 = "9c6cde222489f6f181d7f9f326d7b86ec3e19519f1a6639e6dd89455658f459d";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/cak/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/cak/firefox-130.0.1.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "47ec72fb4474ec5bdcad20f12b5680a5c06bf799feed95b237df16ff2c10ad9b";
+      sha256 = "d096305980893967e5172856e440667f39fbe18aa9be83973303291029a643ae";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/cs/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/cs/firefox-130.0.1.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "b690391cecf1de3c0f0af9501cae050dbfef4ff732e33feaf0f7d6435db6a379";
+      sha256 = "317bd4a0d62fb46c0c59de2a5d985ac873d35442084197b68cc75043f3049747";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/cy/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/cy/firefox-130.0.1.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "186056bad0eebace8769c41f1fcf9224ce2634da55a184611fdadff8ba8d8dad";
+      sha256 = "4c17d63a133bd58b8874af1cc9c06157d0cc4e02594e308ea9f7f3962fe8f6b9";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/da/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/da/firefox-130.0.1.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "f5de611dc10ffea99475be24ce3240186a671314d109ee982a04418710b34b94";
+      sha256 = "753d8c50cb670826b7c611c6c3f085e241720951e0e53d2d565bb77051c932e6";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/de/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/de/firefox-130.0.1.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "7a1e861d3fb6b03be8e91ce55c1c92fecda5a017e67694ebea56eaebb2ccade8";
+      sha256 = "c1fb1c44db4c82e4e91d94201d99adf75a5c72adf5944edcb4ed53d48e5e1709";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/dsb/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/dsb/firefox-130.0.1.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "c83e91309b4f7813129b39472f22ff2ee8bc391ca6c33141374a6249cc27b63b";
+      sha256 = "9276344352c7b354c946f59bea7bb004c12064a6c7bc777e206191e8afa668b9";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/el/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/el/firefox-130.0.1.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "ef3b34b1ad730ef590437f2adad07048bd8dd5769bcfd55f45974ab12bd62d5d";
+      sha256 = "d5c23287bfcee8547e1d6a49925abe6e3d9caa426fa8cc9f3881a5499d6f4b11";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/en-CA/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/en-CA/firefox-130.0.1.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "583013c0f1b82f2929e1a51df5763b07a358e9af776584114fdb2025fbc198af";
+      sha256 = "f29c1d554cf0278efd95036d9d5d01db8cc2483c510a31183684763943409783";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/en-GB/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/en-GB/firefox-130.0.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "fac27a8e2ae3b65eb8a054c68271c037926baa519ec4381322abe33afa9d084f";
+      sha256 = "937fa4b265929bda1b61f672fea89cecdf1c8494cac298a9ba3eabda51ba4a4d";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/en-US/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/en-US/firefox-130.0.1.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "fca72dcd3748bea7bbeff81d9241c7d566159c91e36b1789c6b465670a1151ed";
+      sha256 = "f02e06f9b63d0f29d8384af8ed43b453bd14e5babc8399b50e399163da219a54";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/eo/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/eo/firefox-130.0.1.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "3ea81875cb5fd9b92968d4b834d1ce35fcc388c8d7a4b91c11eb3640d7d75104";
+      sha256 = "fb59ef2d60d057d606a2fef5f7c15cf610da24e87e2ef6d23f52c14a60665f86";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/es-AR/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/es-AR/firefox-130.0.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "ce4437bbcac1945dbd43a6300d7ea1730e5f87c2419946a6685501e83c2e4d3d";
+      sha256 = "0ab1733c1e4ee830aebde7d542cfbe6dccb4992dc9c5665841561dacd6b28633";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/es-CL/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/es-CL/firefox-130.0.1.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "3e9ea0c9adf6f7c61a7bc9b8fa322b79c20ff5991a05c78ad764f59f58a847bc";
+      sha256 = "e621fed31cb3d6c1a1daff65213f31c9f8fb7a3c085ea571fc487479bc109359";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/es-ES/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/es-ES/firefox-130.0.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "4723e88bafbf57a84fb5c1564b27f81ea9a9f8583c869fd8152e4e2cbcd0e5f2";
+      sha256 = "54eaebdfd4361af096fd511d675bacb5b7951143eaf976f5ad2370e44beb3aad";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/es-MX/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/es-MX/firefox-130.0.1.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "0dff182954017cbace9e81c73d14bb2c81e6758eef0fd365e04844e41b45719d";
+      sha256 = "9e1c1e16c7a306113b72e69999ece716ef39118c2bba71378588c5e6f3d17236";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/et/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/et/firefox-130.0.1.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "0c42654132ee50231ec9256d1f0c2d705db926a906fb2d49c7397e95971c6ff5";
+      sha256 = "10122fd5709a6dc5a74a54fb504bf9c7c4631dee7bca26bfdb42785215229e2f";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/eu/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/eu/firefox-130.0.1.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "b3384af9cab100057bab61db944e99e26ae56e60bb27421fdc02c27be79b0f84";
+      sha256 = "4c32abf0b98d1bf2622332f915312e5f717532dec84d90dbe65b8c41cf355f5f";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/fa/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/fa/firefox-130.0.1.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "aba8b14652908f9a3b77d59faf8f9b4300667ce60a6ee65aae4df54d4cede51a";
+      sha256 = "dd422ecbbf116e5ff12ab72f038c46e74810d678e14c7367bb87e6625f822e8b";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ff/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ff/firefox-130.0.1.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "2c67474f17bf153aa80e437a503d67cc20a9d729f1468d60f806d321253ff094";
+      sha256 = "0ba37f34d5d5ba78a12463cc909e468d7405a437e0f660d8b0cdf39eb09355c1";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/fi/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/fi/firefox-130.0.1.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "38cc478163ce4a6b3e70802abfdcc8b59d0ed302f379124165bda7f9c9ef33b6";
+      sha256 = "cbce7c32c7fa6780a85c6217ad245b018cb01ea5ece9c3e484ce5f23be510d6d";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/fr/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/fr/firefox-130.0.1.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "b96e59897243686c683be02f9b9b68c241ad00903e977e0a92d2767a7657b16a";
+      sha256 = "59a2bc82ea064c806cf44dccd5d7fb90d0b8f8b3a2b7f407844d26d9caf5a53e";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/fur/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/fur/firefox-130.0.1.tar.bz2";
       locale = "fur";
       arch = "linux-i686";
-      sha256 = "98c4483deb4f8a120c0e74934608a1994163f0413966aaacb526fb20959275f0";
+      sha256 = "4170ab542895a23b71e3f9d064b1d0c42be5fbb34f3992b3fc17959e18a9bdda";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/fy-NL/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/fy-NL/firefox-130.0.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "498a1ccaeacd1185e0ac27807b4e65b91c8ab8402a160715a7b129c703f28a6a";
+      sha256 = "2b204aa10331e0dc09e54fe8e07f0f34e22be5ab872402c3378fe375b23d2541";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ga-IE/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ga-IE/firefox-130.0.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "0b14825d1612540585269e0bb74d2d74005d0aad8d9c0aaa81d73be14ff6c5f9";
+      sha256 = "cc0b327505c2c9902042529a53fceb6a844c172591d59e7067dba73e7196b279";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/gd/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/gd/firefox-130.0.1.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "7bf897289348b72b72bd8ec72e95b7ec9a61017be93ce054a5cddce30769d694";
+      sha256 = "57cfa8fb7db17fce664fa688f51698d2f869749e412e869452792c0337802bec";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/gl/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/gl/firefox-130.0.1.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "c3e7bd95ddf3d6d9f36f5d7c59b8201cb8bba785d7f6f19118170b6c6edb2148";
+      sha256 = "f4e27857ced29eef3a42296a06b4cf51423b3f78458c895db49a4a2c0a201729";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/gn/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/gn/firefox-130.0.1.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "47b1785b67b979a128a833a3625873fcf3ed1da01e3f01f2191ad28ff3a898a5";
+      sha256 = "53460973370eb1c9647cc86f5fa732193764fbddc856d7d8a78efb31868c6fa7";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/gu-IN/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/gu-IN/firefox-130.0.1.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "da41f06490e1d7724617d5521453d13b65140f1b524f4e19f1c84b0379da2045";
+      sha256 = "ab646956c079a35bca9f035155134171ac2defc609b404696e4d4d1f04a7178a";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/he/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/he/firefox-130.0.1.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "84c0ea6fe86def639cdc57b138771fa4bb017c341c327914109b0d5d7ca6e2a2";
+      sha256 = "363fad0b806829ca52e945b54557b5ee48ee3c859d5afec808ebe4460ad1b0e8";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/hi-IN/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/hi-IN/firefox-130.0.1.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "33721db288705df409ee212c4f087a54e8e5a479b2ef37c52151d0c5f01f61af";
+      sha256 = "4d5a9358833bb5430ffa9125eb29f819dcd80b5db94581dd0f7796aae4805b77";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/hr/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/hr/firefox-130.0.1.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "d8ee55f4c0728aecb2a3b167dd8c568a61eb519a90cce452afb3e62d6a57fac2";
+      sha256 = "0906822d059699694c82f9be210c76ff09747b1232f88a859fd88874249dbb84";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/hsb/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/hsb/firefox-130.0.1.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "71638ba15aae3ad70347681f3ac68138fe5473108b4424f55d8cb2838ba73a61";
+      sha256 = "82668fd4e948974e994c3fb6fa5e0bb262b930618b32f2324e291a4c23e22fce";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/hu/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/hu/firefox-130.0.1.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "c97a8168c05d3af087dff1b1ec0df185cceff9144d3bfc1bcecb5fb0986d5a2d";
+      sha256 = "43ce11b054450884c1ab7d281ba9e9b6a1dfe8f93420738d2bf944a782c57f3b";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/hy-AM/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/hy-AM/firefox-130.0.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "41de887a0a9008ffeb6389235dd3032842ce0776cc3947dcb27c79f85a5c147f";
+      sha256 = "65cbb814126e407e42dd1e58efb720e67736058c48def442874d489d39f7fc43";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ia/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ia/firefox-130.0.1.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "edb6daf20b93abbb40eda9faf86063fccbf4ba01b53f12e54603d287e201fb80";
+      sha256 = "66dd38b0c2aeb2f744b6e0b20f1ef75bfd5d38d9e83e79d4dca0f655c7c7e0d3";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/id/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/id/firefox-130.0.1.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "54cd80f040c75ba290c728e05a542b8a98190ebff5aeaa6943128790b6d7ce9c";
+      sha256 = "e8f0a1ade237e0f628d71b0534b39ed7966b3a9685dc4834707049b05797302d";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/is/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/is/firefox-130.0.1.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "46dcbbe30762ff44d689695e17c6c90736dc27895885086a2bb3665689011385";
+      sha256 = "152cc67e5f05bd52800fff4e7bc1a692ac6d2903b27e8f17cdc2b4baad00e58d";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/it/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/it/firefox-130.0.1.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "144e3c6d75393fac5ccec369c7fe24c401e7feb14ca5df68896c1a7721289a36";
+      sha256 = "66e34edc74c7c0cab26f079a2735ed735adfca5a31c3780bed623e3720de7344";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ja/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ja/firefox-130.0.1.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "ff67a3a6d806593f855abe6447d2fdd567c3ef7ff83fbad3357da686cd51f920";
+      sha256 = "9072a6a1fddf13ec09d4dad63b2ecffa60fc750d797d1c92b750ea10cac8885c";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ka/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ka/firefox-130.0.1.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "cfa3e5cc4abad4a233546f2afb6b99f4454225a25431a2e4b9644d55a9a5b340";
+      sha256 = "321bdd3e9bbc9d9fa3465d218ed6b93de0952e445323cb73b43cf8e4ae6bec7e";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/kab/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/kab/firefox-130.0.1.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "1dd091984cbb1681abf62383843f8800af3fd15ea5155b791b229572d82b654a";
+      sha256 = "9f76066105d69dd0b1fb72183490f17d0c361206119f3d2033f750a55da8bbb4";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/kk/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/kk/firefox-130.0.1.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "a2cceb14b08cf7a795f23fbf55eb599e6fb0509211c81766723411339e2bd286";
+      sha256 = "4b41c2a6c49932135e6f6cbe46a29bf8c6a368fa04ca3228acdbfbff3bfef5b0";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/km/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/km/firefox-130.0.1.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "693e4377953d469622d51d7eacf95296f94984e8212b17d3b83f28e2f7f22367";
+      sha256 = "bd795ce4f569350354321a9a8251808a8a534fafe9cc8b6a4c4de901f09e486e";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/kn/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/kn/firefox-130.0.1.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "b3176d6c4d8543edd458adbf76f0a95a385eb76a9835be26201976608b3447a9";
+      sha256 = "d6cd41901a18057ff0125b62e36a7dd11a239eee77d1ec2c3d6ed0bba07321a7";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ko/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ko/firefox-130.0.1.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "31e7011287cb130b980dcb581535a1d0d815f9d697b7b1c63f52d46d261ed299";
+      sha256 = "09f995301bb315e4edcafd9b0522ff111092782ac623739447bc6e00d7ca643d";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/lij/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/lij/firefox-130.0.1.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "9676d60a0bd7734d1a0e89ba11fc75c25f999e222451363ceef621f7517f55a7";
+      sha256 = "8b8e9e7437de5c92cfb26cd55161d638cfb9fef9928d861fa0ea75153f82ee8a";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/lt/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/lt/firefox-130.0.1.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "06ef7b9669e999b703cdbaba63215f4bf3bafc9bad82a0b4fe8a665c9ce8fa4b";
+      sha256 = "f1b0d85016e639a036a3de7dd6c30983e21748a0dc2f3954b8c1ca7929998834";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/lv/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/lv/firefox-130.0.1.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "6363bab4881200213925eb7ffa68caa2ebd0c92ab38e9192572d38ac36d8b61c";
+      sha256 = "61573d2c0bce3cdbd795be6c069d3776cbf150e69432a7eabb652c3439506bcc";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/mk/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/mk/firefox-130.0.1.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "0365795f546d2fd29d1eb7abff6eb3aeb15af26f5dfb1fc70f3a17e167d8192f";
+      sha256 = "5b4a34356f94e0225f082a86a8c64e47f9be921700c4e46f592f38cbad332fd3";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/mr/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/mr/firefox-130.0.1.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "2e5d7ea002fc5012ec1d0c612a889f51d1309a59d68425c3237b8e982ed4ccd3";
+      sha256 = "2602ab762b3a97941ddde5f9adc0c2bd0ded08e8025af8f44af5798c8dbbc32c";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ms/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ms/firefox-130.0.1.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "8af836013462cfbd9a22208d2e2a20bd0227c0e71d5f1d5c4fc8d644a9b440d2";
+      sha256 = "604e05d8117cb6b431af1f5870d12c45fccd0226688786c2ae4c688968ba5209";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/my/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/my/firefox-130.0.1.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "1f2aaa46d3dc7629349fda147043e2be8e8c10b9db30dc7e03b197d08cf2951e";
+      sha256 = "c71809a0adc7a018f57f535e13352401e0cf4dc1c637d2e04f72ca1bb269b7e9";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/nb-NO/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/nb-NO/firefox-130.0.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "d72d07ad84d99465e535829f4f3ab1922c09f175d4bb9d62643b287b075fb5f5";
+      sha256 = "c53ef7cb2bdfc336c26147a8dc838fc61d7f714065a09b3e7a3a0b5031ae41c8";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ne-NP/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ne-NP/firefox-130.0.1.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "9b0933f3ec0f68d16106ff45f6d72e0f1cca61fc77a41709453b5e612db8324b";
+      sha256 = "a9a10a800753914f669730249a97735a6ab0cb32af4ac17cc1cb9344f4e8b1d3";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/nl/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/nl/firefox-130.0.1.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "da26294a1cf6ac337522d50f198eedb08f532f99d1ef0663112a34634f8adc5c";
+      sha256 = "32d604df57f8c71bca400121755b6c36e4f55363d5003da939b9080adcd36c9a";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/nn-NO/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/nn-NO/firefox-130.0.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "5a520ac86905a109372fd481325aaaa302d31edf4c1d60e85a1ad3ea688c55e7";
+      sha256 = "ea821827c1ef5d96ddbfd4ff9f8fb3f8a10d9517089a3ac67b06301e48182b97";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/oc/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/oc/firefox-130.0.1.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "112641eead29f19547aea043b3e9b96889c8865f22e80e01e3e3aa5faa853cdb";
+      sha256 = "05d40d35aac0120c3c4d18a77e2f5c8c0f17b5c88d064dcc46f505e948081ffe";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/pa-IN/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/pa-IN/firefox-130.0.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "615c4af99bf66c25ea21389a229ff30d491974888843db2f326dd5a6a8d06de8";
+      sha256 = "d10a37d230077dc830f9663b4f7e588752023ab706a0ee1f3fa3393fdda30814";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/pl/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/pl/firefox-130.0.1.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "8998b0c45de20d3e5144f21c334aafe666ca7249d9fd325f9eebf78d3458211b";
+      sha256 = "4d9e4e3f2e3c32fd0e135513c2db3d4802f287b5623415298f1fd1833dec8da9";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/pt-BR/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/pt-BR/firefox-130.0.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "991bb5f11b3a45edfb1cab642e6df8cb2c8c60712f705cc396012374d21ac0be";
+      sha256 = "0660c82a6865ee612773ae3677d824abbef61d39c2e93d1912f8184b88600226";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/pt-PT/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/pt-PT/firefox-130.0.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "a2c4f9745e9186ff27d76a309ca09d0e14d58521bc9dadaa71b3ad3ffea7b558";
+      sha256 = "48a947f2dd0027167d6559eb5fb622c2f41e3392b8fe0d15ec7991d525305c60";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/rm/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/rm/firefox-130.0.1.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "3d1f1b9b57ed0ff3ab9ea16667555ea5a7c76e70494347e469b67f23c2954f2f";
+      sha256 = "129ae6b2290e5660506d635367b9b85757ff82d1dbdd98f238fe62a5211cfea4";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ro/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ro/firefox-130.0.1.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "9f956644d4b064f824affe492128b5c1413fe4adae6d7609201f3f742c967e70";
+      sha256 = "0b63b7e559563fa71e33b0a2bb29658cdf08c143f4e46515835f315322b651fe";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ru/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ru/firefox-130.0.1.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "772ed70cbee734e4cffc6343cbc320958fe12ccb33693b4800d12071ebbd1a07";
+      sha256 = "60084648b5ee8293a265aca9200dc991159cf1eec7519b39233c6637c5faa875";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/sat/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/sat/firefox-130.0.1.tar.bz2";
       locale = "sat";
       arch = "linux-i686";
-      sha256 = "3cc5b5bfa5fa4e71fd80e52a98fbefb3035c3d39fe6e0745f3cb74e9df3cdb36";
+      sha256 = "e0ea6a503a6f38bad80d5892ebbad01c02e60c7f04c6d6987608b97929f9f2ce";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/sc/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/sc/firefox-130.0.1.tar.bz2";
       locale = "sc";
       arch = "linux-i686";
-      sha256 = "0f94124621cbd893760200bf758c840dc42454a57dd9135860c88c5766172a1d";
+      sha256 = "611369cd0a9002955e330c7f32551a635d261f7840d6b4d3e88a41d6ec23dcbc";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/sco/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/sco/firefox-130.0.1.tar.bz2";
       locale = "sco";
       arch = "linux-i686";
-      sha256 = "54ca19417b73778350886438bd273e832683ad24b0ef22df8d94ac9a5ea24d76";
+      sha256 = "4d551a7386cf7d8a6899c763d0da5fa68f1ab1c032931ba4d9a5017bce9fc30b";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/si/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/si/firefox-130.0.1.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "5a0b94c9bfcb4b8a541c5322b3acee38a3499e618fe668f11acde478d2044075";
+      sha256 = "a8a33765d1a290d9eed09810c01cfde66ebc7692968d4706cf57e17ed2cd72a1";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/sk/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/sk/firefox-130.0.1.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "e6d5417bfde626d998d8a6831aace8fa76c00b69eb0b66cc6f95f78850ee08ba";
+      sha256 = "73c7ccd0009fcbcc87e1e79e086627e36311b435deb160b9b40431e36d69bc97";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/skr/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/skr/firefox-130.0.1.tar.bz2";
       locale = "skr";
       arch = "linux-i686";
-      sha256 = "3a3d19dee825d029de573e53bbc91c7d51fb270f664424360d842765dff3096c";
+      sha256 = "3a2e8976f2e5348de81c665be464f157f1aacec041d021c1cc29bada8bb1fe22";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/sl/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/sl/firefox-130.0.1.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "783d8b5718a5801b3a0ce13cb8e33e28a78fea490cb411eed3a9b76811c426eb";
+      sha256 = "acdfe713b01e5af442a5b8658df9063417f653ae21580f9f3bf8f0aacb132fd0";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/son/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/son/firefox-130.0.1.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "aa0aff78c771c312c1a4527e4afa06d1564daf986bfc388e1e95365b78d002cf";
+      sha256 = "519273f28d0dd0fe46d3e36b9d06ce6b219cab04018eb269859f80af3c279eed";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/sq/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/sq/firefox-130.0.1.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "accdf7b0fd7cc42598b212139c3e885d27ace6d697cab9179ac72c43a594d947";
+      sha256 = "6916949ea0ced4e08c063de8d804ab890874916581afc9dd18c901dab5ad7f49";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/sr/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/sr/firefox-130.0.1.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "81ae434277d95d20882a779de3cb4cafa243040be119898ca2eb9b38b3ee745d";
+      sha256 = "4c9fcb4cc4ddf153ec41090dd1280588aa81b5e505309a7f48336dea2cdcabb2";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/sv-SE/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/sv-SE/firefox-130.0.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "bfdb54d89050728dab2536b3a0610645be4065d890f79f1ab658b86543cac8c0";
+      sha256 = "d20452377ecc4b078b491575d3ce7f82f8446796c82578bc27ead17f40f91827";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/szl/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/szl/firefox-130.0.1.tar.bz2";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "f642262defe11b002680ec1aed487aa9d7d958b499f0d3407b51cb206b8bc998";
+      sha256 = "3e8388925bf93e085474234479d38151931ffdd4787222cb9406829d9e1fc8ed";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ta/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ta/firefox-130.0.1.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "158232b1da18f43b336c4ec04be823ee14fdf1275a6fb0e8c1d0e9a5f8e9a943";
+      sha256 = "d98b8576826b389cb0166410414514dc1260bb0b8a65ceb29a820ab5e24834c6";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/te/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/te/firefox-130.0.1.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "aa7ba85b976f722789f2a629e261d0bb9beeffa47b0ba3ce6f67b26a5db2bb90";
+      sha256 = "27749770e7f973370d78a624f7b80c66954370d5bf72d4e2c9396f155e638912";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/tg/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/tg/firefox-130.0.1.tar.bz2";
       locale = "tg";
       arch = "linux-i686";
-      sha256 = "1d42860824c54a3763efcda16c0f03e0b1c7070e673c733c8d24944cd36ad5f8";
+      sha256 = "61a57d7cb6955d17ffe1d15f28c371f0d90721da6fa5876846ef305198e89263";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/th/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/th/firefox-130.0.1.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "e701c4d151ca5ab21290837ab1f66236e3e7c93a781aab7c104f426604c5b58f";
+      sha256 = "b29e95954704765ffc8097b66f83179eaf0356c4f514096d95023784325d35f9";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/tl/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/tl/firefox-130.0.1.tar.bz2";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "939454b0c8fe7f847a2f203aea5183a9505bd003ebf48f856855522f2ad041a0";
+      sha256 = "82134cc55cf7afd00046729ef8d158fe0a5450d4203be1be5c15252af3429c1c";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/tr/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/tr/firefox-130.0.1.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "e9b0c72338ccf19bca84aea32d370b5416b5dc03978a4a8b13922b1ea716b43f";
+      sha256 = "358a4b57160935a8d99e026244a227834229b035e4b31938a7c697fb6350dd25";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/trs/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/trs/firefox-130.0.1.tar.bz2";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "fff8442ac54c2a0883c08ffbf70167b95d8e7efc8806a2704ab770fe992a05f1";
+      sha256 = "76fe09a6f13bbd779682e1ed9bc1e44076b9e23f4f026141f2ef932bda7543a2";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/uk/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/uk/firefox-130.0.1.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "12b8e3273db5c4f3dc974edc7ee456a021ec6ca238e210263d6e3564f1216efd";
+      sha256 = "402abc1e0cc54bbde912875624c93c20c660823b066812f03281a39dc4eb8669";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/ur/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ur/firefox-130.0.1.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "5a0ab48546681a62b7f7718e4cb5b4d00102a08f9437c495d8a02949a03ac382";
+      sha256 = "59ba12c8b1bae5df3ada83d8535ac25f6da52402d21467f97e8b86bef1a7f458";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/uz/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/uz/firefox-130.0.1.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "af66003305aec11524de3036bf32672fffa0790679febf13dc610c4d8a29deb9";
+      sha256 = "a8c3b35933cd0b2db711b9f5ad62e8248a2bda0ba497eabe5ab0dd39b65ba8cb";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/vi/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/vi/firefox-130.0.1.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "0a6ba375b6ef65bfe50ccd9d7cc71500dc8a720d546fef6d140a0a02dde30826";
+      sha256 = "0984d91b1d36b1552f4bab543369071f44f3292092fd006f7a13c82bf5bfc794";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/xh/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/xh/firefox-130.0.1.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "a4f7ab329e1d7f2a588c907c6e891d70c1a63329f2dc0cf241d25b25e81973b9";
+      sha256 = "f5995cef5deb634f88c42701253d2b52abf8e632890d9d67a7f9d2420ac63bc1";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/zh-CN/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/zh-CN/firefox-130.0.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "30aad51444e23a1f9a0c36dd2f0432691bf7ef99f22d3ef1f773ac0feee370db";
+      sha256 = "8e3738c05dd2e06709f6334aca98168e4a4c90a39c510079f375916f87f7a908";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0/linux-i686/zh-TW/firefox-130.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/zh-TW/firefox-130.0.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "93483e8121671cc1edbdc341b4bd4ab463b4d374afc410786c98039963b6ed54";
+      sha256 = "8aabcb427fcb82cb5301e2c699f701a0fe64f3deb8c7bdd5f556a72b78a26c59";
     }
     ];
 }

From 0d27697f2fa521ce18763a6aab39aea8a24ccfcb Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 16 Sep 2024 20:25:16 +0200
Subject: [PATCH 237/241] shpool: 0.7.0 -> 0.7.1

Diff: https://github.com/shell-pool/shpool/compare/v0.7.0...v0.7.1
---
 pkgs/by-name/sh/shpool/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sh/shpool/package.nix b/pkgs/by-name/sh/shpool/package.nix
index cf210a4f9eb0..2cb4489cff97 100644
--- a/pkgs/by-name/sh/shpool/package.nix
+++ b/pkgs/by-name/sh/shpool/package.nix
@@ -9,13 +9,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "shpool";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "shell-pool";
     repo = "shpool";
     rev = "v${version}";
-    hash = "sha256-4d194y9scjXi5wpTRP66apApXl2R9N3ACAVXkXHfQDM=";
+    hash = "sha256-0ykGGzYL29SxxT0etTaBHooIE8NEUJeTIr/6vTBgY0Q=";
   };
 
 
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
       --replace-fail '/usr/bin/shpool' "$out/bin/shpool"
   '';
 
-  cargoHash = "sha256-lkwgjrEaLuTY0sDSxa+wbT9LX09aCDp1wDUqNQE07Xw=";
+  cargoHash = "sha256-cuLscDki8Y68qtEZh7xDaLp5B6MyTkPWTQX5gHNtULQ=";
 
   buildInputs = [
     linux-pam

From 4cbff7e5d4bfd9abb30485f8d737329c1681667f Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 16 Sep 2024 20:47:07 +0200
Subject: [PATCH 238/241] nixos/services.cloudflared: fix filterConfig

---
 nixos/modules/services/networking/cloudflared.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/cloudflared.nix b/nixos/modules/services/networking/cloudflared.nix
index c328d1de43c6..7023e79d31f9 100644
--- a/nixos/modules/services/networking/cloudflared.nix
+++ b/nixos/modules/services/networking/cloudflared.nix
@@ -273,11 +273,11 @@ in
             ingressesSet = filterIngressSet tunnel.ingress;
             ingressesStr = filterIngressStr tunnel.ingress;
 
-            fullConfig = lib.filterConfig {
+            fullConfig = filterConfig {
               tunnel = name;
               "credentials-file" = tunnel.credentialsFile;
-              warp-routing = lib.filterConfig tunnel.warp-routing;
-              originRequest = lib.filterConfig tunnel.originRequest;
+              warp-routing = filterConfig tunnel.warp-routing;
+              originRequest = filterConfig tunnel.originRequest;
               ingress =
                 (map
                   (key: {

From 0256009d284be86fd42d368761f4b730099ba377 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Sep 2024 09:44:31 +0000
Subject: [PATCH 239/241] helmfile: 0.167.1 -> 0.168.0

---
 pkgs/applications/networking/cluster/helmfile/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix
index 5f19c5697f5a..1aceae0b3182 100644
--- a/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "helmfile";
-  version = "0.167.1";
+  version = "0.168.0";
 
   src = fetchFromGitHub {
     owner = "helmfile";
     repo = "helmfile";
     rev = "v${version}";
-    hash = "sha256-v5H5CQtLUmWCAh1Fhnf63gObxz3Wchpczi4gsPOh2ps=";
+    hash = "sha256-qpYTYOzQWhjuVANOPpLDsYZyhvRl6FnNQz5ssDZHohw=";
   };
 
-  vendorHash = "sha256-QVFCPTGhYcCya9MGtj0vVZ3BJCcJeaxENrrJVef0H4Y=";
+  vendorHash = "sha256-pCP5PxxOLlqQBmqufpo6G69v4M+NxMpTlIUY6TnclVA=";
 
   proxyVendor = true; # darwin/linux hash mismatch
 

From 22cbc6c0f671d92b308223c15585545a7b8cf9e6 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 16 Sep 2024 21:01:37 +0200
Subject: [PATCH 240/241] nixos/nixpkgs: fix incorrect lib usage

---
 nixos/modules/misc/nixpkgs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 393c19c99217..44903a15c5ca 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -96,7 +96,7 @@ in
   imports = [
     ./assertions.nix
     ./meta.nix
-    (lib.mkRemovedOptionModule [ "nixpkgs" "initialSystem" ] "The NixOS options `nesting.clone` and `nesting.children` have been deleted, and replaced with named specialisation. Therefore `nixpgks.initialSystem` has no effect lib.anymore.")
+    (lib.mkRemovedOptionModule [ "nixpkgs" "initialSystem" ] "The NixOS options `nesting.clone` and `nesting.children` have been deleted, and replaced with named specialisation. Therefore `nixpgks.initialSystem` has no effect anymore.")
   ];
 
   options.nixpkgs = {

From b6fed52cbc4e10c54fc11702c70f3f2259fc8938 Mon Sep 17 00:00:00 2001
From: David Knaack <davidkna@users.noreply.github.com>
Date: Mon, 16 Sep 2024 21:10:57 +0200
Subject: [PATCH 241/241] nixos/services.snapraid: re-add missing `lib.` for
 `lib` imports

Related #335631
---
 nixos/modules/services/backup/snapraid.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/backup/snapraid.nix b/nixos/modules/services/backup/snapraid.nix
index 02dabce18811..72b4d9caef3c 100644
--- a/nixos/modules/services/backup/snapraid.nix
+++ b/nixos/modules/services/backup/snapraid.nix
@@ -128,8 +128,8 @@ in
             lib.concatStringsSep "\n"
               (map prependData
                 ((lib.mapAttrsToList (name: value: name + " " + value)) dataDisks)
-              ++ zipListsWith (a: b: a + b)
-                ([ "parity " ] ++ map (i: toString i + "-parity ") (range 2 6))
+              ++ lib.zipListsWith (a: b: a + b)
+                ([ "parity " ] ++ map (i: toString i + "-parity ") (lib.range 2 6))
                 parityFiles ++ map prependContent contentFiles
               ++ map prependExclude exclude) + "\n" + extraConfig;
         };
@@ -222,7 +222,7 @@ in
                 # Multiple "split" parity files can be specified in a single
                 # "parityFile", separated by a comma.
                 # https://www.snapraid.it/manual#7.1
-                splitParityFiles = map (s: splitString "," s) parityFiles;
+                splitParityFiles = map (s: lib.splitString "," s) parityFiles;
               in
               lib.unique (
                 lib.attrValues dataDisks ++ splitParityFiles ++ contentDirs