From 767cf0c71478fdd63debbd9fdb45907cbb497edb Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sat, 2 Mar 2024 20:18:28 -0500
Subject: [PATCH 001/175] av1an: init at 0.4.2

---
 pkgs/by-name/av/av1an-unwrapped/package.nix | 58 ++++++++++++++++
 pkgs/by-name/av/av1an/package.nix           | 77 +++++++++++++++++++++
 2 files changed, 135 insertions(+)
 create mode 100644 pkgs/by-name/av/av1an-unwrapped/package.nix
 create mode 100644 pkgs/by-name/av/av1an/package.nix

diff --git a/pkgs/by-name/av/av1an-unwrapped/package.nix b/pkgs/by-name/av/av1an-unwrapped/package.nix
new file mode 100644
index 000000000000..df9364d17e1d
--- /dev/null
+++ b/pkgs/by-name/av/av1an-unwrapped/package.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  ffmpeg,
+  nasm,
+  vapoursynth,
+  libaom,
+  rav1e,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "av1an-unwrapped";
+  version = "0.4.2";
+
+  src = fetchFromGitHub {
+    owner = "master-of-zen";
+    repo = "av1an";
+    rev = version;
+    hash = "sha256-A4/1UdM8N5CHP44PBNB+ZH2Gcl84rcpUBwQRSnubBGc=";
+  };
+
+  cargoHash = "sha256-ahoiCAUREtXgXLNrWVQ2Gc65bWMo4pIJXP9xjnQAlaI=";
+
+  nativeBuildInputs = [
+    rustPlatform.bindgenHook
+    pkg-config
+    nasm
+  ];
+
+  buildInputs = [
+    ffmpeg
+    vapoursynth
+  ];
+
+  nativeCheckInputs = [
+    libaom
+    rav1e
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Cross-platform command-line encoding framework";
+    longDescription = ''
+      Cross-platform command-line AV1 / VP9 / HEVC / H264 encoding framework with per scene quality encoding.
+      It can increase your encoding speed and improve cpu utilization by running multiple encoder processes in parallel.
+    '';
+    homepage = "https://github.com/master-of-zen/Av1an";
+    changelog = "https://github.com/master-of-zen/Av1an/releases/tag/${src.rev}";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ getchoo ];
+    mainProgram = "av1an";
+  };
+}
diff --git a/pkgs/by-name/av/av1an/package.nix b/pkgs/by-name/av/av1an/package.nix
new file mode 100644
index 000000000000..ec3a4d66ae8b
--- /dev/null
+++ b/pkgs/by-name/av/av1an/package.nix
@@ -0,0 +1,77 @@
+{
+  lib,
+  symlinkJoin,
+  makeBinaryWrapper,
+  testers,
+  av1an-unwrapped,
+  ffmpeg,
+  python3Packages,
+  libaom,
+  svt-av1,
+  rav1e,
+  libvpx,
+  x264,
+  x265,
+  libvmaf,
+  withAom ? true, # AV1 reference encoder
+  withSvtav1 ? false, # AV1 encoder/decoder (focused on speed and correctness)
+  withRav1e ? false, # AV1 encoder (focused on speed and safety)
+  withVpx ? true, # VP8 & VP9 de/encoding
+  withX264 ? true, # H.264/AVC encoder
+  withX265 ? true, # H.265/HEVC encoder
+  withVmaf ? false, # Perceptual video quality assessment algorithm
+}:
+# av1an requires at least one encoder
+assert lib.assertMsg (lib.elem true [
+  withAom
+  withSvtav1
+  withRav1e
+  withVpx
+  withX264
+  withX265
+]) "At least one encoder is required!";
+symlinkJoin {
+  name = "av1an-${av1an-unwrapped.version}";
+
+  paths = [ av1an-unwrapped ];
+
+  nativeBuildInputs = [ makeBinaryWrapper ];
+
+  postBuild =
+    let
+      runtimePrograms =
+        [ (ffmpeg.override { inherit withVmaf; }) ]
+        ++ lib.optional withAom libaom
+        ++ lib.optional withSvtav1 svt-av1
+        ++ lib.optional withRav1e rav1e
+        ++ lib.optional withVpx libvpx
+        ++ lib.optional withX264 x264
+        ++ lib.optional withX265 x265
+        ++ lib.optional withVmaf libvmaf;
+    in
+    ''
+      wrapProgram $out/bin/av1an \
+        --prefix PATH : ${lib.makeBinPath runtimePrograms} \
+        --prefix PYTHONPATH : ${python3Packages.makePythonPath [ python3Packages.vapoursynth ]}
+    '';
+
+  passthru = {
+    # TODO: uncomment when upstream actually bumps CARGO_PKG_VERSION
+    #tests.version = testers.testVersion {
+    #  package = av1an;
+    #  inherit (av1an-unwrapped) version;
+    #};
+  };
+
+  meta = {
+    inherit (av1an-unwrapped.meta)
+      description
+      longDescription
+      homepage
+      changelog
+      license
+      maintainers
+      mainProgram
+      ;
+  };
+}

From 4105fb3312e8fe2b87cd212e17d84aaa8284d79a Mon Sep 17 00:00:00 2001
From: Daniel Baker <daniel.n.baker@gmail.com>
Date: Sat, 22 Jun 2024 20:59:41 -0700
Subject: [PATCH 002/175] python3Packages.ansitable: init at 0.10.0

Co-authored-by: Anthony Camarillo <anthony.camarillo.96@gmail.com>
---
 .../python-modules/ansitable/default.nix      | 44 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/development/python-modules/ansitable/default.nix

diff --git a/pkgs/development/python-modules/ansitable/default.nix b/pkgs/development/python-modules/ansitable/default.nix
new file mode 100644
index 000000000000..3f0ecc839a9b
--- /dev/null
+++ b/pkgs/development/python-modules/ansitable/default.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  pythonOlder,
+  setuptools,
+  colored,
+  pytestCheckHook,
+  numpy,
+}:
+
+buildPythonPackage rec {
+  pname = "ansitable";
+  version = "0.10.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-ehPPpZ9C/Nrly9WoJJfZtv2YfZ9MEcQsKtuxNpcJe7U=";
+  };
+
+  nativeBuildInputs = [ setuptools ];
+
+  propagatedBuildInputs = [ colored ];
+
+  pythonImportsCheck = [ "ansitable" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    numpy
+  ];
+
+  meta = with lib; {
+    description = "Quick and easy display of tabular data and matrices with optional ANSI color and borders";
+    homepage = "https://pypi.org/project/ansitable/";
+    license = licenses.mit;
+    maintainers = with maintainers; [
+      djacu
+      a-camarillo
+    ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f7dd618be0fc..1361dd429e4c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -621,6 +621,8 @@ self: super: with self; {
 
   ansimarkup = callPackage ../development/python-modules/ansimarkup { };
 
+  ansitable = callPackage ../development/python-modules/ansitable { };
+
   ansiwrap = callPackage ../development/python-modules/ansiwrap { };
 
   anthemav = callPackage ../development/python-modules/anthemav { };

From b9116dc0a275745961daf94a2a9ef5bebdf57f9c Mon Sep 17 00:00:00 2001
From: Daniel Baker <daniel.n.baker@gmail.com>
Date: Sat, 22 Jun 2024 21:37:59 -0700
Subject: [PATCH 003/175] python3Packages.rtb-data: init at 1.0.1

Co-authored-by: Anthony Camarillo <anthony.camarillo.96@gmail.com>
---
 .../python-modules/rtb-data/default.nix       | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/rtb-data/default.nix

diff --git a/pkgs/development/python-modules/rtb-data/default.nix b/pkgs/development/python-modules/rtb-data/default.nix
new file mode 100644
index 000000000000..4202e2bb1af8
--- /dev/null
+++ b/pkgs/development/python-modules/rtb-data/default.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "rtb-data";
+  version = "1.0.1";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-xRKS3c31li5ZRWw6WrYqTVQKXqW91ONbKWP57Dglzx0=";
+  };
+
+  nativeBuildInputs = [ setuptools ];
+
+  pythonImportsCheck = [ "rtbdata" ];
+
+  meta = with lib; {
+    description = "Data files for the Robotics Toolbox for Python";
+    homepage = "https://pypi.org/project/rtb-data/";
+    license = licenses.mit;
+    maintainers = with maintainers; [
+      djacu
+      a-camarillo
+    ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f7dd618be0fc..d8e2bb6dffd7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13566,6 +13566,8 @@ self: super: with self; {
 
   rtoml = callPackage ../development/python-modules/rtoml { };
 
+  rtb-data = callPackage ../development/python-modules/rtb-data { };
+
   rtp = callPackage ../development/python-modules/rtp { };
 
   rtree = callPackage ../development/python-modules/rtree {

From ba16633fea5a0548ba1606a918cace2f5dc5cf30 Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Tue, 2 Jul 2024 12:44:44 -0700
Subject: [PATCH 004/175] mealie: fix Darwin builds

---
 pkgs/by-name/me/mealie/package.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/me/mealie/package.nix b/pkgs/by-name/me/mealie/package.nix
index 6646a8ec0980..ad4534f97038 100644
--- a/pkgs/by-name/me/mealie/package.nix
+++ b/pkgs/by-name/me/mealie/package.nix
@@ -1,10 +1,10 @@
 { lib
+, stdenv
 , callPackage
 , fetchFromGitHub
 , makeWrapper
 , nixosTests
 , python3Packages
-, stdenv
 , writeShellScript
 }:
 
@@ -31,8 +31,17 @@ let
       rev = "c56dd9f29469c8a9f34456b8c0d6ae0476110516";
       hash = "sha256-XNps3ZApU8m07bfPEnvip1w+3hLajdn9+L5+IpEaP0c=";
     };
+
+    # Can remove once the `register` keyword is removed from source files
+    # Configure overwrites CXXFLAGS so patch it in the Makefile
+    postConfigure = lib.optionalString stdenv.cc.isClang ''
+      substituteInPlace Makefile \
+        --replace-fail "CXXFLAGS = " "CXXFLAGS = -std=c++14 "
+    '';
   };
-in pythonpkgs.buildPythonPackage rec {
+in
+
+pythonpkgs.buildPythonPackage rec {
   pname = "mealie";
   inherit version src;
   pyproject = true;

From cba1e458a84949a0e5324f00ecf2e3feeb15afa2 Mon Sep 17 00:00:00 2001
From: Nikita Pedorich <pedorich.n@gmail.com>
Date: Sat, 22 Jun 2024 10:27:50 +0900
Subject: [PATCH 005/175] netdata: 1.45.4 -> 1.46.1

---
 nixos/modules/services/monitoring/netdata.nix |  3 ++-
 .../system/netdata/dashboard-v2-removal.patch | 25 ++++++++++++++++++
 pkgs/tools/system/netdata/default.nix         | 26 +++++++------------
 .../system/netdata/ndsudo-fix-path.patch      | 16 ++++++++++++
 4 files changed, 53 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/tools/system/netdata/dashboard-v2-removal.patch
 create mode 100644 pkgs/tools/system/netdata/ndsudo-fix-path.patch

diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix
index 8f89408bdea5..c47da2cc075d 100644
--- a/nixos/modules/services/monitoring/netdata.nix
+++ b/nixos/modules/services/monitoring/netdata.nix
@@ -247,7 +247,8 @@ in {
         ++ lib.optional cfg.python.enable (pkgs.python3.withPackages cfg.python.extraPackages)
         ++ lib.optional config.virtualisation.libvirtd.enable config.virtualisation.libvirtd.package
         ++ lib.optional config.virtualisation.docker.enable config.virtualisation.docker.package
-        ++ lib.optionals config.virtualisation.podman.enable [ pkgs.jq config.virtualisation.podman.package ];
+        ++ lib.optionals config.virtualisation.podman.enable [ pkgs.jq config.virtualisation.podman.package ]
+        ++ lib.optional config.boot.zfs.enabled config.boot.zfs.package;
       environment = {
         PYTHONPATH = "${cfg.package}/libexec/netdata/python.d/python_modules";
         NETDATA_PIPENAME = "/run/netdata/ipc";
diff --git a/pkgs/tools/system/netdata/dashboard-v2-removal.patch b/pkgs/tools/system/netdata/dashboard-v2-removal.patch
new file mode 100644
index 000000000000..5eb7ef62eeb0
--- /dev/null
+++ b/pkgs/tools/system/netdata/dashboard-v2-removal.patch
@@ -0,0 +1,25 @@
+# Original: https://github.com/netdata/netdata/pull/17240
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f37cbd18a..6db4c9f52 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -134,6 +134,7 @@ mark_as_advanced(DEFAULT_FEATURE_STATE)
+ # High-level features
+ option(ENABLE_ACLK "Enable Netdata Cloud support (ACLK)" ${DEFAULT_FEATURE_STATE})
+ option(ENABLE_CLOUD "Enable Netdata Cloud by default at runtime" ${DEFAULT_FEATURE_STATE})
++option(ENABLE_DASHBOARD_V2 "enable dashboard v2" True)
+ option(ENABLE_ML "Enable machine learning features" ${DEFAULT_FEATURE_STATE})
+ option(ENABLE_DBENGINE "Enable dbengine metrics storage" True)
+
+@@ -2946,7 +2947,9 @@ endif()
+ #
+
+ include(src/web/gui/v1/dashboard_v1.cmake)
+-include(src/web/gui/v2/dashboard_v2.cmake)
++if(ENABLE_DASHBOARD_V2)
++        include(src/web/gui/v2/dashboard_v2.cmake)
++endif()
+ include(src/web/gui/gui.cmake)
+
+ function(cat IN_FILE OUT_FILE)
\ No newline at end of file
diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix
index 9ddba232de19..936b7ec9926d 100644
--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, makeWrapper
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, makeWrapper
 , CoreFoundation, IOKit, libossp_uuid
 , nixosTests
 , bash, curl, jemalloc, json_c, libuv, zlib, libyaml, libelf, libbpf
@@ -20,7 +20,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.45.4";
+  version = "1.46.1";
   pname = "netdata";
 
   src = fetchFromGitHub {
@@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
     repo = "netdata";
     rev = "v${version}";
     hash = if withCloudUi
-      then "sha256-g/wxKtpNsDw/ZaUokdip39enQHMysJE6pYGsApuL4po="
+      then "sha256-tFjczhJ7bIEUDZx3MxYBu4tGkJhoQn5V79D4sLV2o8U="
       # we delete the v2 GUI after fetching
-      else "sha256-Mkrmvdr19sWzFOkdpt46mcsbA3CNpXy4w8um95xaWlo=";
+      else "sha256-uW3jRiJjFIFSfmmavM3KVF985F8nMKa+lQAgNBZvKyE=";
     fetchSubmodules = true;
 
     # Remove v2 dashboard distributed under NCUL1. Make sure an empty
@@ -60,18 +60,12 @@ stdenv.mkDerivation rec {
     ++ lib.optionals withSsl [ openssl ];
 
   patches = [
+    # Allow ndsudo to use non-hardcoded `PATH`
+    # See https://github.com/netdata/netdata/pull/17377#issuecomment-2183017868
+    #     https://github.com/netdata/netdata/security/advisories/GHSA-pmhq-4cxq-wj93
+    ./ndsudo-fix-path.patch
     # Allow building without non-free v2 dashboard.
-    (fetchpatch {
-      url = "https://github.com/netdata/netdata/pull/17240/commits/b108df72281633234b731b223d99ec99f1d36adf.patch";
-      hash = "sha256-tgsnbNY0pxFU3bz1J1qPaAeVsozsk2bpHV2mNy8A9is=";
-    })
-    # Allow for go.d plugins to access the right directory.
-    # Can be removed once > v1.45.4 is released
-    # https://github.com/netdata/netdata/pull/17661
-    (fetchpatch {
-      url = "https://patch-diff.githubusercontent.com/raw/netdata/netdata/pull/17661.patch";
-      sha256 = "sha256-j+mrwkibQio2KO8UnV7sxzCoHmkcsalHNzP+YvrRz74=";
-    })
+    ./dashboard-v2-removal.patch
   ];
 
   # Guard against unused buld-time development inputs in closure. Without
@@ -186,7 +180,7 @@ stdenv.mkDerivation rec {
 
       sourceRoot = "${src.name}/src/go/collectors/go.d.plugin";
 
-      vendorHash = "sha256-KO+xMk6fpZCYRyxxKrsGfOHJ2bwjBaSmkgz1jIUHaZs=";
+      vendorHash = "sha256-fK6pboXgJom77iakb+CJvNuweQjLIrpS7suWRNY/KM4=";
       doCheck = false;
       proxyVendor = true;
 
diff --git a/pkgs/tools/system/netdata/ndsudo-fix-path.patch b/pkgs/tools/system/netdata/ndsudo-fix-path.patch
new file mode 100644
index 000000000000..04087e54a00a
--- /dev/null
+++ b/pkgs/tools/system/netdata/ndsudo-fix-path.patch
@@ -0,0 +1,16 @@
+# See https://github.com/netdata/netdata/pull/17377#issuecomment-2183017868
+#     https://github.com/netdata/netdata/security/advisories/GHSA-pmhq-4cxq-wj93
+
+diff --git a/src/collectors/plugins.d/ndsudo.c b/src/collectors/plugins.d/ndsudo.c
+index 8b4d76f46..68fa52d38 100644
+--- a/src/collectors/plugins.d/ndsudo.c
++++ b/src/collectors/plugins.d/ndsudo.c
+@@ -357,9 +357,6 @@ int main(int argc, char *argv[]) {
+         return 3;
+     }
+
+-    char new_path[] = "PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin";
+-    putenv(new_path);
+-
+     bool found = false;
+     char filename[FILENAME_MAX];
\ No newline at end of file

From 3f6aa2017aa8a61a173b343dc4a551182488e1f9 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Thu, 20 Jun 2024 15:18:28 -0700
Subject: [PATCH 006/175] libkrunfw: 4.0.0 -> 4.0.0-unstable-2024-06-10, build
 on aarch64

---
 .../libraries/libkrunfw/default.nix           | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/libkrunfw/default.nix b/pkgs/development/libraries/libkrunfw/default.nix
index 0485c82ffb41..21b8918d75ec 100644
--- a/pkgs/development/libraries/libkrunfw/default.nix
+++ b/pkgs/development/libraries/libkrunfw/default.nix
@@ -5,25 +5,27 @@
 , flex
 , bison
 , bc
+, cpio
+, perl
 , elfutils
 , python3
 , sevVariant ? false
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libkrunfw";
-  version = "4.0.0";
+  version = "4.0.0-unstable-2024-06-10";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "libkrunfw";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-9oVl4mlJE7QHeehG86pbh7KdShZNUGwlnO75k/F/PQ0=";
+    rev = "12236fa4caa42423ff3081b6179aa0a5f37c67c9";
+    hash = "sha256-Vcbg2zBVMQsiAQF/cEEIRMqppMBVGnqUBlDquGzRBsc=";
   };
 
   kernelSrc = fetchurl {
-    url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.4.7.tar.xz";
-    hash = "sha256-3hQ8th3Kp1bAX1b/NRRDFtgQYVgZUYoz40dU8GTEp9g=";
+    url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.6.32.tar.xz";
+    hash = "sha256-qqgk6vB/YZEdIrdf8JCkA8PdC9c+I5M+C7qLWXFDbOE=";
   };
 
   postPatch = ''
@@ -35,6 +37,8 @@ stdenv.mkDerivation rec {
     flex
     bison
     bc
+    cpio
+    perl
     python3
     python3.pkgs.pyelftools
   ];
@@ -49,13 +53,16 @@ stdenv.mkDerivation rec {
     "SEV=1"
   ];
 
+  # Fixes https://github.com/containers/libkrunfw/issues/55
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.targetPlatform.isAarch64 "-march=armv8-a+crypto";
+
   enableParallelBuilding = true;
 
   meta = with lib; {
     description = "Dynamic library bundling the guest payload consumed by libkrun";
     homepage = "https://github.com/containers/libkrunfw";
     license = with licenses; [ lgpl2Only lgpl21Only ];
-    maintainers = with maintainers; [ nickcao ];
-    platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ nickcao RossComputerGuy ];
+    platforms = [ "x86_64-linux" "aarch64-linux" ];
   };
-}
+})

From 0d44d96f5b9b838358fbdead146ddee8d551c858 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Thu, 20 Jun 2024 15:40:14 -0700
Subject: [PATCH 007/175] libkrun: 1.9.2 -> 1.9.3, add more options

---
 .../development/libraries/libkrun/default.nix | 46 +++++++++++++------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/libkrun/default.nix b/pkgs/development/libraries/libkrun/default.nix
index de0e20d93ff2..30730d38a6f7 100644
--- a/pkgs/development/libraries/libkrun/default.nix
+++ b/pkgs/development/libraries/libkrun/default.nix
@@ -6,54 +6,72 @@
 , pkg-config
 , glibc
 , openssl
+, libepoxy
+, libdrm
+, pipewire
+, virglrenderer
 , libkrunfw
+, llvmPackages
 , rustc
+, withGpu ? false
+, withSound ? false
+, withNet ? false
 , sevVariant ? false
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libkrun";
   version = "1.9.3";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "libkrun";
-    rev = "refs/tags/v${version}";
+    rev = "refs/tags/v${finalAttrs.version}";
     hash = "sha256-LIp2/794gbHPweBJcHCjbF0m+bJAs0SPF7WivW7fxLI=";
   };
 
+  outputs = [ "out" "dev" ];
+
   cargoDeps = rustPlatform.fetchCargoTarball {
-    inherit pname version src;
+    inherit (finalAttrs) pname version src;
     hash = "sha256-g4ceYi16mjEgvWTAQEW8ShT/e5IKnlgLgk49Mg0N2fQ=";
   };
 
   nativeBuildInputs = [
+    llvmPackages.clang
     rustPlatform.cargoSetupHook
     cargo
     rustc
-  ] ++ lib.optionals sevVariant [
-    pkg-config
-  ];
+  ] ++ lib.optional (sevVariant || withGpu) pkg-config;
 
   buildInputs = [
     (libkrunfw.override { inherit sevVariant; })
     glibc
     glibc.static
-  ] ++ lib.optionals sevVariant [
-    openssl
-  ];
+  ] ++ lib.optionals withGpu [ libepoxy libdrm virglrenderer ]
+    ++ lib.optional withSound pipewire
+    ++ lib.optional sevVariant openssl;
+
+  env.LIBCLANG_PATH = "${llvmPackages.clang-unwrapped.lib}/lib/libclang.so";
 
   makeFlags = [
     "PREFIX=${placeholder "out"}"
-  ] ++ lib.optionals sevVariant [
-    "SEV=1"
-  ];
+  ] ++ lib.optional withGpu "GPU=1"
+    ++ lib.optional withSound "SND=1"
+    ++ lib.optional withNet "NET=1"
+    ++ lib.optional sevVariant "SEV=1";
+
+  postInstall = ''
+    mkdir -p $dev/lib/pkgconfig
+    mv $out/lib64/pkgconfig $dev/lib/pkgconfig
+    mv $out/include $dev/include
+  '';
 
   meta = with lib; {
     description = "Dynamic library providing Virtualization-based process isolation capabilities";
     homepage = "https://github.com/containers/libkrun";
     license = licenses.asl20;
-    maintainers = with maintainers; [ nickcao ];
+    maintainers = with maintainers; [ nickcao RossComputerGuy ];
     platforms = libkrunfw.meta.platforms;
   };
-}
+})

From ab4247be8c8dd04b8bd49057e0fdd64a95f8937c Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Thu, 20 Jun 2024 15:40:41 -0700
Subject: [PATCH 008/175] krun: init at 0-unstable-2024-06-18

---
 pkgs/by-name/kr/krun/package.nix | 70 ++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 pkgs/by-name/kr/krun/package.nix

diff --git a/pkgs/by-name/kr/krun/package.nix b/pkgs/by-name/kr/krun/package.nix
new file mode 100644
index 000000000000..d851203a30fd
--- /dev/null
+++ b/pkgs/by-name/kr/krun/package.nix
@@ -0,0 +1,70 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, rustPlatform
+, libiconv
+, libkrun
+, makeWrapper
+, passt
+, sommelier
+, mesa
+, opengl-driver ? mesa.drivers
+, withSommelier ? false
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "krun";
+  version = "0-unstable-2024-06-18";
+
+  src = fetchFromGitHub {
+    owner = "slp";
+    repo = pname;
+    rev = "912afa5c6525b7c8f83dffd65ec4b1425b3f7521";
+    hash = "sha256-rDuxv3UakAemDnj4Nsbpqsykts2IcseuQmDwO24L+u8=";
+  };
+
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/slp/krun/pull/39.diff";
+      hash = "sha256-CV69L+VDDLRcWgpgDCAYKLlTU9ytFcHhzNgOibWD8KY=";
+    })
+    (fetchpatch {
+      url = "https://github.com/slp/krun/pull/38.diff";
+      hash = "sha256-cK3iDhh+33H16V65lWUXahjmpSxI1HhiLUmkjfkRB7A=";
+    })
+  ];
+
+  cargoHash = "sha256-NahnigxJaY2QwWnySCRrnf3JyqZ+7jRA1CpE7ON0OOE=";
+
+  nativeBuildInputs = [
+    rustPlatform.bindgenHook
+    makeWrapper
+  ];
+
+  buildInputs = [
+    (libkrun.override {
+      withGpu = true;
+      withNet = true;
+    })
+  ];
+
+  # Allow for sommelier to be disabled as it can cause problems.
+  wrapArgs = [
+    "--prefix PATH : ${lib.makeBinPath (lib.optional withSommelier [ sommelier ] ++ [ passt ])}"
+  ];
+
+  postFixup = ''
+    wrapProgram $out/bin/krun $wrapArgs \
+      --set-default OPENGL_DRIVER ${opengl-driver}
+  '';
+
+  meta = {
+    description = "Run programs from your system in a microVM";
+    homepage = "https://github.com/slp/krun";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ RossComputerGuy ];
+    platforms = libkrun.meta.platforms;
+    mainProgram = "krun";
+  };
+}

From b85639c5890abf2eb3ab6757b036529a035b6235 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Mon, 8 Jul 2024 12:42:51 +1200
Subject: [PATCH 009/175] lib.licenses: refactor internal mkLicense to avoid
 future typo bugs

This is a follow-up to https://github.com/NixOS/nixpkgs/pull/325380 where @emilazy discovered that we have some typos in field names.

This refactoring wraps the implicit lib.licenses schema up in a factory function to ensure consistency.

While a more proper type checker like the one we use for meta checks would be better I didn't want to depend on that in more places.
In fact, we might want to make meta type checks more strict on the license field.
---
 lib/licenses.nix | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index c5d05437efc0..3a739783ea7d 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -1,25 +1,29 @@
 { lib }:
+let
+  inherit (lib) optionalAttrs;
 
-lib.mapAttrs (lname: lset: let
-  defaultLicense = {
-    shortName = lname;
-    free = true; # Most of our licenses are Free, explicitly declare unfree additions as such!
-    deprecated = false;
+  mkLicense = lname: {
+    shortName ? lname,
+    # Most of our licenses are Free, explicitly declare unfree additions as such!
+    free ? true,
+    deprecated ? false,
+    spdxId ? null,
+    url ? null,
+    fullName ? null,
+    redistributable ? free
+  }@attrs: {
+    inherit shortName free deprecated redistributable;
+  } // optionalAttrs (attrs ? spdxId) {
+    inherit spdxId;
+    url = "https://spdx.org/licenses/${spdxId}.html";
+  } // optionalAttrs (attrs ? url) {
+    inherit url;
+  } // optionalAttrs (attrs ? fullName) {
+    inherit fullName;
   };
 
-  mkLicense = licenseDeclaration: let
-    applyDefaults = license: defaultLicense // license;
-    applySpdx = license:
-      if license ? spdxId
-      then license // { url = "https://spdx.org/licenses/${license.spdxId}.html"; }
-      else license;
-    applyRedistributable = license: { redistributable = license.free; } // license;
-  in lib.pipe licenseDeclaration [
-    applyDefaults
-    applySpdx
-    applyRedistributable
-  ];
-in mkLicense lset) ({
+in
+lib.mapAttrs mkLicense ({
   /* License identifiers from spdx.org where possible.
    * If you cannot find your license here, then look for a similar license or
    * add it to this list. The URL mentioned above is a good source for inspiration.

From e708e7a14d9108d4b61cb0d869d980f6af56e8b1 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Thu, 11 Jul 2024 15:04:04 -0400
Subject: [PATCH 010/175] nixos/nvidia: enable modesetting by default on driver
 versions >= 535

---
 nixos/modules/hardware/video/nvidia.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 94d6acbdefea..1aa79166dee7 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -101,7 +101,10 @@ in
         Enabling this and using version 545 or newer of the proprietary NVIDIA
         driver causes it to provide its own framebuffer device, which can cause
         Wayland compositors to work when they otherwise wouldn't.
-      '';
+      '' // {
+        default = lib.versionAtLeast nvidia_x11.version "535";
+        defaultText = lib.literalExpression "lib.versionAtLeast nvidia_x11.version \"535\"";
+      };
 
       prime.nvidiaBusId = lib.mkOption {
         type = busIDType;

From f89edac370f3a15950320025e7a112490386372b Mon Sep 17 00:00:00 2001
From: qubitnano <146656568+qubitnano@users.noreply.github.com>
Date: Tue, 9 Jul 2024 19:33:51 -0400
Subject: [PATCH 011/175] glances: 4.0.8-unstable-2024-06-09 -> 4.1.2.1

---
 pkgs/applications/system/glances/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix
index 3e387f34a734..6d8899440d4a 100644
--- a/pkgs/applications/system/glances/default.nix
+++ b/pkgs/applications/system/glances/default.nix
@@ -26,15 +26,14 @@
 
 buildPythonApplication rec {
   pname = "glances";
-  # use unstable to fix a build error for aarch64.
-  version = "4.0.8-unstable-2024-06-09";
+  version = "4.1.2.1";
   disabled = isPyPy;
 
   src = fetchFromGitHub {
     owner = "nicolargo";
     repo = "glances";
-    rev = "051006e12f7c90281dda4af60871b535b0dcdcb9";
-    hash = "sha256-iCK5soTACQwtCVMmMsFaqXvZtTKX9WbTul0mUeSWC2M=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-SlKt+wjzI9QRmMVvbIERuhQuCCaOh7L89WuNUXNhkuI=";
   };
 
   # On Darwin this package segfaults due to mismatch of pure and impure

From 542b17798aeb7248e2824af22431d21dc8fa32c8 Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Sat, 13 Jul 2024 23:14:25 +0300
Subject: [PATCH 012/175] packcc: 1.8.0 -> 2.0.2

---
 pkgs/development/tools/packcc/default.nix | 66 +++++++++++++----------
 1 file changed, 39 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/tools/packcc/default.nix b/pkgs/development/tools/packcc/default.nix
index 2128e48886b8..0f756388be3b 100644
--- a/pkgs/development/tools/packcc/default.nix
+++ b/pkgs/development/tools/packcc/default.nix
@@ -1,59 +1,70 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, bats
-, uncrustify
-, testers
-, packcc
+{
+  bats,
+  fetchFromGitHub,
+  lib,
+  packcc,
+  python3,
+  stdenv,
+  testers,
+  uncrustify,
 }:
 
 stdenv.mkDerivation rec {
   pname = "packcc";
-  version = "1.8.0";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "arithy";
     repo = "packcc";
     rev = "v${version}";
-    hash = "sha256-T7PWM5IGly6jpGt04dh5meQjrZPUTs8VEFTQEPO5RSw=";
+    hash = "sha256-k1C/thvr/5fYrgu/j8YN3kwXp4k26sC9AhYhYAKQuX0=";
   };
 
+  postPatch = ''
+    patchShebangs tests
+  '';
+
   dontConfigure = true;
 
   preBuild = ''
-    cd build/${if stdenv.cc.isGNU then "gcc"
-               else if stdenv.cc.isClang then "clang"
-               else throw "Unsupported C compiler"}
+    cd build/${
+      if stdenv.cc.isGNU then
+        "gcc"
+      else if stdenv.cc.isClang then
+        "clang"
+      else
+        throw "Unsupported C compiler"
+    }
   '';
 
   doCheck = true;
 
-  nativeCheckInputs = [ bats uncrustify ];
+  nativeCheckInputs = [
+    bats
+    uncrustify
+    python3
+  ];
 
-  preCheck = ''
-    patchShebangs ../../tests
-
-    # Disable a failing test.
-    rm -rf ../../tests/style.d
-  '' + lib.optionalString stdenv.cc.isClang ''
-    export NIX_CFLAGS_COMPILE+=' -Wno-error=strict-prototypes -Wno-error=int-conversion'
-  '';
+  preCheck =
+    ''
+      # Style tests will always fail because upstream uses an older version of
+      # uncrustify.
+      rm -rf ../../tests/style.d
+    ''
+    + lib.optionalString stdenv.cc.isClang ''
+      export NIX_CFLAGS_COMPILE+=' -Wno-error=strict-prototypes -Wno-error=int-conversion'
+    '';
 
   installPhase = ''
     runHook preInstall
-
     install -Dm755 release/bin/packcc $out/bin/packcc
-
     runHook postInstall
   '';
 
-  passthru.tests.version = testers.testVersion {
-    package = packcc;
-  };
+  passthru.tests.version = testers.testVersion { package = packcc; };
 
   meta = with lib; {
     description = "Parser generator for C";
-    mainProgram = "packcc";
     longDescription = ''
       PackCC is a parser generator for C. Its main features are as follows:
       - Generates your parser in C from a grammar described in a PEG,
@@ -65,5 +76,6 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     maintainers = with maintainers; [ azahi ];
     platforms = platforms.unix;
+    mainProgram = "packcc";
   };
 }

From 7360a278bc231f81e0b421918ae2da7d942b5533 Mon Sep 17 00:00:00 2001
From: Smaug123 <3138005+Smaug123@users.noreply.github.com>
Date: Sat, 13 Jul 2024 22:36:32 +0100
Subject: [PATCH 013/175] certdump: mark broken on aarch64-darwin

---
 pkgs/tools/security/certdump/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/certdump/default.nix b/pkgs/tools/security/certdump/default.nix
index 789f4fd57370..8615fda62b49 100644
--- a/pkgs/tools/security/certdump/default.nix
+++ b/pkgs/tools/security/certdump/default.nix
@@ -2,7 +2,7 @@
 , buildDotnetModule
 , fetchFromGitHub
 , dotnetCorePackages
-, callPackage
+, stdenv
 }:
 
 buildDotnetModule rec {
@@ -40,5 +40,7 @@ buildDotnetModule rec {
     '';
     license = licenses.asl20;
     maintainers = [ maintainers.baloo ];
+    # net5 has no osx-arm64 target available
+    broken = stdenv.isDarwin && stdenv.isAarch64;
   };
 }

From 1dd44eaf6766ea7c9e2c11f91d9f978aa13e2aec Mon Sep 17 00:00:00 2001
From: Max <max@privatevoid.net>
Date: Tue, 16 Jul 2024 00:38:07 +0200
Subject: [PATCH 014/175] nixos/pam: use Kanidm's package option

---
 nixos/modules/security/pam.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index b63eb6276a81..672c86c5b073 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -637,7 +637,7 @@ let
           { name = "mysql"; enable = cfg.mysqlAuth; control = "sufficient"; modulePath = "${pkgs.pam_mysql}/lib/security/pam_mysql.so"; settings = {
             config_file = "/etc/security/pam_mysql.conf";
           }; }
-          { name = "kanidm"; enable = config.services.kanidm.enablePam; control = "sufficient"; modulePath = "${pkgs.kanidm}/lib/pam_kanidm.so"; settings = {
+          { name = "kanidm"; enable = config.services.kanidm.enablePam; control = "sufficient"; modulePath = "${config.services.kanidm.package}/lib/pam_kanidm.so"; settings = {
             ignore_unknown_user = true;
           }; }
           { name = "sss"; enable = config.services.sssd.enable; control = if cfg.sssdStrictAccess then "[default=bad success=ok user_unknown=ignore]" else "sufficient"; modulePath = "${pkgs.sssd}/lib/security/pam_sss.so"; }
@@ -750,7 +750,7 @@ let
           { name = "ldap"; enable = use_ldap; control = "sufficient"; modulePath = "${pam_ldap}/lib/security/pam_ldap.so"; settings = {
             use_first_pass = true;
           }; }
-          { name = "kanidm"; enable = config.services.kanidm.enablePam; control = "sufficient"; modulePath = "${pkgs.kanidm}/lib/pam_kanidm.so"; settings = {
+          { name = "kanidm"; enable = config.services.kanidm.enablePam; control = "sufficient"; modulePath = "${config.services.kanidm.package}/lib/pam_kanidm.so"; settings = {
             ignore_unknown_user = true;
             use_first_pass = true;
           }; }
@@ -787,7 +787,7 @@ let
           { name = "mysql"; enable = cfg.mysqlAuth; control = "sufficient"; modulePath = "${pkgs.pam_mysql}/lib/security/pam_mysql.so"; settings = {
             config_file = "/etc/security/pam_mysql.conf";
           }; }
-          { name = "kanidm"; enable = config.services.kanidm.enablePam; control = "sufficient"; modulePath = "${pkgs.kanidm}/lib/pam_kanidm.so"; }
+          { name = "kanidm"; enable = config.services.kanidm.enablePam; control = "sufficient"; modulePath = "${config.services.kanidm.package}/lib/pam_kanidm.so"; }
           { name = "sss"; enable = config.services.sssd.enable; control = "sufficient"; modulePath = "${pkgs.sssd}/lib/security/pam_sss.so"; }
           { name = "krb5"; enable = config.security.pam.krb5.enable; control = "sufficient"; modulePath = "${pam_krb5}/lib/security/pam_krb5.so"; settings = {
             use_first_pass = true;
@@ -841,7 +841,7 @@ let
           { name = "mysql"; enable = cfg.mysqlAuth; control = "optional"; modulePath = "${pkgs.pam_mysql}/lib/security/pam_mysql.so"; settings = {
             config_file = "/etc/security/pam_mysql.conf";
           }; }
-          { name = "kanidm"; enable = config.services.kanidm.enablePam; control = "optional"; modulePath = "${pkgs.kanidm}/lib/pam_kanidm.so"; }
+          { name = "kanidm"; enable = config.services.kanidm.enablePam; control = "optional"; modulePath = "${config.services.kanidm.package}/lib/pam_kanidm.so"; }
           { name = "sss"; enable = config.services.sssd.enable; control = "optional"; modulePath = "${pkgs.sssd}/lib/security/pam_sss.so"; }
           { name = "krb5"; enable = config.security.pam.krb5.enable; control = "optional"; modulePath = "${pam_krb5}/lib/security/pam_krb5.so"; }
           { name = "otpw"; enable = cfg.otpwAuth; control = "optional"; modulePath = "${pkgs.otpw}/lib/security/pam_otpw.so"; }
@@ -1517,7 +1517,7 @@ in
       # Include the PAM modules in the system path mostly for the manpages.
       [ pkgs.pam ]
       ++ optional config.users.ldap.enable pam_ldap
-      ++ optional config.services.kanidm.enablePam pkgs.kanidm
+      ++ optional config.services.kanidm.enablePam config.services.kanidm.package
       ++ optional config.services.sssd.enable pkgs.sssd
       ++ optionals config.security.pam.krb5.enable [pam_krb5 pam_ccreds]
       ++ optionals config.security.pam.enableOTPW [ pkgs.otpw ]

From 5c3ad3f8954df4e54ba1798ca573c1f325171720 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Jul 2024 04:00:44 +0000
Subject: [PATCH 015/175] kent: 467 -> 468

---
 pkgs/applications/science/biology/kent/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/kent/default.nix b/pkgs/applications/science/biology/kent/default.nix
index f30a6725bb47..7d73ed90856d 100644
--- a/pkgs/applications/science/biology/kent/default.nix
+++ b/pkgs/applications/science/biology/kent/default.nix
@@ -13,13 +13,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "kent";
-  version = "467";
+  version = "468";
 
   src = fetchFromGitHub {
     owner = "ucscGenomeBrowser";
     repo = pname;
     rev = "v${version}_base";
-    hash = "sha256-Y8iHSo70nsPZwVy8ZiiqjU3mGrPOyPQkW0VpLS+ulGE=";
+    hash = "sha256-OM/noraW2X8WV5wqWEFiI5/JPOBmsp0fTeDdcZoXxAA=";
   };
 
   buildInputs = [ libpng libuuid zlib bzip2 xz openssl curl libmysqlclient ];

From c6ba378b7bb174f38eb4552f0c6a094f9f6c923f Mon Sep 17 00:00:00 2001
From: Cassandra McCarthy <cassie@7596ff.com>
Date: Wed, 17 Jul 2024 13:23:19 -0400
Subject: [PATCH 016/175] airsonic: update context-path directive

This line has been broken since the service file was created. According
to the [spring docs] that Airsonic uses, server.context-path is what
should be here. I've tested this by manually setting it as an extra JVM
option on my machine, and it works.

[spring docs]: https://docs.spring.io/spring-boot/docs/1.4.5.RELEASE/reference/htmlsingle/#common-application-properties
---
 nixos/modules/services/misc/airsonic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/airsonic.nix b/nixos/modules/services/misc/airsonic.nix
index 6095268eb960..d980069608e7 100644
--- a/nixos/modules/services/misc/airsonic.nix
+++ b/nixos/modules/services/misc/airsonic.nix
@@ -141,7 +141,7 @@ in {
           -Dairsonic.home=${cfg.home} \
           -Dserver.address=${cfg.listenAddress} \
           -Dserver.port=${toString cfg.port} \
-          -Dairsonic.contextPath=${cfg.contextPath} \
+          -Dserver.context-path=${cfg.contextPath} \
           -Djava.awt.headless=true \
           ${optionalString (cfg.virtualHost != null)
             "-Dserver.use-forward-headers=true"} \

From 0cde7df13a5d2d6b06867a0b7e412e72fafaf34e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Jul 2024 04:13:10 +0000
Subject: [PATCH 017/175] plexamp: 4.10.1 -> 4.11.0

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

diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix
index ec79cbefabf0..b3475b4c3d0e 100644
--- a/pkgs/applications/audio/plexamp/default.nix
+++ b/pkgs/applications/audio/plexamp/default.nix
@@ -2,12 +2,12 @@
 
 let
   pname = "plexamp";
-  version = "4.10.1";
+  version = "4.11.0";
 
   src = fetchurl {
     url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
     name = "${pname}-${version}.AppImage";
-    hash = "sha512-Y43W6aPnZEMnkBQwSHbT8PWjuhkfNxce79Y9cixEPnq4VybROHGb9s6ghV7kP81TSWkb9QruFhmXfuJRSkXxTw==";
+    hash = "sha512-t5ImqZvwKrZoobXFHX8wfQBQBPnAp4rJq4p1GLG/6CxAeKYuYMTPr7+xjwVqhGm/DGw7vSVY9sdMyFodq8rJ2A==";
   };
 
   appimageContents = appimageTools.extractType2 {
@@ -30,7 +30,7 @@ appimageTools.wrapType2 {
   meta = with lib; {
     description = "Beautiful Plex music player for audiophiles, curators, and hipsters";
     homepage = "https://plexamp.com/";
-    changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/73";
+    changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/74";
     license = licenses.unfree;
     maintainers = with maintainers; [ killercup redhawk synthetica ];
     platforms = [ "x86_64-linux" ];

From 45de5100851332c4700364419650cf65417ef053 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Jul 2024 04:16:01 +0000
Subject: [PATCH 018/175] qdrant: 1.10.0 -> 1.10.1

---
 pkgs/servers/search/qdrant/Cargo.lock  | 636 ++++++++++++++-----------
 pkgs/servers/search/qdrant/default.nix |   4 +-
 2 files changed, 354 insertions(+), 286 deletions(-)

diff --git a/pkgs/servers/search/qdrant/Cargo.lock b/pkgs/servers/search/qdrant/Cargo.lock
index 96e99f61e421..be2eaf076f8c 100644
--- a/pkgs/servers/search/qdrant/Cargo.lock
+++ b/pkgs/servers/search/qdrant/Cargo.lock
@@ -94,7 +94,7 @@ dependencies = [
  "tokio",
  "tokio-util",
  "tracing",
- "zstd 0.13.0",
+ "zstd",
 ]
 
 [[package]]
@@ -109,14 +109,13 @@ dependencies = [
 
 [[package]]
 name = "actix-multipart"
-version = "0.6.2"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d974dd6c4f78d102d057c672dcf6faa618fafa9df91d44f9c466688fc1275a3a"
+checksum = "d5118a26dee7e34e894f7e85aa0ee5080ae4c18bf03c0e30d49a80e418f00a53"
 dependencies = [
  "actix-multipart-derive",
  "actix-utils",
  "actix-web",
- "bytes",
  "derive_more",
  "futures-core",
  "futures-util",
@@ -135,9 +134,9 @@ dependencies = [
 
 [[package]]
 name = "actix-multipart-derive"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a0a77f836d869f700e5b47ac7c3c8b9c8bc82e4aec861954c6198abee3ebd4d"
+checksum = "e11eb847f49a700678ea2fa73daeb3208061afa2b9d1a8527c03390f4c4a1c6b"
 dependencies = [
  "darling",
  "parse-size",
@@ -338,17 +337,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
 
-[[package]]
-name = "aes"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2"
-dependencies = [
- "cfg-if",
- "cipher",
- "cpufeatures",
-]
-
 [[package]]
 name = "ahash"
 version = "0.8.11"
@@ -476,7 +464,7 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
 
 [[package]]
 name = "api"
-version = "1.10.0"
+version = "1.10.1"
 dependencies = [
  "chrono",
  "common",
@@ -553,9 +541,9 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.80"
+version = "0.1.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
+checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -674,12 +662,6 @@ version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51"
 
-[[package]]
-name = "base64ct"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
-
 [[package]]
 name = "bincode"
 version = "1.3.3"
@@ -709,6 +691,12 @@ dependencies = [
  "syn 2.0.48",
 ]
 
+[[package]]
+name = "binout"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b60b1af88a588fca5fe424ae7d735bc52814f80ff57614f57043cc4e2024f2ea"
+
 [[package]]
 name = "bit-set"
 version = "0.5.3"
@@ -739,6 +727,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "bitm"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b06e8e5bec3490b9f6f3adbb78aa4f53e8396fd9994e8a62a346b44ea7c15f35"
+dependencies = [
+ "dyn_size_of",
+]
+
 [[package]]
 name = "bitpacking"
 version = "0.9.2"
@@ -833,16 +830,6 @@ dependencies = [
  "bytes",
 ]
 
-[[package]]
-name = "bzip2"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8"
-dependencies = [
- "bzip2-sys",
- "libc",
-]
-
 [[package]]
 name = "bzip2-sys"
 version = "0.1.11+1.0.8"
@@ -871,9 +858,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.0.100"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c891175c3fb232128f48de6590095e59198bbeb8620c310be349bfc3afd12c7b"
+checksum = "066fce287b1d4eafef758e89e09d724a24808a9196fe9756b8ca90e86d0719a2"
 dependencies = [
  "jobserver",
  "libc",
@@ -919,9 +906,9 @@ dependencies = [
 
 [[package]]
 name = "charabia"
-version = "0.8.8"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60dc1a562fc8cb53d552d371758a4ecd76d15cc7489d2b968529cd9cadcbd854"
+checksum = "11a09ae38cfcc153f01576c3f579dfd916e0320f1b474f298c8d680b2dd92eb6"
 dependencies = [
  "aho-corasick",
  "cow-utils",
@@ -931,12 +918,9 @@ dependencies = [
  "fst",
  "irg-kvariants",
  "jieba-rs",
- "lindera-core",
- "lindera-dictionary",
- "lindera-tokenizer",
+ "lindera",
  "litemap",
  "once_cell",
- "pinyin",
  "serde",
  "slice-group-by",
  "unicode-normalization",
@@ -995,16 +979,6 @@ dependencies = [
  "half 1.8.2",
 ]
 
-[[package]]
-name = "cipher"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
-dependencies = [
- "crypto-common",
- "inout",
-]
-
 [[package]]
 name = "clang-sys"
 version = "1.4.0"
@@ -1035,19 +1009,19 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.7"
+version = "4.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f"
+checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d"
 dependencies = [
  "clap_builder",
- "clap_derive 4.5.5",
+ "clap_derive 4.5.8",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.5.7"
+version = "4.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f"
+checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1070,9 +1044,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.5"
+version = "4.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6"
+checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -1139,7 +1113,7 @@ dependencies = [
  "log",
  "merge",
  "object_store",
- "ordered-float 4.2.0",
+ "ordered-float 4.2.1",
  "parking_lot",
  "pprof",
  "proptest",
@@ -1192,14 +1166,19 @@ name = "common"
 version = "0.0.0"
 dependencies = [
  "lazy_static",
+ "memmap2 0.9.4",
  "num_cpus",
- "ordered-float 4.2.0",
+ "ordered-float 4.2.1",
+ "ph",
+ "rand 0.8.5",
  "semver",
  "serde",
+ "tempfile",
  "thiserror",
  "thread-priority",
  "tokio",
  "validator",
+ "zerocopy",
 ]
 
 [[package]]
@@ -1398,7 +1377,7 @@ dependencies = [
  "anes",
  "cast",
  "ciborium",
- "clap 4.5.7",
+ "clap 4.5.8",
  "criterion-plot",
  "is-terminal",
  "itertools 0.10.5",
@@ -1551,9 +1530,9 @@ dependencies = [
 
 [[package]]
 name = "darling"
-version = "0.20.3"
+version = "0.20.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
+checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -1561,9 +1540,9 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.3"
+version = "0.20.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
+checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f"
 dependencies = [
  "fnv",
  "ident_case",
@@ -1575,9 +1554,9 @@ dependencies = [
 
 [[package]]
 name = "darling_macro"
-version = "0.20.3"
+version = "0.20.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
+checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
 dependencies = [
  "darling_core",
  "quote",
@@ -1617,6 +1596,37 @@ dependencies = [
  "uuid",
 ]
 
+[[package]]
+name = "derive_builder"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7"
+dependencies = [
+ "derive_builder_macro",
+]
+
+[[package]]
+name = "derive_builder_core"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "derive_builder_macro"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b"
+dependencies = [
+ "derive_builder_core",
+ "syn 2.0.48",
+]
+
 [[package]]
 name = "derive_more"
 version = "0.99.17"
@@ -1644,7 +1654,6 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer",
  "crypto-common",
- "subtle",
 ]
 
 [[package]]
@@ -1680,6 +1689,12 @@ version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60"
 
+[[package]]
+name = "dyn_size_of"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33d4f78a40b1ec35bf8cafdaaf607ba2f773c366b0b3bda48937cacd7a8d5134"
+
 [[package]]
 name = "earcutr"
 version = "0.4.2"
@@ -2365,15 +2380,6 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
-[[package]]
-name = "hmac"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
-dependencies = [
- "digest",
-]
-
 [[package]]
 name = "http"
 version = "0.2.9"
@@ -2532,7 +2538,7 @@ dependencies = [
  "http 1.0.0",
  "hyper 1.2.0",
  "hyper-util",
- "rustls 0.23.10",
+ "rustls 0.23.11",
  "rustls-native-certs",
  "rustls-pki-types",
  "tokio",
@@ -2688,15 +2694,6 @@ dependencies = [
  "str_stack",
 ]
 
-[[package]]
-name = "inout"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "instant"
 version = "0.1.12"
@@ -2892,6 +2889,15 @@ dependencies = [
  "simple_asn1",
 ]
 
+[[package]]
+name = "kanaria"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0f9d9652540055ac4fded998a73aca97d965899077ab1212587437da44196ff"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
 [[package]]
 name = "language-tags"
 version = "0.3.2"
@@ -2978,29 +2984,79 @@ dependencies = [
 ]
 
 [[package]]
-name = "lindera-cc-cedict-builder"
-version = "0.28.0"
+name = "lindera"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca21f2ee3ca40e7f3ebbd568d041be1531c2c28dbf540e737aeba934ab53f330"
+checksum = "dcd4fa369654517f72c10b24adf03ad4ce69d19facb79c3cb3cf9b4580ac352f"
+dependencies = [
+ "lindera-analyzer",
+ "lindera-core",
+ "lindera-dictionary",
+ "lindera-filter",
+ "lindera-tokenizer",
+]
+
+[[package]]
+name = "lindera-analyzer"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2cba7fe275cb8ec4c594cfee9cc39e48b71e02a089457d52f3e70dc146a8133"
 dependencies = [
  "anyhow",
  "bincode",
  "byteorder",
- "csv",
  "encoding",
- "env_logger",
- "glob",
+ "kanaria",
+ "lindera-cc-cedict-builder",
  "lindera-core",
- "lindera-decompress",
- "log",
+ "lindera-dictionary",
+ "lindera-filter",
+ "lindera-ipadic-builder",
+ "lindera-ko-dic-builder",
+ "lindera-tokenizer",
+ "lindera-unidic-builder",
+ "once_cell",
+ "regex",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "unicode-blocks",
+ "unicode-normalization",
+ "unicode-segmentation",
  "yada",
 ]
 
 [[package]]
-name = "lindera-compress"
-version = "0.28.0"
+name = "lindera-cc-cedict"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34da125091f3b3a49351f418484a16cb2a23f6888cd53fe219edad19d263da5d"
+checksum = "240adf9faba3f09ad16557aefcd316dd00ebb940ac94334a629660d772f118c1"
+dependencies = [
+ "bincode",
+ "byteorder",
+ "lindera-cc-cedict-builder",
+ "lindera-core",
+ "lindera-decompress",
+ "once_cell",
+]
+
+[[package]]
+name = "lindera-cc-cedict-builder"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f12241f9e74babe708a0b9441d9f3fa67cb29fd01257918f30ffd480ca568820"
+dependencies = [
+ "anyhow",
+ "lindera-core",
+ "lindera-decompress",
+ "lindera-dictionary-builder",
+]
+
+[[package]]
+name = "lindera-compress"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50f9f7a858d70ff9e4383cbd507ca9e98c8faf0319e08c10df4c30cb58c9ca6c"
 dependencies = [
  "anyhow",
  "flate2",
@@ -3009,9 +3065,9 @@ dependencies = [
 
 [[package]]
 name = "lindera-core"
-version = "0.28.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09d4b717a8a31b73a3cbd3552e0abda14e0c85d97dc8b911035342533defdbad"
+checksum = "7f09810ab98ce2a084d788ac38fbb7b31697f34bc47c61de0d880320a674bd15"
 dependencies = [
  "anyhow",
  "bincode",
@@ -3026,9 +3082,9 @@ dependencies = [
 
 [[package]]
 name = "lindera-decompress"
-version = "0.28.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98f4476c99cb4ffa54fbfc42953adf69ada7276cfbb594bce9829547de012058"
+checksum = "d53400c9b2dd6b45f82d9fa5b5efe079f3acaf6ce609dba8d42c8a76baaa2b12"
 dependencies = [
  "anyhow",
  "flate2",
@@ -3037,71 +3093,133 @@ dependencies = [
 
 [[package]]
 name = "lindera-dictionary"
-version = "0.28.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a45b92f0ce331c2202c6cec3135e4bfce29525ab3bb97a613c27c8e0a29fa967"
+checksum = "2053d064a515839250438b8dfa6cf445e2b97633232ded34a54f267e945d196e"
 dependencies = [
  "anyhow",
  "bincode",
  "byteorder",
+ "lindera-cc-cedict",
  "lindera-cc-cedict-builder",
  "lindera-core",
+ "lindera-ipadic",
  "lindera-ipadic-builder",
+ "lindera-ipadic-neologd",
  "lindera-ipadic-neologd-builder",
  "lindera-ko-dic",
  "lindera-ko-dic-builder",
  "lindera-unidic",
  "lindera-unidic-builder",
  "serde",
+ "strum",
+ "strum_macros",
+]
+
+[[package]]
+name = "lindera-dictionary-builder"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14f486924055f8bedcc5877572e4dc91fbc10370862430ac2e5f7f0d671a18c8"
+dependencies = [
+ "anyhow",
+ "bincode",
+ "byteorder",
+ "csv",
+ "derive_builder",
+ "encoding",
+ "encoding_rs",
+ "encoding_rs_io",
+ "glob",
+ "lindera-compress",
+ "lindera-core",
+ "lindera-decompress",
+ "log",
+ "yada",
+]
+
+[[package]]
+name = "lindera-filter"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb3904fc279f0297f6fd6210435adab1f8c82ba84eba8635407c791af51c0d8a"
+dependencies = [
+ "anyhow",
+ "csv",
+ "kanaria",
+ "lindera-cc-cedict-builder",
+ "lindera-core",
+ "lindera-dictionary",
+ "lindera-ipadic-builder",
+ "lindera-ko-dic-builder",
+ "lindera-unidic-builder",
+ "once_cell",
+ "regex",
+ "serde",
+ "serde_json",
+ "unicode-blocks",
+ "unicode-normalization",
+ "unicode-segmentation",
+ "yada",
+]
+
+[[package]]
+name = "lindera-ipadic"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4aa3ef2f1f6838b0fa2e2fca2896242bb83bc877c1760cdb6fa23449ab95d664"
+dependencies = [
+ "bincode",
+ "byteorder",
+ "lindera-core",
+ "lindera-decompress",
+ "lindera-ipadic-builder",
+ "once_cell",
 ]
 
 [[package]]
 name = "lindera-ipadic-builder"
-version = "0.28.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "642dee52201852df209cb43423ff1ca4d161a329f5cdba049a7b5820118345f2"
+checksum = "a41287db18eadb58d73a04d49778d41c161549fbbbe155d4338976b7b8541c7d"
 dependencies = [
  "anyhow",
- "bincode",
- "byteorder",
- "csv",
- "encoding_rs",
- "encoding_rs_io",
- "env_logger",
- "glob",
  "lindera-core",
  "lindera-decompress",
- "log",
- "serde",
- "yada",
+ "lindera-dictionary-builder",
+]
+
+[[package]]
+name = "lindera-ipadic-neologd"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49382256f245078400bf7e72663f9eb30afcd9ed54cd46f29d7db1be529678e1"
+dependencies = [
+ "bincode",
+ "byteorder",
+ "lindera-core",
+ "lindera-decompress",
+ "lindera-ipadic-neologd-builder",
+ "once_cell",
 ]
 
 [[package]]
 name = "lindera-ipadic-neologd-builder"
-version = "0.28.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "325144b154e68159373e944d1cd7f67c6ff9965a2af41240a8e41732b3fdb3af"
+checksum = "5ae9cfd2fda68ef526ef0c7b50c5d4d5582a4daa6ecd0cea9e2b0b62564a2a5d"
 dependencies = [
  "anyhow",
- "bincode",
- "byteorder",
- "csv",
- "encoding_rs",
- "encoding_rs_io",
- "env_logger",
- "glob",
  "lindera-core",
  "lindera-decompress",
- "log",
- "serde",
- "yada",
+ "lindera-dictionary-builder",
 ]
 
 [[package]]
 name = "lindera-ko-dic"
-version = "0.28.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b484a2f9964e7424264fda304beb6ff6ad883c347accfe1115e777dedef3661d"
+checksum = "7f86d03a863f3ae1d269e7b7d4dd2cce9385a53463479bafc5d7aa48719f36db"
 dependencies = [
  "bincode",
  "byteorder",
@@ -3112,33 +3230,26 @@ dependencies = [
  "lindera-ko-dic-builder",
  "once_cell",
  "tar",
+ "ureq",
 ]
 
 [[package]]
 name = "lindera-ko-dic-builder"
-version = "0.28.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9413d4d9bf7af921f5ac64414a290c7ba81695e8ba08dd2f6c950b57c281a69"
+checksum = "bd0f44f2e56358c5879dfb5e7f76cc6ba7853ec31082c4e3f8fb65fb2d849c51"
 dependencies = [
  "anyhow",
- "bincode",
- "byteorder",
- "csv",
- "encoding",
- "env_logger",
- "glob",
- "lindera-compress",
  "lindera-core",
  "lindera-decompress",
- "log",
- "yada",
+ "lindera-dictionary-builder",
 ]
 
 [[package]]
 name = "lindera-tokenizer"
-version = "0.28.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9987c818462d51ca67e131e40f0386e25e8c557e195059b1257f95731561185d"
+checksum = "7c5182735cdc2832ac757b31e8a5b150a3514357a30efe3dec212f8dcb06ba14"
 dependencies = [
  "bincode",
  "lindera-core",
@@ -3150,39 +3261,32 @@ dependencies = [
 
 [[package]]
 name = "lindera-unidic"
-version = "0.28.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c379cf436b2627cd7d3498642e491eadbff9b3e01231c516ce9f9b1893ab7c3"
+checksum = "6c63da104728dd1cf14bfa564753cbfa996f6078ed2e23e31475bd1d639fc597"
 dependencies = [
  "bincode",
  "byteorder",
  "encoding",
+ "flate2",
  "lindera-core",
  "lindera-decompress",
  "lindera-unidic-builder",
  "once_cell",
+ "tar",
  "ureq",
- "zip",
 ]
 
 [[package]]
 name = "lindera-unidic-builder"
-version = "0.28.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "601ec33b5174141396a7a4ca066278863840221fec32d0be19091e7fae91ed94"
+checksum = "04acecbc068dac21766a1b7ed1f2608b6f250d10b4f8bff67abc2a00437a0974"
 dependencies = [
  "anyhow",
- "bincode",
- "byteorder",
- "csv",
- "encoding",
- "env_logger",
- "glob",
- "lindera-compress",
  "lindera-core",
  "lindera-decompress",
- "log",
- "yada",
+ "lindera-dictionary-builder",
 ]
 
 [[package]]
@@ -3249,9 +3353,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 = "loom"
@@ -3288,7 +3392,7 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
 dependencies = [
- "regex-automata",
+ "regex-automata 0.1.10",
 ]
 
 [[package]]
@@ -3309,9 +3413,9 @@ dependencies = [
 
 [[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 = "memmap2"
@@ -3646,9 +3750,9 @@ dependencies = [
 
 [[package]]
 name = "ordered-float"
-version = "4.2.0"
+version = "4.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e"
+checksum = "19ff2cf528c6c03d9ed653d6c4ce1dc0582dc4af309790ad92f07c1cd551b0be"
 dependencies = [
  "num-traits",
 ]
@@ -3707,17 +3811,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "944553dd59c802559559161f9816429058b869003836120e262e8caec061b7ae"
 
-[[package]]
-name = "password-hash"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700"
-dependencies = [
- "base64ct",
- "rand_core 0.6.4",
- "subtle",
-]
-
 [[package]]
 name = "paste"
 version = "1.0.11"
@@ -3730,18 +3823,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
 
-[[package]]
-name = "pbkdf2"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
-dependencies = [
- "digest",
- "hmac",
- "password-hash",
- "sha2",
-]
-
 [[package]]
 name = "pem"
 version = "3.0.3"
@@ -3822,6 +3903,19 @@ dependencies = [
  "indexmap 1.9.2",
 ]
 
+[[package]]
+name = "ph"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b7b74d575d7c11fb653fae69688be5206cafc1ead33c01ce61ac7f36eae45b"
+dependencies = [
+ "binout",
+ "bitm",
+ "dyn_size_of",
+ "rayon",
+ "wyhash",
+]
+
 [[package]]
 name = "phf"
 version = "0.11.2"
@@ -3892,12 +3986,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
-[[package]]
-name = "pinyin"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16f2611cd06a1ac239a0cea4521de9eb068a6ca110324ee00631aa68daa74fc0"
-
 [[package]]
 name = "pkg-config"
 version = "0.3.26"
@@ -4315,7 +4403,7 @@ dependencies = [
 
 [[package]]
 name = "qdrant"
-version = "1.10.0"
+version = "1.10.1"
 dependencies = [
  "actix-cors",
  "actix-files",
@@ -4327,7 +4415,7 @@ dependencies = [
  "api",
  "cancel",
  "chrono",
- "clap 4.5.7",
+ "clap 4.5.8",
  "collection",
  "colored",
  "common",
@@ -4351,7 +4439,7 @@ dependencies = [
  "rand 0.8.5",
  "reqwest 0.12.5",
  "rstack-self",
- "rustls 0.23.10",
+ "rustls 0.23.11",
  "rustls-pemfile 2.1.2",
  "rustls-pki-types",
  "rusty-hook",
@@ -4433,7 +4521,7 @@ dependencies = [
  "quinn-proto",
  "quinn-udp",
  "rustc-hash",
- "rustls 0.23.10",
+ "rustls 0.23.11",
  "thiserror",
  "tokio",
  "tracing",
@@ -4449,7 +4537,7 @@ dependencies = [
  "rand 0.8.5",
  "ring 0.17.5",
  "rustc-hash",
- "rustls 0.23.10",
+ "rustls 0.23.11",
  "slab",
  "thiserror",
  "tinyvec",
@@ -4641,13 +4729,14 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.8.4"
+version = "1.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
+checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.7.2",
+ "regex-automata 0.4.7",
+ "regex-syntax 0.8.2",
 ]
 
 [[package]]
@@ -4659,6 +4748,17 @@ dependencies = [
  "regex-syntax 0.6.28",
 ]
 
+[[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 0.8.2",
+]
+
 [[package]]
 name = "regex-lite"
 version = "0.1.5"
@@ -4671,12 +4771,6 @@ version = "0.6.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
 
-[[package]]
-name = "regex-syntax"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
-
 [[package]]
 name = "regex-syntax"
 version = "0.8.2"
@@ -4756,7 +4850,7 @@ dependencies = [
  "percent-encoding",
  "pin-project-lite",
  "quinn",
- "rustls 0.23.10",
+ "rustls 0.23.11",
  "rustls-native-certs",
  "rustls-pemfile 2.1.2",
  "rustls-pki-types",
@@ -5024,22 +5118,22 @@ dependencies = [
  "log",
  "ring 0.17.5",
  "rustls-pki-types",
- "rustls-webpki 0.102.4",
+ "rustls-webpki 0.102.5",
  "subtle",
  "zeroize",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.23.10"
+version = "0.23.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402"
+checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0"
 dependencies = [
  "log",
  "once_cell",
  "ring 0.17.5",
  "rustls-pki-types",
- "rustls-webpki 0.102.4",
+ "rustls-webpki 0.102.5",
  "subtle",
  "zeroize",
 ]
@@ -5094,9 +5188,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.4"
+version = "0.102.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e"
+checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78"
 dependencies = [
  "ring 0.17.5",
  "rustls-pki-types",
@@ -5310,7 +5404,6 @@ dependencies = [
  "criterion",
  "dataset",
  "fnv",
- "fs4",
  "fs_extra",
  "generic-tests",
  "geo",
@@ -5332,7 +5425,7 @@ dependencies = [
  "num-cmp",
  "num-derive",
  "num-traits",
- "ordered-float 4.2.0",
+ "ordered-float 4.2.1",
  "parking_lot",
  "pprof",
  "procfs",
@@ -5380,9 +5473,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.203"
+version = "1.0.204"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
 dependencies = [
  "serde_derive",
 ]
@@ -5420,9 +5513,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.203"
+version = "1.0.204"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
+checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5442,9 +5535,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.117"
+version = "1.0.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
 dependencies = [
  "itoa",
  "ryu",
@@ -5715,11 +5808,9 @@ dependencies = [
  "indicatif",
  "io",
  "itertools 0.13.0",
- "log",
  "memmap2 0.9.4",
  "memory",
- "num-traits",
- "ordered-float 4.2.0",
+ "ordered-float 4.2.1",
  "parking_lot",
  "pprof",
  "rand 0.8.5",
@@ -6127,9 +6218,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",
 ]
@@ -6197,7 +6288,7 @@ version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
 dependencies = [
- "rustls 0.23.10",
+ "rustls 0.23.11",
  "rustls-pki-types",
  "tokio",
 ]
@@ -6521,6 +6612,12 @@ version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
 
+[[package]]
+name = "unicode-blocks"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b12e05d9e06373163a9bb6bb8c263c261b396643a99445fe6b9811fd376581b"
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.6"
@@ -6529,18 +6626,18 @@ checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.22"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
 dependencies = [
  "tinyvec",
 ]
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.10.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
 [[package]]
 name = "unicode-width"
@@ -6592,7 +6689,7 @@ dependencies = [
  "once_cell",
  "rustls 0.22.4",
  "rustls-pki-types",
- "rustls-webpki 0.102.4",
+ "rustls-webpki 0.102.5",
  "url",
  "webpki-roots 0.26.1",
 ]
@@ -7177,6 +7274,15 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "wyhash"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf6e163c25e3fac820b4b453185ea2dea3b6a3e0a721d4d23d75bd33734c295"
+dependencies = [
+ "rand_core 0.6.4",
+]
+
 [[package]]
 name = "wyz"
 version = "0.5.1"
@@ -7199,9 +7305,9 @@ dependencies = [
 
 [[package]]
 name = "yada"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6d12cb7a57bbf2ab670ed9545bae3648048547f9039279a89ce000208e585c1"
+checksum = "aed111bd9e48a802518765906cbdadf0b45afb72b9c81ab049a3b86252adffdd"
 
 [[package]]
 name = "yaml-rust"
@@ -7214,18 +7320,19 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.7.31"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
+ "byteorder",
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.31"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7246,59 +7353,20 @@ checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
 
 [[package]]
 name = "zerovec"
-version = "0.10.2"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
 dependencies = [
  "zerofrom",
 ]
 
-[[package]]
-name = "zip"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
-dependencies = [
- "aes",
- "byteorder",
- "bzip2",
- "constant_time_eq 0.1.5",
- "crc32fast",
- "crossbeam-utils",
- "flate2",
- "hmac",
- "pbkdf2",
- "sha1",
- "time",
- "zstd 0.11.2+zstd.1.5.2",
-]
-
-[[package]]
-name = "zstd"
-version = "0.11.2+zstd.1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"
-dependencies = [
- "zstd-safe 5.0.2+zstd.1.5.2",
-]
-
 [[package]]
 name = "zstd"
 version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110"
 dependencies = [
- "zstd-safe 7.0.0",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "5.0.2+zstd.1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db"
-dependencies = [
- "libc",
- "zstd-sys",
+ "zstd-safe",
 ]
 
 [[package]]
diff --git a/pkgs/servers/search/qdrant/default.nix b/pkgs/servers/search/qdrant/default.nix
index 4d77d3700c9a..f742cf81c0ae 100644
--- a/pkgs/servers/search/qdrant/default.nix
+++ b/pkgs/servers/search/qdrant/default.nix
@@ -13,13 +13,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "qdrant";
-  version = "1.10.0";
+  version = "1.10.1";
 
   src = fetchFromGitHub {
     owner = "qdrant";
     repo = "qdrant";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-TG8huGKhh0tqJhqtb6Pu3opX2lPK1UrbgrV/eoZnU08=";
+    sha256 = "sha256-H1b275dVZGjkvXCV/zHDQtIrJiFMc7tmxbHh3B1+nPE=";
   };
 
   cargoLock = {

From c0da1a474509e18b028e4c735e3da8758aa1c3dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Jul 2024 09:01:06 +0000
Subject: [PATCH 019/175] python312Packages.textual: 0.70.0 -> 0.72.0

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

diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix
index ea00817ab76d..95cc7633dcf4 100644
--- a/pkgs/development/python-modules/textual/default.nix
+++ b/pkgs/development/python-modules/textual/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "textual";
-  version = "0.70.0";
+  version = "0.72.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "Textualize";
     repo = "textual";
     rev = "refs/tags/v${version}";
-    hash = "sha256-nOgiMT+q2pc94Q6g3MvKQVhGJYSGNnoE+5/foK62zLM=";
+    hash = "sha256-iNl9bos1GBLmHRvSgqYD8b6cptmmMktXkDXQbm3xMtc=";
   };
 
   build-system = [ poetry-core ];

From a91621dcdc0fdff7cf01ae135869a508e0d58fff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Jul 2024 14:28:36 +0000
Subject: [PATCH 020/175] python312Packages.asyncssh: 2.14.2 -> 2.15.0

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

diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix
index 3618d0eaa184..1b77638073f5 100644
--- a/pkgs/development/python-modules/asyncssh/default.nix
+++ b/pkgs/development/python-modules/asyncssh/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "asyncssh";
-  version = "2.14.2";
+  version = "2.15.0";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-6Va/iYjQega6MwX2YE4mH0ygFMSiMvCHPxx2kvvjz8I=";
+    hash = "sha256-ChOkOBb0bPCEZX+wVZaCO5PVtI5173djyKdW7BIXg3o=";
   };
 
   build-system = [ setuptools ];

From 24096e9fb34ccc5a4ee625eaceb2cf2048d2e978 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Thu, 18 Jul 2024 12:57:51 -0400
Subject: [PATCH 021/175] maintainers: remove adamlwgriffiths

---
 maintainers/maintainer-list.nix               | 6 ------
 pkgs/development/libraries/raylib/default.nix | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5716dc7a271c..88a1332eab09 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -490,12 +490,6 @@
     githubId = 2071575;
     name = "Adam C. Stephens";
   };
-  adamlwgriffiths = {
-    email = "adam.lw.griffiths@gmail.com";
-    github = "adamlwgriffiths";
-    githubId = 1239156;
-    name = "Adam Griffiths";
-  };
   adamt = {
     email = "mail@adamtulinius.dk";
     github = "adamtulinius";
diff --git a/pkgs/development/libraries/raylib/default.nix b/pkgs/development/libraries/raylib/default.nix
index 64e327ec34af..ddc14bcc98b4 100644
--- a/pkgs/development/libraries/raylib/default.nix
+++ b/pkgs/development/libraries/raylib/default.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Simple and easy-to-use library to enjoy videogames programming";
     homepage = "https://www.raylib.com/";
     license = licenses.zlib;
-    maintainers = with maintainers; [ adamlwgriffiths ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.all;
     changelog = "https://github.com/raysan5/raylib/blob/${finalAttrs.version}/CHANGELOG";
   };

From 4bcfdfd271587d2ada5e17fe967035bda1254085 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Thu, 18 Jul 2024 23:58:45 +0100
Subject: [PATCH 022/175] mangal: move to by-name

---
 .../misc/mangal/default.nix => by-name/ma/mangal/package.nix}   | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/misc/mangal/default.nix => by-name/ma/mangal/package.nix} (100%)

diff --git a/pkgs/applications/misc/mangal/default.nix b/pkgs/by-name/ma/mangal/package.nix
similarity index 100%
rename from pkgs/applications/misc/mangal/default.nix
rename to pkgs/by-name/ma/mangal/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b2018bdc1ec2..77bbede50cef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1001,8 +1001,6 @@ with pkgs;
 
   graph-easy = callPackage ../tools/graphics/graph-easy { };
 
-  mangal = callPackage ../applications/misc/mangal { };
-
   mermaid-filter = callPackage ../tools/misc/mermaid-filter { };
 
   graphw00f = callPackage ../tools/security/graphw00f { };

From 3bb5e993cac3a6e1c3056d2bc9bf43eb2c7a5951 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Thu, 18 Jul 2024 23:59:19 +0100
Subject: [PATCH 023/175] mangal: format with nixfmt-rfc-style

---
 pkgs/by-name/ma/mangal/package.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ma/mangal/package.nix b/pkgs/by-name/ma/mangal/package.nix
index cc485d84e8e0..65e26ee20556 100644
--- a/pkgs/by-name/ma/mangal/package.nix
+++ b/pkgs/by-name/ma/mangal/package.nix
@@ -1,5 +1,10 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
-
+{
+  lib,
+  stdenv,
+  buildGoModule,
+  fetchFromGitHub,
+  installShellFiles,
+}:
 buildGoModule rec {
   pname = "mangal";
   version = "4.0.6";
@@ -14,7 +19,10 @@ buildGoModule rec {
   proxyVendor = true;
   vendorHash = null;
 
-  ldflags = [ "-s" "-w" ];
+  ldflags = [
+    "-s"
+    "-w"
+  ];
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -30,8 +38,7 @@ buildGoModule rec {
   doCheck = false; # test fail because of sandbox
 
   meta = with lib; {
-    description =
-      "A fancy CLI app written in Go which scrapes, downloads and packs manga into different formats";
+    description = "CLI app written in Go which scrapes, downloads and packs manga into different formats";
     homepage = "https://github.com/metafates/mangal";
     license = licenses.mit;
     maintainers = [ maintainers.bertof ];

From 498701505d7ac872c4e56cb4857d0a0860565a2c Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Fri, 19 Jul 2024 20:39:27 +0100
Subject: [PATCH 024/175] mangal: fix build

---
 .git-blame-ignore-revs             | 3 +++
 pkgs/by-name/ma/mangal/package.nix | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 012889bb2e82..0c5869db6b61 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -141,3 +141,6 @@ acd0e3898feb321cb9a71a0fd376f1157d0f4553
 
 # poptracker: format with nixfmt-rfc-style (#326697)
 ff5c8f6cc3d1f2e017e86d50965c14b71f00567b
+
+# mangal: format with nixfmt-rfc-style #328284
+3bb5e993cac3a6e1c3056d2bc9bf43eb2c7a5951
diff --git a/pkgs/by-name/ma/mangal/package.nix b/pkgs/by-name/ma/mangal/package.nix
index 65e26ee20556..c1d7c1540508 100644
--- a/pkgs/by-name/ma/mangal/package.nix
+++ b/pkgs/by-name/ma/mangal/package.nix
@@ -28,7 +28,7 @@ buildGoModule rec {
 
   postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
     # Mangal creates a config file in the folder ~/.config/mangal and fails if not possible
-    export MANGAL_CONFIG_PATH=`mktemp -d`
+    export HOME=$(mktemp -d)
     installShellCompletion --cmd mangal \
       --bash <($out/bin/mangal completion bash) \
       --zsh <($out/bin/mangal completion zsh) \

From a5f2496f25d44c4f4fc90e6e9d87b50dbb45e58d Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 19 Jul 2024 21:40:15 -0400
Subject: [PATCH 025/175] mpdecimal: add windows to `meta.platforms`

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

diff --git a/pkgs/development/libraries/mpdecimal/default.nix b/pkgs/development/libraries/mpdecimal/default.nix
index 687abab7d45b..1041100f9f8e 100644
--- a/pkgs/development/libraries/mpdecimal/default.nix
+++ b/pkgs/development/libraries/mpdecimal/default.nix
@@ -52,6 +52,6 @@ stdenv.mkDerivation rec {
 
     maintainers = with lib.maintainers; [ kaction ];
 
-    platforms = lib.platforms.unix;
+    platforms = lib.platforms.unix ++ lib.platforms.windows;
   };
 }

From 1e2071847de6ba5a7340cb8fef24f8f1a021d373 Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Mon, 27 May 2024 12:08:14 -0700
Subject: [PATCH 026/175] stdenv/freebsd: reinit

The old stdenv didn't work, and was also impure. The new one works, and
is pure. Presently, the bootstrap tools are cross compiled into one small
nar and one large tar, which is then unpacked, patched, and split into
smaller derivations. Efforts were made to make the boot process as short
as possible - there are only two clangs built, and as many packages are
propagated between stages as possible while leaving the bootstrap tools
out of the final stdenv's closure.
---
 lib/systems/flake-systems.nix                 |    3 +-
 .../bsd/freebsd/pkgs/mkDerivation.nix         |    3 +-
 pkgs/stdenv/freebsd/always-patchelf.sh        |    5 +
 .../freebsd/bootstrap-files-spurious.txt      | 5229 +++++++++++++++++
 pkgs/stdenv/freebsd/bootstrap-files.nix       |  105 +
 pkgs/stdenv/freebsd/default.nix               |  778 ++-
 pkgs/stdenv/freebsd/linkBS.sh                 |   10 +
 pkgs/stdenv/freebsd/trivial-bootstrap.sh      |  118 -
 pkgs/stdenv/freebsd/trivial-builder.nix       |   13 -
 pkgs/stdenv/freebsd/trivial-builder.sh        |   10 -
 pkgs/stdenv/freebsd/unpack-bootstrap-files.sh |   56 +
 pkgs/stdenv/freebsd/unpack-source.sh          |   41 +
 12 files changed, 5975 insertions(+), 396 deletions(-)
 create mode 100644 pkgs/stdenv/freebsd/always-patchelf.sh
 create mode 100644 pkgs/stdenv/freebsd/bootstrap-files-spurious.txt
 create mode 100644 pkgs/stdenv/freebsd/bootstrap-files.nix
 create mode 100644 pkgs/stdenv/freebsd/linkBS.sh
 delete mode 100644 pkgs/stdenv/freebsd/trivial-bootstrap.sh
 delete mode 100644 pkgs/stdenv/freebsd/trivial-builder.nix
 delete mode 100755 pkgs/stdenv/freebsd/trivial-builder.sh
 create mode 100644 pkgs/stdenv/freebsd/unpack-bootstrap-files.sh
 create mode 100644 pkgs/stdenv/freebsd/unpack-source.sh

diff --git a/lib/systems/flake-systems.nix b/lib/systems/flake-systems.nix
index a68580ff1407..851dc1af7181 100644
--- a/lib/systems/flake-systems.nix
+++ b/lib/systems/flake-systems.nix
@@ -24,6 +24,5 @@
   # "armv5tel-linux" is excluded because it is not bootstrapped
   "powerpc64le-linux"
   "riscv64-linux"
-
-  # "x86_64-freebsd" is excluded because it is mostly broken
+  "x86_64-freebsd"
 ]
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix
index 3ff7258734ef..a7034d98bea6 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix
@@ -5,6 +5,7 @@
   stdenvNoLibs,
   overrideCC,
   buildPackages,
+  stdenvNoLibcxx ? overrideCC stdenv buildPackages.llvmPackages.clangNoLibcxx,
   versionData,
   patches,
   compatIfNeeded,
@@ -29,7 +30,7 @@ lib.makeOverridable (
       else if attrs.noLibc or false then
         stdenvNoLibs
       else if attrs.noLibcxx or false then
-        overrideCC stdenv buildPackages.llvmPackages.clangNoLibcxx
+        stdenvNoLibcxx
       else
         stdenv;
   in
diff --git a/pkgs/stdenv/freebsd/always-patchelf.sh b/pkgs/stdenv/freebsd/always-patchelf.sh
new file mode 100644
index 000000000000..022c4af719a1
--- /dev/null
+++ b/pkgs/stdenv/freebsd/always-patchelf.sh
@@ -0,0 +1,5 @@
+fixupOutputHooks+=(_FreeBSDPatchelfShrink)
+
+_FreeBSDPatchelfShrink() {
+    find $prefix -type f | xargs -n1 patchelf --shrink-rpath &>/dev/null || true
+}
diff --git a/pkgs/stdenv/freebsd/bootstrap-files-spurious.txt b/pkgs/stdenv/freebsd/bootstrap-files-spurious.txt
new file mode 100644
index 000000000000..8f44810450d1
--- /dev/null
+++ b/pkgs/stdenv/freebsd/bootstrap-files-spurious.txt
@@ -0,0 +1,5229 @@
+.attr-0l2nkwhif96f51f4amnlf414lhl4rv9vh8iffyp431v6s28gsr90
+bin/addr2line
+bin/amdgpu-arch
+bin/analyze-build
+bin/as
+bin/autopoint
+bin/bzdiff
+bin/bzgrep
+bin/bzip2recover
+bin/bzmore
+bin/c++filt
+bin/clang-apply-replacements
+bin/clang-change-namespace
+bin/clang-check
+bin/clang-doc
+bin/clang-extdef-mapping
+bin/clang-format
+bin/clang-include-cleaner
+bin/clang-include-fixer
+bin/clang-linker-wrapper
+bin/clang-move
+bin/clang-offload-bundler
+bin/clang-offload-packager
+bin/clang-pseudo
+bin/clang-query
+bin/clang-refactor
+bin/clang-rename
+bin/clang-reorder-fields
+bin/clang-repl
+bin/clang-scan-deps
+bin/clang-tidy
+bin/clangd
+bin/clear
+bin/compile_et
+bin/diagtool
+bin/diff3
+bin/dwp
+bin/elfedit
+bin/envsubst
+bin/expand-response-params
+bin/find-all-symbols
+bin/gawkbug
+bin/gettext
+bin/gettext.sh
+bin/gettextize
+bin/gprof
+bin/gunzip
+bin/gzexe
+bin/hmaptool
+bin/infocmp
+bin/intercept-build
+bin/krb5-send-pr
+bin/ld.gold
+bin/lzmadec
+bin/lzmainfo
+bin/modularize
+bin/msgattrib
+bin/msgcat
+bin/msgcmp
+bin/msgcomm
+bin/msgconv
+bin/msgen
+bin/msgexec
+bin/msgfilter
+bin/msgfmt
+bin/msggrep
+bin/msginit
+bin/msgmerge
+bin/msgunfmt
+bin/msguniq
+bin/ngettext
+bin/nvptx-arch
+bin/objdump
+bin/pp-trace
+bin/recode-sr-latin
+bin/run-clang-tidy
+bin/scan-build
+bin/scan-build-py
+bin/sdiff
+bin/tabs
+bin/tic
+bin/tput
+bin/tset
+bin/uncompress
+bin/xgettext
+bin/xzdec
+bin/xzdiff
+bin/xzgrep
+bin/xzless
+bin/xzmore
+bin/zcat
+bin/zcmp
+bin/zdiff
+bin/zegrep
+bin/zfgrep
+bin/zforce
+bin/zgrep
+bin/zless
+bin/zmore
+bin/znew
+env-vars
+etc/profile.d/gawk.csh
+etc/profile.d/gawk.sh
+etc/ssl/ct_log_list.cnf
+etc/ssl/ct_log_list.cnf.dist
+etc/ssl/openssl.cnf.dist
+include/__libunwind_config.h
+include/a.out.h
+include/arpa/ftp.h
+include/arpa/telnet.h
+include/arpa/tftp.h
+include/autosprintf.h
+include/bitstring.h
+include/bsm/audit_domain.h
+include/bsm/audit_errno.h
+include/bsm/audit_fcntl.h
+include/bsm/audit_internal.h
+include/bsm/audit_kevents.h
+include/bsm/audit_record.h
+include/bsm/audit_socket_type.h
+include/c++/v1/__bsd_locale_fallbacks.h
+include/c++/v1/__charconv/chars_format.h
+include/c++/v1/__charconv/from_chars_result.h
+include/c++/v1/__charconv/tables.h
+include/c++/v1/__charconv/to_chars_base_10.h
+include/c++/v1/__charconv/to_chars_result.h
+include/c++/v1/__chrono/formatter.h
+include/c++/v1/__chrono/ostream.h
+include/c++/v1/__chrono/parser_std_format_spec.h
+include/c++/v1/__coroutine/coroutine_handle.h
+include/c++/v1/__coroutine/coroutine_traits.h
+include/c++/v1/__coroutine/noop_coroutine_handle.h
+include/c++/v1/__coroutine/trivial_awaitables.h
+include/c++/v1/__expected/bad_expected_access.h
+include/c++/v1/__expected/expected.h
+include/c++/v1/__expected/unexpect.h
+include/c++/v1/__expected/unexpected.h
+include/c++/v1/__format/buffer.h
+include/c++/v1/__format/container_adaptor.h
+include/c++/v1/__format/escaped_output_table.h
+include/c++/v1/__format/extended_grapheme_cluster_table.h
+include/c++/v1/__format/format_arg.h
+include/c++/v1/__format/format_arg_store.h
+include/c++/v1/__format/format_args.h
+include/c++/v1/__format/format_context.h
+include/c++/v1/__format/format_functions.h
+include/c++/v1/__format/format_string.h
+include/c++/v1/__format/format_to_n_result.h
+include/c++/v1/__format/formatter_bool.h
+include/c++/v1/__format/formatter_char.h
+include/c++/v1/__format/formatter_floating_point.h
+include/c++/v1/__format/formatter_integer.h
+include/c++/v1/__format/formatter_integral.h
+include/c++/v1/__format/formatter_output.h
+include/c++/v1/__format/formatter_pointer.h
+include/c++/v1/__format/formatter_string.h
+include/c++/v1/__format/formatter_tuple.h
+include/c++/v1/__format/parser_std_format_spec.h
+include/c++/v1/__format/range_default_formatter.h
+include/c++/v1/__format/range_formatter.h
+include/c++/v1/__format/unicode.h
+include/c++/v1/__fwd/span.h
+include/c++/v1/__iterator/iterator_with_data.h
+include/c++/v1/__memory_resource/monotonic_buffer_resource.h
+include/c++/v1/__memory_resource/pool_options.h
+include/c++/v1/__memory_resource/synchronized_pool_resource.h
+include/c++/v1/__memory_resource/unsynchronized_pool_resource.h
+include/c++/v1/__ranges/all.h
+include/c++/v1/__ranges/as_rvalue_view.h
+include/c++/v1/__ranges/common_view.h
+include/c++/v1/__ranges/copyable_box.h
+include/c++/v1/__ranges/counted.h
+include/c++/v1/__ranges/drop_view.h
+include/c++/v1/__ranges/drop_while_view.h
+include/c++/v1/__ranges/elements_view.h
+include/c++/v1/__ranges/empty_view.h
+include/c++/v1/__ranges/filter_view.h
+include/c++/v1/__ranges/iota_view.h
+include/c++/v1/__ranges/istream_view.h
+include/c++/v1/__ranges/join_view.h
+include/c++/v1/__ranges/lazy_split_view.h
+include/c++/v1/__ranges/non_propagating_cache.h
+include/c++/v1/__ranges/owning_view.h
+include/c++/v1/__ranges/range_adaptor.h
+include/c++/v1/__ranges/rbegin.h
+include/c++/v1/__ranges/ref_view.h
+include/c++/v1/__ranges/rend.h
+include/c++/v1/__ranges/reverse_view.h
+include/c++/v1/__ranges/single_view.h
+include/c++/v1/__ranges/split_view.h
+include/c++/v1/__ranges/take_view.h
+include/c++/v1/__ranges/take_while_view.h
+include/c++/v1/__ranges/transform_view.h
+include/c++/v1/__ranges/views.h
+include/c++/v1/__ranges/zip_view.h
+include/c++/v1/__std_stream
+include/c++/v1/__support/android/locale_bionic.h
+include/c++/v1/__support/fuchsia/xlocale.h
+include/c++/v1/__support/ibm/gettod_zos.h
+include/c++/v1/__support/ibm/locale_mgmt_zos.h
+include/c++/v1/__support/ibm/nanosleep.h
+include/c++/v1/__support/ibm/xlocale.h
+include/c++/v1/__support/musl/xlocale.h
+include/c++/v1/__support/newlib/xlocale.h
+include/c++/v1/__support/openbsd/xlocale.h
+include/c++/v1/__support/solaris/floatingpoint.h
+include/c++/v1/__support/solaris/wchar.h
+include/c++/v1/__support/solaris/xlocale.h
+include/c++/v1/__support/win32/locale_win32.h
+include/c++/v1/__support/xlocale/__nop_locale_mgmt.h
+include/c++/v1/__support/xlocale/__posix_l_fallback.h
+include/c++/v1/__support/xlocale/__strtonum_fallback.h
+include/c++/v1/__type_traits/make_32_64_or_128_bit.h
+include/c++/v1/any
+include/c++/v1/barrier
+include/c++/v1/ccomplex
+include/c++/v1/cfloat
+include/c++/v1/charconv
+include/c++/v1/codecvt
+include/c++/v1/complex
+include/c++/v1/complex.h
+include/c++/v1/coroutine
+include/c++/v1/csetjmp
+include/c++/v1/cstdbool
+include/c++/v1/ctgmath
+include/c++/v1/cuchar
+include/c++/v1/execution
+include/c++/v1/expected
+include/c++/v1/experimental/__config
+include/c++/v1/experimental/__memory
+include/c++/v1/experimental/algorithm
+include/c++/v1/experimental/coroutine
+include/c++/v1/experimental/deque
+include/c++/v1/experimental/forward_list
+include/c++/v1/experimental/functional
+include/c++/v1/experimental/iterator
+include/c++/v1/experimental/list
+include/c++/v1/experimental/map
+include/c++/v1/experimental/memory_resource
+include/c++/v1/experimental/propagate_const
+include/c++/v1/experimental/regex
+include/c++/v1/experimental/set
+include/c++/v1/experimental/simd
+include/c++/v1/experimental/string
+include/c++/v1/experimental/type_traits
+include/c++/v1/experimental/unordered_map
+include/c++/v1/experimental/unordered_set
+include/c++/v1/experimental/utility
+include/c++/v1/experimental/vector
+include/c++/v1/format
+include/c++/v1/latch
+include/c++/v1/libcxx.imp
+include/c++/v1/memory_resource
+include/c++/v1/module.modulemap
+include/c++/v1/numbers
+include/c++/v1/ranges
+include/c++/v1/scoped_allocator
+include/c++/v1/semaphore
+include/c++/v1/source_location
+include/c++/v1/span
+include/c++/v1/stdatomic.h
+include/c++/v1/strstream
+include/c++/v1/tgmath.h
+include/c++/v1/typeindex
+include/c++/v1/uchar.h
+include/cam/ata/ata_all.h
+include/cam/cam.h
+include/cam/cam_ccb.h
+include/cam/cam_compat.h
+include/cam/cam_debug.h
+include/cam/cam_iosched.h
+include/cam/cam_periph.h
+include/cam/cam_queue.h
+include/cam/cam_sim.h
+include/cam/cam_xpt.h
+include/cam/cam_xpt_internal.h
+include/cam/cam_xpt_periph.h
+include/cam/cam_xpt_sim.h
+include/cam/mmc/mmc.h
+include/cam/mmc/mmc_all.h
+include/cam/mmc/mmc_bus.h
+include/cam/nvme/nvme_all.h
+include/cam/scsi/scsi_all.h
+include/cam/scsi/scsi_cd.h
+include/cam/scsi/scsi_ch.h
+include/cam/scsi/scsi_da.h
+include/cam/scsi/scsi_enc.h
+include/cam/scsi/scsi_enc_internal.h
+include/cam/scsi/scsi_iu.h
+include/cam/scsi/scsi_message.h
+include/cam/scsi/scsi_pass.h
+include/cam/scsi/scsi_pt.h
+include/cam/scsi/scsi_sa.h
+include/cam/scsi/scsi_ses.h
+include/cam/scsi/scsi_sg.h
+include/cam/scsi/scsi_targetio.h
+include/cam/scsi/smp_all.h
+include/cpio.h
+include/dev/acpica/acpi_hpet.h
+include/dev/acpica/acpiio.h
+include/dev/agp/agpreg.h
+include/dev/ciss/cissio.h
+include/dev/ciss/cissreg.h
+include/dev/ciss/cissvar.h
+include/dev/evdev/input-event-codes.h
+include/dev/evdev/input.h
+include/dev/evdev/uinput.h
+include/dev/filemon
+include/dev/firewire/firewire.h
+include/dev/firewire/firewire_phy.h
+include/dev/firewire/firewirereg.h
+include/dev/firewire/fwdma.h
+include/dev/firewire/fwmem.h
+include/dev/firewire/fwohcireg.h
+include/dev/firewire/fwohcivar.h
+include/dev/firewire/fwphyreg.h
+include/dev/firewire/iec13213.h
+include/dev/firewire/iec68113.h
+include/dev/firewire/if_fwevar.h
+include/dev/firewire/if_fwipvar.h
+include/dev/firewire/sbp.h
+include/dev/hid/hid.h
+include/dev/hid/hidraw.h
+include/dev/hwpmc/hwpmc_amd.h
+include/dev/hwpmc/hwpmc_arm64.h
+include/dev/hwpmc/hwpmc_armv7.h
+include/dev/hwpmc/hwpmc_cmn600.h
+include/dev/hwpmc/hwpmc_core.h
+include/dev/hwpmc/hwpmc_dmc620.h
+include/dev/hwpmc/hwpmc_powerpc.h
+include/dev/hwpmc/hwpmc_riscv.h
+include/dev/hwpmc/hwpmc_soft.h
+include/dev/hwpmc/hwpmc_tsc.h
+include/dev/hwpmc/hwpmc_uncore.h
+include/dev/hwpmc/pmc_events.h
+include/dev/hwpmc/pmu_dmc620_reg.h
+include/dev/hyperv/hv_snapshot.h
+include/dev/hyperv/hyperv.h
+include/dev/ic/cd1400.h
+include/dev/ic/cd180.h
+include/dev/ic/i8237.h
+include/dev/ic/i8253reg.h
+include/dev/ic/i82586.h
+include/dev/ic/i8259.h
+include/dev/ic/nec765.h
+include/dev/ic/ns16550.h
+include/dev/ic/quicc.h
+include/dev/ic/via6522reg.h
+include/dev/ic/z8530.h
+include/dev/iicbus/ds1307reg.h
+include/dev/iicbus/ds3231reg.h
+include/dev/iicbus/iic.h
+include/dev/iicbus/iic_recover_bus.h
+include/dev/iicbus/iicbus.h
+include/dev/iicbus/iicoc.h
+include/dev/iicbus/iiconf.h
+include/dev/io
+include/dev/mfi/mfi_ioctl.h
+include/dev/mfi/mfireg.h
+include/dev/mfi/mfivar.h
+include/dev/mlx5/mlx5io.h
+include/dev/mmc/bridge.h
+include/dev/mmc/mmc_fdt_helpers.h
+include/dev/mmc/mmc_helpers.h
+include/dev/mmc/mmc_ioctl.h
+include/dev/mmc/mmc_private.h
+include/dev/mmc/mmc_subr.h
+include/dev/mmc/mmcbrvar.h
+include/dev/mmc/mmcreg.h
+include/dev/mmc/mmcvar.h
+include/dev/mpt/mpilib/mpi.h
+include/dev/mpt/mpilib/mpi_cnfg.h
+include/dev/mpt/mpilib/mpi_fc.h
+include/dev/mpt/mpilib/mpi_init.h
+include/dev/mpt/mpilib/mpi_ioc.h
+include/dev/mpt/mpilib/mpi_lan.h
+include/dev/mpt/mpilib/mpi_log_fc.h
+include/dev/mpt/mpilib/mpi_log_sas.h
+include/dev/mpt/mpilib/mpi_raid.h
+include/dev/mpt/mpilib/mpi_sas.h
+include/dev/mpt/mpilib/mpi_targ.h
+include/dev/mpt/mpilib/mpi_tool.h
+include/dev/mpt/mpilib/mpi_type.h
+include/dev/nvme/nvme.h
+include/dev/ofw/ofw_bus.h
+include/dev/ofw/ofw_bus_subr.h
+include/dev/ofw/ofw_cpu.h
+include/dev/ofw/ofw_graph.h
+include/dev/ofw/ofw_pci.h
+include/dev/ofw/ofw_subr.h
+include/dev/ofw/ofwpci.h
+include/dev/ofw/ofwvar.h
+include/dev/ofw/openfirm.h
+include/dev/ofw/openfirmio.h
+include/dev/pbio
+include/dev/pci/pcireg.h
+include/dev/ppbus/lpt.h
+include/dev/ppbus/lptio.h
+include/dev/ppbus/ppb_1284.h
+include/dev/ppbus/ppb_msq.h
+include/dev/ppbus/ppbconf.h
+include/dev/ppbus/ppbio.h
+include/dev/ppbus/ppi.h
+include/dev/pwm/ofw_pwm.h
+include/dev/pwm/pwmbus.h
+include/dev/pwm/pwmc.h
+include/dev/smbus/smb.h
+include/dev/smbus/smbconf.h
+include/dev/smbus/smbus.h
+include/dev/speaker
+include/dev/tcp_log
+include/dev/usb/ufm_ioctl.h
+include/dev/usb/uftdiio.h
+include/dev/usb/uled_ioctl.h
+include/dev/usb/usb.h
+include/dev/usb/usb_bus.h
+include/dev/usb/usb_busdma.h
+include/dev/usb/usb_cdc.h
+include/dev/usb/usb_controller.h
+include/dev/usb/usb_core.h
+include/dev/usb/usb_debug.h
+include/dev/usb/usb_dev.h
+include/dev/usb/usb_device.h
+include/dev/usb/usb_dynamic.h
+include/dev/usb/usb_endian.h
+include/dev/usb/usb_fdt_support.h
+include/dev/usb/usb_freebsd.h
+include/dev/usb/usb_freebsd_loader.h
+include/dev/usb/usb_generic.h
+include/dev/usb/usb_hub.h
+include/dev/usb/usb_hub_private.h
+include/dev/usb/usb_ioctl.h
+include/dev/usb/usb_mbuf.h
+include/dev/usb/usb_msctest.h
+include/dev/usb/usb_pci.h
+include/dev/usb/usb_pf.h
+include/dev/usb/usb_process.h
+include/dev/usb/usb_request.h
+include/dev/usb/usb_transfer.h
+include/dev/usb/usb_util.h
+include/dev/usb/usbdi.h
+include/dev/usb/usbdi_util.h
+include/dev/usb/usbhid.h
+include/dev/veriexec/veriexec_ioctl.h
+include/dev/vkbd
+include/dev/wg/if_wg.h
+include/elf.h
+include/fmtmsg.h
+include/fs/cuse/cuse_defs.h
+include/fs/cuse/cuse_ioctl.h
+include/fs/devfs/devfs.h
+include/fs/devfs/devfs_int.h
+include/fs/fdescfs
+include/fs/msdosfs/bootsect.h
+include/fs/msdosfs/bpb.h
+include/fs/msdosfs/denode.h
+include/fs/msdosfs/direntry.h
+include/fs/msdosfs/fat.h
+include/fs/msdosfs/msdosfsmount.h
+include/fs/nfs/nfs.h
+include/fs/nfs/nfs_var.h
+include/fs/nfs/nfscl.h
+include/fs/nfs/nfsclstate.h
+include/fs/nfs/nfsdport.h
+include/fs/nfs/nfskpiport.h
+include/fs/nfs/nfsm_subs.h
+include/fs/nfs/nfsport.h
+include/fs/nfs/nfsproto.h
+include/fs/nfs/nfsrvcache.h
+include/fs/nfs/nfsrvstate.h
+include/fs/nfs/nfsv4_errstr.h
+include/fs/nfs/rpcv2.h
+include/fs/nfs/xdr_subs.h
+include/fs/nullfs
+include/fs/procfs
+include/fs/smbfs/smbfs.h
+include/fs/smbfs/smbfs_node.h
+include/fs/smbfs/smbfs_subr.h
+include/fs/udf/ecma167-udf.h
+include/fs/udf/osta.h
+include/fs/udf/udf.h
+include/fs/udf/udf_mount.h
+include/fs/unionfs
+include/ftw.h
+include/gawkapi.h
+include/gelf.h
+include/geom/cache
+include/geom/concat
+include/geom/eli/g_eli.h
+include/geom/eli/pkcs5v2.h
+include/geom/gate
+include/geom/geom.h
+include/geom/geom_ctl.h
+include/geom/geom_dbg.h
+include/geom/geom_disk.h
+include/geom/geom_flashmap.h
+include/geom/geom_int.h
+include/geom/geom_slice.h
+include/geom/geom_vfs.h
+include/geom/journal
+include/geom/label/g_label.h
+include/geom/label/g_label_msdosfs.h
+include/geom/mirror
+include/geom/mountver
+include/geom/multipath
+include/geom/nop
+include/geom/raid/g_raid.h
+include/geom/raid/md_ddf.h
+include/geom/raid3
+include/geom/shsec
+include/geom/stripe
+include/geom/union
+include/geom/virstor/binstream.h
+include/geom/virstor/g_virstor.h
+include/geom/virstor/g_virstor_md.h
+include/gettext-po.h
+include/gnumake.h
+include/gssapi/gssapi.h
+include/gssapi.h
+include/hesiod.h
+include/i386/asm.h
+include/i386/asmacros.h
+include/i386/atomic.h
+include/i386/counter.h
+include/i386/cpufunc.h
+include/i386/md_var.h
+include/i386/pcpu.h
+include/i386/pcpu_aux.h
+include/i386/pmap.h
+include/i386/proc.h
+include/i386/profile.h
+include/i386/segments.h
+include/i386/vmparam.h
+include/iso646.h
+include/isofs/cd9660/cd9660_mount.h
+include/isofs/cd9660/cd9660_node.h
+include/isofs/cd9660/cd9660_rrip.h
+include/isofs/cd9660/iso.h
+include/isofs/cd9660/iso_rrip.h
+include/libelf.h
+include/libprocstat.h
+include/libunwind.h
+include/login_cap.h
+include/machine/_bus.h
+include/machine/acpica_machdep.h
+include/machine/apm_bios.h
+include/machine/asan.h
+include/machine/asm.h
+include/machine/asmacros.h
+include/machine/atomic.h
+include/machine/bus.h
+include/machine/bus_dma.h
+include/machine/clock.h
+include/machine/counter.h
+include/machine/cpufunc.h
+include/machine/cputypes.h
+include/machine/csan.h
+include/machine/db_machdep.h
+include/machine/dump.h
+include/machine/efi.h
+include/machine/exec.h
+include/machine/fdt.h
+include/machine/float.h
+include/machine/gdb_machdep.h
+include/machine/in_cksum.h
+include/machine/intr_machdep.h
+include/machine/iodev.h
+include/machine/iommu.h
+include/machine/kdb.h
+include/machine/limits.h
+include/machine/md_var.h
+include/machine/memdev.h
+include/machine/metadata.h
+include/machine/minidump.h
+include/machine/msan.h
+include/machine/nexusvar.h
+include/machine/npx.h
+include/machine/ofw_machdep.h
+include/machine/pc/bios.h
+include/machine/pc/display.h
+include/machine/pci_cfgreg.h
+include/machine/pcpu.h
+include/machine/pcpu_aux.h
+include/machine/pmc_mdep.h
+include/machine/profile.h
+include/machine/ptrace.h
+include/machine/pvclock.h
+include/machine/reloc.h
+include/machine/resource.h
+include/machine/sf_buf.h
+include/machine/sgx.h
+include/machine/sgxreg.h
+include/machine/sigframe.h
+include/machine/smp.h
+include/machine/stack.h
+include/machine/stdarg.h
+include/machine/sysarch.h
+include/machine/tls.h
+include/machine/trap.h
+include/machine/tss.h
+include/machine/vdso.h
+include/machine/vmm.h
+include/machine/vmm_dev.h
+include/machine/vmm_instruction_emul.h
+include/machine/vmm_snapshot.h
+include/md4.h
+include/memstat.h
+include/monetary.h
+include/mpool.h
+include/mqueue.h
+include/net/altq/altq.h
+include/net/altq/altq_cbq.h
+include/net/altq/altq_cdnr.h
+include/net/altq/altq_classq.h
+include/net/altq/altq_codel.h
+include/net/altq/altq_fairq.h
+include/net/altq/altq_hfsc.h
+include/net/altq/altq_priq.h
+include/net/altq/altq_red.h
+include/net/altq/altq_rio.h
+include/net/altq/altq_rmclass.h
+include/net/altq/altq_rmclass_debug.h
+include/net/altq/altq_var.h
+include/net/altq/if_altq.h
+include/net/bpf.h
+include/net/bpf_buffer.h
+include/net/bpf_jitter.h
+include/net/bpf_zerocopy.h
+include/net/bpfdesc.h
+include/net/bridgestp.h
+include/net/debugnet.h
+include/net/debugnet_int.h
+include/net/dlt.h
+include/net/ethernet.h
+include/net/firewire.h
+include/net/ieee8023ad_lacp.h
+include/net/ieee_oui.h
+include/net/if_arp.h
+include/net/if_bridgevar.h
+include/net/if_clone.h
+include/net/if_enc.h
+include/net/if_gif.h
+include/net/if_gre.h
+include/net/if_ipsec.h
+include/net/if_lagg.h
+include/net/if_llatbl.h
+include/net/if_llc.h
+include/net/if_mib.h
+include/net/if_ovpn.h
+include/net/if_pflog.h
+include/net/if_pfsync.h
+include/net/if_private.h
+include/net/if_stf.h
+include/net/if_strings.h
+include/net/if_tap.h
+include/net/if_tun.h
+include/net/if_types.h
+include/net/if_var.h
+include/net/if_vlan_var.h
+include/net/if_vxlan.h
+include/net/iflib.h
+include/net/ifq.h
+include/net/infiniband.h
+include/net/mp_ring.h
+include/net/mppc.h
+include/net/netisr.h
+include/net/netisr_internal.h
+include/net/netmap.h
+include/net/netmap_legacy.h
+include/net/netmap_user.h
+include/net/netmap_virt.h
+include/net/paravirt.h
+include/net/pfil.h
+include/net/pfkeyv2.h
+include/net/pfvar.h
+include/net/ppp_defs.h
+include/net/radix.h
+include/net/rndis.h
+include/net/route/fib_algo.h
+include/net/route/nhgrp_var.h
+include/net/route/nhop.h
+include/net/route/nhop_utils.h
+include/net/route/nhop_var.h
+include/net/route/route_ctl.h
+include/net/route/route_debug.h
+include/net/route/route_var.h
+include/net/rss_config.h
+include/net/sff8436.h
+include/net/sff8472.h
+include/net/slcompress.h
+include/net/toeplitz.h
+include/net80211/_ieee80211.h
+include/net80211/ieee80211.h
+include/net80211/ieee80211_action.h
+include/net80211/ieee80211_adhoc.h
+include/net80211/ieee80211_ageq.h
+include/net80211/ieee80211_alq.h
+include/net80211/ieee80211_amrr.h
+include/net80211/ieee80211_crypto.h
+include/net80211/ieee80211_dfs.h
+include/net80211/ieee80211_freebsd.h
+include/net80211/ieee80211_hostap.h
+include/net80211/ieee80211_ht.h
+include/net80211/ieee80211_input.h
+include/net80211/ieee80211_ioctl.h
+include/net80211/ieee80211_mesh.h
+include/net80211/ieee80211_monitor.h
+include/net80211/ieee80211_node.h
+include/net80211/ieee80211_phy.h
+include/net80211/ieee80211_power.h
+include/net80211/ieee80211_proto.h
+include/net80211/ieee80211_radiotap.h
+include/net80211/ieee80211_ratectl.h
+include/net80211/ieee80211_regdomain.h
+include/net80211/ieee80211_rssadapt.h
+include/net80211/ieee80211_scan.h
+include/net80211/ieee80211_scan_sw.h
+include/net80211/ieee80211_sta.h
+include/net80211/ieee80211_superg.h
+include/net80211/ieee80211_tdma.h
+include/net80211/ieee80211_var.h
+include/net80211/ieee80211_vht.h
+include/net80211/ieee80211_wds.h
+include/net80211/ieee80211_wps.h
+include/netgraph/bluetooth/include/ng_bluetooth.h
+include/netgraph/bluetooth/include/ng_btsocket.h
+include/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
+include/netgraph/bluetooth/include/ng_btsocket_l2cap.h
+include/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
+include/netgraph/bluetooth/include/ng_btsocket_sco.h
+include/netgraph/bluetooth/include/ng_hci.h
+include/netgraph/bluetooth/include/ng_l2cap.h
+include/netgraph/bluetooth/include/ng_ubt.h
+include/netgraph/netflow/netflow.h
+include/netgraph/netflow/netflow_v9.h
+include/netgraph/netflow/ng_netflow.h
+include/netgraph/netgraph.h
+include/netgraph/ng_UI.h
+include/netgraph/ng_async.h
+include/netgraph/ng_bpf.h
+include/netgraph/ng_bridge.h
+include/netgraph/ng_car.h
+include/netgraph/ng_checksum.h
+include/netgraph/ng_cisco.h
+include/netgraph/ng_deflate.h
+include/netgraph/ng_device.h
+include/netgraph/ng_echo.h
+include/netgraph/ng_eiface.h
+include/netgraph/ng_etf.h
+include/netgraph/ng_ether.h
+include/netgraph/ng_ether_echo.h
+include/netgraph/ng_frame_relay.h
+include/netgraph/ng_gif.h
+include/netgraph/ng_gif_demux.h
+include/netgraph/ng_hole.h
+include/netgraph/ng_hub.h
+include/netgraph/ng_iface.h
+include/netgraph/ng_ip_input.h
+include/netgraph/ng_ipfw.h
+include/netgraph/ng_ksocket.h
+include/netgraph/ng_l2tp.h
+include/netgraph/ng_lmi.h
+include/netgraph/ng_macfilter.h
+include/netgraph/ng_message.h
+include/netgraph/ng_mppc.h
+include/netgraph/ng_nat.h
+include/netgraph/ng_one2many.h
+include/netgraph/ng_parse.h
+include/netgraph/ng_patch.h
+include/netgraph/ng_pipe.h
+include/netgraph/ng_ppp.h
+include/netgraph/ng_pppoe.h
+include/netgraph/ng_pptpgre.h
+include/netgraph/ng_pred1.h
+include/netgraph/ng_rfc1490.h
+include/netgraph/ng_sample.h
+include/netgraph/ng_socket.h
+include/netgraph/ng_socketvar.h
+include/netgraph/ng_source.h
+include/netgraph/ng_split.h
+include/netgraph/ng_tag.h
+include/netgraph/ng_tcpmss.h
+include/netgraph/ng_tee.h
+include/netgraph/ng_tty.h
+include/netgraph/ng_vjc.h
+include/netgraph/ng_vlan.h
+include/netgraph/ng_vlan_rotate.h
+include/netgraph/qos.h
+include/netinet/cc/cc.h
+include/netinet/cc/cc_cubic.h
+include/netinet/cc/cc_module.h
+include/netinet/cc/cc_newreno.h
+include/netinet/dccp.h
+include/netinet/icmp6.h
+include/netinet/icmp_var.h
+include/netinet/if_ether.h
+include/netinet/igmp.h
+include/netinet/igmp_var.h
+include/netinet/in_fib.h
+include/netinet/in_kdtrace.h
+include/netinet/in_pcb_var.h
+include/netinet/in_rss.h
+include/netinet/in_var.h
+include/netinet/ip6.h
+include/netinet/ip_auth.h
+include/netinet/ip_carp.h
+include/netinet/ip_carp_nl.h
+include/netinet/ip_compat.h
+include/netinet/ip_divert.h
+include/netinet/ip_dstlist.h
+include/netinet/ip_dummynet.h
+include/netinet/ip_ecn.h
+include/netinet/ip_encap.h
+include/netinet/ip_fil.h
+include/netinet/ip_frag.h
+include/netinet/ip_fw.h
+include/netinet/ip_htable.h
+include/netinet/ip_icmp.h
+include/netinet/ip_lookup.h
+include/netinet/ip_mroute.h
+include/netinet/ip_nat.h
+include/netinet/ip_options.h
+include/netinet/ip_pool.h
+include/netinet/ip_proxy.h
+include/netinet/ip_rules.h
+include/netinet/ip_scan.h
+include/netinet/ip_state.h
+include/netinet/ip_sync.h
+include/netinet/ip_var.h
+include/netinet/ipf_rb.h
+include/netinet/ipl.h
+include/netinet/netdump
+include/netinet/pim.h
+include/netinet/pim_var.h
+include/netinet/radix_ipf.h
+include/netinet/sctp.h
+include/netinet/sctp_asconf.h
+include/netinet/sctp_auth.h
+include/netinet/sctp_bsd_addr.h
+include/netinet/sctp_constants.h
+include/netinet/sctp_crc32.h
+include/netinet/sctp_header.h
+include/netinet/sctp_indata.h
+include/netinet/sctp_input.h
+include/netinet/sctp_kdtrace.h
+include/netinet/sctp_lock_bsd.h
+include/netinet/sctp_os.h
+include/netinet/sctp_os_bsd.h
+include/netinet/sctp_output.h
+include/netinet/sctp_pcb.h
+include/netinet/sctp_peeloff.h
+include/netinet/sctp_structs.h
+include/netinet/sctp_sysctl.h
+include/netinet/sctp_timer.h
+include/netinet/sctp_uio.h
+include/netinet/sctp_var.h
+include/netinet/sctputil.h
+include/netinet/tcp_accounting.h
+include/netinet/tcp_ecn.h
+include/netinet/tcp_fastopen.h
+include/netinet/tcp_hpts.h
+include/netinet/tcp_log_buf.h
+include/netinet/tcp_lro.h
+include/netinet/tcp_offload.h
+include/netinet/tcp_pcap.h
+include/netinet/tcp_ratelimit.h
+include/netinet/tcp_seq.h
+include/netinet/tcp_stacks/rack_bbr_common.h
+include/netinet/tcp_stacks/sack_filter.h
+include/netinet/tcp_stacks/tailq_hash.h
+include/netinet/tcp_stacks/tcp_bbr.h
+include/netinet/tcp_stacks/tcp_rack.h
+include/netinet/tcp_syncache.h
+include/netinet/tcp_timer.h
+include/netinet/tcpip.h
+include/netinet/toecore.h
+include/netinet/udp_var.h
+include/netinet/udplite.h
+include/netinet6/icmp6.h
+include/netinet6/in6_fib.h
+include/netinet6/in6_ifattach.h
+include/netinet6/in6_pcb.h
+include/netinet6/in6_rss.h
+include/netinet6/in6_var.h
+include/netinet6/ip6.h
+include/netinet6/ip6_ecn.h
+include/netinet6/ip6_mroute.h
+include/netinet6/ip6_var.h
+include/netinet6/ip_fw_nat64.h
+include/netinet6/ip_fw_nptv6.h
+include/netinet6/mld6.h
+include/netinet6/mld6_var.h
+include/netinet6/nd6.h
+include/netinet6/pim6.h
+include/netinet6/pim6_var.h
+include/netinet6/raw_ip6.h
+include/netinet6/scope6_var.h
+include/netinet6/sctp6_var.h
+include/netinet6/send.h
+include/netinet6/tcp6_var.h
+include/netinet6/udp6_var.h
+include/netipsec/ah.h
+include/netipsec/ah_var.h
+include/netipsec/esp.h
+include/netipsec/esp_var.h
+include/netipsec/ipcomp.h
+include/netipsec/ipcomp_var.h
+include/netipsec/ipsec.h
+include/netipsec/ipsec6.h
+include/netipsec/ipsec_support.h
+include/netipsec/key.h
+include/netipsec/key_debug.h
+include/netipsec/key_var.h
+include/netipsec/keydb.h
+include/netipsec/keysock.h
+include/netipsec/xform.h
+include/netlink/ktest_netlink_message_writer.h
+include/netlink/netlink.h
+include/netlink/netlink_bitset.h
+include/netlink/netlink_ctl.h
+include/netlink/netlink_debug.h
+include/netlink/netlink_generic.h
+include/netlink/netlink_linux.h
+include/netlink/netlink_message_parser.h
+include/netlink/netlink_message_writer.h
+include/netlink/netlink_route.h
+include/netlink/netlink_snl.h
+include/netlink/netlink_snl_generic.h
+include/netlink/netlink_snl_route.h
+include/netlink/netlink_snl_route_compat.h
+include/netlink/netlink_snl_route_parsers.h
+include/netlink/netlink_sysevent.h
+include/netlink/netlink_var.h
+include/netlink/route/common.h
+include/netlink/route/ifaddrs.h
+include/netlink/route/interface.h
+include/netlink/route/neigh.h
+include/netlink/route/nexthop.h
+include/netlink/route/route.h
+include/netlink/route/route_var.h
+include/netpfil/pf/pf.h
+include/netpfil/pf/pf_altq.h
+include/netpfil/pf/pf_mtag.h
+include/netsmb/netbios.h
+include/netsmb/smb.h
+include/netsmb/smb_conn.h
+include/netsmb/smb_dev.h
+include/netsmb/smb_rq.h
+include/netsmb/smb_subr.h
+include/netsmb/smb_tran.h
+include/netsmb/smb_trantcp.h
+include/nfs/krpc.h
+include/nfs/nfs_kdtrace.h
+include/nfs/nfs_lock.h
+include/nfs/nfs_mountcommon.h
+include/nfs/nfsdiskless.h
+include/nfs/nfsproto.h
+include/nfs/nfssvc.h
+include/nfs/xdr_subs.h
+include/nfsclient/nfs.h
+include/nfsclient/nfsargs.h
+include/nfsclient/nfsmount.h
+include/nfsclient/nfsnode.h
+include/nfsclient/nfsstats.h
+include/nfsserver/nfs.h
+include/nfsserver/nfsrvstats.h
+include/nss.h
+include/nsswitch.h
+include/printf.h
+include/proc_service.h
+include/protocols/dumprestore.h
+include/protocols/routed.h
+include/protocols/rwhod.h
+include/protocols/talkd.h
+include/protocols/timed.h
+include/res_update.h
+include/rpc/auth_kerb.h
+include/rpc/des.h
+include/rpc/des_crypt.h
+include/rpc/key_prot.h
+include/rpc/nettype.h
+include/rpc/pmap_rmt.h
+include/rpc/raw.h
+include/rpc/rpc_com.h
+include/rpc/rpcb_prot.x
+include/rpc/rpcsec_gss.h
+include/rpc/rpcsec_tls.h
+include/rpc/svc_dg.h
+include/rpcsvc/bootparam_prot.h
+include/rpcsvc/bootparam_prot.x
+include/rpcsvc/crypt.h
+include/rpcsvc/crypt.x
+include/rpcsvc/key_prot.h
+include/rpcsvc/key_prot.x
+include/rpcsvc/klm_prot.h
+include/rpcsvc/klm_prot.x
+include/rpcsvc/mount.h
+include/rpcsvc/mount.x
+include/rpcsvc/nfs_prot.h
+include/rpcsvc/nfs_prot.x
+include/rpcsvc/nis.h
+include/rpcsvc/nis.x
+include/rpcsvc/nis_cache.h
+include/rpcsvc/nis_cache.x
+include/rpcsvc/nis_callback.h
+include/rpcsvc/nis_callback.x
+include/rpcsvc/nis_db.h
+include/rpcsvc/nis_object.x
+include/rpcsvc/nis_tags.h
+include/rpcsvc/nislib.h
+include/rpcsvc/nlm_prot.h
+include/rpcsvc/nlm_prot.x
+include/rpcsvc/rex.h
+include/rpcsvc/rex.x
+include/rpcsvc/rnusers.h
+include/rpcsvc/rnusers.x
+include/rpcsvc/rquota.h
+include/rpcsvc/rquota.x
+include/rpcsvc/rstat.h
+include/rpcsvc/rstat.x
+include/rpcsvc/rwall.h
+include/rpcsvc/rwall.x
+include/rpcsvc/sm_inter.h
+include/rpcsvc/sm_inter.x
+include/rpcsvc/spray.h
+include/rpcsvc/spray.x
+include/rpcsvc/yp.h
+include/rpcsvc/yp.x
+include/rpcsvc/yppasswd.h
+include/rpcsvc/yppasswd.x
+include/rpcsvc/ypupdate_prot.h
+include/rpcsvc/ypupdate_prot.x
+include/rpcsvc/ypxfrd.h
+include/rpcsvc/ypxfrd.x
+include/security/audit/audit.h
+include/security/audit/audit_ioctl.h
+include/security/audit/audit_private.h
+include/security/mac_biba
+include/security/mac_bsdextended/mac_bsdextended.h
+include/security/mac_bsdextended/ugidfw_internal.h
+include/security/mac_lomac
+include/security/mac_mls
+include/security/mac_partition
+include/security/mac_veriexec/mac_veriexec.h
+include/security/mac_veriexec/mac_veriexec_internal.h
+include/sha224.h
+include/sha384.h
+include/sha512t.h
+include/skein.h
+include/skein_freebsd.h
+include/skein_iv.h
+include/skein_port.h
+include/stab.h
+include/stdalign.h
+include/stdbool.h
+include/stddef.h
+include/stdnoreturn.h
+include/sys/_atomic64e.h
+include/sys/_atomic_subword.h
+include/sys/_blockcount.h
+include/sys/_bus_dma.h
+include/sys/_eventhandler.h
+include/sys/_ffcounter.h
+include/sys/_rmlock.h
+include/sys/_semaphore.h
+include/sys/_stack.h
+include/sys/_stdarg.h
+include/sys/_task.h
+include/sys/_tls_variant_i.h
+include/sys/_unrhdr.h
+include/sys/aac_ioctl.h
+include/sys/abi_compat.h
+include/sys/acct.h
+include/sys/agpio.h
+include/sys/aio.h
+include/sys/alq.h
+include/sys/apm.h
+include/sys/arb.h
+include/sys/asan.h
+include/sys/assym.h
+include/sys/ata.h
+include/sys/atomic_common.h
+include/sys/atomic_san.h
+include/sys/backlight.h
+include/sys/bio.h
+include/sys/bitstring.h
+include/sys/blist.h
+include/sys/blockcount.h
+include/sys/boot.h
+include/sys/boottrace.h
+include/sys/buf.h
+include/sys/buf_ring.h
+include/sys/bus.h
+include/sys/bus_dma.h
+include/sys/bus_dma_internal.h
+include/sys/bus_san.h
+include/sys/busdma_bufalloc.h
+include/sys/cdio.h
+include/sys/cdrio.h
+include/sys/cfictl.h
+include/sys/clock.h
+include/sys/compressor.h
+include/sys/cons.h
+include/sys/copyright.h
+include/sys/counter.h
+include/sys/coverage.h
+include/sys/cpu.h
+include/sys/cpuctl.h
+include/sys/crc16.h
+include/sys/csan.h
+include/sys/ctf.h
+include/sys/ctype.h
+include/sys/devctl.h
+include/sys/devmap.h
+include/sys/disk/apm.h
+include/sys/disk/gpt.h
+include/sys/disk/mbr.h
+include/sys/diskmbr.h
+include/sys/dkstat.h
+include/sys/domain.h
+include/sys/dtrace_bsd.h
+include/sys/dvdio.h
+include/sys/efi.h
+include/sys/efiio.h
+include/sys/eui64.h
+include/sys/eventhandler.h
+include/sys/eventvar.h
+include/sys/exec.h
+include/sys/fail.h
+include/sys/fdcio.h
+include/sys/firmware.h
+include/sys/fnv_hash.h
+include/sys/gmon.h
+include/sys/gpio.h
+include/sys/gpt.h
+include/sys/gsb_crc32.h
+include/sys/gtaskqueue.h
+include/sys/hash.h
+include/sys/hhook.h
+include/sys/iconv.h
+include/sys/imgact.h
+include/sys/imgact_aout.h
+include/sys/imgact_binmisc.h
+include/sys/imgact_elf.h
+include/sys/interrupt.h
+include/sys/intr.h
+include/sys/ioctl_compat.h
+include/sys/iov.h
+include/sys/iov_schema.h
+include/sys/ipmi.h
+include/sys/joystick.h
+include/sys/kbio.h
+include/sys/kcov.h
+include/sys/kdb.h
+include/sys/kern_prefetch.h
+include/sys/kernel.h
+include/sys/khelp.h
+include/sys/kobj.h
+include/sys/kpilite.h
+include/sys/ksem.h
+include/sys/kthread.h
+include/sys/ktls.h
+include/sys/ktrace.h
+include/sys/libkern.h
+include/sys/link_aout.h
+include/sys/linker_set.h
+include/sys/lockf.h
+include/sys/lockstat.h
+include/sys/loginclass.h
+include/sys/mbuf.h
+include/sys/mchain.h
+include/sys/md4.h
+include/sys/mdioctl.h
+include/sys/membarrier.h
+include/sys/memdesc.h
+include/sys/memrange.h
+include/sys/module_khelp.h
+include/sys/mouse.h
+include/sys/mpt_ioctl.h
+include/sys/mqueue.h
+include/sys/msan.h
+include/sys/msgbuf.h
+include/sys/namei.h
+include/sys/nvpair.h
+include/sys/pciio.h
+include/sys/pcpu.h
+include/sys/pctrie.h
+include/sys/physmem.h
+include/sys/pidctrl.h
+include/sys/pipe.h
+include/sys/pmc.h
+include/sys/pmckern.h
+include/sys/pmclog.h
+include/sys/posix4.h
+include/sys/power.h
+include/sys/priv.h
+include/sys/prng.h
+include/sys/protosw.h
+include/sys/ptio.h
+include/sys/ptrace.h
+include/sys/qmath.h
+include/sys/queue_mergesort.h
+include/sys/racct.h
+include/sys/rangeset.h
+include/sys/rctl.h
+include/sys/reboot.h
+include/sys/refcount.h
+include/sys/reg.h
+include/sys/regression.h
+include/sys/rman.h
+include/sys/rmlock.h
+include/sys/rwlock.h
+include/sys/sbuf.h
+include/sys/sdt.h
+include/sys/sema.h
+include/sys/serial.h
+include/sys/sf_buf.h
+include/sys/sglist.h
+include/sys/sleepqueue.h
+include/sys/slicer.h
+include/sys/smp.h
+include/sys/smr.h
+include/sys/sndstat.h
+include/sys/snoop.h
+include/sys/sockbuf.h
+include/sys/sockopt.h
+include/sys/specialfd.h
+include/sys/spigenio.h
+include/sys/stack.h
+include/sys/stats.h
+include/sys/stddef.h
+include/sys/syscallsubr.h
+include/sys/sysent.h
+include/sys/sysproto.h
+include/sys/systm.h
+include/sys/taskqueue.h
+include/sys/terminal.h
+include/sys/thr.h
+include/sys/tiio.h
+include/sys/tim_filter.h
+include/sys/timeet.h
+include/sys/timeffc.h
+include/sys/timepps.h
+include/sys/timers.h
+include/sys/timetc.h
+include/sys/timex.h
+include/sys/tslog.h
+include/sys/tty.h
+include/sys/ttydevsw.h
+include/sys/ttydisc.h
+include/sys/ttyhook.h
+include/sys/ttyqueue.h
+include/sys/turnstile.h
+include/sys/umtx.h
+include/sys/umtxvar.h
+include/sys/vdso.h
+include/sys/vmem.h
+include/sys/watchdog.h
+include/tar.h
+include/teken/teken.h
+include/tgmath.h
+include/timeconv.h
+include/timers.h
+include/uchar.h
+include/ufs/ffs/ffs_extern.h
+include/ufs/ffs/fs.h
+include/ufs/ffs/softdep.h
+include/ufs/ufs/acl.h
+include/ufs/ufs/dinode.h
+include/ufs/ufs/dir.h
+include/ufs/ufs/dirhash.h
+include/ufs/ufs/extattr.h
+include/ufs/ufs/gjournal.h
+include/ufs/ufs/inode.h
+include/ufs/ufs/ufs_extern.h
+include/ufs/ufs/ufsmount.h
+include/ulimit.h
+include/unwind.h
+include/unwind_arm_ehabi.h
+include/unwind_itanium.h
+include/varargs.h
+include/vm/_vm_phys.h
+include/vm/memguard.h
+include/vm/redzone.h
+include/vm/swap_pager.h
+include/vm/uma_dbg.h
+include/vm/uma_int.h
+include/vm/vm_domainset.h
+include/vm/vm_dumpset.h
+include/vm/vm_extern.h
+include/vm/vm_kern.h
+include/vm/vm_object.h
+include/vm/vm_page.h
+include/vm/vm_pageout.h
+include/vm/vm_pagequeue.h
+include/vm/vm_pager.h
+include/vm/vm_phys.h
+include/vm/vm_radix.h
+include/vm/vm_reserv.h
+include/vm/vnode_pager.h
+include/wordexp.h
+include/x86/acpica_machdep.h
+include/x86/apicreg.h
+include/x86/apicvar.h
+include/x86/apm_bios.h
+include/x86/bus.h
+include/x86/bus_dma.h
+include/x86/busdma_impl.h
+include/x86/clock.h
+include/x86/cputypes.h
+include/x86/dump.h
+include/x86/fdt.h
+include/x86/float.h
+include/x86/ifunc.h
+include/x86/init.h
+include/x86/intr_machdep.h
+include/x86/iommu.h
+include/x86/kvm.h
+include/x86/legacyvar.h
+include/x86/mca.h
+include/x86/metadata.h
+include/x86/mptable.h
+include/x86/ofw_machdep.h
+include/x86/pci_cfgreg.h
+include/x86/ppireg.h
+include/x86/ptrace.h
+include/x86/pvclock.h
+include/x86/sigframe.h
+include/x86/stack.h
+include/x86/stdarg.h
+include/x86/sysarch.h
+include/x86/timerreg.h
+include/x86/tls.h
+include/x86/trap.h
+include/x86/ucode.h
+include/x86/vdso.h
+include/x86/vmware.h
+include/x86/x86_smp.h
+include/x86/x86_var.h
+include/xlocale/_monetary.h
+include/xlocale/_uchar.h
+lib/LLVMPolly.so
+lib/LLVMgold.so
+lib/bash/Makefile.sample
+lib/bash/accept
+lib/bash/basename
+lib/bash/csv
+lib/bash/cut
+lib/bash/dirname
+lib/bash/dsv
+lib/bash/fdflags
+lib/bash/finfo
+lib/bash/getconf
+lib/bash/head
+lib/bash/id
+lib/bash/ln
+lib/bash/loadables.h
+lib/bash/logname
+lib/bash/mkdir
+lib/bash/mkfifo
+lib/bash/mktemp
+lib/bash/mypid
+lib/bash/pathchk
+lib/bash/print
+lib/bash/printenv
+lib/bash/push
+lib/bash/realpath
+lib/bash/rm
+lib/bash/rmdir
+lib/bash/seq
+lib/bash/setpgid
+lib/bash/sleep
+lib/bash/stat
+lib/bash/strftime
+lib/bash/sync
+lib/bash/tee
+lib/bash/truefalse
+lib/bash/tty
+lib/bash/uname
+lib/bash/unlink
+lib/bash/whoami
+lib/charset.alias
+lib/clang/16/include/__clang_cuda_builtin_vars.h
+lib/clang/16/include/__clang_cuda_cmath.h
+lib/clang/16/include/__clang_cuda_complex_builtins.h
+lib/clang/16/include/__clang_cuda_device_functions.h
+lib/clang/16/include/__clang_cuda_intrinsics.h
+lib/clang/16/include/__clang_cuda_libdevice_declares.h
+lib/clang/16/include/__clang_cuda_math.h
+lib/clang/16/include/__clang_cuda_math_forward_declares.h
+lib/clang/16/include/__clang_cuda_runtime_wrapper.h
+lib/clang/16/include/__clang_cuda_texture_intrinsics.h
+lib/clang/16/include/__clang_hip_cmath.h
+lib/clang/16/include/__clang_hip_libdevice_declares.h
+lib/clang/16/include/__clang_hip_math.h
+lib/clang/16/include/__clang_hip_runtime_wrapper.h
+lib/clang/16/include/__clang_hip_stdlib.h
+lib/clang/16/include/altivec.h
+lib/clang/16/include/ammintrin.h
+lib/clang/16/include/arm64intr.h
+lib/clang/16/include/arm_acle.h
+lib/clang/16/include/arm_bf16.h
+lib/clang/16/include/arm_cde.h
+lib/clang/16/include/arm_cmse.h
+lib/clang/16/include/arm_fp16.h
+lib/clang/16/include/arm_mve.h
+lib/clang/16/include/arm_neon.h
+lib/clang/16/include/arm_neon_sve_bridge.h
+lib/clang/16/include/arm_sve.h
+lib/clang/16/include/armintr.h
+lib/clang/16/include/builtins.h
+lib/clang/16/include/clzerointrin.h
+lib/clang/16/include/cuda_wrappers/algorithm
+lib/clang/16/include/cuda_wrappers/cmath
+lib/clang/16/include/cuda_wrappers/complex
+lib/clang/16/include/cuda_wrappers/new
+lib/clang/16/include/fma4intrin.h
+lib/clang/16/include/hexagon_circ_brev_intrinsics.h
+lib/clang/16/include/hexagon_protos.h
+lib/clang/16/include/hexagon_types.h
+lib/clang/16/include/htmintrin.h
+lib/clang/16/include/htmxlintrin.h
+lib/clang/16/include/hvx_hexagon_protos.h
+lib/clang/16/include/ia32intrin.h
+lib/clang/16/include/iso646.h
+lib/clang/16/include/larchintrin.h
+lib/clang/16/include/lwpintrin.h
+lib/clang/16/include/mm3dnow.h
+lib/clang/16/include/module.modulemap
+lib/clang/16/include/msa.h
+lib/clang/16/include/mwaitxintrin.h
+lib/clang/16/include/nmmintrin.h
+lib/clang/16/include/opencl-c-base.h
+lib/clang/16/include/opencl-c.h
+lib/clang/16/include/openmp_wrappers/__clang_openmp_device_functions.h
+lib/clang/16/include/openmp_wrappers/cmath
+lib/clang/16/include/openmp_wrappers/complex
+lib/clang/16/include/openmp_wrappers/complex.h
+lib/clang/16/include/openmp_wrappers/complex_cmath.h
+lib/clang/16/include/openmp_wrappers/math.h
+lib/clang/16/include/openmp_wrappers/new
+lib/clang/16/include/ppc_wrappers/bmi2intrin.h
+lib/clang/16/include/ppc_wrappers/bmiintrin.h
+lib/clang/16/include/ppc_wrappers/emmintrin.h
+lib/clang/16/include/ppc_wrappers/immintrin.h
+lib/clang/16/include/ppc_wrappers/mm_malloc.h
+lib/clang/16/include/ppc_wrappers/mmintrin.h
+lib/clang/16/include/ppc_wrappers/pmmintrin.h
+lib/clang/16/include/ppc_wrappers/smmintrin.h
+lib/clang/16/include/ppc_wrappers/tmmintrin.h
+lib/clang/16/include/ppc_wrappers/x86gprintrin.h
+lib/clang/16/include/ppc_wrappers/x86intrin.h
+lib/clang/16/include/ppc_wrappers/xmmintrin.h
+lib/clang/16/include/prfchwintrin.h
+lib/clang/16/include/rdpruintrin.h
+lib/clang/16/include/riscv_vector.h
+lib/clang/16/include/s390intrin.h
+lib/clang/16/include/tbmintrin.h
+lib/clang/16/include/tgmath.h
+lib/clang/16/include/vadefs.h
+lib/clang/16/include/vecintrin.h
+lib/clang/16/include/velintrin.h
+lib/clang/16/include/velintrin_approx.h
+lib/clang/16/include/velintrin_gen.h
+lib/clang/16/include/wasm_simd128.h
+lib/clang/16/include/x86intrin.h
+lib/clang/16/include/xopintrin.h
+lib/engines-3/capi.so
+lib/engines-3/devcrypto.so
+lib/engines-3/loader_attic.so
+lib/engines-3/padlock.so
+lib/freebsd/libclang_rt.builtins-x86_64.a
+lib/gawk/filefuncs.so
+lib/gawk/fnmatch.so
+lib/gawk/fork.so
+lib/gawk/inplace.so
+lib/gawk/intdiv.so
+lib/gawk/ordchr.so
+lib/gawk/readdir.so
+lib/gawk/readfile.so
+lib/gawk/revoutput.so
+lib/gawk/revtwoway.so
+lib/gawk/rwarray.so
+lib/gawk/time.so
+lib/gcrt1.o
+lib/gettext/cldr-plurals
+lib/gettext/hostname
+lib/gettext/project-id
+lib/gettext/urlget
+lib/gettext/user-email
+lib/i18n/libBIG5.so.5
+lib/i18n/libDECHanyu.so.5
+lib/i18n/libEUCTW.so.5
+lib/i18n/libGBK2K.so.5
+lib/i18n/libHZ.so.5
+lib/i18n/libISO2022.so.5
+lib/i18n/libJOHAB.so.5
+lib/i18n/libUES.so.5
+lib/i18n/libUTF7.so.5
+lib/i18n/libVIQR.so.5
+lib/i18n/libZW.so.5
+lib/i18n/libiconv_none.so.5
+lib/libLLVMAArch64AsmParser.a
+lib/libLLVMAArch64CodeGen.a
+lib/libLLVMAArch64Desc.a
+lib/libLLVMAArch64Disassembler.a
+lib/libLLVMAArch64Info.a
+lib/libLLVMAArch64Utils.a
+lib/libLLVMAMDGPUAsmParser.a
+lib/libLLVMAMDGPUCodeGen.a
+lib/libLLVMAMDGPUDesc.a
+lib/libLLVMAMDGPUDisassembler.a
+lib/libLLVMAMDGPUInfo.a
+lib/libLLVMAMDGPUTargetMCA.a
+lib/libLLVMAMDGPUUtils.a
+lib/libLLVMARMAsmParser.a
+lib/libLLVMARMCodeGen.a
+lib/libLLVMARMDesc.a
+lib/libLLVMARMDisassembler.a
+lib/libLLVMARMInfo.a
+lib/libLLVMARMUtils.a
+lib/libLLVMAVRAsmParser.a
+lib/libLLVMAVRCodeGen.a
+lib/libLLVMAVRDesc.a
+lib/libLLVMAVRDisassembler.a
+lib/libLLVMAVRInfo.a
+lib/libLLVMAggressiveInstCombine.a
+lib/libLLVMAnalysis.a
+lib/libLLVMAsmParser.a
+lib/libLLVMAsmPrinter.a
+lib/libLLVMBPFAsmParser.a
+lib/libLLVMBPFCodeGen.a
+lib/libLLVMBPFDesc.a
+lib/libLLVMBPFDisassembler.a
+lib/libLLVMBPFInfo.a
+lib/libLLVMBinaryFormat.a
+lib/libLLVMBitReader.a
+lib/libLLVMBitWriter.a
+lib/libLLVMBitstreamReader.a
+lib/libLLVMCFGuard.a
+lib/libLLVMCFIVerify.a
+lib/libLLVMCodeGen.a
+lib/libLLVMCore.a
+lib/libLLVMCoroutines.a
+lib/libLLVMCoverage.a
+lib/libLLVMDWARFLinker.a
+lib/libLLVMDWARFLinkerParallel.a
+lib/libLLVMDWP.a
+lib/libLLVMDebugInfoCodeView.a
+lib/libLLVMDebugInfoDWARF.a
+lib/libLLVMDebugInfoGSYM.a
+lib/libLLVMDebugInfoLogicalView.a
+lib/libLLVMDebugInfoMSF.a
+lib/libLLVMDebugInfoPDB.a
+lib/libLLVMDebuginfod.a
+lib/libLLVMDemangle.a
+lib/libLLVMDiff.a
+lib/libLLVMDlltoolDriver.a
+lib/libLLVMExecutionEngine.a
+lib/libLLVMExegesis.a
+lib/libLLVMExegesisAArch64.a
+lib/libLLVMExegesisMips.a
+lib/libLLVMExegesisPowerPC.a
+lib/libLLVMExegesisX86.a
+lib/libLLVMExtensions.a
+lib/libLLVMFileCheck.a
+lib/libLLVMFrontendHLSL.a
+lib/libLLVMFrontendOpenACC.a
+lib/libLLVMFrontendOpenMP.a
+lib/libLLVMFuzzMutate.a
+lib/libLLVMFuzzerCLI.a
+lib/libLLVMGlobalISel.a
+lib/libLLVMHexagonAsmParser.a
+lib/libLLVMHexagonCodeGen.a
+lib/libLLVMHexagonDesc.a
+lib/libLLVMHexagonDisassembler.a
+lib/libLLVMHexagonInfo.a
+lib/libLLVMIRPrinter.a
+lib/libLLVMIRReader.a
+lib/libLLVMInstCombine.a
+lib/libLLVMInstrumentation.a
+lib/libLLVMInterfaceStub.a
+lib/libLLVMInterpreter.a
+lib/libLLVMJITLink.a
+lib/libLLVMLTO.a
+lib/libLLVMLanaiAsmParser.a
+lib/libLLVMLanaiCodeGen.a
+lib/libLLVMLanaiDesc.a
+lib/libLLVMLanaiDisassembler.a
+lib/libLLVMLanaiInfo.a
+lib/libLLVMLibDriver.a
+lib/libLLVMLineEditor.a
+lib/libLLVMLinker.a
+lib/libLLVMLoongArchAsmParser.a
+lib/libLLVMLoongArchCodeGen.a
+lib/libLLVMLoongArchDesc.a
+lib/libLLVMLoongArchDisassembler.a
+lib/libLLVMLoongArchInfo.a
+lib/libLLVMMC.a
+lib/libLLVMMCA.a
+lib/libLLVMMCDisassembler.a
+lib/libLLVMMCJIT.a
+lib/libLLVMMCParser.a
+lib/libLLVMMIRParser.a
+lib/libLLVMMSP430AsmParser.a
+lib/libLLVMMSP430CodeGen.a
+lib/libLLVMMSP430Desc.a
+lib/libLLVMMSP430Disassembler.a
+lib/libLLVMMSP430Info.a
+lib/libLLVMMipsAsmParser.a
+lib/libLLVMMipsCodeGen.a
+lib/libLLVMMipsDesc.a
+lib/libLLVMMipsDisassembler.a
+lib/libLLVMMipsInfo.a
+lib/libLLVMNVPTXCodeGen.a
+lib/libLLVMNVPTXDesc.a
+lib/libLLVMNVPTXInfo.a
+lib/libLLVMObjCARCOpts.a
+lib/libLLVMObjCopy.a
+lib/libLLVMObject.a
+lib/libLLVMObjectYAML.a
+lib/libLLVMOption.a
+lib/libLLVMOrcJIT.a
+lib/libLLVMOrcShared.a
+lib/libLLVMOrcTargetProcess.a
+lib/libLLVMPasses.a
+lib/libLLVMPowerPCAsmParser.a
+lib/libLLVMPowerPCCodeGen.a
+lib/libLLVMPowerPCDesc.a
+lib/libLLVMPowerPCDisassembler.a
+lib/libLLVMPowerPCInfo.a
+lib/libLLVMProfileData.a
+lib/libLLVMRISCVAsmParser.a
+lib/libLLVMRISCVCodeGen.a
+lib/libLLVMRISCVDesc.a
+lib/libLLVMRISCVDisassembler.a
+lib/libLLVMRISCVInfo.a
+lib/libLLVMRISCVTargetMCA.a
+lib/libLLVMRemarks.a
+lib/libLLVMRuntimeDyld.a
+lib/libLLVMScalarOpts.a
+lib/libLLVMSelectionDAG.a
+lib/libLLVMSparcAsmParser.a
+lib/libLLVMSparcCodeGen.a
+lib/libLLVMSparcDesc.a
+lib/libLLVMSparcDisassembler.a
+lib/libLLVMSparcInfo.a
+lib/libLLVMSupport.a
+lib/libLLVMSymbolize.a
+lib/libLLVMSystemZAsmParser.a
+lib/libLLVMSystemZCodeGen.a
+lib/libLLVMSystemZDesc.a
+lib/libLLVMSystemZDisassembler.a
+lib/libLLVMSystemZInfo.a
+lib/libLLVMTableGen.a
+lib/libLLVMTableGenGlobalISel.a
+lib/libLLVMTarget.a
+lib/libLLVMTargetParser.a
+lib/libLLVMTextAPI.a
+lib/libLLVMTransformUtils.a
+lib/libLLVMVEAsmParser.a
+lib/libLLVMVECodeGen.a
+lib/libLLVMVEDesc.a
+lib/libLLVMVEDisassembler.a
+lib/libLLVMVEInfo.a
+lib/libLLVMVectorize.a
+lib/libLLVMWebAssemblyAsmParser.a
+lib/libLLVMWebAssemblyCodeGen.a
+lib/libLLVMWebAssemblyDesc.a
+lib/libLLVMWebAssemblyDisassembler.a
+lib/libLLVMWebAssemblyInfo.a
+lib/libLLVMWebAssemblyUtils.a
+lib/libLLVMWindowsDriver.a
+lib/libLLVMWindowsManifest.a
+lib/libLLVMX86AsmParser.a
+lib/libLLVMX86CodeGen.a
+lib/libLLVMX86Desc.a
+lib/libLLVMX86Disassembler.a
+lib/libLLVMX86Info.a
+lib/libLLVMX86TargetMCA.a
+lib/libLLVMXCoreCodeGen.a
+lib/libLLVMXCoreDesc.a
+lib/libLLVMXCoreDisassembler.a
+lib/libLLVMXCoreInfo.a
+lib/libLLVMXRay.a
+lib/libLLVMipo.a
+lib/libLTO.so.16
+lib/libPolly.a
+lib/libPollyISL.a
+lib/libRemarks.so.16
+lib/libasprintf.la
+lib/libasprintf.so.0.0.0
+lib/libbfd.la
+lib/libbrotlienc.so.1.1.0
+lib/libbz2.la
+lib/libc++abi.a
+lib/libc++experimental.a
+lib/libc_pic.a
+lib/libclang.so.16.0.6
+lib/libclangAPINotes.a
+lib/libclangARCMigrate.a
+lib/libclangAST.a
+lib/libclangASTMatchers.a
+lib/libclangAnalysis.a
+lib/libclangAnalysisFlowSensitive.a
+lib/libclangAnalysisFlowSensitiveModels.a
+lib/libclangApplyReplacements.a
+lib/libclangBasic.a
+lib/libclangChangeNamespace.a
+lib/libclangCodeGen.a
+lib/libclangCrossTU.a
+lib/libclangDaemon.a
+lib/libclangDaemonTweaks.a
+lib/libclangDependencyScanning.a
+lib/libclangDirectoryWatcher.a
+lib/libclangDoc.a
+lib/libclangDriver.a
+lib/libclangDynamicASTMatchers.a
+lib/libclangEdit.a
+lib/libclangExtractAPI.a
+lib/libclangFormat.a
+lib/libclangFrontend.a
+lib/libclangFrontendTool.a
+lib/libclangHandleCXX.a
+lib/libclangHandleLLVM.a
+lib/libclangIncludeCleaner.a
+lib/libclangIncludeFixer.a
+lib/libclangIncludeFixerPlugin.a
+lib/libclangIndex.a
+lib/libclangIndexSerialization.a
+lib/libclangInterpreter.a
+lib/libclangLex.a
+lib/libclangMove.a
+lib/libclangParse.a
+lib/libclangPseudo.a
+lib/libclangPseudoCLI.a
+lib/libclangPseudoCXX.a
+lib/libclangPseudoGrammar.a
+lib/libclangQuery.a
+lib/libclangReorderFields.a
+lib/libclangRewrite.a
+lib/libclangRewriteFrontend.a
+lib/libclangSema.a
+lib/libclangSerialization.a
+lib/libclangStaticAnalyzerCheckers.a
+lib/libclangStaticAnalyzerCore.a
+lib/libclangStaticAnalyzerFrontend.a
+lib/libclangSupport.a
+lib/libclangTidy.a
+lib/libclangTidyAbseilModule.a
+lib/libclangTidyAlteraModule.a
+lib/libclangTidyAndroidModule.a
+lib/libclangTidyBoostModule.a
+lib/libclangTidyBugproneModule.a
+lib/libclangTidyCERTModule.a
+lib/libclangTidyConcurrencyModule.a
+lib/libclangTidyCppCoreGuidelinesModule.a
+lib/libclangTidyDarwinModule.a
+lib/libclangTidyFuchsiaModule.a
+lib/libclangTidyGoogleModule.a
+lib/libclangTidyHICPPModule.a
+lib/libclangTidyLLVMLibcModule.a
+lib/libclangTidyLLVMModule.a
+lib/libclangTidyLinuxKernelModule.a
+lib/libclangTidyMPIModule.a
+lib/libclangTidyMain.a
+lib/libclangTidyMiscModule.a
+lib/libclangTidyModernizeModule.a
+lib/libclangTidyObjCModule.a
+lib/libclangTidyOpenMPModule.a
+lib/libclangTidyPerformanceModule.a
+lib/libclangTidyPlugin.a
+lib/libclangTidyPortabilityModule.a
+lib/libclangTidyReadabilityModule.a
+lib/libclangTidyUtils.a
+lib/libclangTidyZirconModule.a
+lib/libclangTooling.a
+lib/libclangToolingASTDiff.a
+lib/libclangToolingCore.a
+lib/libclangToolingInclusions.a
+lib/libclangToolingInclusionsStdlib.a
+lib/libclangToolingRefactoring.a
+lib/libclangToolingSyntax.a
+lib/libclangTransformer.a
+lib/libclangdRemoteIndex.a
+lib/libclangdSupport.a
+lib/libcrypt.a
+lib/libctf-nobfd.la
+lib/libctf.la
+lib/libcurl.la
+lib/libdevstat.a
+lib/libdl.a
+lib/libear/__init__.py
+lib/libear/config.h.in
+lib/libear/ear.c
+lib/libelf.a
+lib/libexecinfo.a
+lib/libffi.la
+lib/libfindAllSymbols.a
+lib/libformw.so.6.4
+lib/libgettextlib-0.21.1.so
+lib/libgettextlib.la
+lib/libgettextpo.la
+lib/libgettextpo.so.0.5.8
+lib/libgettextsrc-0.21.1.so
+lib/libgettextsrc.la
+lib/libgmp.la
+lib/libgmpxx.la
+lib/libgmpxx.so.4.7.0
+lib/libgssrpc.so.4
+lib/libidn2.la
+lib/libintl.la
+lib/libkadm5clnt_mit.so.12
+lib/libkadm5srv_mit.so.12
+lib/libkdb5.so.10
+lib/libkrad.so.0
+lib/libkvm.a
+lib/liblzma.la
+lib/libmd.a
+lib/libmemstat.a
+lib/libmemstat.so.3
+lib/libmenuw.so.6.4
+lib/libnghttp2.la
+lib/libopcodes-2.41.so
+lib/libopcodes.la
+lib/libpanelw.so.6.4
+lib/libpcre2-16.la
+lib/libpcre2-16.so.0.12.0
+lib/libpcre2-32.la
+lib/libpcre2-32.so.0.12.0
+lib/libpcre2-8.la
+lib/libpcre2-posix.la
+lib/libpcre2-posix.so.3.0.5
+lib/libprocstat.a
+lib/libprocstat.so.1
+lib/libpsl.la
+lib/librpcsvc.a
+lib/librpcsvc.so.5
+lib/librt.a
+lib/libscanbuild/__init__.py
+lib/libscanbuild/analyze.py
+lib/libscanbuild/arguments.py
+lib/libscanbuild/clang.py
+lib/libscanbuild/compilation.py
+lib/libscanbuild/intercept.py
+lib/libscanbuild/report.py
+lib/libscanbuild/resources/scanview.css
+lib/libscanbuild/resources/selectable.js
+lib/libscanbuild/resources/sorttable.js
+lib/libscanbuild/shell.py
+lib/libsframe.la
+lib/libssh2.la
+lib/libtextstyle.la
+lib/libthr.a
+lib/libunistring.la
+lib/libunwind.a
+lib/libutil.a
+lib/libverto.so.0
+lib/libxml2.la
+lib/ossl-modules/legacy.so
+lib/pkgconfig/bzip2.pc
+lib/pkgconfig/liblzma.pc
+libexec/analyze-c++
+libexec/analyze-cc
+libexec/awk/grcat
+libexec/awk/pwcat
+libexec/c++-analyzer
+libexec/ccc-analyzer
+libexec/coreutils/libstdbuf.so
+libexec/frcode
+libexec/intercept-c++
+libexec/intercept-cc
+libexec/rmt
+nix-support/propagated-build-inputs
+nix-support/setup-hook
+share/aclocal/gettext.m4
+share/aclocal/host-cpu-c-abi.m4
+share/aclocal/iconv.m4
+share/aclocal/intlmacosx.m4
+share/aclocal/lib-ld.m4
+share/aclocal/lib-link.m4
+share/aclocal/lib-prefix.m4
+share/aclocal/nls.m4
+share/aclocal/po.m4
+share/aclocal/progtest.m4
+share/awk/assert.awk
+share/awk/bits2str.awk
+share/awk/cliff_rand.awk
+share/awk/ctime.awk
+share/awk/ftrans.awk
+share/awk/getopt.awk
+share/awk/gettime.awk
+share/awk/group.awk
+share/awk/have_mpfr.awk
+share/awk/inplace.awk
+share/awk/intdiv0.awk
+share/awk/isnumeric.awk
+share/awk/join.awk
+share/awk/libintl.awk
+share/awk/noassign.awk
+share/awk/ns_passwd.awk
+share/awk/ord.awk
+share/awk/passwd.awk
+share/awk/processarray.awk
+share/awk/quicksort.awk
+share/awk/readable.awk
+share/awk/readfile.awk
+share/awk/rewind.awk
+share/awk/round.awk
+share/awk/shellquote.awk
+share/awk/strtonum.awk
+share/awk/walkarray.awk
+share/awk/zerofile.awk
+share/clang/bash-autocomplete.sh
+share/clang/clang-doc-default-stylesheet.css
+share/clang/clang-format-bbedit.applescript
+share/clang/clang-format.el
+share/clang/clang-include-fixer.el
+share/clang/clang-rename.el
+share/clang/index.js
+share/doc/patchelf/README.md
+share/et/et_c.awk
+share/et/et_h.awk
+share/gettext/ABOUT-NLS
+share/gettext/archive.dir.tar.xz
+share/gettext/config.rpath
+share/gettext/gettext.h
+share/gettext/javaversion.class
+share/gettext/msgunfmt.tcl
+share/gettext/po/Makefile.in.in
+share/gettext/po/Makevars.template
+share/gettext/po/Rules-quot
+share/gettext/po/boldquot.sed
+share/gettext/po/en@boldquot.header
+share/gettext/po/en@quot.header
+share/gettext/po/insert-header.sin
+share/gettext/po/quot.sed
+share/gettext/po/remove-potcdate.sin
+share/gettext/projects/GNOME/team-address
+share/gettext/projects/GNOME/teams.html
+share/gettext/projects/GNOME/teams.url
+share/gettext/projects/GNOME/trigger
+share/gettext/projects/KDE/team-address
+share/gettext/projects/KDE/teams.html
+share/gettext/projects/KDE/teams.url
+share/gettext/projects/KDE/trigger
+share/gettext/projects/TP/team-address
+share/gettext/projects/TP/teams.html
+share/gettext/projects/TP/teams.url
+share/gettext/projects/TP/trigger
+share/gettext/projects/index
+share/gettext/projects/team-address
+share/gettext/styles/po-default.css
+share/gettext/styles/po-emacs-x.css
+share/gettext/styles/po-emacs-xterm.css
+share/gettext/styles/po-emacs-xterm16.css
+share/gettext/styles/po-emacs-xterm256.css
+share/gettext/styles/po-vim.css
+share/gettext-0.21.1/its/glade.loc
+share/gettext-0.21.1/its/glade1.its
+share/gettext-0.21.1/its/glade2.its
+share/gettext-0.21.1/its/gsettings.its
+share/gettext-0.21.1/its/gsettings.loc
+share/gettext-0.21.1/its/gtkbuilder.its
+share/gettext-0.21.1/its/metainfo.its
+share/gettext-0.21.1/its/metainfo.loc
+share/i18n/csmapper/APPLE/ARABIC%UCS.mps
+share/i18n/csmapper/APPLE/CELTIC%UCS.mps
+share/i18n/csmapper/APPLE/CENTEURO%UCS.mps
+share/i18n/csmapper/APPLE/CROATIAN%UCS.mps
+share/i18n/csmapper/APPLE/CYRILLIC%UCS.mps
+share/i18n/csmapper/APPLE/DEVANAGA%UCS.mps
+share/i18n/csmapper/APPLE/DINGBATS%UCS.mps
+share/i18n/csmapper/APPLE/FARSI%UCS.mps
+share/i18n/csmapper/APPLE/GAELIC%UCS.mps
+share/i18n/csmapper/APPLE/GREEK%UCS.mps
+share/i18n/csmapper/APPLE/GUJARATI%UCS.mps
+share/i18n/csmapper/APPLE/GURMUKHI%UCS.mps
+share/i18n/csmapper/APPLE/HEBREW%UCS.mps
+share/i18n/csmapper/APPLE/ICELAND%UCS.mps
+share/i18n/csmapper/APPLE/INUIT%UCS.mps
+share/i18n/csmapper/APPLE/KEYBOARD%UCS.mps
+share/i18n/csmapper/APPLE/ROMAN%UCS.mps
+share/i18n/csmapper/APPLE/ROMANIAN%UCS.mps
+share/i18n/csmapper/APPLE/SYMBOL%UCS.mps
+share/i18n/csmapper/APPLE/THAI%UCS.mps
+share/i18n/csmapper/APPLE/TURKISH%UCS.mps
+share/i18n/csmapper/APPLE/UCS%ARABIC.mps
+share/i18n/csmapper/APPLE/UCS%CELTIC.mps
+share/i18n/csmapper/APPLE/UCS%CENTEURO.mps
+share/i18n/csmapper/APPLE/UCS%CROATIAN.mps
+share/i18n/csmapper/APPLE/UCS%CYRILLIC.mps
+share/i18n/csmapper/APPLE/UCS%DEVANAGA.mps
+share/i18n/csmapper/APPLE/UCS%DINGBATS.mps
+share/i18n/csmapper/APPLE/UCS%FARSI.mps
+share/i18n/csmapper/APPLE/UCS%GAELIC.mps
+share/i18n/csmapper/APPLE/UCS%GREEK.mps
+share/i18n/csmapper/APPLE/UCS%GUJARATI.mps
+share/i18n/csmapper/APPLE/UCS%GURMUKHI.mps
+share/i18n/csmapper/APPLE/UCS%HEBREW.mps
+share/i18n/csmapper/APPLE/UCS%ICELAND.mps
+share/i18n/csmapper/APPLE/UCS%INUIT.mps
+share/i18n/csmapper/APPLE/UCS%KEYBOARD.mps
+share/i18n/csmapper/APPLE/UCS%ROMAN.mps
+share/i18n/csmapper/APPLE/UCS%ROMANIAN.mps
+share/i18n/csmapper/APPLE/UCS%SYMBOL.mps
+share/i18n/csmapper/APPLE/UCS%THAI.mps
+share/i18n/csmapper/APPLE/UCS%TURKISH.mps
+share/i18n/csmapper/AST/ARMSCII-7%UCS.mps
+share/i18n/csmapper/AST/ARMSCII-8%UCS.mps
+share/i18n/csmapper/AST/ARMSCII-8A%UCS.mps
+share/i18n/csmapper/AST/UCS%ARMSCII-7.mps
+share/i18n/csmapper/AST/UCS%ARMSCII-8.mps
+share/i18n/csmapper/AST/UCS%ARMSCII-8A.mps
+share/i18n/csmapper/BIG5/Big5@1984%UCS.mps
+share/i18n/csmapper/BIG5/Big5EXT@2003%UCS.mps
+share/i18n/csmapper/BIG5/Big5EXT@E%UCS.mps
+share/i18n/csmapper/BIG5/Big5EXT@IBM%UCS.mps
+share/i18n/csmapper/BIG5/Big5EXT@Plus%UCS.mps
+share/i18n/csmapper/BIG5/Big5UDA%UCS.mps
+share/i18n/csmapper/BIG5/ETen%UCS@BMP.mps
+share/i18n/csmapper/BIG5/ETen%UCS@SIP.mps
+share/i18n/csmapper/BIG5/HKSCS%UCS@BMP.mps
+share/i18n/csmapper/BIG5/HKSCS%UCS@SIP.mps
+share/i18n/csmapper/BIG5/UCS%Big5@1984.mps
+share/i18n/csmapper/BIG5/UCS%Big5EXT@2003.mps
+share/i18n/csmapper/BIG5/UCS%Big5EXT@E.mps
+share/i18n/csmapper/BIG5/UCS%Big5EXT@IBM.mps
+share/i18n/csmapper/BIG5/UCS%Big5EXT@Plus.mps
+share/i18n/csmapper/BIG5/UCS%Big5UDA.mps
+share/i18n/csmapper/BIG5/UCS@BMP%ETen.mps
+share/i18n/csmapper/BIG5/UCS@BMP%HKSCS.mps
+share/i18n/csmapper/BIG5/UCS@SIP%ETen.mps
+share/i18n/csmapper/BIG5/UCS@SIP%HKSCS.mps
+share/i18n/csmapper/CNS/CNS11643-1%UCS.mps
+share/i18n/csmapper/CNS/CNS11643-2%UCS.mps
+share/i18n/csmapper/CNS/CNS11643-3%UCS@BMP.mps
+share/i18n/csmapper/CNS/CNS11643-3%UCS@SIP.mps
+share/i18n/csmapper/CNS/CNS11643-4%UCS@BMP.mps
+share/i18n/csmapper/CNS/CNS11643-4%UCS@SIP.mps
+share/i18n/csmapper/CNS/CNS11643-5%UCS@BMP.mps
+share/i18n/csmapper/CNS/CNS11643-5%UCS@SIP.mps
+share/i18n/csmapper/CNS/CNS11643-6%UCS@BMP.mps
+share/i18n/csmapper/CNS/CNS11643-6%UCS@SIP.mps
+share/i18n/csmapper/CNS/CNS11643-7%UCS@BMP.mps
+share/i18n/csmapper/CNS/CNS11643-7%UCS@SIP.mps
+share/i18n/csmapper/CNS/UCS%CNS11643-1.mps
+share/i18n/csmapper/CNS/UCS%CNS11643-2.mps
+share/i18n/csmapper/CNS/UCS@BMP%CNS11643-3.mps
+share/i18n/csmapper/CNS/UCS@BMP%CNS11643-4.mps
+share/i18n/csmapper/CNS/UCS@BMP%CNS11643-5.mps
+share/i18n/csmapper/CNS/UCS@BMP%CNS11643-6.mps
+share/i18n/csmapper/CNS/UCS@BMP%CNS11643-7.mps
+share/i18n/csmapper/CNS/UCS@SIP%CNS11643-3.mps
+share/i18n/csmapper/CNS/UCS@SIP%CNS11643-4.mps
+share/i18n/csmapper/CNS/UCS@SIP%CNS11643-5.mps
+share/i18n/csmapper/CNS/UCS@SIP%CNS11643-6.mps
+share/i18n/csmapper/CNS/UCS@SIP%CNS11643-7.mps
+share/i18n/csmapper/CP/CP037%UCS.mps
+share/i18n/csmapper/CP/CP038%UCS.mps
+share/i18n/csmapper/CP/CP10000%UCS.mps
+share/i18n/csmapper/CP/CP10006%UCS.mps
+share/i18n/csmapper/CP/CP10007%UCS.mps
+share/i18n/csmapper/CP/CP10029%UCS.mps
+share/i18n/csmapper/CP/CP1006%UCS.mps
+share/i18n/csmapper/CP/CP10079%UCS.mps
+share/i18n/csmapper/CP/CP10081%UCS.mps
+share/i18n/csmapper/CP/CP1026%UCS.mps
+share/i18n/csmapper/CP/CP1046%UCS.mps
+share/i18n/csmapper/CP/CP1124%UCS.mps
+share/i18n/csmapper/CP/CP1125%UCS.mps
+share/i18n/csmapper/CP/CP1129%UCS.mps
+share/i18n/csmapper/CP/CP1131%UCS.mps
+share/i18n/csmapper/CP/CP1133%UCS.mps
+share/i18n/csmapper/CP/CP1161%UCS.mps
+share/i18n/csmapper/CP/CP1162%UCS.mps
+share/i18n/csmapper/CP/CP1163%UCS.mps
+share/i18n/csmapper/CP/CP1250%UCS.mps
+share/i18n/csmapper/CP/CP1252%UCS.mps
+share/i18n/csmapper/CP/CP1253%UCS.mps
+share/i18n/csmapper/CP/CP1254%UCS.mps
+share/i18n/csmapper/CP/CP1255%UCS.mps
+share/i18n/csmapper/CP/CP1256%UCS.mps
+share/i18n/csmapper/CP/CP1257%UCS.mps
+share/i18n/csmapper/CP/CP1258%UCS.mps
+share/i18n/csmapper/CP/CP273%UCS.mps
+share/i18n/csmapper/CP/CP274%UCS.mps
+share/i18n/csmapper/CP/CP275%UCS.mps
+share/i18n/csmapper/CP/CP277%UCS.mps
+share/i18n/csmapper/CP/CP278%UCS.mps
+share/i18n/csmapper/CP/CP280%UCS.mps
+share/i18n/csmapper/CP/CP281%UCS.mps
+share/i18n/csmapper/CP/CP284%UCS.mps
+share/i18n/csmapper/CP/CP285%UCS.mps
+share/i18n/csmapper/CP/CP290%UCS.mps
+share/i18n/csmapper/CP/CP297%UCS.mps
+share/i18n/csmapper/CP/CP423%UCS.mps
+share/i18n/csmapper/CP/CP424%UCS.mps
+share/i18n/csmapper/CP/CP437%UCS.mps
+share/i18n/csmapper/CP/CP500%UCS.mps
+share/i18n/csmapper/CP/CP737%UCS.mps
+share/i18n/csmapper/CP/CP775%UCS.mps
+share/i18n/csmapper/CP/CP850%UCS.mps
+share/i18n/csmapper/CP/CP851%UCS.mps
+share/i18n/csmapper/CP/CP852%UCS.mps
+share/i18n/csmapper/CP/CP853%UCS.mps
+share/i18n/csmapper/CP/CP855%UCS.mps
+share/i18n/csmapper/CP/CP856%UCS.mps
+share/i18n/csmapper/CP/CP857%UCS.mps
+share/i18n/csmapper/CP/CP858%UCS.mps
+share/i18n/csmapper/CP/CP860%UCS.mps
+share/i18n/csmapper/CP/CP861%UCS.mps
+share/i18n/csmapper/CP/CP862%UCS.mps
+share/i18n/csmapper/CP/CP863%UCS.mps
+share/i18n/csmapper/CP/CP864%UCS.mps
+share/i18n/csmapper/CP/CP865%UCS.mps
+share/i18n/csmapper/CP/CP868%UCS.mps
+share/i18n/csmapper/CP/CP869%UCS.mps
+share/i18n/csmapper/CP/CP870%UCS.mps
+share/i18n/csmapper/CP/CP871%UCS.mps
+share/i18n/csmapper/CP/CP874%UCS.mps
+share/i18n/csmapper/CP/CP875%UCS.mps
+share/i18n/csmapper/CP/CP880%UCS.mps
+share/i18n/csmapper/CP/CP891%UCS.mps
+share/i18n/csmapper/CP/CP903%UCS.mps
+share/i18n/csmapper/CP/CP904%UCS.mps
+share/i18n/csmapper/CP/CP905%UCS.mps
+share/i18n/csmapper/CP/CP918%UCS.mps
+share/i18n/csmapper/CP/CP922%UCS.mps
+share/i18n/csmapper/CP/CP936EXT%UCS.mps
+share/i18n/csmapper/CP/CP942EXT%UCS.mps
+share/i18n/csmapper/CP/CP949EXT%UCS.mps
+share/i18n/csmapper/CP/CP950%UCS.mps
+share/i18n/csmapper/CP/UCS%CP037.mps
+share/i18n/csmapper/CP/UCS%CP038.mps
+share/i18n/csmapper/CP/UCS%CP10000.mps
+share/i18n/csmapper/CP/UCS%CP10006.mps
+share/i18n/csmapper/CP/UCS%CP10007.mps
+share/i18n/csmapper/CP/UCS%CP10029.mps
+share/i18n/csmapper/CP/UCS%CP1006.mps
+share/i18n/csmapper/CP/UCS%CP10079.mps
+share/i18n/csmapper/CP/UCS%CP10081.mps
+share/i18n/csmapper/CP/UCS%CP1026.mps
+share/i18n/csmapper/CP/UCS%CP1046.mps
+share/i18n/csmapper/CP/UCS%CP1124.mps
+share/i18n/csmapper/CP/UCS%CP1125.mps
+share/i18n/csmapper/CP/UCS%CP1129.mps
+share/i18n/csmapper/CP/UCS%CP1131.mps
+share/i18n/csmapper/CP/UCS%CP1133.mps
+share/i18n/csmapper/CP/UCS%CP1161.mps
+share/i18n/csmapper/CP/UCS%CP1162.mps
+share/i18n/csmapper/CP/UCS%CP1163.mps
+share/i18n/csmapper/CP/UCS%CP1250.mps
+share/i18n/csmapper/CP/UCS%CP1252.mps
+share/i18n/csmapper/CP/UCS%CP1253.mps
+share/i18n/csmapper/CP/UCS%CP1254.mps
+share/i18n/csmapper/CP/UCS%CP1255.mps
+share/i18n/csmapper/CP/UCS%CP1256.mps
+share/i18n/csmapper/CP/UCS%CP1257.mps
+share/i18n/csmapper/CP/UCS%CP1258.mps
+share/i18n/csmapper/CP/UCS%CP273.mps
+share/i18n/csmapper/CP/UCS%CP274.mps
+share/i18n/csmapper/CP/UCS%CP275.mps
+share/i18n/csmapper/CP/UCS%CP277.mps
+share/i18n/csmapper/CP/UCS%CP278.mps
+share/i18n/csmapper/CP/UCS%CP280.mps
+share/i18n/csmapper/CP/UCS%CP281.mps
+share/i18n/csmapper/CP/UCS%CP284.mps
+share/i18n/csmapper/CP/UCS%CP285.mps
+share/i18n/csmapper/CP/UCS%CP290.mps
+share/i18n/csmapper/CP/UCS%CP297.mps
+share/i18n/csmapper/CP/UCS%CP420.mps
+share/i18n/csmapper/CP/UCS%CP423.mps
+share/i18n/csmapper/CP/UCS%CP424.mps
+share/i18n/csmapper/CP/UCS%CP437.mps
+share/i18n/csmapper/CP/UCS%CP500.mps
+share/i18n/csmapper/CP/UCS%CP737.mps
+share/i18n/csmapper/CP/UCS%CP775.mps
+share/i18n/csmapper/CP/UCS%CP850.mps
+share/i18n/csmapper/CP/UCS%CP851.mps
+share/i18n/csmapper/CP/UCS%CP852.mps
+share/i18n/csmapper/CP/UCS%CP853.mps
+share/i18n/csmapper/CP/UCS%CP855.mps
+share/i18n/csmapper/CP/UCS%CP856.mps
+share/i18n/csmapper/CP/UCS%CP857.mps
+share/i18n/csmapper/CP/UCS%CP858.mps
+share/i18n/csmapper/CP/UCS%CP860.mps
+share/i18n/csmapper/CP/UCS%CP861.mps
+share/i18n/csmapper/CP/UCS%CP862.mps
+share/i18n/csmapper/CP/UCS%CP863.mps
+share/i18n/csmapper/CP/UCS%CP864.mps
+share/i18n/csmapper/CP/UCS%CP865.mps
+share/i18n/csmapper/CP/UCS%CP868.mps
+share/i18n/csmapper/CP/UCS%CP869.mps
+share/i18n/csmapper/CP/UCS%CP870.mps
+share/i18n/csmapper/CP/UCS%CP871.mps
+share/i18n/csmapper/CP/UCS%CP874.mps
+share/i18n/csmapper/CP/UCS%CP875.mps
+share/i18n/csmapper/CP/UCS%CP880.mps
+share/i18n/csmapper/CP/UCS%CP891.mps
+share/i18n/csmapper/CP/UCS%CP903.mps
+share/i18n/csmapper/CP/UCS%CP904.mps
+share/i18n/csmapper/CP/UCS%CP905.mps
+share/i18n/csmapper/CP/UCS%CP918.mps
+share/i18n/csmapper/CP/UCS%CP922.mps
+share/i18n/csmapper/CP/UCS%CP936EXT.mps
+share/i18n/csmapper/CP/UCS%CP942EXT.mps
+share/i18n/csmapper/CP/UCS%CP949EXT.mps
+share/i18n/csmapper/CP/UCS%CP950.mps
+share/i18n/csmapper/EBCDIC/EBCDIC-AT-DE%UCS.mps
+share/i18n/csmapper/EBCDIC/EBCDIC-AT-DE-A%UCS.mps
+share/i18n/csmapper/EBCDIC/EBCDIC-CA-FR%UCS.mps
+share/i18n/csmapper/EBCDIC/EBCDIC-DK-NO%UCS.mps
+share/i18n/csmapper/EBCDIC/EBCDIC-DK-NO-A%UCS.mps
+share/i18n/csmapper/EBCDIC/EBCDIC-ES%UCS.mps
+share/i18n/csmapper/EBCDIC/EBCDIC-ES-A%UCS.mps
+share/i18n/csmapper/EBCDIC/EBCDIC-ES-S%UCS.mps
+share/i18n/csmapper/EBCDIC/EBCDIC-FI-SE%UCS.mps
+share/i18n/csmapper/EBCDIC/EBCDIC-FI-SE-A%UCS.mps
+share/i18n/csmapper/EBCDIC/EBCDIC-FR%UCS.mps
+share/i18n/csmapper/EBCDIC/EBCDIC-IT%UCS.mps
+share/i18n/csmapper/EBCDIC/EBCDIC-PT%UCS.mps
+share/i18n/csmapper/EBCDIC/EBCDIC-UK%UCS.mps
+share/i18n/csmapper/EBCDIC/UCS%EBCDIC-AT-DE-A.mps
+share/i18n/csmapper/EBCDIC/UCS%EBCDIC-AT-DE.mps
+share/i18n/csmapper/EBCDIC/UCS%EBCDIC-CA-FR.mps
+share/i18n/csmapper/EBCDIC/UCS%EBCDIC-DK-NO-A.mps
+share/i18n/csmapper/EBCDIC/UCS%EBCDIC-DK-NO.mps
+share/i18n/csmapper/EBCDIC/UCS%EBCDIC-ES-A.mps
+share/i18n/csmapper/EBCDIC/UCS%EBCDIC-ES-S.mps
+share/i18n/csmapper/EBCDIC/UCS%EBCDIC-ES.mps
+share/i18n/csmapper/EBCDIC/UCS%EBCDIC-FI-SE-A.mps
+share/i18n/csmapper/EBCDIC/UCS%EBCDIC-FI-SE.mps
+share/i18n/csmapper/EBCDIC/UCS%EBCDIC-FR.mps
+share/i18n/csmapper/EBCDIC/UCS%EBCDIC-IT.mps
+share/i18n/csmapper/EBCDIC/UCS%EBCDIC-PT.mps
+share/i18n/csmapper/EBCDIC/UCS%EBCDIC-UK.mps
+share/i18n/csmapper/GB/GB12345%UCS.mps
+share/i18n/csmapper/GB/GB18030%UCS@BMP.mps
+share/i18n/csmapper/GB/GB2312%UCS.mps
+share/i18n/csmapper/GB/GB2312EXT%UCS.mps
+share/i18n/csmapper/GB/GB2312GBK%UCS.mps
+share/i18n/csmapper/GB/GB2312UDA1%UCS.mps
+share/i18n/csmapper/GB/GB2312UDA2%UCS.mps
+share/i18n/csmapper/GB/GBKEXT%UCS.mps
+share/i18n/csmapper/GB/GBKUDA%UCS.mps
+share/i18n/csmapper/GB/ISO-IR-165EXT%UCS.mps
+share/i18n/csmapper/GB/UCS%GB12345.mps
+share/i18n/csmapper/GB/UCS%GB2312.mps
+share/i18n/csmapper/GB/UCS%GB2312EXT.mps
+share/i18n/csmapper/GB/UCS%GB2312UDA1.mps
+share/i18n/csmapper/GB/UCS%GB2312UDA2.mps
+share/i18n/csmapper/GB/UCS%GBKEXT.mps
+share/i18n/csmapper/GB/UCS%GBKUDA.mps
+share/i18n/csmapper/GB/UCS%ISO-IR-165EXT.mps
+share/i18n/csmapper/GB/UCS@BMP%GB18030.mps
+share/i18n/csmapper/GEORGIAN/GEORGIAN-ACADEMY%UCS.mps
+share/i18n/csmapper/GEORGIAN/GEORGIAN-ACADEMY@OldCapital%UCS.mps
+share/i18n/csmapper/GEORGIAN/GEORGIAN-PS%UCS.mps
+share/i18n/csmapper/GEORGIAN/GEORGIAN-PS@OldCapital%UCS.mps
+share/i18n/csmapper/GEORGIAN/UCS%GEORGIAN-ACADEMY.mps
+share/i18n/csmapper/GEORGIAN/UCS%GEORGIAN-ACADEMY@OldCapital.mps
+share/i18n/csmapper/GEORGIAN/UCS%GEORGIAN-PS.mps
+share/i18n/csmapper/GEORGIAN/UCS%GEORGIAN-PS@OldCapital.mps
+share/i18n/csmapper/ISO-8859/ISO-8859-10%UCS.mps
+share/i18n/csmapper/ISO-8859/ISO-8859-11%UCS.mps
+share/i18n/csmapper/ISO-8859/ISO-8859-13%UCS.mps
+share/i18n/csmapper/ISO-8859/ISO-8859-14%UCS.mps
+share/i18n/csmapper/ISO-8859/ISO-8859-16%UCS.mps
+share/i18n/csmapper/ISO-8859/ISO-8859-3%UCS.mps
+share/i18n/csmapper/ISO-8859/ISO-8859-4%UCS.mps
+share/i18n/csmapper/ISO-8859/ISO-8859-6%UCS.mps
+share/i18n/csmapper/ISO-8859/ISO-8859-7%UCS.mps
+share/i18n/csmapper/ISO-8859/ISO-8859-8%UCS.mps
+share/i18n/csmapper/ISO-8859/ISO-8859-9%UCS.mps
+share/i18n/csmapper/ISO-8859/UCS%ISO-8859-10.mps
+share/i18n/csmapper/ISO-8859/UCS%ISO-8859-11.mps
+share/i18n/csmapper/ISO-8859/UCS%ISO-8859-13.mps
+share/i18n/csmapper/ISO-8859/UCS%ISO-8859-14.mps
+share/i18n/csmapper/ISO-8859/UCS%ISO-8859-15.mps
+share/i18n/csmapper/ISO-8859/UCS%ISO-8859-16.mps
+share/i18n/csmapper/ISO-8859/UCS%ISO-8859-2.mps
+share/i18n/csmapper/ISO-8859/UCS%ISO-8859-3.mps
+share/i18n/csmapper/ISO-8859/UCS%ISO-8859-4.mps
+share/i18n/csmapper/ISO-8859/UCS%ISO-8859-6.mps
+share/i18n/csmapper/ISO-8859/UCS%ISO-8859-7.mps
+share/i18n/csmapper/ISO-8859/UCS%ISO-8859-8.mps
+share/i18n/csmapper/ISO-8859/UCS%ISO-8859-9.mps
+share/i18n/csmapper/ISO646/ISO646-BASIC@1983%UCS.646
+share/i18n/csmapper/ISO646/ISO646-CA%UCS.646
+share/i18n/csmapper/ISO646/ISO646-CA2%UCS.646
+share/i18n/csmapper/ISO646/ISO646-CN%UCS.646
+share/i18n/csmapper/ISO646/ISO646-CU%UCS.646
+share/i18n/csmapper/ISO646/ISO646-DE%UCS.646
+share/i18n/csmapper/ISO646/ISO646-DK%UCS.646
+share/i18n/csmapper/ISO646/ISO646-ES%UCS.646
+share/i18n/csmapper/ISO646/ISO646-ES2%UCS.646
+share/i18n/csmapper/ISO646/ISO646-FI%UCS.646
+share/i18n/csmapper/ISO646/ISO646-FR%UCS.646
+share/i18n/csmapper/ISO646/ISO646-FR1%UCS.646
+share/i18n/csmapper/ISO646/ISO646-GB%UCS.646
+share/i18n/csmapper/ISO646/ISO646-HU%UCS.646
+share/i18n/csmapper/ISO646/ISO646-IRV@1983%UCS.646
+share/i18n/csmapper/ISO646/ISO646-IT%UCS.646
+share/i18n/csmapper/ISO646/ISO646-JP-OCR-B%UCS.646
+share/i18n/csmapper/ISO646/ISO646-KR%UCS.646
+share/i18n/csmapper/ISO646/ISO646-NO%UCS.646
+share/i18n/csmapper/ISO646/ISO646-NO2%UCS.646
+share/i18n/csmapper/ISO646/ISO646-PT%UCS.646
+share/i18n/csmapper/ISO646/ISO646-PT2%UCS.646
+share/i18n/csmapper/ISO646/ISO646-SE%UCS.646
+share/i18n/csmapper/ISO646/ISO646-SE2%UCS.646
+share/i18n/csmapper/ISO646/ISO646-YU%UCS.646
+share/i18n/csmapper/JIS/JISX0208@1978%UCS.mps
+share/i18n/csmapper/JIS/JISX0208UDC%UCS.mps
+share/i18n/csmapper/JIS/JISX0212@MS%UCS.mps
+share/i18n/csmapper/JIS/JISX0212UDC%UCS.mps
+share/i18n/csmapper/JIS/JISX0212VDC@IBM%UCS.mps
+share/i18n/csmapper/JIS/JISX0213-1%UCS@BMP.mps
+share/i18n/csmapper/JIS/JISX0213-1%UCS@SIP.mps
+share/i18n/csmapper/JIS/JISX0213-2%UCS@BMP.mps
+share/i18n/csmapper/JIS/JISX0213-2%UCS@SIP.mps
+share/i18n/csmapper/JIS/UCS%JISX0208@1978.mps
+share/i18n/csmapper/JIS/UCS%JISX0208UDC.mps
+share/i18n/csmapper/JIS/UCS%JISX0212@MS.mps
+share/i18n/csmapper/JIS/UCS%JISX0212UDC.mps
+share/i18n/csmapper/JIS/UCS%JISX0212VDC@IBM.mps
+share/i18n/csmapper/JIS/UCS@BMP%JISX0213-1.mps
+share/i18n/csmapper/JIS/UCS@BMP%JISX0213-2.mps
+share/i18n/csmapper/JIS/UCS@SIP%JISX0213-1.mps
+share/i18n/csmapper/JIS/UCS@SIP%JISX0213-2.mps
+share/i18n/csmapper/KAZAKH/KZ1048%UCS.mps
+share/i18n/csmapper/KAZAKH/PTCP154%UCS.mps
+share/i18n/csmapper/KAZAKH/UCS%KZ1048.mps
+share/i18n/csmapper/KAZAKH/UCS%PTCP154.mps
+share/i18n/csmapper/KOI/ISO-5427%UCS.mps
+share/i18n/csmapper/KOI/KOI7%UCS.mps
+share/i18n/csmapper/KOI/KOI8%UCS.mps
+share/i18n/csmapper/KOI/KOI8-C%UCS.mps
+share/i18n/csmapper/KOI/KOI8-CyrillicOld%UCS.mps
+share/i18n/csmapper/KOI/KOI8-E%UCS.mps
+share/i18n/csmapper/KOI/KOI8-RU%UCS.mps
+share/i18n/csmapper/KOI/KOI8-T%UCS.mps
+share/i18n/csmapper/KOI/UCS%ISO-5427.mps
+share/i18n/csmapper/KOI/UCS%KOI7.mps
+share/i18n/csmapper/KOI/UCS%KOI8-C.mps
+share/i18n/csmapper/KOI/UCS%KOI8-CyrillicOld.mps
+share/i18n/csmapper/KOI/UCS%KOI8-E.mps
+share/i18n/csmapper/KOI/UCS%KOI8-RU.mps
+share/i18n/csmapper/KOI/UCS%KOI8-T.mps
+share/i18n/csmapper/KOI/UCS%KOI8-U.mps
+share/i18n/csmapper/KOI/UCS%KOI8.mps
+share/i18n/csmapper/KS/JOHAB%UCS.mps
+share/i18n/csmapper/KS/UCS%JOHAB.mps
+share/i18n/csmapper/KS/UCS%KSC5601HANGUL.mps
+share/i18n/csmapper/KS/UCS%KSC5601HANJA.mps
+share/i18n/csmapper/MISC/ATARIST%UCS.mps
+share/i18n/csmapper/MISC/DECMCS%UCS.mps
+share/i18n/csmapper/MISC/HP-ROMAN8%UCS.mps
+share/i18n/csmapper/MISC/MULELAO-1%UCS.mps
+share/i18n/csmapper/MISC/NEXTSTEP%UCS.mps
+share/i18n/csmapper/MISC/RISCOS-LATIN1%UCS.mps
+share/i18n/csmapper/MISC/TDS565%UCS.mps
+share/i18n/csmapper/MISC/UCS%ATARIST.mps
+share/i18n/csmapper/MISC/UCS%DECMCS.mps
+share/i18n/csmapper/MISC/UCS%HP-ROMAN8.mps
+share/i18n/csmapper/MISC/UCS%MULELAO-1.mps
+share/i18n/csmapper/MISC/UCS%NEXTSTEP.mps
+share/i18n/csmapper/MISC/UCS%RISCOS-LATIN1.mps
+share/i18n/csmapper/MISC/UCS%TDS565.mps
+share/i18n/csmapper/TCVN/TCVN5712-1%UCS.mps
+share/i18n/csmapper/TCVN/UCS%TCVN5712-1.mps
+share/i18n/csmapper/TCVN/UCS%VISCII.mps
+share/i18n/csmapper/TCVN/VISCII%UCS.mps
+share/i18n/csmapper/charset.pivot
+share/i18n/csmapper/mapper.dir.db
+share/i18n/esdb/APPLE/MACARABIC.esdb
+share/i18n/esdb/APPLE/MACCELTIC.esdb
+share/i18n/esdb/APPLE/MACCENTEURO.esdb
+share/i18n/esdb/APPLE/MACCROATIAN.esdb
+share/i18n/esdb/APPLE/MACCYRILLIC.esdb
+share/i18n/esdb/APPLE/MACDEVANAGA.esdb
+share/i18n/esdb/APPLE/MACDINGBATS.esdb
+share/i18n/esdb/APPLE/MACFARSI.esdb
+share/i18n/esdb/APPLE/MACGAELIC.esdb
+share/i18n/esdb/APPLE/MACGREEK.esdb
+share/i18n/esdb/APPLE/MACGUJARATI.esdb
+share/i18n/esdb/APPLE/MACGURMUKHI.esdb
+share/i18n/esdb/APPLE/MACHEBREW.esdb
+share/i18n/esdb/APPLE/MACICELAND.esdb
+share/i18n/esdb/APPLE/MACINUIT.esdb
+share/i18n/esdb/APPLE/MACKEYBOARD.esdb
+share/i18n/esdb/APPLE/MACROMAN.esdb
+share/i18n/esdb/APPLE/MACROMANIAN.esdb
+share/i18n/esdb/APPLE/MACSYMBOL.esdb
+share/i18n/esdb/APPLE/MACTHAI.esdb
+share/i18n/esdb/APPLE/MACTURKISH.esdb
+share/i18n/esdb/AST/ARMSCII-7.esdb
+share/i18n/esdb/AST/ARMSCII-8.esdb
+share/i18n/esdb/AST/ARMSCII-8A.esdb
+share/i18n/esdb/BIG5/Big5-2003.esdb
+share/i18n/esdb/BIG5/Big5-E.esdb
+share/i18n/esdb/BIG5/Big5-ETen.esdb
+share/i18n/esdb/BIG5/Big5-HKSCS.esdb
+share/i18n/esdb/BIG5/Big5-IBM.esdb
+share/i18n/esdb/BIG5/Big5-Plus.esdb
+share/i18n/esdb/CP/CP037.esdb
+share/i18n/esdb/CP/CP038.esdb
+share/i18n/esdb/CP/CP10000.esdb
+share/i18n/esdb/CP/CP10006.esdb
+share/i18n/esdb/CP/CP10007.esdb
+share/i18n/esdb/CP/CP10029.esdb
+share/i18n/esdb/CP/CP1006.esdb
+share/i18n/esdb/CP/CP10079.esdb
+share/i18n/esdb/CP/CP10081.esdb
+share/i18n/esdb/CP/CP1026.esdb
+share/i18n/esdb/CP/CP1046.esdb
+share/i18n/esdb/CP/CP1124.esdb
+share/i18n/esdb/CP/CP1125.esdb
+share/i18n/esdb/CP/CP1129.esdb
+share/i18n/esdb/CP/CP1131.esdb
+share/i18n/esdb/CP/CP1133.esdb
+share/i18n/esdb/CP/CP1161.esdb
+share/i18n/esdb/CP/CP1162.esdb
+share/i18n/esdb/CP/CP1163.esdb
+share/i18n/esdb/CP/CP1250.esdb
+share/i18n/esdb/CP/CP1252.esdb
+share/i18n/esdb/CP/CP1253.esdb
+share/i18n/esdb/CP/CP1254.esdb
+share/i18n/esdb/CP/CP1255.esdb
+share/i18n/esdb/CP/CP1256.esdb
+share/i18n/esdb/CP/CP1257.esdb
+share/i18n/esdb/CP/CP1258.esdb
+share/i18n/esdb/CP/CP273.esdb
+share/i18n/esdb/CP/CP274.esdb
+share/i18n/esdb/CP/CP275.esdb
+share/i18n/esdb/CP/CP277.esdb
+share/i18n/esdb/CP/CP278.esdb
+share/i18n/esdb/CP/CP280.esdb
+share/i18n/esdb/CP/CP281.esdb
+share/i18n/esdb/CP/CP284.esdb
+share/i18n/esdb/CP/CP285.esdb
+share/i18n/esdb/CP/CP290.esdb
+share/i18n/esdb/CP/CP297.esdb
+share/i18n/esdb/CP/CP423.esdb
+share/i18n/esdb/CP/CP424.esdb
+share/i18n/esdb/CP/CP437.esdb
+share/i18n/esdb/CP/CP500.esdb
+share/i18n/esdb/CP/CP50220.esdb
+share/i18n/esdb/CP/CP50221.esdb
+share/i18n/esdb/CP/CP50222.esdb
+share/i18n/esdb/CP/CP51932.esdb
+share/i18n/esdb/CP/CP737.esdb
+share/i18n/esdb/CP/CP775.esdb
+share/i18n/esdb/CP/CP850.esdb
+share/i18n/esdb/CP/CP851.esdb
+share/i18n/esdb/CP/CP852.esdb
+share/i18n/esdb/CP/CP853.esdb
+share/i18n/esdb/CP/CP855.esdb
+share/i18n/esdb/CP/CP856.esdb
+share/i18n/esdb/CP/CP857.esdb
+share/i18n/esdb/CP/CP858.esdb
+share/i18n/esdb/CP/CP860.esdb
+share/i18n/esdb/CP/CP861.esdb
+share/i18n/esdb/CP/CP862.esdb
+share/i18n/esdb/CP/CP863.esdb
+share/i18n/esdb/CP/CP864.esdb
+share/i18n/esdb/CP/CP865.esdb
+share/i18n/esdb/CP/CP868.esdb
+share/i18n/esdb/CP/CP869.esdb
+share/i18n/esdb/CP/CP870.esdb
+share/i18n/esdb/CP/CP871.esdb
+share/i18n/esdb/CP/CP874.esdb
+share/i18n/esdb/CP/CP875.esdb
+share/i18n/esdb/CP/CP880.esdb
+share/i18n/esdb/CP/CP891.esdb
+share/i18n/esdb/CP/CP903.esdb
+share/i18n/esdb/CP/CP904.esdb
+share/i18n/esdb/CP/CP905.esdb
+share/i18n/esdb/CP/CP918.esdb
+share/i18n/esdb/CP/CP922.esdb
+share/i18n/esdb/CP/CP936.esdb
+share/i18n/esdb/CP/CP942.esdb
+share/i18n/esdb/CP/CP942C.esdb
+share/i18n/esdb/CP/CP943.esdb
+share/i18n/esdb/CP/CP943C.esdb
+share/i18n/esdb/CP/CP949.esdb
+share/i18n/esdb/CP/CP950.esdb
+share/i18n/esdb/DEC/DECHanyu.esdb
+share/i18n/esdb/DEC/DECMCS.esdb
+share/i18n/esdb/EBCDIC/EBCDIC-AT-DE-A.esdb
+share/i18n/esdb/EBCDIC/EBCDIC-AT-DE.esdb
+share/i18n/esdb/EBCDIC/EBCDIC-CA-FR.esdb
+share/i18n/esdb/EBCDIC/EBCDIC-DK-NO-A.esdb
+share/i18n/esdb/EBCDIC/EBCDIC-DK-NO.esdb
+share/i18n/esdb/EBCDIC/EBCDIC-ES-A.esdb
+share/i18n/esdb/EBCDIC/EBCDIC-ES-S.esdb
+share/i18n/esdb/EBCDIC/EBCDIC-ES.esdb
+share/i18n/esdb/EBCDIC/EBCDIC-FI-SE-A.esdb
+share/i18n/esdb/EBCDIC/EBCDIC-FI-SE.esdb
+share/i18n/esdb/EBCDIC/EBCDIC-FR.esdb
+share/i18n/esdb/EBCDIC/EBCDIC-IT.esdb
+share/i18n/esdb/EBCDIC/EBCDIC-PT.esdb
+share/i18n/esdb/EBCDIC/EBCDIC-UK.esdb
+share/i18n/esdb/EUC/EUC-CN.esdb
+share/i18n/esdb/EUC/EUC-JIS-2004.esdb
+share/i18n/esdb/EUC/EUC-JP-MS.esdb
+share/i18n/esdb/EUC/EUC-TW.esdb
+share/i18n/esdb/GB/GB12345.esdb
+share/i18n/esdb/GB/GB18030.esdb
+share/i18n/esdb/GB/GBK.esdb
+share/i18n/esdb/GEORGIAN/GEORGIAN-ACADEMY-OldCapital.esdb
+share/i18n/esdb/GEORGIAN/GEORGIAN-ACADEMY.esdb
+share/i18n/esdb/GEORGIAN/GEORGIAN-PS-OldCapital.esdb
+share/i18n/esdb/GEORGIAN/GEORGIAN-PS.esdb
+share/i18n/esdb/ISO-2022/ISO-2022-CN-EXT.esdb
+share/i18n/esdb/ISO-2022/ISO-2022-CN.esdb
+share/i18n/esdb/ISO-2022/ISO-2022-JP-1.esdb
+share/i18n/esdb/ISO-2022/ISO-2022-JP-2.esdb
+share/i18n/esdb/ISO-2022/ISO-2022-JP-2004.esdb
+share/i18n/esdb/ISO-2022/ISO-2022-JP.esdb
+share/i18n/esdb/ISO-2022/ISO-2022-KR.esdb
+share/i18n/esdb/ISO-8859/ISO-8859-10.esdb
+share/i18n/esdb/ISO-8859/ISO-8859-11.esdb
+share/i18n/esdb/ISO-8859/ISO-8859-13.esdb
+share/i18n/esdb/ISO-8859/ISO-8859-14.esdb
+share/i18n/esdb/ISO-8859/ISO-8859-16.esdb
+share/i18n/esdb/ISO-8859/ISO-8859-3.esdb
+share/i18n/esdb/ISO-8859/ISO-8859-4.esdb
+share/i18n/esdb/ISO-8859/ISO-8859-6.esdb
+share/i18n/esdb/ISO-8859/ISO-8859-7.esdb
+share/i18n/esdb/ISO-8859/ISO-8859-8.esdb
+share/i18n/esdb/ISO-8859/ISO-8859-9.esdb
+share/i18n/esdb/ISO646/ISO646-BASIC@1983.esdb
+share/i18n/esdb/ISO646/ISO646-CA.esdb
+share/i18n/esdb/ISO646/ISO646-CA2.esdb
+share/i18n/esdb/ISO646/ISO646-CN.esdb
+share/i18n/esdb/ISO646/ISO646-CU.esdb
+share/i18n/esdb/ISO646/ISO646-DE.esdb
+share/i18n/esdb/ISO646/ISO646-DK.esdb
+share/i18n/esdb/ISO646/ISO646-ES.esdb
+share/i18n/esdb/ISO646/ISO646-ES2.esdb
+share/i18n/esdb/ISO646/ISO646-FR.esdb
+share/i18n/esdb/ISO646/ISO646-FR1.esdb
+share/i18n/esdb/ISO646/ISO646-GB.esdb
+share/i18n/esdb/ISO646/ISO646-HU.esdb
+share/i18n/esdb/ISO646/ISO646-IRV@1983.esdb
+share/i18n/esdb/ISO646/ISO646-IT.esdb
+share/i18n/esdb/ISO646/ISO646-JP-OCR-B.esdb
+share/i18n/esdb/ISO646/ISO646-JP.esdb
+share/i18n/esdb/ISO646/ISO646-KR.esdb
+share/i18n/esdb/ISO646/ISO646-NO.esdb
+share/i18n/esdb/ISO646/ISO646-NO2.esdb
+share/i18n/esdb/ISO646/ISO646-PT.esdb
+share/i18n/esdb/ISO646/ISO646-PT2.esdb
+share/i18n/esdb/ISO646/ISO646-SE.esdb
+share/i18n/esdb/ISO646/ISO646-SE2.esdb
+share/i18n/esdb/ISO646/ISO646-YU.esdb
+share/i18n/esdb/KAZAKH/KZ1048.esdb
+share/i18n/esdb/KAZAKH/PTCP154.esdb
+share/i18n/esdb/KOI/KOI7-switched.esdb
+share/i18n/esdb/KOI/KOI7.esdb
+share/i18n/esdb/KOI/KOI8-C.esdb
+share/i18n/esdb/KOI/KOI8-E.esdb
+share/i18n/esdb/KOI/KOI8-RU.esdb
+share/i18n/esdb/KOI/KOI8-T.esdb
+share/i18n/esdb/KOI/KOI8.esdb
+share/i18n/esdb/MISC/ATARIST.esdb
+share/i18n/esdb/MISC/C99.esdb
+share/i18n/esdb/MISC/CTEXT.esdb
+share/i18n/esdb/MISC/HP-ROMAN8.esdb
+share/i18n/esdb/MISC/HZ.esdb
+share/i18n/esdb/MISC/HZ8.esdb
+share/i18n/esdb/MISC/ISO-IR-165.esdb
+share/i18n/esdb/MISC/JAVA.esdb
+share/i18n/esdb/MISC/JISX0201-KANA.esdb
+share/i18n/esdb/MISC/JISX0208@1990.esdb
+share/i18n/esdb/MISC/JOHAB.esdb
+share/i18n/esdb/MISC/MULELAO-1.esdb
+share/i18n/esdb/MISC/NEXTSTEP.esdb
+share/i18n/esdb/MISC/RISCOS-LATIN1.esdb
+share/i18n/esdb/MISC/Shift_JIS-2004.esdb
+share/i18n/esdb/MISC/TDS565.esdb
+share/i18n/esdb/MISC/ZW.esdb
+share/i18n/esdb/TCVN/TCVN5712-1.esdb
+share/i18n/esdb/TCVN/VIQR.esdb
+share/i18n/esdb/TCVN/VISCII.esdb
+share/i18n/esdb/UTF/UTF-16-INTERNAL.esdb
+share/i18n/esdb/UTF/UTF-16-SWAPPED.esdb
+share/i18n/esdb/UTF/UTF-32-INTERNAL.esdb
+share/i18n/esdb/UTF/UTF-32-SWAPPED.esdb
+share/i18n/esdb/UTF/UTF-32BE.esdb
+share/i18n/esdb/UTF/UTF-7.esdb
+share/i18n/esdb/esdb.alias
+share/i18n/esdb/esdb.dir
+share/locale/af_ZA.ISO8859-1/LC_COLLATE
+share/locale/af_ZA.ISO8859-15/LC_COLLATE
+share/locale/af_ZA.UTF-8/LC_COLLATE
+share/locale/af_ZA.UTF-8/LC_TIME
+share/locale/am_ET.UTF-8/LC_COLLATE
+share/locale/am_ET.UTF-8/LC_MESSAGES
+share/locale/am_ET.UTF-8/LC_MONETARY
+share/locale/am_ET.UTF-8/LC_TIME
+share/locale/ar_AE.UTF-8/LC_MONETARY
+share/locale/ar_EG.UTF-8/LC_MONETARY
+share/locale/ar_JO.UTF-8/LC_MONETARY
+share/locale/ar_JO.UTF-8/LC_TIME
+share/locale/ar_MA.UTF-8/LC_MONETARY
+share/locale/ar_MA.UTF-8/LC_TIME
+share/locale/ar_QA.UTF-8/LC_MONETARY
+share/locale/ar_SA.UTF-8/LC_COLLATE
+share/locale/ar_SA.UTF-8/LC_MESSAGES
+share/locale/ar_SA.UTF-8/LC_MONETARY
+share/locale/ar_SA.UTF-8/LC_TIME
+share/locale/ast/LC_MESSAGES/gettext-runtime.mo
+share/locale/be/LC_MESSAGES/gettext-runtime.mo
+share/locale/be/LC_MESSAGES/gettext-tools.mo
+share/locale/be_BY.CP1131/LC_COLLATE
+share/locale/be_BY.CP1131/LC_CTYPE
+share/locale/be_BY.CP1131/LC_MESSAGES
+share/locale/be_BY.CP1131/LC_MONETARY
+share/locale/be_BY.CP1131/LC_TIME
+share/locale/be_BY.CP1251/LC_COLLATE
+share/locale/be_BY.CP1251/LC_MESSAGES
+share/locale/be_BY.CP1251/LC_TIME
+share/locale/be_BY.ISO8859-5/LC_COLLATE
+share/locale/be_BY.ISO8859-5/LC_MESSAGES
+share/locale/be_BY.ISO8859-5/LC_MONETARY
+share/locale/be_BY.ISO8859-5/LC_TIME
+share/locale/be_BY.UTF-8/LC_COLLATE
+share/locale/be_BY.UTF-8/LC_MESSAGES
+share/locale/be_BY.UTF-8/LC_MONETARY
+share/locale/be_BY.UTF-8/LC_TIME
+share/locale/bg/LC_MESSAGES/binutils.mo
+share/locale/bg/LC_MESSAGES/gettext-runtime.mo
+share/locale/bg/LC_MESSAGES/gettext-tools.mo
+share/locale/bg/LC_MESSAGES/gprof.mo
+share/locale/bg/LC_MESSAGES/ld.mo
+share/locale/bg_BG.CP1251/LC_COLLATE
+share/locale/bg_BG.CP1251/LC_MESSAGES
+share/locale/bg_BG.CP1251/LC_MONETARY
+share/locale/bg_BG.CP1251/LC_TIME
+share/locale/bg_BG.UTF-8/LC_MONETARY
+share/locale/bg_BG.UTF-8/LC_TIME
+share/locale/ca/LC_MESSAGES/binutils.mo
+share/locale/ca/LC_MESSAGES/gettext-runtime.mo
+share/locale/ca/LC_MESSAGES/gettext-tools.mo
+share/locale/ca_AD.ISO8859-1/LC_COLLATE
+share/locale/ca_AD.ISO8859-15/LC_COLLATE
+share/locale/ca_AD.UTF-8/LC_COLLATE
+share/locale/ca_ES.ISO8859-1/LC_COLLATE
+share/locale/ca_ES.ISO8859-15/LC_COLLATE
+share/locale/ca_FR.ISO8859-1/LC_COLLATE
+share/locale/ca_FR.ISO8859-15/LC_COLLATE
+share/locale/ca_IT.ISO8859-1/LC_COLLATE
+share/locale/ca_IT.ISO8859-1/LC_CTYPE
+share/locale/ca_IT.ISO8859-15/LC_COLLATE
+share/locale/ca_IT.ISO8859-15/LC_CTYPE
+share/locale/ca_IT.ISO8859-15/LC_TIME
+share/locale/ca_IT.UTF-8/LC_TIME
+share/locale/cs/LC_MESSAGES/gettext-runtime.mo
+share/locale/cs/LC_MESSAGES/gettext-tools.mo
+share/locale/cs_CZ.ISO8859-2/LC_COLLATE
+share/locale/cs_CZ.ISO8859-2/LC_MESSAGES
+share/locale/cs_CZ.ISO8859-2/LC_MONETARY
+share/locale/cs_CZ.ISO8859-2/LC_TIME
+share/locale/cs_CZ.UTF-8/LC_COLLATE
+share/locale/cs_CZ.UTF-8/LC_MESSAGES
+share/locale/cs_CZ.UTF-8/LC_MONETARY
+share/locale/cs_CZ.UTF-8/LC_TIME
+share/locale/da/LC_MESSAGES/bfd.mo
+share/locale/da/LC_MESSAGES/binutils.mo
+share/locale/da/LC_MESSAGES/gettext-runtime.mo
+share/locale/da/LC_MESSAGES/gettext-tools.mo
+share/locale/da/LC_MESSAGES/gprof.mo
+share/locale/da/LC_MESSAGES/ld.mo
+share/locale/da/LC_MESSAGES/opcodes.mo
+share/locale/da_DK.ISO8859-1/LC_COLLATE
+share/locale/da_DK.ISO8859-15/LC_COLLATE
+share/locale/da_DK.ISO8859-15/LC_MONETARY
+share/locale/da_DK.ISO8859-15/LC_TIME
+share/locale/da_DK.UTF-8/LC_COLLATE
+share/locale/da_DK.UTF-8/LC_MONETARY
+share/locale/da_DK.UTF-8/LC_TIME
+share/locale/de/LC_MESSAGES/gettext-runtime.mo
+share/locale/de/LC_MESSAGES/gettext-tools.mo
+share/locale/de/LC_MESSAGES/gprof.mo
+share/locale/de/LC_MESSAGES/ld.mo
+share/locale/de/LC_MESSAGES/opcodes.mo
+share/locale/de_AT.ISO8859-1/LC_COLLATE
+share/locale/de_AT.ISO8859-15/LC_COLLATE
+share/locale/de_AT.ISO8859-15/LC_TIME
+share/locale/de_AT.UTF-8/LC_MONETARY
+share/locale/de_AT.UTF-8/LC_TIME
+share/locale/de_CH.ISO8859-1/LC_COLLATE
+share/locale/de_CH.ISO8859-15/LC_COLLATE
+share/locale/de_DE.ISO8859-15/LC_COLLATE
+share/locale/el/LC_MESSAGES/gettext-runtime.mo
+share/locale/el/LC_MESSAGES/gettext-tools.mo
+share/locale/el_GR.ISO8859-7/LC_COLLATE
+share/locale/el_GR.ISO8859-7/LC_CTYPE
+share/locale/el_GR.ISO8859-7/LC_MESSAGES
+share/locale/el_GR.ISO8859-7/LC_TIME
+share/locale/el_GR.UTF-8/LC_COLLATE
+share/locale/el_GR.UTF-8/LC_MESSAGES
+share/locale/el_GR.UTF-8/LC_TIME
+share/locale/en@boldquot/LC_MESSAGES/gettext-runtime.mo
+share/locale/en@boldquot/LC_MESSAGES/gettext-tools.mo
+share/locale/en@quot/LC_MESSAGES/gettext-runtime.mo
+share/locale/en@quot/LC_MESSAGES/gettext-tools.mo
+share/locale/en_AU.ISO8859-1/LC_COLLATE
+share/locale/en_AU.ISO8859-15/LC_COLLATE
+share/locale/en_AU.US-ASCII/LC_COLLATE
+share/locale/en_AU.US-ASCII/LC_MONETARY
+share/locale/en_AU.UTF-8/LC_MONETARY
+share/locale/en_CA.ISO8859-1/LC_COLLATE
+share/locale/en_CA.ISO8859-15/LC_COLLATE
+share/locale/en_CA.US-ASCII/LC_COLLATE
+share/locale/en_CA.US-ASCII/LC_MONETARY
+share/locale/en_CA.UTF-8/LC_MONETARY
+share/locale/en_CA.UTF-8/LC_TIME
+share/locale/en_GB.ISO8859-1/LC_COLLATE
+share/locale/en_GB.ISO8859-15/LC_COLLATE
+share/locale/en_GB.ISO8859-15/LC_MONETARY
+share/locale/en_GB.US-ASCII/LC_COLLATE
+share/locale/en_GB.US-ASCII/LC_MONETARY
+share/locale/en_GB.UTF-8/LC_MONETARY
+share/locale/en_GB.UTF-8/LC_TIME
+share/locale/en_HK.ISO8859-1/LC_COLLATE
+share/locale/en_HK.ISO8859-1/LC_MONETARY
+share/locale/en_IE.ISO8859-1/LC_COLLATE
+share/locale/en_IE.ISO8859-1/LC_MONETARY
+share/locale/en_IE.ISO8859-15/LC_COLLATE
+share/locale/en_IE.ISO8859-15/LC_MONETARY
+share/locale/en_IE.UTF-8/LC_TIME
+share/locale/en_NZ.ISO8859-1/LC_COLLATE
+share/locale/en_NZ.ISO8859-15/LC_COLLATE
+share/locale/en_NZ.US-ASCII/LC_COLLATE
+share/locale/en_NZ.US-ASCII/LC_MONETARY
+share/locale/en_NZ.UTF-8/LC_MONETARY
+share/locale/en_PH.UTF-8/LC_MONETARY
+share/locale/en_PH.UTF-8/LC_TIME
+share/locale/en_SG.ISO8859-1/LC_COLLATE
+share/locale/en_SG.ISO8859-1/LC_MONETARY
+share/locale/en_SG.UTF-8/LC_MONETARY
+share/locale/en_SG.UTF-8/LC_TIME
+share/locale/en_US.ISO8859-1/LC_COLLATE
+share/locale/en_US.ISO8859-15/LC_COLLATE
+share/locale/en_US.ISO8859-15/LC_CTYPE
+share/locale/en_US.US-ASCII/LC_COLLATE
+share/locale/en_US.US-ASCII/LC_CTYPE
+share/locale/en_US.US-ASCII/LC_MESSAGES
+share/locale/en_US.US-ASCII/LC_MONETARY
+share/locale/en_ZA.ISO8859-1/LC_COLLATE
+share/locale/en_ZA.ISO8859-15/LC_COLLATE
+share/locale/en_ZA.ISO8859-15/LC_MONETARY
+share/locale/en_ZA.US-ASCII/LC_COLLATE
+share/locale/en_ZA.US-ASCII/LC_MONETARY
+share/locale/en_ZA.US-ASCII/LC_NUMERIC
+share/locale/en_ZA.UTF-8/LC_MONETARY
+share/locale/en_ZA.UTF-8/LC_TIME
+share/locale/eo/LC_MESSAGES/gettext-runtime.mo
+share/locale/eo/LC_MESSAGES/gprof.mo
+share/locale/es/LC_MESSAGES/bfd.mo
+share/locale/es/LC_MESSAGES/binutils.mo
+share/locale/es/LC_MESSAGES/gas.mo
+share/locale/es/LC_MESSAGES/gettext-runtime.mo
+share/locale/es/LC_MESSAGES/gettext-tools.mo
+share/locale/es/LC_MESSAGES/gold.mo
+share/locale/es/LC_MESSAGES/gprof.mo
+share/locale/es/LC_MESSAGES/ld.mo
+share/locale/es/LC_MESSAGES/opcodes.mo
+share/locale/es_AR.ISO8859-1/LC_COLLATE
+share/locale/es_AR.ISO8859-1/LC_MONETARY
+share/locale/es_AR.ISO8859-1/LC_TIME
+share/locale/es_AR.UTF-8/LC_MONETARY
+share/locale/es_CR.UTF-8/LC_MONETARY
+share/locale/es_CR.UTF-8/LC_TIME
+share/locale/es_ES.ISO8859-1/LC_COLLATE
+share/locale/es_ES.ISO8859-15/LC_COLLATE
+share/locale/es_ES.ISO8859-15/LC_TIME
+share/locale/es_ES.UTF-8/LC_TIME
+share/locale/es_MX.ISO8859-1/LC_COLLATE
+share/locale/es_MX.ISO8859-1/LC_MESSAGES
+share/locale/es_MX.ISO8859-1/LC_MONETARY
+share/locale/es_MX.ISO8859-1/LC_TIME
+share/locale/es_MX.UTF-8/LC_COLLATE
+share/locale/es_MX.UTF-8/LC_MESSAGES
+share/locale/es_MX.UTF-8/LC_MONETARY
+share/locale/es_MX.UTF-8/LC_TIME
+share/locale/et/LC_MESSAGES/gettext-runtime.mo
+share/locale/et/LC_MESSAGES/gettext-tools.mo
+share/locale/et_EE.ISO8859-1/LC_COLLATE
+share/locale/et_EE.ISO8859-15/LC_COLLATE
+share/locale/et_EE.ISO8859-15/LC_MESSAGES
+share/locale/et_EE.ISO8859-15/LC_TIME
+share/locale/et_EE.UTF-8/LC_COLLATE
+share/locale/et_EE.UTF-8/LC_MESSAGES
+share/locale/et_EE.UTF-8/LC_TIME
+share/locale/eu/LC_MESSAGES/gettext-tools.mo
+share/locale/eu_ES.ISO8859-1/LC_COLLATE
+share/locale/eu_ES.ISO8859-15/LC_COLLATE
+share/locale/eu_ES.ISO8859-15/LC_MESSAGES
+share/locale/eu_ES.UTF-8/LC_MESSAGES
+share/locale/eu_ES.UTF-8/LC_TIME
+share/locale/fa_AF.UTF-8/LC_COLLATE
+share/locale/fa_AF.UTF-8/LC_MONETARY
+share/locale/fa_AF.UTF-8/LC_TIME
+share/locale/fa_IR.UTF-8/LC_COLLATE
+share/locale/fa_IR.UTF-8/LC_MESSAGES
+share/locale/fa_IR.UTF-8/LC_MONETARY
+share/locale/fa_IR.UTF-8/LC_NUMERIC
+share/locale/fa_IR.UTF-8/LC_TIME
+share/locale/fi/LC_MESSAGES/bfd.mo
+share/locale/fi/LC_MESSAGES/binutils.mo
+share/locale/fi/LC_MESSAGES/gas.mo
+share/locale/fi/LC_MESSAGES/gettext-runtime.mo
+share/locale/fi/LC_MESSAGES/gettext-tools.mo
+share/locale/fi/LC_MESSAGES/gold.mo
+share/locale/fi/LC_MESSAGES/gprof.mo
+share/locale/fi/LC_MESSAGES/ld.mo
+share/locale/fi/LC_MESSAGES/opcodes.mo
+share/locale/fi_FI.ISO8859-1/LC_COLLATE
+share/locale/fi_FI.ISO8859-15/LC_COLLATE
+share/locale/fi_FI.ISO8859-15/LC_MESSAGES
+share/locale/fi_FI.ISO8859-15/LC_TIME
+share/locale/fi_FI.UTF-8/LC_COLLATE
+share/locale/fi_FI.UTF-8/LC_MESSAGES
+share/locale/fi_FI.UTF-8/LC_TIME
+share/locale/fr/LC_MESSAGES/bfd.mo
+share/locale/fr/LC_MESSAGES/binutils.mo
+share/locale/fr/LC_MESSAGES/gas.mo
+share/locale/fr/LC_MESSAGES/gettext-runtime.mo
+share/locale/fr/LC_MESSAGES/gettext-tools.mo
+share/locale/fr/LC_MESSAGES/gold.mo
+share/locale/fr/LC_MESSAGES/gprof.mo
+share/locale/fr/LC_MESSAGES/ld.mo
+share/locale/fr/LC_MESSAGES/opcodes.mo
+share/locale/fr_BE.ISO8859-1/LC_COLLATE
+share/locale/fr_BE.ISO8859-15/LC_COLLATE
+share/locale/fr_BE.ISO8859-15/LC_TIME
+share/locale/fr_BE.UTF-8/LC_TIME
+share/locale/fr_CA.ISO8859-1/LC_COLLATE
+share/locale/fr_CA.ISO8859-15/LC_COLLATE
+share/locale/fr_CA.ISO8859-15/LC_MONETARY
+share/locale/fr_CA.ISO8859-15/LC_TIME
+share/locale/fr_CA.UTF-8/LC_COLLATE
+share/locale/fr_CA.UTF-8/LC_MONETARY
+share/locale/fr_CA.UTF-8/LC_TIME
+share/locale/fr_CH.ISO8859-1/LC_COLLATE
+share/locale/fr_CH.ISO8859-15/LC_COLLATE
+share/locale/fr_CH.ISO8859-15/LC_MONETARY
+share/locale/fr_CH.ISO8859-15/LC_TIME
+share/locale/fr_CH.UTF-8/LC_MONETARY
+share/locale/fr_CH.UTF-8/LC_TIME
+share/locale/fr_FR.ISO8859-15/LC_COLLATE
+share/locale/ga/LC_MESSAGES/gettext-runtime.mo
+share/locale/ga/LC_MESSAGES/gprof.mo
+share/locale/ga/LC_MESSAGES/ld.mo
+share/locale/ga/LC_MESSAGES/opcodes.mo
+share/locale/ga_IE.UTF-8/LC_MESSAGES
+share/locale/ga_IE.UTF-8/LC_MONETARY
+share/locale/ga_IE.UTF-8/LC_TIME
+share/locale/gl/LC_MESSAGES/gettext-runtime.mo
+share/locale/gl/LC_MESSAGES/gettext-tools.mo
+share/locale/he_IL.UTF-8/LC_COLLATE
+share/locale/he_IL.UTF-8/LC_MESSAGES
+share/locale/he_IL.UTF-8/LC_MONETARY
+share/locale/he_IL.UTF-8/LC_TIME
+share/locale/hi_IN.ISCII-DEV/LC_COLLATE
+share/locale/hi_IN.ISCII-DEV/LC_CTYPE
+share/locale/hi_IN.ISCII-DEV/LC_MESSAGES
+share/locale/hi_IN.ISCII-DEV/LC_MONETARY
+share/locale/hi_IN.ISCII-DEV/LC_NUMERIC
+share/locale/hi_IN.ISCII-DEV/LC_TIME
+share/locale/hi_IN.UTF-8/LC_COLLATE
+share/locale/hi_IN.UTF-8/LC_MESSAGES
+share/locale/hi_IN.UTF-8/LC_MONETARY
+share/locale/hi_IN.UTF-8/LC_NUMERIC
+share/locale/hi_IN.UTF-8/LC_TIME
+share/locale/hr/LC_MESSAGES/bfd.mo
+share/locale/hr/LC_MESSAGES/binutils.mo
+share/locale/hr/LC_MESSAGES/gettext-runtime.mo
+share/locale/hr_HR.ISO8859-2/LC_COLLATE
+share/locale/hr_HR.ISO8859-2/LC_MONETARY
+share/locale/hr_HR.ISO8859-2/LC_TIME
+share/locale/hr_HR.UTF-8/LC_COLLATE
+share/locale/hr_HR.UTF-8/LC_TIME
+share/locale/hu/LC_MESSAGES/gettext-runtime.mo
+share/locale/hu/LC_MESSAGES/gprof.mo
+share/locale/hu_HU.ISO8859-2/LC_COLLATE
+share/locale/hu_HU.ISO8859-2/LC_MESSAGES
+share/locale/hu_HU.ISO8859-2/LC_MONETARY
+share/locale/hu_HU.ISO8859-2/LC_TIME
+share/locale/hu_HU.UTF-8/LC_COLLATE
+share/locale/hu_HU.UTF-8/LC_MESSAGES
+share/locale/hu_HU.UTF-8/LC_MONETARY
+share/locale/hu_HU.UTF-8/LC_TIME
+share/locale/hy_AM.ARMSCII-8/LC_COLLATE
+share/locale/hy_AM.ARMSCII-8/LC_CTYPE
+share/locale/hy_AM.ARMSCII-8/LC_MESSAGES
+share/locale/hy_AM.ARMSCII-8/LC_MONETARY
+share/locale/hy_AM.ARMSCII-8/LC_TIME
+share/locale/hy_AM.UTF-8/LC_COLLATE
+share/locale/hy_AM.UTF-8/LC_MESSAGES
+share/locale/hy_AM.UTF-8/LC_MONETARY
+share/locale/hy_AM.UTF-8/LC_TIME
+share/locale/id/LC_MESSAGES/bfd.mo
+share/locale/id/LC_MESSAGES/binutils.mo
+share/locale/id/LC_MESSAGES/gas.mo
+share/locale/id/LC_MESSAGES/gettext-runtime.mo
+share/locale/id/LC_MESSAGES/gettext-tools.mo
+share/locale/id/LC_MESSAGES/gold.mo
+share/locale/id/LC_MESSAGES/gprof.mo
+share/locale/id/LC_MESSAGES/ld.mo
+share/locale/id/LC_MESSAGES/opcodes.mo
+share/locale/is_IS.ISO8859-1/LC_COLLATE
+share/locale/is_IS.ISO8859-15/LC_COLLATE
+share/locale/is_IS.ISO8859-15/LC_MESSAGES
+share/locale/is_IS.ISO8859-15/LC_MONETARY
+share/locale/is_IS.ISO8859-15/LC_TIME
+share/locale/is_IS.UTF-8/LC_COLLATE
+share/locale/is_IS.UTF-8/LC_MESSAGES
+share/locale/is_IS.UTF-8/LC_MONETARY
+share/locale/is_IS.UTF-8/LC_TIME
+share/locale/it/LC_MESSAGES/binutils.mo
+share/locale/it/LC_MESSAGES/gettext-runtime.mo
+share/locale/it/LC_MESSAGES/gettext-tools.mo
+share/locale/it/LC_MESSAGES/gold.mo
+share/locale/it/LC_MESSAGES/gprof.mo
+share/locale/it/LC_MESSAGES/ld.mo
+share/locale/it/LC_MESSAGES/opcodes.mo
+share/locale/it_CH.ISO8859-1/LC_COLLATE
+share/locale/it_CH.ISO8859-15/LC_COLLATE
+share/locale/it_CH.ISO8859-15/LC_MONETARY
+share/locale/it_CH.ISO8859-15/LC_NUMERIC
+share/locale/it_CH.ISO8859-15/LC_TIME
+share/locale/it_CH.UTF-8/LC_MONETARY
+share/locale/it_CH.UTF-8/LC_NUMERIC
+share/locale/it_CH.UTF-8/LC_TIME
+share/locale/it_IT.ISO8859-1/LC_COLLATE
+share/locale/it_IT.ISO8859-15/LC_COLLATE
+share/locale/it_IT.ISO8859-15/LC_MESSAGES
+share/locale/it_IT.ISO8859-15/LC_MONETARY
+share/locale/it_IT.ISO8859-15/LC_TIME
+share/locale/it_IT.UTF-8/LC_MESSAGES
+share/locale/it_IT.UTF-8/LC_TIME
+share/locale/ja/LC_MESSAGES/bfd.mo
+share/locale/ja/LC_MESSAGES/binutils.mo
+share/locale/ja/LC_MESSAGES/gas.mo
+share/locale/ja/LC_MESSAGES/gettext-runtime.mo
+share/locale/ja/LC_MESSAGES/gettext-tools.mo
+share/locale/ja/LC_MESSAGES/gold.mo
+share/locale/ja/LC_MESSAGES/gprof.mo
+share/locale/ja/LC_MESSAGES/ld.mo
+share/locale/ja_JP.UTF-8/LC_COLLATE
+share/locale/ja_JP.UTF-8/LC_MESSAGES
+share/locale/ja_JP.UTF-8/LC_MONETARY
+share/locale/ja_JP.UTF-8/LC_TIME
+share/locale/ka/LC_MESSAGES/bfd.mo
+share/locale/ka/LC_MESSAGES/gprof.mo
+share/locale/kk_KZ.UTF-8/LC_COLLATE
+share/locale/kk_KZ.UTF-8/LC_MESSAGES
+share/locale/kk_KZ.UTF-8/LC_MONETARY
+share/locale/kk_KZ.UTF-8/LC_TIME
+share/locale/ko/LC_MESSAGES/gettext-runtime.mo
+share/locale/ko/LC_MESSAGES/gettext-tools.mo
+share/locale/ko_KR.UTF-8/LC_COLLATE
+share/locale/ko_KR.UTF-8/LC_MESSAGES
+share/locale/ko_KR.UTF-8/LC_MONETARY
+share/locale/ko_KR.UTF-8/LC_TIME
+share/locale/ko_KR.eucKR/LC_COLLATE
+share/locale/ko_KR.eucKR/LC_CTYPE
+share/locale/ko_KR.eucKR/LC_MESSAGES
+share/locale/ko_KR.eucKR/LC_MONETARY
+share/locale/ko_KR.eucKR/LC_TIME
+share/locale/lt_LT.ISO8859-13/LC_COLLATE
+share/locale/lt_LT.ISO8859-13/LC_MESSAGES
+share/locale/lt_LT.ISO8859-13/LC_TIME
+share/locale/lt_LT.UTF-8/LC_COLLATE
+share/locale/lt_LT.UTF-8/LC_MESSAGES
+share/locale/lt_LT.UTF-8/LC_TIME
+share/locale/lv_LV.ISO8859-13/LC_COLLATE
+share/locale/lv_LV.ISO8859-13/LC_CTYPE
+share/locale/lv_LV.ISO8859-13/LC_MESSAGES
+share/locale/lv_LV.ISO8859-13/LC_TIME
+share/locale/lv_LV.UTF-8/LC_COLLATE
+share/locale/lv_LV.UTF-8/LC_MESSAGES
+share/locale/lv_LV.UTF-8/LC_TIME
+share/locale/mn_MN.UTF-8/LC_MESSAGES
+share/locale/mn_MN.UTF-8/LC_MONETARY
+share/locale/mn_MN.UTF-8/LC_TIME
+share/locale/ms/LC_MESSAGES/gprof.mo
+share/locale/nb/LC_MESSAGES/gettext-runtime.mo
+share/locale/nb/LC_MESSAGES/gettext-tools.mo
+share/locale/nb_NO.ISO8859-1/LC_COLLATE
+share/locale/nb_NO.ISO8859-15/LC_COLLATE
+share/locale/nb_NO.ISO8859-15/LC_MESSAGES
+share/locale/nb_NO.ISO8859-15/LC_MONETARY
+share/locale/nb_NO.ISO8859-15/LC_TIME
+share/locale/nb_NO.UTF-8/LC_MESSAGES
+share/locale/nb_NO.UTF-8/LC_MONETARY
+share/locale/nb_NO.UTF-8/LC_TIME
+share/locale/nl/LC_MESSAGES/gettext-runtime.mo
+share/locale/nl/LC_MESSAGES/gettext-tools.mo
+share/locale/nl/LC_MESSAGES/gprof.mo
+share/locale/nl/LC_MESSAGES/opcodes.mo
+share/locale/nl_BE.ISO8859-1/LC_COLLATE
+share/locale/nl_BE.ISO8859-1/LC_MONETARY
+share/locale/nl_BE.ISO8859-15/LC_COLLATE
+share/locale/nl_BE.ISO8859-15/LC_MONETARY
+share/locale/nl_BE.UTF-8/LC_TIME
+share/locale/nl_NL.ISO8859-1/LC_COLLATE
+share/locale/nl_NL.ISO8859-1/LC_MONETARY
+share/locale/nl_NL.ISO8859-15/LC_COLLATE
+share/locale/nl_NL.ISO8859-15/LC_MESSAGES
+share/locale/nl_NL.ISO8859-15/LC_MONETARY
+share/locale/nl_NL.UTF-8/LC_MESSAGES
+share/locale/nl_NL.UTF-8/LC_MONETARY
+share/locale/nl_NL.UTF-8/LC_TIME
+share/locale/nn/LC_MESSAGES/gettext-runtime.mo
+share/locale/nn/LC_MESSAGES/gettext-tools.mo
+share/locale/nn_NO.ISO8859-1/LC_COLLATE
+share/locale/nn_NO.ISO8859-15/LC_COLLATE
+share/locale/nn_NO.ISO8859-15/LC_MONETARY
+share/locale/nn_NO.ISO8859-15/LC_TIME
+share/locale/nn_NO.UTF-8/LC_COLLATE
+share/locale/nn_NO.UTF-8/LC_MESSAGES
+share/locale/nn_NO.UTF-8/LC_TIME
+share/locale/pa/LC_MESSAGES/gettext-tools.mo
+share/locale/pl/LC_MESSAGES/gettext-runtime.mo
+share/locale/pl/LC_MESSAGES/gettext-tools.mo
+share/locale/pl_PL.ISO8859-2/LC_COLLATE
+share/locale/pl_PL.ISO8859-2/LC_MESSAGES
+share/locale/pl_PL.ISO8859-2/LC_MONETARY
+share/locale/pl_PL.ISO8859-2/LC_TIME
+share/locale/pl_PL.UTF-8/LC_COLLATE
+share/locale/pl_PL.UTF-8/LC_MESSAGES
+share/locale/pl_PL.UTF-8/LC_MONETARY
+share/locale/pl_PL.UTF-8/LC_TIME
+share/locale/pt/LC_MESSAGES/bfd.mo
+share/locale/pt/LC_MESSAGES/binutils.mo
+share/locale/pt/LC_MESSAGES/gettext-runtime.mo
+share/locale/pt/LC_MESSAGES/gettext-tools.mo
+share/locale/pt_BR/LC_MESSAGES/gettext-runtime.mo
+share/locale/pt_BR/LC_MESSAGES/gettext-tools.mo
+share/locale/pt_BR/LC_MESSAGES/gprof.mo
+share/locale/pt_BR/LC_MESSAGES/ld.mo
+share/locale/pt_BR/LC_MESSAGES/opcodes.mo
+share/locale/pt_BR.ISO8859-1/LC_COLLATE
+share/locale/pt_BR.ISO8859-1/LC_MONETARY
+share/locale/pt_BR.ISO8859-1/LC_TIME
+share/locale/pt_BR.UTF-8/LC_MONETARY
+share/locale/pt_BR.UTF-8/LC_TIME
+share/locale/pt_PT.ISO8859-1/LC_COLLATE
+share/locale/pt_PT.ISO8859-15/LC_COLLATE
+share/locale/pt_PT.ISO8859-15/LC_MESSAGES
+share/locale/pt_PT.ISO8859-15/LC_TIME
+share/locale/pt_PT.UTF-8/LC_MESSAGES
+share/locale/pt_PT.UTF-8/LC_TIME
+share/locale/ro/LC_MESSAGES/bfd.mo
+share/locale/ro/LC_MESSAGES/binutils.mo
+share/locale/ro/LC_MESSAGES/gettext-runtime.mo
+share/locale/ro/LC_MESSAGES/gettext-tools.mo
+share/locale/ro/LC_MESSAGES/gold.mo
+share/locale/ro/LC_MESSAGES/gprof.mo
+share/locale/ro/LC_MESSAGES/opcodes.mo
+share/locale/ro_RO.ISO8859-2/LC_COLLATE
+share/locale/ro_RO.ISO8859-2/LC_MESSAGES
+share/locale/ro_RO.ISO8859-2/LC_MONETARY
+share/locale/ro_RO.ISO8859-2/LC_TIME
+share/locale/ro_RO.UTF-8/LC_COLLATE
+share/locale/ro_RO.UTF-8/LC_MESSAGES
+share/locale/ro_RO.UTF-8/LC_MONETARY
+share/locale/ro_RO.UTF-8/LC_TIME
+share/locale/ru/LC_MESSAGES/bfd.mo
+share/locale/ru/LC_MESSAGES/binutils.mo
+share/locale/ru/LC_MESSAGES/gas.mo
+share/locale/ru/LC_MESSAGES/gettext-runtime.mo
+share/locale/ru/LC_MESSAGES/gettext-tools.mo
+share/locale/ru/LC_MESSAGES/gprof.mo
+share/locale/ru/LC_MESSAGES/ld.mo
+share/locale/ru_RU.ISO8859-5/LC_COLLATE
+share/locale/ru_RU.ISO8859-5/LC_CTYPE
+share/locale/ru_RU.ISO8859-5/LC_MESSAGES
+share/locale/ru_RU.ISO8859-5/LC_TIME
+share/locale/ru_RU.UTF-8/LC_COLLATE
+share/locale/ru_RU.UTF-8/LC_MESSAGES
+share/locale/ru_RU.UTF-8/LC_MONETARY
+share/locale/ru_RU.UTF-8/LC_TIME
+share/locale/rw/LC_MESSAGES/bfd.mo
+share/locale/rw/LC_MESSAGES/binutils.mo
+share/locale/rw/LC_MESSAGES/gas.mo
+share/locale/rw/LC_MESSAGES/gprof.mo
+share/locale/se_FI.UTF-8/LC_TIME
+share/locale/se_NO.UTF-8/LC_COLLATE
+share/locale/se_NO.UTF-8/LC_MESSAGES
+share/locale/se_NO.UTF-8/LC_MONETARY
+share/locale/se_NO.UTF-8/LC_TIME
+share/locale/sk/LC_MESSAGES/binutils.mo
+share/locale/sk/LC_MESSAGES/gettext-runtime.mo
+share/locale/sk/LC_MESSAGES/gettext-tools.mo
+share/locale/sk_SK.ISO8859-2/LC_COLLATE
+share/locale/sk_SK.ISO8859-2/LC_MESSAGES
+share/locale/sk_SK.ISO8859-2/LC_TIME
+share/locale/sk_SK.UTF-8/LC_COLLATE
+share/locale/sk_SK.UTF-8/LC_MESSAGES
+share/locale/sk_SK.UTF-8/LC_MONETARY
+share/locale/sk_SK.UTF-8/LC_TIME
+share/locale/sl/LC_MESSAGES/gettext-runtime.mo
+share/locale/sl/LC_MESSAGES/gettext-tools.mo
+share/locale/sl_SI.ISO8859-2/LC_COLLATE
+share/locale/sl_SI.ISO8859-2/LC_TIME
+share/locale/sl_SI.UTF-8/LC_COLLATE
+share/locale/sl_SI.UTF-8/LC_MONETARY
+share/locale/sl_SI.UTF-8/LC_TIME
+share/locale/sr/LC_MESSAGES/bfd.mo
+share/locale/sr/LC_MESSAGES/binutils.mo
+share/locale/sr/LC_MESSAGES/gettext-runtime.mo
+share/locale/sr/LC_MESSAGES/gettext-tools.mo
+share/locale/sr/LC_MESSAGES/gold.mo
+share/locale/sr/LC_MESSAGES/gprof.mo
+share/locale/sr/LC_MESSAGES/ld.mo
+share/locale/sr/LC_MESSAGES/opcodes.mo
+share/locale/sr_RS.ISO8859-2/LC_COLLATE
+share/locale/sr_RS.ISO8859-2/LC_CTYPE
+share/locale/sr_RS.ISO8859-2/LC_MONETARY
+share/locale/sr_RS.ISO8859-2/LC_TIME
+share/locale/sr_RS.ISO8859-5/LC_COLLATE
+share/locale/sr_RS.ISO8859-5/LC_MESSAGES
+share/locale/sr_RS.ISO8859-5/LC_TIME
+share/locale/sr_RS.UTF-8/LC_COLLATE
+share/locale/sr_RS.UTF-8/LC_MESSAGES
+share/locale/sr_RS.UTF-8/LC_TIME
+share/locale/sr_RS.UTF-8@latin/LC_COLLATE
+share/locale/sr_RS.UTF-8@latin/LC_MESSAGES
+share/locale/sr_RS.UTF-8@latin/LC_MONETARY
+share/locale/sr_RS.UTF-8@latin/LC_TIME
+share/locale/sv/LC_MESSAGES/bfd.mo
+share/locale/sv/LC_MESSAGES/binutils.mo
+share/locale/sv/LC_MESSAGES/gas.mo
+share/locale/sv/LC_MESSAGES/gettext-runtime.mo
+share/locale/sv/LC_MESSAGES/gettext-tools.mo
+share/locale/sv/LC_MESSAGES/gold.mo
+share/locale/sv/LC_MESSAGES/gprof.mo
+share/locale/sv/LC_MESSAGES/ld.mo
+share/locale/sv/LC_MESSAGES/opcodes.mo
+share/locale/sv_FI.ISO8859-1/LC_COLLATE
+share/locale/sv_FI.ISO8859-15/LC_COLLATE
+share/locale/sv_FI.ISO8859-15/LC_MONETARY
+share/locale/sv_FI.ISO8859-15/LC_TIME
+share/locale/sv_FI.UTF-8/LC_MONETARY
+share/locale/sv_FI.UTF-8/LC_TIME
+share/locale/sv_SE.ISO8859-1/LC_COLLATE
+share/locale/sv_SE.ISO8859-15/LC_COLLATE
+share/locale/sv_SE.ISO8859-15/LC_MESSAGES
+share/locale/sv_SE.ISO8859-15/LC_MONETARY
+share/locale/sv_SE.ISO8859-15/LC_TIME
+share/locale/sv_SE.UTF-8/LC_COLLATE
+share/locale/sv_SE.UTF-8/LC_MESSAGES
+share/locale/sv_SE.UTF-8/LC_MONETARY
+share/locale/sv_SE.UTF-8/LC_TIME
+share/locale/tr/LC_MESSAGES/bfd.mo
+share/locale/tr/LC_MESSAGES/binutils.mo
+share/locale/tr/LC_MESSAGES/gas.mo
+share/locale/tr/LC_MESSAGES/gettext-runtime.mo
+share/locale/tr/LC_MESSAGES/gettext-tools.mo
+share/locale/tr/LC_MESSAGES/gprof.mo
+share/locale/tr/LC_MESSAGES/ld.mo
+share/locale/tr/LC_MESSAGES/opcodes.mo
+share/locale/tr_TR.ISO8859-9/LC_COLLATE
+share/locale/tr_TR.ISO8859-9/LC_CTYPE
+share/locale/tr_TR.ISO8859-9/LC_MESSAGES
+share/locale/tr_TR.ISO8859-9/LC_MONETARY
+share/locale/tr_TR.ISO8859-9/LC_TIME
+share/locale/uk/LC_MESSAGES/bfd.mo
+share/locale/uk/LC_MESSAGES/binutils.mo
+share/locale/uk/LC_MESSAGES/gas.mo
+share/locale/uk/LC_MESSAGES/gettext-runtime.mo
+share/locale/uk/LC_MESSAGES/gettext-tools.mo
+share/locale/uk/LC_MESSAGES/gold.mo
+share/locale/uk/LC_MESSAGES/gprof.mo
+share/locale/uk/LC_MESSAGES/ld.mo
+share/locale/uk/LC_MESSAGES/opcodes.mo
+share/locale/uk_UA.CP1251/LC_COLLATE
+share/locale/uk_UA.CP1251/LC_CTYPE
+share/locale/uk_UA.CP1251/LC_MESSAGES
+share/locale/uk_UA.CP1251/LC_MONETARY
+share/locale/uk_UA.CP1251/LC_TIME
+share/locale/uk_UA.ISO8859-5/LC_COLLATE
+share/locale/uk_UA.ISO8859-5/LC_CTYPE
+share/locale/uk_UA.ISO8859-5/LC_MESSAGES
+share/locale/uk_UA.ISO8859-5/LC_MONETARY
+share/locale/uk_UA.ISO8859-5/LC_TIME
+share/locale/uk_UA.KOI8-U/LC_COLLATE
+share/locale/uk_UA.KOI8-U/LC_CTYPE
+share/locale/uk_UA.KOI8-U/LC_MESSAGES
+share/locale/uk_UA.KOI8-U/LC_MONETARY
+share/locale/uk_UA.KOI8-U/LC_TIME
+share/locale/uk_UA.UTF-8/LC_COLLATE
+share/locale/uk_UA.UTF-8/LC_MESSAGES
+share/locale/uk_UA.UTF-8/LC_MONETARY
+share/locale/uk_UA.UTF-8/LC_NUMERIC
+share/locale/uk_UA.UTF-8/LC_TIME
+share/locale/vi/LC_MESSAGES/bfd.mo
+share/locale/vi/LC_MESSAGES/binutils.mo
+share/locale/vi/LC_MESSAGES/gettext-runtime.mo
+share/locale/vi/LC_MESSAGES/gettext-tools.mo
+share/locale/vi/LC_MESSAGES/gold.mo
+share/locale/vi/LC_MESSAGES/gprof.mo
+share/locale/vi/LC_MESSAGES/ld.mo
+share/locale/vi/LC_MESSAGES/opcodes.mo
+share/locale/zh_CN/LC_MESSAGES/bfd.mo
+share/locale/zh_CN/LC_MESSAGES/binutils.mo
+share/locale/zh_CN/LC_MESSAGES/gas.mo
+share/locale/zh_CN/LC_MESSAGES/gettext-runtime.mo
+share/locale/zh_CN/LC_MESSAGES/gettext-tools.mo
+share/locale/zh_CN/LC_MESSAGES/gold.mo
+share/locale/zh_CN/LC_MESSAGES/ld.mo
+share/locale/zh_CN/LC_MESSAGES/opcodes.mo
+share/locale/zh_CN.GB2312/LC_COLLATE
+share/locale/zh_CN.GB2312/LC_CTYPE
+share/locale/zh_CN.GB2312/LC_MESSAGES
+share/locale/zh_CN.GB2312/LC_MONETARY
+share/locale/zh_CN.GB2312/LC_NUMERIC
+share/locale/zh_CN.GB2312/LC_TIME
+share/locale/zh_CN.GBK/LC_COLLATE
+share/locale/zh_CN.GBK/LC_CTYPE
+share/locale/zh_CN.UTF-8/LC_COLLATE
+share/locale/zh_CN.UTF-8/LC_MESSAGES
+share/locale/zh_CN.UTF-8/LC_MONETARY
+share/locale/zh_CN.UTF-8/LC_TIME
+share/locale/zh_CN.eucCN/LC_COLLATE
+share/locale/zh_CN.eucCN/LC_CTYPE
+share/locale/zh_CN.eucCN/LC_MONETARY
+share/locale/zh_CN.eucCN/LC_NUMERIC
+share/locale/zh_CN.eucCN/LC_TIME
+share/locale/zh_HK/LC_MESSAGES/gettext-runtime.mo
+share/locale/zh_HK.UTF-8/LC_MONETARY
+share/locale/zh_HK.UTF-8/LC_TIME
+share/locale/zh_TW/LC_MESSAGES/binutils.mo
+share/locale/zh_TW/LC_MESSAGES/gettext-runtime.mo
+share/locale/zh_TW/LC_MESSAGES/gettext-tools.mo
+share/locale/zh_TW/LC_MESSAGES/ld.mo
+share/locale/zh_TW.Big5/LC_COLLATE
+share/locale/zh_TW.Big5/LC_CTYPE
+share/locale/zh_TW.Big5/LC_MESSAGES
+share/locale/zh_TW.Big5/LC_MONETARY
+share/locale/zh_TW.Big5/LC_TIME
+share/locale/zh_TW.UTF-8/LC_COLLATE
+share/locale/zh_TW.UTF-8/LC_MESSAGES
+share/locale/zh_TW.UTF-8/LC_MONETARY
+share/locale/zh_TW.UTF-8/LC_TIME
+share/man/man1/cmp.1.gz
+share/man/man1/compile_et.1.gz
+share/man/man1/diff.1.gz
+share/man/man1/diff3.1.gz
+share/man/man1/find.1.gz
+share/man/man1/grep.1.gz
+share/man/man1/patch.1.gz
+share/man/man1/patchelf.1.gz
+share/man/man1/scan-build.1.gz
+share/man/man1/sdiff.1.gz
+share/man/man1/sed.1.gz
+share/man/man1/tar.1.gz
+share/man/man1/xargs.1.gz
+share/man/man3/zlib.3.gz
+share/man/man8/rmt.8.gz
+share/nls/be_BY.UTF-8/libc.cat
+share/nls/ca_ES.ISO8859-1/libc.cat
+share/nls/de_DE.ISO8859-1/libc.cat
+share/nls/el_GR.ISO8859-7/libc.cat
+share/nls/es_ES.ISO8859-1/libc.cat
+share/nls/fi_FI.ISO8859-1/libc.cat
+share/nls/fr_FR.ISO8859-1/libc.cat
+share/nls/gl_ES.ISO8859-1/libc.cat
+share/nls/hu_HU.ISO8859-2/libc.cat
+share/nls/it_IT.ISO8859-15/libc.cat
+share/nls/ja_JP.UTF-8/libc.cat
+share/nls/ja_JP.eucJP/libc.cat
+share/nls/ko_KR.UTF-8/libc.cat
+share/nls/ko_KR.eucKR/libc.cat
+share/nls/mn_MN.UTF-8/libc.cat
+share/nls/nl_NL.ISO8859-1/libc.cat
+share/nls/no_NO.ISO8859-1/libc.cat
+share/nls/pl_PL.ISO8859-2/libc.cat
+share/nls/pt_BR.ISO8859-1/libc.cat
+share/nls/ru_RU.KOI8-R/libc.cat
+share/nls/sk_SK.ISO8859-2/libc.cat
+share/nls/sv_SE.ISO8859-1/libc.cat
+share/nls/uk_UA.UTF-8/libc.cat
+share/nls/zh_CN.GB18030/libc.cat
+share/nls/zh_CN.GB2312/libc.cat
+share/nls/zh_CN.UTF-8/libc.cat
+share/publicsuffix/public_suffix_list.dat
+share/publicsuffix/test_psl.txt
+share/scan-build/scanview.css
+share/scan-build/sorttable.js
+share/scan-view/Reporter.py
+share/scan-view/ScanView.py
+share/scan-view/bugcatcher.ico
+share/scan-view/startfile.py
+share/tabset/std
+share/tabset/stdcrt
+share/tabset/vt100
+share/tabset/vt300
+share/terminfo/9/9term
+share/terminfo/E/Eterm
+share/terminfo/E/Eterm-256color
+share/terminfo/E/Eterm-88color
+share/terminfo/M/MtxOrb
+share/terminfo/M/MtxOrb162
+share/terminfo/M/MtxOrb204
+share/terminfo/a/aaa
+share/terminfo/a/aaa+dec
+share/terminfo/a/aaa+rv
+share/terminfo/a/aaa+unk
+share/terminfo/a/aaa-18
+share/terminfo/a/aaa-18-rv
+share/terminfo/a/aaa-20
+share/terminfo/a/aaa-22
+share/terminfo/a/aaa-24
+share/terminfo/a/aaa-24-rv
+share/terminfo/a/aaa-26
+share/terminfo/a/aaa-28
+share/terminfo/a/aaa-30-ctxt
+share/terminfo/a/aaa-30-rv
+share/terminfo/a/aaa-30-rv-ctxt
+share/terminfo/a/aaa-30-s
+share/terminfo/a/aaa-30-s-rv
+share/terminfo/a/aaa-36
+share/terminfo/a/aaa-36-rv
+share/terminfo/a/aaa-40
+share/terminfo/a/aaa-40-rv
+share/terminfo/a/aaa-48
+share/terminfo/a/aaa-48-rv
+share/terminfo/a/aaa-60
+share/terminfo/a/aaa-60-dec-rv
+share/terminfo/a/aaa-60-rv
+share/terminfo/a/aaa-60-s
+share/terminfo/a/aaa-60-s-rv
+share/terminfo/a/aaa-db
+share/terminfo/a/aaa-rv-unk
+share/terminfo/a/aaa-s-ctxt
+share/terminfo/a/aaa-s-rv-ctxt
+share/terminfo/a/aas1901
+share/terminfo/a/abm80
+share/terminfo/a/abm85
+share/terminfo/a/abm85e
+share/terminfo/a/abm85h
+share/terminfo/a/abm85h-old
+share/terminfo/a/absolute
+share/terminfo/a/act4
+share/terminfo/a/act5
+share/terminfo/a/addrinfo
+share/terminfo/a/adds980
+share/terminfo/a/adm+sgr
+share/terminfo/a/adm11
+share/terminfo/a/adm1178
+share/terminfo/a/adm12
+share/terminfo/a/adm1a
+share/terminfo/a/adm2
+share/terminfo/a/adm20
+share/terminfo/a/adm21
+share/terminfo/a/adm22
+share/terminfo/a/adm3
+share/terminfo/a/adm31
+share/terminfo/a/adm31-old
+share/terminfo/a/adm36
+share/terminfo/a/adm3a
+share/terminfo/a/adm3a+
+share/terminfo/a/adm42
+share/terminfo/a/adm42-ns
+share/terminfo/a/adm5
+share/terminfo/a/aepro
+share/terminfo/a/aixterm
+share/terminfo/a/aixterm+sl
+share/terminfo/a/aixterm-16color
+share/terminfo/a/aixterm-m
+share/terminfo/a/aixterm-m-old
+share/terminfo/a/aj510
+share/terminfo/a/aj830
+share/terminfo/a/alacritty
+share/terminfo/a/alacritty+common
+share/terminfo/a/alacritty-direct
+share/terminfo/a/alto-h19
+share/terminfo/a/altos2
+share/terminfo/a/altos3
+share/terminfo/a/altos4
+share/terminfo/a/altos7
+share/terminfo/a/altos7pc
+share/terminfo/a/amiga
+share/terminfo/a/amiga-8bit
+share/terminfo/a/amiga-h
+share/terminfo/a/amiga-vnc
+share/terminfo/a/ampex175
+share/terminfo/a/ampex175-b
+share/terminfo/a/ampex210
+share/terminfo/a/ampex219
+share/terminfo/a/ampex219w
+share/terminfo/a/ampex232
+share/terminfo/a/ampex232w
+share/terminfo/a/ampex80
+share/terminfo/a/annarbor4080
+share/terminfo/a/ansi
+share/terminfo/a/ansi+arrows
+share/terminfo/a/ansi+cpr
+share/terminfo/a/ansi+csr
+share/terminfo/a/ansi+cup
+share/terminfo/a/ansi+enq
+share/terminfo/a/ansi+erase
+share/terminfo/a/ansi+idc
+share/terminfo/a/ansi+idc1
+share/terminfo/a/ansi+idl
+share/terminfo/a/ansi+idl1
+share/terminfo/a/ansi+inittabs
+share/terminfo/a/ansi+local
+share/terminfo/a/ansi+local1
+share/terminfo/a/ansi+pp
+share/terminfo/a/ansi+rca
+share/terminfo/a/ansi+rca2
+share/terminfo/a/ansi+rep
+share/terminfo/a/ansi+sgr
+share/terminfo/a/ansi+sgrbold
+share/terminfo/a/ansi+sgrdim
+share/terminfo/a/ansi+sgrso
+share/terminfo/a/ansi+sgrul
+share/terminfo/a/ansi+tabs
+share/terminfo/a/ansi-color-2-emx
+share/terminfo/a/ansi-color-3-emx
+share/terminfo/a/ansi-emx
+share/terminfo/a/ansi-generic
+share/terminfo/a/ansi-m
+share/terminfo/a/ansi-mini
+share/terminfo/a/ansi-mr
+share/terminfo/a/ansi-mtabs
+share/terminfo/a/ansi-nt
+share/terminfo/a/ansi.sys
+share/terminfo/a/ansi.sys-old
+share/terminfo/a/ansi.sysk
+share/terminfo/a/ansi77
+share/terminfo/a/apollo
+share/terminfo/a/apollo+vt132
+share/terminfo/a/apollo_15P
+share/terminfo/a/apollo_19L
+share/terminfo/a/apollo_color
+share/terminfo/a/apple-80
+share/terminfo/a/apple-ae
+share/terminfo/a/apple-soroc
+share/terminfo/a/apple-uterm
+share/terminfo/a/apple-uterm-vb
+share/terminfo/a/apple-videx
+share/terminfo/a/apple-videx2
+share/terminfo/a/apple-videx3
+share/terminfo/a/apple-vm80
+share/terminfo/a/apple2e
+share/terminfo/a/apple2e-p
+share/terminfo/a/apple80p
+share/terminfo/a/appleII
+share/terminfo/a/appleIIgs
+share/terminfo/a/arm100
+share/terminfo/a/arm100-w
+share/terminfo/a/atari-old
+share/terminfo/a/aterm
+share/terminfo/a/att2300
+share/terminfo/a/att2350
+share/terminfo/a/att4410
+share/terminfo/a/att4410v1-w
+share/terminfo/a/att4415
+share/terminfo/a/att4415+nl
+share/terminfo/a/att4415-nl
+share/terminfo/a/att4415-rv
+share/terminfo/a/att4415-rv-nl
+share/terminfo/a/att4415-w
+share/terminfo/a/att4415-w-nl
+share/terminfo/a/att4415-w-rv
+share/terminfo/a/att4415-w-rv-n
+share/terminfo/a/att4418
+share/terminfo/a/att4418-w
+share/terminfo/a/att4420
+share/terminfo/a/att4424
+share/terminfo/a/att4424-1
+share/terminfo/a/att4424m
+share/terminfo/a/att4426
+share/terminfo/a/att500
+share/terminfo/a/att505
+share/terminfo/a/att505-22
+share/terminfo/a/att505-24
+share/terminfo/a/att510a
+share/terminfo/a/att510d
+share/terminfo/a/att5310
+share/terminfo/a/att5410-w
+share/terminfo/a/att5410v1
+share/terminfo/a/att5420_2
+share/terminfo/a/att5420_2-w
+share/terminfo/a/att5425
+share/terminfo/a/att5425-nl
+share/terminfo/a/att5425-w
+share/terminfo/a/att5620
+share/terminfo/a/att5620-1
+share/terminfo/a/att5620-24
+share/terminfo/a/att5620-34
+share/terminfo/a/att5620-s
+share/terminfo/a/att605
+share/terminfo/a/att605-pc
+share/terminfo/a/att605-w
+share/terminfo/a/att610
+share/terminfo/a/att610+cvis
+share/terminfo/a/att610+cvis0
+share/terminfo/a/att610-103k
+share/terminfo/a/att610-103k-w
+share/terminfo/a/att610-w
+share/terminfo/a/att615
+share/terminfo/a/att615-103k
+share/terminfo/a/att615-103k-w
+share/terminfo/a/att615-w
+share/terminfo/a/att620
+share/terminfo/a/att620-103k
+share/terminfo/a/att620-103k-w
+share/terminfo/a/att620-w
+share/terminfo/a/att630
+share/terminfo/a/att630-24
+share/terminfo/a/att6386
+share/terminfo/a/att700
+share/terminfo/a/att730
+share/terminfo/a/att730-24
+share/terminfo/a/att730-41
+share/terminfo/a/att7300
+share/terminfo/a/att730r
+share/terminfo/a/att730r-24
+share/terminfo/a/att730r-41
+share/terminfo/a/avatar
+share/terminfo/a/avatar0
+share/terminfo/a/avatar0+
+share/terminfo/a/avt
+share/terminfo/a/avt+s
+share/terminfo/a/avt-ns
+share/terminfo/a/avt-rv
+share/terminfo/a/avt-rv-ns
+share/terminfo/a/avt-w
+share/terminfo/a/avt-w-ns
+share/terminfo/a/avt-w-rv
+share/terminfo/a/avt-w-rv-ns
+share/terminfo/a/aws
+share/terminfo/a/awsc
+share/terminfo/b/bantam
+share/terminfo/b/basis
+share/terminfo/b/beacon
+share/terminfo/b/beehive
+share/terminfo/b/beehive3
+share/terminfo/b/beehive4
+share/terminfo/b/beterm
+share/terminfo/b/bg1.25
+share/terminfo/b/bg1.25nv
+share/terminfo/b/bg1.25rv
+share/terminfo/b/bg2.0
+share/terminfo/b/bg2.0rv
+share/terminfo/b/bitgraph
+share/terminfo/b/blit
+share/terminfo/b/bobcat
+share/terminfo/b/bq300
+share/terminfo/b/bq300-8
+share/terminfo/b/bq300-8-pc
+share/terminfo/b/bq300-8-pc-rv
+share/terminfo/b/bq300-8-pc-w
+share/terminfo/b/bq300-8-pc-w-rv
+share/terminfo/b/bq300-8rv
+share/terminfo/b/bq300-8w
+share/terminfo/b/bq300-pc
+share/terminfo/b/bq300-pc-rv
+share/terminfo/b/bq300-pc-w
+share/terminfo/b/bq300-pc-w-rv
+share/terminfo/b/bq300-rv
+share/terminfo/b/bq300-w
+share/terminfo/b/bq300-w-8rv
+share/terminfo/b/bq300-w-rv
+share/terminfo/b/bracketed+paste
+share/terminfo/b/bsdos-pc
+share/terminfo/b/bsdos-pc-m
+share/terminfo/b/bsdos-pc-nobold
+share/terminfo/b/bsdos-ppc
+share/terminfo/b/bsdos-sparc
+share/terminfo/b/bterm
+share/terminfo/c/c100
+share/terminfo/c/c100-rv
+share/terminfo/c/c108
+share/terminfo/c/c108-4p
+share/terminfo/c/c108-rv
+share/terminfo/c/c108-rv-4p
+share/terminfo/c/c108-w
+share/terminfo/c/ca22851
+share/terminfo/c/cad68-2
+share/terminfo/c/cad68-3
+share/terminfo/c/cbblit
+share/terminfo/c/cbunix
+share/terminfo/c/cci
+share/terminfo/c/cdc456
+share/terminfo/c/cdc721
+share/terminfo/c/cdc721-esc
+share/terminfo/c/cdc721ll
+share/terminfo/c/cdc752
+share/terminfo/c/cdc756
+share/terminfo/c/cg7900
+share/terminfo/c/cit101
+share/terminfo/c/cit101e
+share/terminfo/c/cit101e-132
+share/terminfo/c/cit101e-n
+share/terminfo/c/cit101e-n132
+share/terminfo/c/cit101e-rv
+share/terminfo/c/cit500
+share/terminfo/c/cit80
+share/terminfo/c/citoh
+share/terminfo/c/citoh-6lpi
+share/terminfo/c/citoh-8lpi
+share/terminfo/c/citoh-comp
+share/terminfo/c/citoh-elite
+share/terminfo/c/citoh-pica
+share/terminfo/c/citoh-prop
+share/terminfo/c/coco3
+share/terminfo/c/color_xterm
+share/terminfo/c/commodore
+share/terminfo/c/cons25
+share/terminfo/c/cons25-debian
+share/terminfo/c/cons25-m
+share/terminfo/c/cons25l1
+share/terminfo/c/cons25l1-m
+share/terminfo/c/cons25r
+share/terminfo/c/cons25r-m
+share/terminfo/c/cons25w
+share/terminfo/c/cons30
+share/terminfo/c/cons30-m
+share/terminfo/c/cons43
+share/terminfo/c/cons43-m
+share/terminfo/c/cons50
+share/terminfo/c/cons50-m
+share/terminfo/c/cons50l1
+share/terminfo/c/cons50l1-m
+share/terminfo/c/cons50r
+share/terminfo/c/cons50r-m
+share/terminfo/c/cons60
+share/terminfo/c/cons60-m
+share/terminfo/c/cons60l1
+share/terminfo/c/cons60l1-m
+share/terminfo/c/cons60r
+share/terminfo/c/cons60r-m
+share/terminfo/c/contel300
+share/terminfo/c/contel301
+share/terminfo/c/cops10
+share/terminfo/c/crt
+share/terminfo/c/cs10
+share/terminfo/c/cs10-w
+share/terminfo/c/ct8500
+share/terminfo/c/ctrm
+share/terminfo/c/cyb110
+share/terminfo/c/cyb83
+share/terminfo/c/cygwin
+share/terminfo/c/cygwinB19
+share/terminfo/c/cygwinDBG
+share/terminfo/d/d132
+share/terminfo/d/d200
+share/terminfo/d/d210
+share/terminfo/d/d210-dg
+share/terminfo/d/d211
+share/terminfo/d/d211-7b
+share/terminfo/d/d211-dg
+share/terminfo/d/d216-dg
+share/terminfo/d/d216-unix
+share/terminfo/d/d216-unix-25
+share/terminfo/d/d217-unix
+share/terminfo/d/d217-unix-25
+share/terminfo/d/d220
+share/terminfo/d/d220-7b
+share/terminfo/d/d220-dg
+share/terminfo/d/d230c
+share/terminfo/d/d230c-dg
+share/terminfo/d/d400
+share/terminfo/d/d410
+share/terminfo/d/d410-7b
+share/terminfo/d/d410-7b-w
+share/terminfo/d/d410-dg
+share/terminfo/d/d410-w
+share/terminfo/d/d412-dg
+share/terminfo/d/d412-unix
+share/terminfo/d/d412-unix-25
+share/terminfo/d/d412-unix-s
+share/terminfo/d/d412-unix-sr
+share/terminfo/d/d412-unix-w
+share/terminfo/d/d413-unix
+share/terminfo/d/d413-unix-25
+share/terminfo/d/d413-unix-s
+share/terminfo/d/d413-unix-sr
+share/terminfo/d/d413-unix-w
+share/terminfo/d/d414-unix
+share/terminfo/d/d414-unix-25
+share/terminfo/d/d414-unix-s
+share/terminfo/d/d414-unix-sr
+share/terminfo/d/d414-unix-w
+share/terminfo/d/d430c-dg
+share/terminfo/d/d430c-dg-ccc
+share/terminfo/d/d430c-unix
+share/terminfo/d/d430c-unix-25
+share/terminfo/d/d430c-unix-25-ccc
+share/terminfo/d/d430c-unix-ccc
+share/terminfo/d/d430c-unix-s
+share/terminfo/d/d430c-unix-s-ccc
+share/terminfo/d/d430c-unix-sr
+share/terminfo/d/d430c-unix-sr-ccc
+share/terminfo/d/d430c-unix-w
+share/terminfo/d/d430c-unix-w-ccc
+share/terminfo/d/d470c
+share/terminfo/d/d470c-7b
+share/terminfo/d/d470c-dg
+share/terminfo/d/d555
+share/terminfo/d/d555-7b
+share/terminfo/d/d555-7b-w
+share/terminfo/d/d555-dg
+share/terminfo/d/d555-w
+share/terminfo/d/d577
+share/terminfo/d/d577-7b
+share/terminfo/d/d577-7b-w
+share/terminfo/d/d577-dg
+share/terminfo/d/d577-w
+share/terminfo/d/d578
+share/terminfo/d/d578-7b
+share/terminfo/d/d800
+share/terminfo/d/ddr
+share/terminfo/d/dec+pp
+share/terminfo/d/dec+sl
+share/terminfo/d/dec-vt100
+share/terminfo/d/dec-vt220
+share/terminfo/d/decansi
+share/terminfo/d/decid+cpr
+share/terminfo/d/delta
+share/terminfo/d/dg+ccc
+share/terminfo/d/dg+color
+share/terminfo/d/dg+color8
+share/terminfo/d/dg+fixed
+share/terminfo/d/dg-generic
+share/terminfo/d/dg200
+share/terminfo/d/dg210
+share/terminfo/d/dg211
+share/terminfo/d/dg450
+share/terminfo/d/dg460-ansi
+share/terminfo/d/dg6053
+share/terminfo/d/dg6053-old
+share/terminfo/d/dgkeys+11
+share/terminfo/d/dgkeys+15
+share/terminfo/d/dgkeys+7b
+share/terminfo/d/dgkeys+8b
+share/terminfo/d/dgmode+color
+share/terminfo/d/dgmode+color8
+share/terminfo/d/dgunix+ccc
+share/terminfo/d/dgunix+fixed
+share/terminfo/d/diablo1620
+share/terminfo/d/diablo1620-m8
+share/terminfo/d/diablo1640
+share/terminfo/d/diablo1640-lm
+share/terminfo/d/diablo1740-lm
+share/terminfo/d/digilog
+share/terminfo/d/djgpp
+share/terminfo/d/djgpp203
+share/terminfo/d/djgpp204
+share/terminfo/d/dku7003
+share/terminfo/d/dku7003-dumb
+share/terminfo/d/dku7102-old
+share/terminfo/d/dku7202
+share/terminfo/d/dm1520
+share/terminfo/d/dm2500
+share/terminfo/d/dm3025
+share/terminfo/d/dm3045
+share/terminfo/d/dm80
+share/terminfo/d/dm80w
+share/terminfo/d/dmchat
+share/terminfo/d/dmterm
+share/terminfo/d/domterm
+share/terminfo/d/dp3360
+share/terminfo/d/dp8242
+share/terminfo/d/dt100
+share/terminfo/d/dt100w
+share/terminfo/d/dt110
+share/terminfo/d/dt80-sas
+share/terminfo/d/dtc300s
+share/terminfo/d/dtc382
+share/terminfo/d/dtterm
+share/terminfo/d/dumb
+share/terminfo/d/dumb-emacs-ansi
+share/terminfo/d/dvtm
+share/terminfo/d/dvtm-256color
+share/terminfo/d/dw1
+share/terminfo/d/dw2
+share/terminfo/d/dw3
+share/terminfo/d/dw4
+share/terminfo/d/dwk
+share/terminfo/e/ecma+color
+share/terminfo/e/ecma+index
+share/terminfo/e/ecma+italics
+share/terminfo/e/ecma+sgr
+share/terminfo/e/ecma+strikeout
+share/terminfo/e/elks
+share/terminfo/e/elks-ansi
+share/terminfo/e/elks-glasstty
+share/terminfo/e/elks-vt52
+share/terminfo/e/emu
+share/terminfo/e/emu-220
+share/terminfo/e/emx-base
+share/terminfo/e/env230
+share/terminfo/e/ep40
+share/terminfo/e/ep48
+share/terminfo/e/ergo4000
+share/terminfo/e/esprit
+share/terminfo/e/esprit-am
+share/terminfo/e/eterm
+share/terminfo/e/eterm-color
+share/terminfo/e/ex155
+share/terminfo/e/excel62
+share/terminfo/e/excel62-rv
+share/terminfo/e/excel62-w
+share/terminfo/f/f100
+share/terminfo/f/f100-rv
+share/terminfo/f/f110
+share/terminfo/f/f110-14
+share/terminfo/f/f110-14w
+share/terminfo/f/f110-w
+share/terminfo/f/f1720
+share/terminfo/f/f200
+share/terminfo/f/f200-w
+share/terminfo/f/f200vi
+share/terminfo/f/f200vi-w
+share/terminfo/f/falco
+share/terminfo/f/falco-p
+share/terminfo/f/fbterm
+share/terminfo/f/foot
+share/terminfo/f/foot+base
+share/terminfo/f/foot-direct
+share/terminfo/f/fos
+share/terminfo/f/fox
+share/terminfo/g/gator
+share/terminfo/g/gator-52
+share/terminfo/g/gator-52t
+share/terminfo/g/gator-t
+share/terminfo/g/gigi
+share/terminfo/g/glasstty
+share/terminfo/g/gnome
+share/terminfo/g/gnome+pcfkeys
+share/terminfo/g/gnome-2007
+share/terminfo/g/gnome-2008
+share/terminfo/g/gnome-2012
+share/terminfo/g/gnome-256color
+share/terminfo/g/gnome-fc5
+share/terminfo/g/gnome-rh62
+share/terminfo/g/gnome-rh72
+share/terminfo/g/gnome-rh80
+share/terminfo/g/gnome-rh90
+share/terminfo/g/go140
+share/terminfo/g/go140w
+share/terminfo/g/go225
+share/terminfo/g/graphos
+share/terminfo/g/graphos-30
+share/terminfo/g/gs6300
+share/terminfo/g/gsi
+share/terminfo/g/gt40
+share/terminfo/g/gt42
+share/terminfo/g/guru
+share/terminfo/g/guru+rv
+share/terminfo/g/guru+s
+share/terminfo/g/guru-24
+share/terminfo/g/guru-44
+share/terminfo/g/guru-44-s
+share/terminfo/g/guru-76
+share/terminfo/g/guru-76-lp
+share/terminfo/g/guru-76-s
+share/terminfo/g/guru-76-w
+share/terminfo/g/guru-76-w-s
+share/terminfo/g/guru-76-wm
+share/terminfo/g/guru-nctxt
+share/terminfo/g/guru-rv
+share/terminfo/g/guru-s
+share/terminfo/h/h19
+share/terminfo/h/h19-a
+share/terminfo/h/h19-bs
+share/terminfo/h/h19-g
+share/terminfo/h/h19-u
+share/terminfo/h/h19-us
+share/terminfo/h/h19k
+share/terminfo/h/ha8675
+share/terminfo/h/ha8686
+share/terminfo/h/hazel
+share/terminfo/h/hds200
+share/terminfo/h/hft-c
+share/terminfo/h/hft-c-old
+share/terminfo/h/hft-old
+share/terminfo/h/hirez100
+share/terminfo/h/hirez100-w
+share/terminfo/h/hmod1
+share/terminfo/h/hp+arrows
+share/terminfo/h/hp+color
+share/terminfo/h/hp+labels
+share/terminfo/h/hp+pfk+arrows
+share/terminfo/h/hp+pfk+cr
+share/terminfo/h/hp+pfk-cr
+share/terminfo/h/hp+printer
+share/terminfo/h/hp110
+share/terminfo/h/hp150
+share/terminfo/h/hp2
+share/terminfo/h/hp236
+share/terminfo/h/hp2382a
+share/terminfo/h/hp2392
+share/terminfo/h/hp2397a
+share/terminfo/h/hp2621
+share/terminfo/h/hp2621-48
+share/terminfo/h/hp2621-a
+share/terminfo/h/hp2621-ba
+share/terminfo/h/hp2621-fl
+share/terminfo/h/hp2621-k45
+share/terminfo/h/hp2621-nl
+share/terminfo/h/hp2621-nt
+share/terminfo/h/hp2621b
+share/terminfo/h/hp2621b-kx
+share/terminfo/h/hp2621b-kx-p
+share/terminfo/h/hp2621b-p
+share/terminfo/h/hp2621p
+share/terminfo/h/hp2621p-a
+share/terminfo/h/hp2622
+share/terminfo/h/hp2623
+share/terminfo/h/hp2624
+share/terminfo/h/hp2624-10p
+share/terminfo/h/hp2624b-10p-p
+share/terminfo/h/hp2624b-p
+share/terminfo/h/hp2626
+share/terminfo/h/hp2626-12
+share/terminfo/h/hp2626-12-s
+share/terminfo/h/hp2626-12x40
+share/terminfo/h/hp2626-ns
+share/terminfo/h/hp2626-s
+share/terminfo/h/hp2626-x40
+share/terminfo/h/hp2627a
+share/terminfo/h/hp2627a-rev
+share/terminfo/h/hp2627c
+share/terminfo/h/hp262x
+share/terminfo/h/hp2640a
+share/terminfo/h/hp2640b
+share/terminfo/h/hp2641a
+share/terminfo/h/hp2645
+share/terminfo/h/hp2648
+share/terminfo/h/hp300h
+share/terminfo/h/hp700-wy
+share/terminfo/h/hp70092
+share/terminfo/h/hp9837
+share/terminfo/h/hp9845
+share/terminfo/h/hp98550
+share/terminfo/h/hp98550-color
+share/terminfo/h/hpansi
+share/terminfo/h/hpex
+share/terminfo/h/hpgeneric
+share/terminfo/h/hpsub
+share/terminfo/h/hpterm
+share/terminfo/h/hpterm-color
+share/terminfo/h/hpterm-color2
+share/terminfo/h/hterm
+share/terminfo/h/hterm-256color
+share/terminfo/h/hurd
+share/terminfo/h/hz1000
+share/terminfo/h/hz1420
+share/terminfo/h/hz1500
+share/terminfo/h/hz1510
+share/terminfo/h/hz1520
+share/terminfo/h/hz1520-noesc
+share/terminfo/h/hz1552
+share/terminfo/h/hz1552-rv
+share/terminfo/h/hz2000
+share/terminfo/i/i100
+share/terminfo/i/i400
+share/terminfo/i/iTerm.app
+share/terminfo/i/iTerm2.app
+share/terminfo/i/ibcs2
+share/terminfo/i/ibm+16color
+share/terminfo/i/ibm+color
+share/terminfo/i/ibm-apl
+share/terminfo/i/ibm-pc
+share/terminfo/i/ibm-system1
+share/terminfo/i/ibm3101
+share/terminfo/i/ibm3151
+share/terminfo/i/ibm3161
+share/terminfo/i/ibm3161-C
+share/terminfo/i/ibm3162
+share/terminfo/i/ibm3164
+share/terminfo/i/ibm327x
+share/terminfo/i/ibm5081
+share/terminfo/i/ibm5081-c
+share/terminfo/i/ibm5151
+share/terminfo/i/ibm5154
+share/terminfo/i/ibm6153
+share/terminfo/i/ibm6153-40
+share/terminfo/i/ibm6153-90
+share/terminfo/i/ibm6154
+share/terminfo/i/ibm6155
+share/terminfo/i/ibm8503
+share/terminfo/i/ibm8512
+share/terminfo/i/ibm8514
+share/terminfo/i/ibm8514-c
+share/terminfo/i/ibmaed
+share/terminfo/i/ibmapa8c
+share/terminfo/i/ibmapa8c-c
+share/terminfo/i/ibmega
+share/terminfo/i/ibmega-c
+share/terminfo/i/ibmmono
+share/terminfo/i/ibmpc
+share/terminfo/i/ibmpc3
+share/terminfo/i/ibmpcx
+share/terminfo/i/ibmvga
+share/terminfo/i/ibmvga-c
+share/terminfo/i/icl6404
+share/terminfo/i/icl6404-w
+share/terminfo/i/ifmr
+share/terminfo/i/ims-ansi
+share/terminfo/i/ims950
+share/terminfo/i/ims950-b
+share/terminfo/i/ims950-rv
+share/terminfo/i/infoton
+share/terminfo/i/infoton2
+share/terminfo/i/interix
+share/terminfo/i/interix-nti
+share/terminfo/i/intertube
+share/terminfo/i/intertube2
+share/terminfo/i/intext
+share/terminfo/i/intext2
+share/terminfo/i/iris-ansi
+share/terminfo/i/iris-ansi-ap
+share/terminfo/i/iris-color
+share/terminfo/i/iterm2-direct
+share/terminfo/j/jaixterm
+share/terminfo/j/jaixterm-m
+share/terminfo/j/jfbterm
+share/terminfo/k/kaypro
+share/terminfo/k/kermit
+share/terminfo/k/kermit-am
+share/terminfo/k/kitty
+share/terminfo/k/kitty+common
+share/terminfo/k/kitty+setal
+share/terminfo/k/kitty-direct
+share/terminfo/k/klone+acs
+share/terminfo/k/klone+color
+share/terminfo/k/klone+koi8acs
+share/terminfo/k/klone+sgr
+share/terminfo/k/klone+sgr-dumb
+share/terminfo/k/klone+sgr8
+share/terminfo/k/kon
+share/terminfo/k/konsole
+share/terminfo/k/konsole+pcfkeys
+share/terminfo/k/konsole-16color
+share/terminfo/k/konsole-256color
+share/terminfo/k/konsole-base
+share/terminfo/k/konsole-direct
+share/terminfo/k/konsole-linux
+share/terminfo/k/konsole-solaris
+share/terminfo/k/konsole-vt100
+share/terminfo/k/konsole-vt420pc
+share/terminfo/k/konsole-xf3x
+share/terminfo/k/konsole-xf4x
+share/terminfo/k/kt7
+share/terminfo/k/kt7ix
+share/terminfo/k/kterm
+share/terminfo/k/kterm-color
+share/terminfo/k/kvt
+share/terminfo/l/lft
+share/terminfo/l/linux
+share/terminfo/l/linux+decid
+share/terminfo/l/linux+sfkeys
+share/terminfo/l/linux-16color
+share/terminfo/l/linux-basic
+share/terminfo/l/linux-c
+share/terminfo/l/linux-c-nc
+share/terminfo/l/linux-koi8
+share/terminfo/l/linux-koi8r
+share/terminfo/l/linux-lat
+share/terminfo/l/linux-m
+share/terminfo/l/linux-m1
+share/terminfo/l/linux-m1b
+share/terminfo/l/linux-m2
+share/terminfo/l/linux-nic
+share/terminfo/l/linux-s
+share/terminfo/l/linux-vt
+share/terminfo/l/linux2.2
+share/terminfo/l/linux2.6
+share/terminfo/l/linux2.6.26
+share/terminfo/l/linux3.0
+share/terminfo/l/lisa
+share/terminfo/l/lisaterm
+share/terminfo/l/lisaterm-w
+share/terminfo/l/liswb
+share/terminfo/l/ln03
+share/terminfo/l/ln03-w
+share/terminfo/l/lpr
+share/terminfo/l/luna
+share/terminfo/m/m2-nam
+share/terminfo/m/mac
+share/terminfo/m/mac-w
+share/terminfo/m/mach
+share/terminfo/m/mach-bold
+share/terminfo/m/mach-color
+share/terminfo/m/mach-gnu
+share/terminfo/m/mach-gnu-color
+share/terminfo/m/mai
+share/terminfo/m/masscomp
+share/terminfo/m/masscomp1
+share/terminfo/m/masscomp2
+share/terminfo/m/megatek
+share/terminfo/m/memhp
+share/terminfo/m/mgr
+share/terminfo/m/mgr-linux
+share/terminfo/m/mgr-sun
+share/terminfo/m/mgt
+share/terminfo/m/mgterm
+share/terminfo/m/microb
+share/terminfo/m/mime
+share/terminfo/m/mime-fb
+share/terminfo/m/mime-hb
+share/terminfo/m/mime2a
+share/terminfo/m/mime2a-s
+share/terminfo/m/mime314
+share/terminfo/m/mime3a
+share/terminfo/m/mime3ax
+share/terminfo/m/minitel1
+share/terminfo/m/minitel1-nb
+share/terminfo/m/minitel12-80
+share/terminfo/m/minitel1b
+share/terminfo/m/minitel1b-80
+share/terminfo/m/minitel1b-nb
+share/terminfo/m/minitel2-80
+share/terminfo/m/minix
+share/terminfo/m/minix-1.7
+share/terminfo/m/minix-3.0
+share/terminfo/m/minix-old
+share/terminfo/m/minix-old-am
+share/terminfo/m/mintty
+share/terminfo/m/mintty+common
+share/terminfo/m/mintty-direct
+share/terminfo/m/mlterm
+share/terminfo/m/mlterm+pcfkeys
+share/terminfo/m/mlterm-256color
+share/terminfo/m/mlterm-direct
+share/terminfo/m/mlterm2
+share/terminfo/m/mlterm3
+share/terminfo/m/mm340
+share/terminfo/m/modgraph
+share/terminfo/m/modgraph2
+share/terminfo/m/modgraph48
+share/terminfo/m/mono-emx
+share/terminfo/m/morphos
+share/terminfo/m/mosh
+share/terminfo/m/mosh-256color
+share/terminfo/m/mrxvt
+share/terminfo/m/mrxvt-256color
+share/terminfo/m/ms-terminal
+share/terminfo/m/ms-vt-utf8
+share/terminfo/m/ms-vt100
+share/terminfo/m/ms-vt100+
+share/terminfo/m/ms-vt100-color
+share/terminfo/m/msk227
+share/terminfo/m/msk22714
+share/terminfo/m/msk227am
+share/terminfo/m/mt4520-rv
+share/terminfo/m/mt70
+share/terminfo/m/mterm
+share/terminfo/m/mterm-ansi
+share/terminfo/m/mvterm
+share/terminfo/n/nansi.sys
+share/terminfo/n/nansi.sysk
+share/terminfo/n/ncr160vppp
+share/terminfo/n/ncr160vpwpp
+share/terminfo/n/ncr160vt100an
+share/terminfo/n/ncr160vt100pp
+share/terminfo/n/ncr160vt100wan
+share/terminfo/n/ncr160vt100wpp
+share/terminfo/n/ncr160vt200an
+share/terminfo/n/ncr160vt200pp
+share/terminfo/n/ncr160vt200wan
+share/terminfo/n/ncr160vt200wpp
+share/terminfo/n/ncr160vt300an
+share/terminfo/n/ncr160vt300pp
+share/terminfo/n/ncr160vt300wan
+share/terminfo/n/ncr160vt300wpp
+share/terminfo/n/ncr160wy50+pp
+share/terminfo/n/ncr160wy50+wpp
+share/terminfo/n/ncr160wy60pp
+share/terminfo/n/ncr160wy60wpp
+share/terminfo/n/ncr260intan
+share/terminfo/n/ncr260intpp
+share/terminfo/n/ncr260intwan
+share/terminfo/n/ncr260intwpp
+share/terminfo/n/ncr260vp+sl
+share/terminfo/n/ncr260vppp
+share/terminfo/n/ncr260vpwpp
+share/terminfo/n/ncr260vt+sl
+share/terminfo/n/ncr260vt100an
+share/terminfo/n/ncr260vt100pp
+share/terminfo/n/ncr260vt100wan
+share/terminfo/n/ncr260vt100wpp
+share/terminfo/n/ncr260vt200an
+share/terminfo/n/ncr260vt200pp
+share/terminfo/n/ncr260vt200wan
+share/terminfo/n/ncr260vt200wpp
+share/terminfo/n/ncr260vt300an
+share/terminfo/n/ncr260vt300pp
+share/terminfo/n/ncr260vt300wan
+share/terminfo/n/ncr260vt300wpp
+share/terminfo/n/ncr260wy325pp
+share/terminfo/n/ncr260wy325wpp
+share/terminfo/n/ncr260wy350pp
+share/terminfo/n/ncr260wy350wpp
+share/terminfo/n/ncr260wy50+pp
+share/terminfo/n/ncr260wy50+wpp
+share/terminfo/n/ncr260wy60pp
+share/terminfo/n/ncr260wy60wpp
+share/terminfo/n/ncr7900i
+share/terminfo/n/ncr7900iv
+share/terminfo/n/ncr7901
+share/terminfo/n/ncrvt100an
+share/terminfo/n/ncrvt100wan
+share/terminfo/n/ncsa
+share/terminfo/n/ncsa-m
+share/terminfo/n/ncsa-m-ns
+share/terminfo/n/ncsa-ns
+share/terminfo/n/ncsa-vt220
+share/terminfo/n/ndr9500
+share/terminfo/n/ndr9500-25
+share/terminfo/n/ndr9500-25-mc
+share/terminfo/n/ndr9500-25-mc-nl
+share/terminfo/n/ndr9500-25-nl
+share/terminfo/n/ndr9500-mc
+share/terminfo/n/ndr9500-mc-nl
+share/terminfo/n/ndr9500-nl
+share/terminfo/n/nec5520
+share/terminfo/n/netbsd6
+share/terminfo/n/newhp
+share/terminfo/n/newhpkeyboard
+share/terminfo/n/news-29
+share/terminfo/n/news-29-euc
+share/terminfo/n/news-29-sjis
+share/terminfo/n/news-33
+share/terminfo/n/news-33-euc
+share/terminfo/n/news-33-sjis
+share/terminfo/n/news-42
+share/terminfo/n/news-42-euc
+share/terminfo/n/news-42-sjis
+share/terminfo/n/news-old-unk
+share/terminfo/n/news-unk
+share/terminfo/n/news28
+share/terminfo/n/news29
+share/terminfo/n/next
+share/terminfo/n/nextshell
+share/terminfo/n/no+brackets
+share/terminfo/n/northstar
+share/terminfo/n/nsterm
+share/terminfo/n/nsterm+7
+share/terminfo/n/nsterm+acs
+share/terminfo/n/nsterm+c
+share/terminfo/n/nsterm+c41
+share/terminfo/n/nsterm+mac
+share/terminfo/n/nsterm+s
+share/terminfo/n/nsterm-16color
+share/terminfo/n/nsterm-7
+share/terminfo/n/nsterm-7-c
+share/terminfo/n/nsterm-acs
+share/terminfo/n/nsterm-bce
+share/terminfo/n/nsterm-build309
+share/terminfo/n/nsterm-build326
+share/terminfo/n/nsterm-build343
+share/terminfo/n/nsterm-build361
+share/terminfo/n/nsterm-build400
+share/terminfo/n/nsterm-build440
+share/terminfo/n/nsterm-c
+share/terminfo/n/nsterm-c-acs
+share/terminfo/n/nsterm-c-s
+share/terminfo/n/nsterm-c-s-7
+share/terminfo/n/nsterm-c-s-acs
+share/terminfo/n/nsterm-direct
+share/terminfo/n/nsterm-m
+share/terminfo/n/nsterm-m-7
+share/terminfo/n/nsterm-m-acs
+share/terminfo/n/nsterm-m-s
+share/terminfo/n/nsterm-m-s-7
+share/terminfo/n/nsterm-m-s-acs
+share/terminfo/n/nsterm-old
+share/terminfo/n/nsterm-s
+share/terminfo/n/nsterm-s-7
+share/terminfo/n/nsterm-s-acs
+share/terminfo/n/nwp511
+share/terminfo/n/nwp512
+share/terminfo/n/nwp512-a
+share/terminfo/n/nwp513
+share/terminfo/n/nwp513-a
+share/terminfo/n/nwp517
+share/terminfo/n/nwp517-w
+share/terminfo/o/oblit
+share/terminfo/o/oc100
+share/terminfo/o/ofcons
+share/terminfo/o/oldpc3
+share/terminfo/o/oldsun
+share/terminfo/o/omron
+share/terminfo/o/opennt-100
+share/terminfo/o/opennt-100-nti
+share/terminfo/o/opennt-35
+share/terminfo/o/opennt-35-nti
+share/terminfo/o/opennt-35-w
+share/terminfo/o/opennt-50
+share/terminfo/o/opennt-50-nti
+share/terminfo/o/opennt-50-w
+share/terminfo/o/opennt-60
+share/terminfo/o/opennt-60-nti
+share/terminfo/o/opennt-60-w
+share/terminfo/o/opennt-w
+share/terminfo/o/opennt-w-vt
+share/terminfo/o/opus3n1+
+share/terminfo/o/origpc3
+share/terminfo/o/osborne
+share/terminfo/o/osborne-w
+share/terminfo/o/osexec
+share/terminfo/o/otek4112
+share/terminfo/o/otek4115
+share/terminfo/o/owl
+share/terminfo/p/p19
+share/terminfo/p/p8gl
+share/terminfo/p/pc-coherent
+share/terminfo/p/pc-minix
+share/terminfo/p/pc-venix
+share/terminfo/p/pc3
+share/terminfo/p/pc6300plus
+share/terminfo/p/pcansi
+share/terminfo/p/pcansi-25
+share/terminfo/p/pcansi-25-m
+share/terminfo/p/pcansi-33
+share/terminfo/p/pcansi-33-m
+share/terminfo/p/pcansi-43
+share/terminfo/p/pcansi-43-m
+share/terminfo/p/pcansi-m
+share/terminfo/p/pccon
+share/terminfo/p/pccon+base
+share/terminfo/p/pccon+colors
+share/terminfo/p/pccon+keys
+share/terminfo/p/pccon+sgr+acs
+share/terminfo/p/pccon+sgr+acs0
+share/terminfo/p/pccon-m
+share/terminfo/p/pccon0
+share/terminfo/p/pccon0-m
+share/terminfo/p/pccons
+share/terminfo/p/pcix
+share/terminfo/p/pckermit
+share/terminfo/p/pckermit120
+share/terminfo/p/pcmw
+share/terminfo/p/pcplot
+share/terminfo/p/pcvt25
+share/terminfo/p/pcvt25-color
+share/terminfo/p/pcvt25w
+share/terminfo/p/pcvt28
+share/terminfo/p/pcvt28w
+share/terminfo/p/pcvt35
+share/terminfo/p/pcvt35w
+share/terminfo/p/pcvt40
+share/terminfo/p/pcvt40w
+share/terminfo/p/pcvt43
+share/terminfo/p/pcvt43w
+share/terminfo/p/pcvt50
+share/terminfo/p/pcvt50w
+share/terminfo/p/pcvtXX
+share/terminfo/p/pe1251
+share/terminfo/p/pe7000c
+share/terminfo/p/pe7000m
+share/terminfo/p/pilot
+share/terminfo/p/pmcons
+share/terminfo/p/prism12
+share/terminfo/p/prism12-m
+share/terminfo/p/prism12-m-w
+share/terminfo/p/prism12-w
+share/terminfo/p/prism14
+share/terminfo/p/prism14-m
+share/terminfo/p/prism14-m-w
+share/terminfo/p/prism14-w
+share/terminfo/p/prism2
+share/terminfo/p/prism4
+share/terminfo/p/prism5
+share/terminfo/p/prism7
+share/terminfo/p/prism8
+share/terminfo/p/prism8-w
+share/terminfo/p/prism9
+share/terminfo/p/prism9-8
+share/terminfo/p/prism9-8-w
+share/terminfo/p/prism9-w
+share/terminfo/p/pro350
+share/terminfo/p/ps300
+share/terminfo/p/psterm
+share/terminfo/p/psterm-80x24
+share/terminfo/p/psterm-90x28
+share/terminfo/p/psterm-96x48
+share/terminfo/p/psterm-fast
+share/terminfo/p/pt100
+share/terminfo/p/pt100w
+share/terminfo/p/pt210
+share/terminfo/p/pt250
+share/terminfo/p/pt250w
+share/terminfo/p/pty
+share/terminfo/p/putty
+share/terminfo/p/putty+fnkeys
+share/terminfo/p/putty+fnkeys+esc
+share/terminfo/p/putty+fnkeys+linux
+share/terminfo/p/putty+fnkeys+sco
+share/terminfo/p/putty+fnkeys+vt100
+share/terminfo/p/putty+fnkeys+vt400
+share/terminfo/p/putty+fnkeys+xterm
+share/terminfo/p/putty+keypad
+share/terminfo/p/putty+screen
+share/terminfo/p/putty-256color
+share/terminfo/p/putty-m1
+share/terminfo/p/putty-m1b
+share/terminfo/p/putty-m2
+share/terminfo/p/putty-noapp
+share/terminfo/p/putty-sco
+share/terminfo/p/putty-screen
+share/terminfo/p/putty-vt100
+share/terminfo/q/qansi
+share/terminfo/q/qansi-g
+share/terminfo/q/qansi-m
+share/terminfo/q/qansi-t
+share/terminfo/q/qansi-w
+share/terminfo/q/qdss
+share/terminfo/q/qnx
+share/terminfo/q/qnxm
+share/terminfo/q/qnxt
+share/terminfo/q/qnxt2
+share/terminfo/q/qnxtmono
+share/terminfo/q/qnxw
+share/terminfo/q/qume5
+share/terminfo/q/qvt101
+share/terminfo/q/qvt101+
+share/terminfo/q/qvt102
+share/terminfo/q/qvt103
+share/terminfo/q/qvt103-w
+share/terminfo/q/qvt119+
+share/terminfo/q/qvt119+-25
+share/terminfo/q/qvt119+-25-w
+share/terminfo/q/qvt119+-w
+share/terminfo/q/qvt203
+share/terminfo/q/qvt203-25
+share/terminfo/q/qvt203-25-w
+share/terminfo/q/qvt203-w
+share/terminfo/r/rbcomm
+share/terminfo/r/rbcomm-nam
+share/terminfo/r/rbcomm-w
+share/terminfo/r/rca
+share/terminfo/r/rcons
+share/terminfo/r/rcons-color
+share/terminfo/r/regent
+share/terminfo/r/regent100
+share/terminfo/r/regent20
+share/terminfo/r/regent25
+share/terminfo/r/regent40
+share/terminfo/r/regent40+
+share/terminfo/r/regent60
+share/terminfo/r/rt6221
+share/terminfo/r/rt6221-w
+share/terminfo/r/rtpc
+share/terminfo/r/rxvt
+share/terminfo/r/rxvt+pcfkeys
+share/terminfo/r/rxvt-16color
+share/terminfo/r/rxvt-256color
+share/terminfo/r/rxvt-88color
+share/terminfo/r/rxvt-basic
+share/terminfo/r/rxvt-cygwin
+share/terminfo/r/rxvt-cygwin-native
+share/terminfo/r/rxvt-xpm
+share/terminfo/s/sb1
+share/terminfo/s/sb2
+share/terminfo/s/sbi
+share/terminfo/s/scanset
+share/terminfo/s/scoansi
+share/terminfo/s/scoansi-new
+share/terminfo/s/scoansi-old
+share/terminfo/s/screen
+share/terminfo/s/screen+fkeys
+share/terminfo/s/screen+italics
+share/terminfo/s/screen-16color
+share/terminfo/s/screen-16color-bce
+share/terminfo/s/screen-16color-bce-s
+share/terminfo/s/screen-16color-s
+share/terminfo/s/screen-256color
+share/terminfo/s/screen-256color-bce
+share/terminfo/s/screen-256color-bce-s
+share/terminfo/s/screen-256color-s
+share/terminfo/s/screen-base
+share/terminfo/s/screen-bce
+share/terminfo/s/screen-bce.Eterm
+share/terminfo/s/screen-bce.gnome
+share/terminfo/s/screen-bce.konsole
+share/terminfo/s/screen-bce.linux
+share/terminfo/s/screen-bce.mrxvt
+share/terminfo/s/screen-bce.rxvt
+share/terminfo/s/screen-bce.xterm-new
+share/terminfo/s/screen-s
+share/terminfo/s/screen-w
+share/terminfo/s/screen.Eterm
+share/terminfo/s/screen.gnome
+share/terminfo/s/screen.konsole
+share/terminfo/s/screen.konsole-256color
+share/terminfo/s/screen.linux
+share/terminfo/s/screen.linux-m1
+share/terminfo/s/screen.linux-m1b
+share/terminfo/s/screen.linux-m2
+share/terminfo/s/screen.minitel1
+share/terminfo/s/screen.minitel1-nb
+share/terminfo/s/screen.minitel1b
+share/terminfo/s/screen.minitel1b-80
+share/terminfo/s/screen.minitel1b-nb
+share/terminfo/s/screen.mlterm
+share/terminfo/s/screen.mlterm-256color
+share/terminfo/s/screen.mrxvt
+share/terminfo/s/screen.putty
+share/terminfo/s/screen.putty-256color
+share/terminfo/s/screen.putty-m1
+share/terminfo/s/screen.putty-m1b
+share/terminfo/s/screen.putty-m2
+share/terminfo/s/screen.rxvt
+share/terminfo/s/screen.teraterm
+share/terminfo/s/screen.vte
+share/terminfo/s/screen.vte-256color
+share/terminfo/s/screen.xterm-256color
+share/terminfo/s/screen.xterm-r6
+share/terminfo/s/screen.xterm-xfree86
+share/terminfo/s/screen2
+share/terminfo/s/screen3
+share/terminfo/s/screen4
+share/terminfo/s/screen5
+share/terminfo/s/screwpoint
+share/terminfo/s/scrhp
+share/terminfo/s/scrt
+share/terminfo/s/sibo
+share/terminfo/s/simpleterm
+share/terminfo/s/simterm
+share/terminfo/s/soroc120
+share/terminfo/s/soroc140
+share/terminfo/s/st
+share/terminfo/s/st-0.6
+share/terminfo/s/st-0.7
+share/terminfo/s/st-0.8
+share/terminfo/s/st-16color
+share/terminfo/s/st-256color
+share/terminfo/s/st-direct
+share/terminfo/s/st52
+share/terminfo/s/st52-color
+share/terminfo/s/st52-old
+share/terminfo/s/stv52
+share/terminfo/s/stv52pc
+share/terminfo/s/sun
+share/terminfo/s/sun+sl
+share/terminfo/s/sun-1
+share/terminfo/s/sun-12
+share/terminfo/s/sun-17
+share/terminfo/s/sun-24
+share/terminfo/s/sun-34
+share/terminfo/s/sun-48
+share/terminfo/s/sun-c
+share/terminfo/s/sun-cgsix
+share/terminfo/s/sun-color
+share/terminfo/s/sun-e
+share/terminfo/s/sun-e-s
+share/terminfo/s/sun-il
+share/terminfo/s/sun-s
+share/terminfo/s/sun-type4
+share/terminfo/s/superbee-xsb
+share/terminfo/s/superbeeic
+share/terminfo/s/superbrain
+share/terminfo/s/swtp
+share/terminfo/s/synertek
+share/terminfo/t/t10
+share/terminfo/t/t1061
+share/terminfo/t/t1061f
+share/terminfo/t/t16
+share/terminfo/t/t3700
+share/terminfo/t/t3800
+share/terminfo/t/tab132
+share/terminfo/t/tab132-rv
+share/terminfo/t/tab132-w
+share/terminfo/t/tab132-w-rv
+share/terminfo/t/tandem6510
+share/terminfo/t/tandem653
+share/terminfo/t/tek
+share/terminfo/t/tek4013
+share/terminfo/t/tek4014
+share/terminfo/t/tek4014-sm
+share/terminfo/t/tek4015
+share/terminfo/t/tek4015-sm
+share/terminfo/t/tek4023
+share/terminfo/t/tek4024
+share/terminfo/t/tek4025-17
+share/terminfo/t/tek4025-17-ws
+share/terminfo/t/tek4025-cr
+share/terminfo/t/tek4025-ex
+share/terminfo/t/tek4025a
+share/terminfo/t/tek4025ex
+share/terminfo/t/tek4105
+share/terminfo/t/tek4105-30
+share/terminfo/t/tek4105a
+share/terminfo/t/tek4106brl
+share/terminfo/t/tek4107
+share/terminfo/t/tek4112
+share/terminfo/t/tek4112-5
+share/terminfo/t/tek4112-nd
+share/terminfo/t/tek4113
+share/terminfo/t/tek4113-34
+share/terminfo/t/tek4113-nd
+share/terminfo/t/tek4115
+share/terminfo/t/tek4125
+share/terminfo/t/tek4205
+share/terminfo/t/tek4207
+share/terminfo/t/tek4207-s
+share/terminfo/t/tek4404
+share/terminfo/t/teken
+share/terminfo/t/teken-16color
+share/terminfo/t/teken-2018
+share/terminfo/t/teken-2022
+share/terminfo/t/teken-sc
+share/terminfo/t/teken-sc+fkeys
+share/terminfo/t/teken-vt+fkeys
+share/terminfo/t/teletec
+share/terminfo/t/teraterm
+share/terminfo/t/teraterm-256color
+share/terminfo/t/teraterm2.3
+share/terminfo/t/teraterm4.59
+share/terminfo/t/teraterm4.97
+share/terminfo/t/terminator
+share/terminfo/t/terminet1200
+share/terminfo/t/terminology
+share/terminfo/t/terminology-0.6.1
+share/terminfo/t/terminology-1.0.0
+share/terminfo/t/terminology-1.8.1
+share/terminfo/t/termite
+share/terminfo/t/ti700
+share/terminfo/t/ti703
+share/terminfo/t/ti703-w
+share/terminfo/t/ti916
+share/terminfo/t/ti916-132
+share/terminfo/t/ti916-8
+share/terminfo/t/ti916-8-132
+share/terminfo/t/ti924
+share/terminfo/t/ti924-8
+share/terminfo/t/ti924-8w
+share/terminfo/t/ti924w
+share/terminfo/t/ti926
+share/terminfo/t/ti926-8
+share/terminfo/t/ti928
+share/terminfo/t/ti928-8
+share/terminfo/t/ti931
+share/terminfo/t/ti_ansi
+share/terminfo/t/tmux
+share/terminfo/t/tmux-256color
+share/terminfo/t/tmux-direct
+share/terminfo/t/trs16
+share/terminfo/t/trs2
+share/terminfo/t/ts100
+share/terminfo/t/ts100-ctxt
+share/terminfo/t/tt
+share/terminfo/t/tt52
+share/terminfo/t/tty33
+share/terminfo/t/tty37
+share/terminfo/t/tty40
+share/terminfo/t/tty43
+share/terminfo/t/tvi803
+share/terminfo/t/tvi9065
+share/terminfo/t/tvi910
+share/terminfo/t/tvi910+
+share/terminfo/t/tvi912
+share/terminfo/t/tvi912b
+share/terminfo/t/tvi912b+2p
+share/terminfo/t/tvi912b+dim
+share/terminfo/t/tvi912b+mc
+share/terminfo/t/tvi912b+printer
+share/terminfo/t/tvi912b+vb
+share/terminfo/t/tvi912b-2p
+share/terminfo/t/tvi912b-2p-mc
+share/terminfo/t/tvi912b-2p-p
+share/terminfo/t/tvi912b-2p-unk
+share/terminfo/t/tvi912b-mc
+share/terminfo/t/tvi912b-p
+share/terminfo/t/tvi912b-unk
+share/terminfo/t/tvi912b-vb
+share/terminfo/t/tvi912b-vb-mc
+share/terminfo/t/tvi912b-vb-p
+share/terminfo/t/tvi912b-vb-unk
+share/terminfo/t/tvi912cc
+share/terminfo/t/tvi920b
+share/terminfo/t/tvi920b+fn
+share/terminfo/t/tvi920b-2p
+share/terminfo/t/tvi920b-2p-mc
+share/terminfo/t/tvi920b-2p-p
+share/terminfo/t/tvi920b-2p-unk
+share/terminfo/t/tvi920b-mc
+share/terminfo/t/tvi920b-p
+share/terminfo/t/tvi920b-unk
+share/terminfo/t/tvi920b-vb
+share/terminfo/t/tvi920b-vb-mc
+share/terminfo/t/tvi920b-vb-p
+share/terminfo/t/tvi920b-vb-unk
+share/terminfo/t/tvi921
+share/terminfo/t/tvi924
+share/terminfo/t/tvi925
+share/terminfo/t/tvi925-hi
+share/terminfo/t/tvi92B
+share/terminfo/t/tvi92D
+share/terminfo/t/tvi950
+share/terminfo/t/tvi950-2p
+share/terminfo/t/tvi950-4p
+share/terminfo/t/tvi950-rv
+share/terminfo/t/tvi950-rv-2p
+share/terminfo/t/tvi950-rv-4p
+share/terminfo/t/tvi955
+share/terminfo/t/tvi955-hb
+share/terminfo/t/tvi955-w
+share/terminfo/t/tvi970
+share/terminfo/t/tvi970-2p
+share/terminfo/t/tvi970-vb
+share/terminfo/t/tvipt
+share/terminfo/t/tw100
+share/terminfo/t/tw52
+share/terminfo/t/tw52-m
+share/terminfo/t/tws-generic
+share/terminfo/t/tws2102-sna
+share/terminfo/t/tws2103
+share/terminfo/t/tws2103-sna
+share/terminfo/u/uniterm
+share/terminfo/u/unknown
+share/terminfo/u/uts30
+share/terminfo/u/uwin
+share/terminfo/v/v3220
+share/terminfo/v/v5410
+share/terminfo/v/vanilla
+share/terminfo/v/vc303
+share/terminfo/v/vc303a
+share/terminfo/v/vc404
+share/terminfo/v/vc404-s
+share/terminfo/v/vc414
+share/terminfo/v/vc415
+share/terminfo/v/versaterm
+share/terminfo/v/vi200
+share/terminfo/v/vi200-f
+share/terminfo/v/vi200-rv
+share/terminfo/v/vi300
+share/terminfo/v/vi300-old
+share/terminfo/v/vi50
+share/terminfo/v/vi500
+share/terminfo/v/vi50adm
+share/terminfo/v/vi55
+share/terminfo/v/vi550
+share/terminfo/v/vi603
+share/terminfo/v/viewdata
+share/terminfo/v/viewdata-o
+share/terminfo/v/viewdata-rv
+share/terminfo/v/viewpoint
+share/terminfo/v/vip
+share/terminfo/v/vip-H
+share/terminfo/v/vip-Hw
+share/terminfo/v/vip-w
+share/terminfo/v/visa50
+share/terminfo/v/vp3a+
+share/terminfo/v/vp60
+share/terminfo/v/vp90
+share/terminfo/v/vremote
+share/terminfo/v/vsc
+share/terminfo/v/vscode
+share/terminfo/v/vscode-direct
+share/terminfo/v/vt100
+share/terminfo/v/vt100+4bsd
+share/terminfo/v/vt100+enq
+share/terminfo/v/vt100+fnkeys
+share/terminfo/v/vt100+keypad
+share/terminfo/v/vt100+pfkeys
+share/terminfo/v/vt100-nav
+share/terminfo/v/vt100-nav-w
+share/terminfo/v/vt100-putty
+share/terminfo/v/vt100-s
+share/terminfo/v/vt100-s-bot
+share/terminfo/v/vt100-vb
+share/terminfo/v/vt100-w
+share/terminfo/v/vt100-w-nam
+share/terminfo/v/vt100nam
+share/terminfo/v/vt102
+share/terminfo/v/vt102+enq
+share/terminfo/v/vt102-nsgr
+share/terminfo/v/vt102-w
+share/terminfo/v/vt125
+share/terminfo/v/vt131
+share/terminfo/v/vt132
+share/terminfo/v/vt200-js
+share/terminfo/v/vt220
+share/terminfo/v/vt220+cvis
+share/terminfo/v/vt220+cvis8
+share/terminfo/v/vt220+keypad
+share/terminfo/v/vt220+pcedit
+share/terminfo/v/vt220+vtedit
+share/terminfo/v/vt220-8bit
+share/terminfo/v/vt220-base
+share/terminfo/v/vt220-nam
+share/terminfo/v/vt220-old
+share/terminfo/v/vt220-w
+share/terminfo/v/vt220d
+share/terminfo/v/vt320
+share/terminfo/v/vt320-k3
+share/terminfo/v/vt320-k311
+share/terminfo/v/vt320-nam
+share/terminfo/v/vt320-w
+share/terminfo/v/vt320-w-nam
+share/terminfo/v/vt320nam
+share/terminfo/v/vt340
+share/terminfo/v/vt400
+share/terminfo/v/vt420
+share/terminfo/v/vt420+lrmm
+share/terminfo/v/vt420f
+share/terminfo/v/vt420pc
+share/terminfo/v/vt420pcdos
+share/terminfo/v/vt50
+share/terminfo/v/vt50h
+share/terminfo/v/vt510
+share/terminfo/v/vt510pc
+share/terminfo/v/vt510pcdos
+share/terminfo/v/vt52
+share/terminfo/v/vt52+keypad
+share/terminfo/v/vt52-basic
+share/terminfo/v/vt520
+share/terminfo/v/vt520ansi
+share/terminfo/v/vt525
+share/terminfo/v/vt61
+share/terminfo/v/vte
+share/terminfo/v/vte+pcfkeys
+share/terminfo/v/vte-2007
+share/terminfo/v/vte-2008
+share/terminfo/v/vte-2012
+share/terminfo/v/vte-2014
+share/terminfo/v/vte-2017
+share/terminfo/v/vte-2018
+share/terminfo/v/vte-256color
+share/terminfo/v/vte-direct
+share/terminfo/v/vwmterm
+share/terminfo/w/wsiris
+share/terminfo/w/wsvt25
+share/terminfo/w/wsvt25m
+share/terminfo/w/wy100
+share/terminfo/w/wy100q
+share/terminfo/w/wy120
+share/terminfo/w/wy120-25
+share/terminfo/w/wy120-25-w
+share/terminfo/w/wy120-vb
+share/terminfo/w/wy120-w
+share/terminfo/w/wy120-w-vb
+share/terminfo/w/wy160
+share/terminfo/w/wy160-25
+share/terminfo/w/wy160-25-w
+share/terminfo/w/wy160-42
+share/terminfo/w/wy160-42-w
+share/terminfo/w/wy160-43
+share/terminfo/w/wy160-43-w
+share/terminfo/w/wy160-tek
+share/terminfo/w/wy160-vb
+share/terminfo/w/wy160-w
+share/terminfo/w/wy160-w-vb
+share/terminfo/w/wy185
+share/terminfo/w/wy185-24
+share/terminfo/w/wy185-vb
+share/terminfo/w/wy185-w
+share/terminfo/w/wy185-wvb
+share/terminfo/w/wy30
+share/terminfo/w/wy30-mc
+share/terminfo/w/wy30-vb
+share/terminfo/w/wy325
+share/terminfo/w/wy325-25
+share/terminfo/w/wy325-25w
+share/terminfo/w/wy325-42
+share/terminfo/w/wy325-42w
+share/terminfo/w/wy325-42w-vb
+share/terminfo/w/wy325-43
+share/terminfo/w/wy325-43w
+share/terminfo/w/wy325-43w-vb
+share/terminfo/w/wy325-vb
+share/terminfo/w/wy325-w
+share/terminfo/w/wy325-w-vb
+share/terminfo/w/wy350
+share/terminfo/w/wy350-vb
+share/terminfo/w/wy350-w
+share/terminfo/w/wy350-wvb
+share/terminfo/w/wy370
+share/terminfo/w/wy370-105k
+share/terminfo/w/wy370-EPC
+share/terminfo/w/wy370-nk
+share/terminfo/w/wy370-rv
+share/terminfo/w/wy370-tek
+share/terminfo/w/wy370-vb
+share/terminfo/w/wy370-w
+share/terminfo/w/wy370-wvb
+share/terminfo/w/wy50
+share/terminfo/w/wy50-mc
+share/terminfo/w/wy50-vb
+share/terminfo/w/wy50-w
+share/terminfo/w/wy50-wvb
+share/terminfo/w/wy520
+share/terminfo/w/wy520-24
+share/terminfo/w/wy520-36
+share/terminfo/w/wy520-36pc
+share/terminfo/w/wy520-36w
+share/terminfo/w/wy520-36wpc
+share/terminfo/w/wy520-48
+share/terminfo/w/wy520-48pc
+share/terminfo/w/wy520-48w
+share/terminfo/w/wy520-48wpc
+share/terminfo/w/wy520-epc
+share/terminfo/w/wy520-epc-24
+share/terminfo/w/wy520-epc-vb
+share/terminfo/w/wy520-epc-w
+share/terminfo/w/wy520-epc-wvb
+share/terminfo/w/wy520-vb
+share/terminfo/w/wy520-w
+share/terminfo/w/wy520-wvb
+share/terminfo/w/wy60
+share/terminfo/w/wy60-25
+share/terminfo/w/wy60-25-w
+share/terminfo/w/wy60-42
+share/terminfo/w/wy60-42-w
+share/terminfo/w/wy60-43
+share/terminfo/w/wy60-43-w
+share/terminfo/w/wy60-vb
+share/terminfo/w/wy60-w
+share/terminfo/w/wy60-w-vb
+share/terminfo/w/wy75
+share/terminfo/w/wy75-mc
+share/terminfo/w/wy75-vb
+share/terminfo/w/wy75-w
+share/terminfo/w/wy75-wvb
+share/terminfo/w/wy75ap
+share/terminfo/w/wy85
+share/terminfo/w/wy85-8bit
+share/terminfo/w/wy85-vb
+share/terminfo/w/wy85-w
+share/terminfo/w/wy85-wvb
+share/terminfo/w/wy99-ansi
+share/terminfo/w/wy99a-ansi
+share/terminfo/w/wy99f
+share/terminfo/w/wy99fa
+share/terminfo/w/wy99gt
+share/terminfo/w/wy99gt-25
+share/terminfo/w/wy99gt-25-w
+share/terminfo/w/wy99gt-tek
+share/terminfo/w/wy99gt-vb
+share/terminfo/w/wy99gt-w
+share/terminfo/w/wy99gt-w-vb
+share/terminfo/w/wyse+sl
+share/terminfo/w/wyse-vp
+share/terminfo/x/x10term
+share/terminfo/x/x10term+sl
+share/terminfo/x/x68k
+share/terminfo/x/xerox1720
+share/terminfo/x/xerox820
+share/terminfo/x/xfce
+share/terminfo/x/xgterm
+share/terminfo/x/xiterm
+share/terminfo/x/xnuppc
+share/terminfo/x/xnuppc+100x37
+share/terminfo/x/xnuppc+112x37
+share/terminfo/x/xnuppc+128x40
+share/terminfo/x/xnuppc+128x48
+share/terminfo/x/xnuppc+144x48
+share/terminfo/x/xnuppc+160x64
+share/terminfo/x/xnuppc+200x64
+share/terminfo/x/xnuppc+200x75
+share/terminfo/x/xnuppc+256x96
+share/terminfo/x/xnuppc+80x25
+share/terminfo/x/xnuppc+80x30
+share/terminfo/x/xnuppc+90x30
+share/terminfo/x/xnuppc+b
+share/terminfo/x/xnuppc+basic
+share/terminfo/x/xnuppc+c
+share/terminfo/x/xnuppc+f
+share/terminfo/x/xnuppc+f2
+share/terminfo/x/xnuppc-100x37
+share/terminfo/x/xnuppc-100x37-m
+share/terminfo/x/xnuppc-112x37
+share/terminfo/x/xnuppc-112x37-m
+share/terminfo/x/xnuppc-128x40
+share/terminfo/x/xnuppc-128x40-m
+share/terminfo/x/xnuppc-128x48
+share/terminfo/x/xnuppc-128x48-m
+share/terminfo/x/xnuppc-144x48
+share/terminfo/x/xnuppc-144x48-m
+share/terminfo/x/xnuppc-160x64
+share/terminfo/x/xnuppc-160x64-m
+share/terminfo/x/xnuppc-200x64
+share/terminfo/x/xnuppc-200x64-m
+share/terminfo/x/xnuppc-200x75
+share/terminfo/x/xnuppc-200x75-m
+share/terminfo/x/xnuppc-256x96
+share/terminfo/x/xnuppc-256x96-m
+share/terminfo/x/xnuppc-80x25
+share/terminfo/x/xnuppc-80x25-m
+share/terminfo/x/xnuppc-80x30
+share/terminfo/x/xnuppc-80x30-m
+share/terminfo/x/xnuppc-90x30
+share/terminfo/x/xnuppc-90x30-m
+share/terminfo/x/xnuppc-b
+share/terminfo/x/xnuppc-f
+share/terminfo/x/xnuppc-f2
+share/terminfo/x/xnuppc-m
+share/terminfo/x/xnuppc-m-b
+share/terminfo/x/xnuppc-m-f
+share/terminfo/x/xnuppc-m-f2
+share/terminfo/x/xtalk
+share/terminfo/x/xterm
+share/terminfo/x/xterm+256color
+share/terminfo/x/xterm+256color2
+share/terminfo/x/xterm+256setaf
+share/terminfo/x/xterm+88color
+share/terminfo/x/xterm+88color2
+share/terminfo/x/xterm+acs
+share/terminfo/x/xterm+alt+title
+share/terminfo/x/xterm+alt1049
+share/terminfo/x/xterm+alt47
+share/terminfo/x/xterm+app
+share/terminfo/x/xterm+direct
+share/terminfo/x/xterm+direct16
+share/terminfo/x/xterm+direct2
+share/terminfo/x/xterm+direct256
+share/terminfo/x/xterm+edit
+share/terminfo/x/xterm+focus
+share/terminfo/x/xterm+indirect
+share/terminfo/x/xterm+kbs
+share/terminfo/x/xterm+keypad
+share/terminfo/x/xterm+meta
+share/terminfo/x/xterm+noalt
+share/terminfo/x/xterm+noapp
+share/terminfo/x/xterm+nofkeys
+share/terminfo/x/xterm+nopcfkeys
+share/terminfo/x/xterm+osc104
+share/terminfo/x/xterm+pc+edit
+share/terminfo/x/xterm+pcc0
+share/terminfo/x/xterm+pcc1
+share/terminfo/x/xterm+pcc2
+share/terminfo/x/xterm+pcc3
+share/terminfo/x/xterm+pce2
+share/terminfo/x/xterm+pcf0
+share/terminfo/x/xterm+pcf2
+share/terminfo/x/xterm+pcfkeys
+share/terminfo/x/xterm+r6f2
+share/terminfo/x/xterm+sl
+share/terminfo/x/xterm+sl-alt
+share/terminfo/x/xterm+sl-twm
+share/terminfo/x/xterm+sm+1002
+share/terminfo/x/xterm+sm+1003
+share/terminfo/x/xterm+sm+1005
+share/terminfo/x/xterm+sm+1006
+share/terminfo/x/xterm+titlestack
+share/terminfo/x/xterm+tmux
+share/terminfo/x/xterm+tmux2
+share/terminfo/x/xterm+vt+edit
+share/terminfo/x/xterm+x10mouse
+share/terminfo/x/xterm+x11hilite
+share/terminfo/x/xterm+x11mouse
+share/terminfo/x/xterm-1002
+share/terminfo/x/xterm-1003
+share/terminfo/x/xterm-1005
+share/terminfo/x/xterm-1006
+share/terminfo/x/xterm-16color
+share/terminfo/x/xterm-24
+share/terminfo/x/xterm-88color
+share/terminfo/x/xterm-8bit
+share/terminfo/x/xterm-basic
+share/terminfo/x/xterm-bold
+share/terminfo/x/xterm-color
+share/terminfo/x/xterm-direct
+share/terminfo/x/xterm-direct16
+share/terminfo/x/xterm-direct2
+share/terminfo/x/xterm-direct256
+share/terminfo/x/xterm-hp
+share/terminfo/x/xterm-mono
+share/terminfo/x/xterm-new
+share/terminfo/x/xterm-nic
+share/terminfo/x/xterm-noapp
+share/terminfo/x/xterm-old
+share/terminfo/x/xterm-p370
+share/terminfo/x/xterm-p371
+share/terminfo/x/xterm-pcolor
+share/terminfo/x/xterm-r5
+share/terminfo/x/xterm-r6
+share/terminfo/x/xterm-sco
+share/terminfo/x/xterm-sun
+share/terminfo/x/xterm-utf8
+share/terminfo/x/xterm-vt220
+share/terminfo/x/xterm-vt52
+share/terminfo/x/xterm-x10mouse
+share/terminfo/x/xterm-x11hilite
+share/terminfo/x/xterm-x11mouse
+share/terminfo/x/xterm-xf86-v32
+share/terminfo/x/xterm-xf86-v33
+share/terminfo/x/xterm-xf86-v333
+share/terminfo/x/xterm-xf86-v40
+share/terminfo/x/xterm-xf86-v43
+share/terminfo/x/xterm-xf86-v44
+share/terminfo/x/xterm-xfree86
+share/terminfo/x/xterm-xi
+share/terminfo/x/xterm1
+share/terminfo/x/xtermc
+share/terminfo/x/xtermm
+share/terminfo/x/xterms-sun
+share/terminfo/z/z100
+share/terminfo/z/z100bw
+share/terminfo/z/z29
+share/terminfo/z/z29a
+share/terminfo/z/z29a-kc-uc
+share/terminfo/z/z29a-nkc-bc
+share/terminfo/z/z29a-nkc-uc
+share/terminfo/z/z340
+share/terminfo/z/z340-nam
+share/terminfo/z/z39-a
+share/terminfo/z/zen30
+share/terminfo/z/zen50
+share/terminfo/z/ztx
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386.x
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386.xbn
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386.xc
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386.xce
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386.xd
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386.xdc
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386.xdce
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386.xde
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386.xdw
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386.xdwe
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386.xe
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386.xn
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386.xr
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386.xs
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386.xsc
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386.xsce
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386.xse
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386.xsw
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386.xswe
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386.xu
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386.xw
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386.xwe
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386_fbsd.x
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386_fbsd.xbn
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386_fbsd.xc
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386_fbsd.xce
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386_fbsd.xd
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386_fbsd.xdc
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386_fbsd.xdce
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386_fbsd.xde
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386_fbsd.xdw
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386_fbsd.xdwe
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386_fbsd.xe
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386_fbsd.xn
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386_fbsd.xr
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386_fbsd.xs
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386_fbsd.xsc
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386_fbsd.xsce
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386_fbsd.xse
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386_fbsd.xsw
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386_fbsd.xswe
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386_fbsd.xu
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386_fbsd.xw
+x86_64-unknown-freebsd/lib/ldscripts/elf_i386_fbsd.xwe
+x86_64-unknown-freebsd/lib/ldscripts/elf_iamcu.x
+x86_64-unknown-freebsd/lib/ldscripts/elf_iamcu.xbn
+x86_64-unknown-freebsd/lib/ldscripts/elf_iamcu.xc
+x86_64-unknown-freebsd/lib/ldscripts/elf_iamcu.xce
+x86_64-unknown-freebsd/lib/ldscripts/elf_iamcu.xd
+x86_64-unknown-freebsd/lib/ldscripts/elf_iamcu.xdc
+x86_64-unknown-freebsd/lib/ldscripts/elf_iamcu.xdce
+x86_64-unknown-freebsd/lib/ldscripts/elf_iamcu.xde
+x86_64-unknown-freebsd/lib/ldscripts/elf_iamcu.xdw
+x86_64-unknown-freebsd/lib/ldscripts/elf_iamcu.xdwe
+x86_64-unknown-freebsd/lib/ldscripts/elf_iamcu.xe
+x86_64-unknown-freebsd/lib/ldscripts/elf_iamcu.xn
+x86_64-unknown-freebsd/lib/ldscripts/elf_iamcu.xr
+x86_64-unknown-freebsd/lib/ldscripts/elf_iamcu.xs
+x86_64-unknown-freebsd/lib/ldscripts/elf_iamcu.xsc
+x86_64-unknown-freebsd/lib/ldscripts/elf_iamcu.xsce
+x86_64-unknown-freebsd/lib/ldscripts/elf_iamcu.xse
+x86_64-unknown-freebsd/lib/ldscripts/elf_iamcu.xsw
+x86_64-unknown-freebsd/lib/ldscripts/elf_iamcu.xswe
+x86_64-unknown-freebsd/lib/ldscripts/elf_iamcu.xu
+x86_64-unknown-freebsd/lib/ldscripts/elf_iamcu.xw
+x86_64-unknown-freebsd/lib/ldscripts/elf_iamcu.xwe
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64.x
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64.xbn
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64.xc
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64.xce
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64.xd
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64.xdc
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64.xdce
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64.xde
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64.xdw
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64.xdwe
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64.xe
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64.xn
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64.xr
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64.xs
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64.xsc
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64.xsce
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64.xse
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64.xsw
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64.xswe
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64.xu
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64.xw
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64.xwe
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64_fbsd.x
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64_fbsd.xbn
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64_fbsd.xc
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64_fbsd.xce
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64_fbsd.xd
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64_fbsd.xdc
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64_fbsd.xdce
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64_fbsd.xde
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64_fbsd.xdw
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64_fbsd.xdwe
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64_fbsd.xe
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64_fbsd.xn
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64_fbsd.xr
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64_fbsd.xs
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64_fbsd.xsc
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64_fbsd.xsce
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64_fbsd.xse
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64_fbsd.xsw
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64_fbsd.xswe
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64_fbsd.xu
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64_fbsd.xw
+x86_64-unknown-freebsd/lib/ldscripts/elf_x86_64_fbsd.xwe
diff --git a/pkgs/stdenv/freebsd/bootstrap-files.nix b/pkgs/stdenv/freebsd/bootstrap-files.nix
new file mode 100644
index 000000000000..2f1e05bbfd81
--- /dev/null
+++ b/pkgs/stdenv/freebsd/bootstrap-files.nix
@@ -0,0 +1,105 @@
+{ system }:
+((import <nixpkgs> { }).callPackage (
+  {
+    stdenv,
+    pkgsCross,
+    runCommand,
+    lib,
+    buildPackages,
+  }:
+  let
+    pkgs = pkgsCross.${system};
+    pack-all =
+      packCmd: name: pkgs: fixups:
+      (runCommand name {
+        requiredSystemFeatures = [ "recursive-nix" ];
+      } ''
+        nix_store=${lib.getBin buildPackages.nix}/bin/nix-store
+        rsync=${lib.getExe buildPackages.rsync}
+        base=$PWD
+        requisites="$($nix_store --query --requisites ${lib.concatStringsSep " " pkgs} | tac)"
+
+        rm -f $base/nix-support/propagated-build-inputs
+        for f in $requisites; do
+          cd $f
+          $rsync --chmod="+w" -av . $base
+        done
+        cd $base
+
+        rm -rf nix nix-support
+        mkdir nix-support
+        for dir in $requisites; do
+          cd "$dir/nix-support" 2>/dev/null || continue
+          for f in $(find . -type f); do
+            mkdir -p "$base/nix-support/$(dirname $f)"
+            cat $f >>"$base/nix-support/$f"
+          done
+        done
+        cd $base
+
+        ${fixups}
+
+        rm .nix-socket
+        ${packCmd}
+      '');
+    nar-all = pack-all "$nix_store --dump . | xz -9 -T $NIX_BUILD_CORES >$out";
+    tar-all = pack-all "XZ_OPT=\"-9 -T $NIX_BUILD_CORES\" tar cJf $out .";
+    coreutils-big = pkgs.coreutils.override { singleBinary = false; };
+    mkdir = runCommand "mkdir" { coreutils = coreutils-big; } ''
+      mkdir -p $out/bin
+      cp $coreutils/bin/mkdir $out/bin
+    '';
+  in {
+  bootstrap-files0 = nar-all "${system}-bootstrap-files0.nar.xz" (with pkgs; [bash mkdir xz gnutar]) ''
+    rm -rf include lib/*.a lib/i18n lib/bash share
+  '';
+  bootstrap-files1 = tar-all "${system}-bootstrap-files1.tar.xz" (
+    with pkgs;
+    [
+      (runCommand "bsdcp" { } "mkdir -p $out/bin; cp ${freebsd.cp}/bin/cp $out/bin/bsdcp")
+      coreutils
+      gnutar
+      findutils
+      gnumake
+      gnused
+      patchelf
+      gnugrep
+      gawk
+      diffutils
+      patch
+      bash
+      xz
+      xz.dev
+      gzip
+      bzip2
+      bzip2.dev
+      curl
+      expand-response-params
+      binutils-unwrapped
+      freebsd.libc
+      llvmPackages.libcxx
+      llvmPackages.libcxx.dev
+      llvmPackages.compiler-rt
+      llvmPackages.compiler-rt.dev
+      llvmPackages.clang-unwrapped
+      (freebsd.locales.override { locales = [ "C.UTF-8" ]; })
+    ]
+    # INSTRUCTIONS FOR GENERATING THE SPURIOUS LIST
+    # - empty this list
+    # - rebuild bootstrap files and update their urls and hashes
+    # - turn on atime on your FreeBSD nix store filesystem
+    # - run nix-collect-garbage on FreeBSD to make it so we rebuild FODs
+    # - build the nixpkgs __bootstrapArchive attribute on FreeBSD
+    # - reboot your FreeBSD system. Otherwise the atimes will simply be wrong because of kernel caching
+    # - run a full build of stdenv on FreeBSD. with -j3, this takes 1h40 on my 20 cpu VM (AMD host)
+    # - use the following to generate a list with access times and filenames
+    #   find /nix/store/###-bootstrap-archive -type f | xargs stat | grep -E 'Access: 2|File:' | paste -d ' ' - - | awk '{ print $4 " " $5 " " $6 " " $2 }' | sort -n > atimes
+    # - manually identify the point where files have no longer been accessed after the patching phase
+    # - use your favorite text editor to snip out the time column, the /nix/store/###-bootstrap-archive/ prefix, and the files that have not been used during bootstrap
+    # - turn off atime if it was off before since it will degrade performance
+    # - manually remove from the list the following; they are not marked as atime'd even though they are used
+    #   - bin/strings           # used only during bootstrap
+    # - plop it here
+  ) "xargs rm -f <${./bootstrap-files-spurious.txt}";
+}
+) { })
diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index de6608587605..b67aa88752c7 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -1,276 +1,550 @@
-{ lib
-, localSystem, crossSystem, config, overlays, crossOverlays ? []
+# afaik the longest dependency chain is stdenv -> stdenv-1#coreutils -> stdenv-1#gmp -> stdenv-0#libcxx -> stdenv-0#libc
+# this is only possible through aggressive hacking to make libcxx build with stdenv-0#libc instead of bootstrapTools.libc.
+{
+  lib,
+  localSystem,
+  crossSystem,
+  config,
+  overlays,
+  crossOverlays ? [ ],
 }:
 
 assert crossSystem == localSystem;
-let inherit (localSystem) system;
-    fetchURL = import <nix/fetchurl.nix>;
-    trivialBuilder = (import ./trivial-builder.nix);
-    make = trivialBuilder rec {
-      inherit (localSystem) system;
-      name = "make";
-      ver = "4.3";
-      url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.gz";
-      sha256 = "06cfqzpqsvdnsxbysl5p2fgdgxgl9y4p7scpnrfa8z2zgkjdspz0";
-      configureArgs = [ "--disable-nls"
-                        "--without-libintl-prefix"
-                        "--without-libiconv-prefix"
-                      ];
+let
+  inherit (localSystem) system;
+  bootstrap-urls-table = {
+    x86_64-freebsd = {
+      stage0 = {
+        url = "http://192.168.122.1:8000/stage0.nar.xz";
+        hash = "sha256-iGPBcwzDLJFroXwE/ADW+aUevywZCOher4mg9Ysx2j4=";
+        name = "bootstrap-files0";
+        unpack = true;
+      };
+      stage1 = {
+        url = "http://192.168.122.1:8000/stage1.tar.xz";
+        hash = "sha256-i0VBzbMPnSSmPjh5CYOQXTYCbSBbfa5omA0xZ2fjDlU=";
+        name = "bootstrap-files1.tar.xz";
+      };
     };
-    bash = trivialBuilder rec {
-      inherit (localSystem) system;
-      name = "bash";
-      ver = "4.4.18";
-      url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.gz";
-      sha256 = "08vz660768mnnax7n8d4d85jxafwdmsxsi7fh0hzvmafbvn9wkb0";
-      configureArgs = [ "--disable-nls"
-                        "--without-libintl-prefix"
-                        "--without-libiconv-prefix"
-                      ];
+  };
+  fetchurlBoot = import <nix/fetchurl.nix>;
+  bootstrap-files = builtins.mapAttrs (k: fetchurlBoot) bootstrap-urls-table.${localSystem.system};
+  mkExtraBuildCommands0 = cc: ''
+    rsrc="$out/resource-root"
+    mkdir "$rsrc"
+    ln -s "${lib.getLib cc}/lib/clang/16/include" "$rsrc"
+    echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
+  '';
+  mkExtraBuildCommands =
+    cc: compiler-rt:
+    mkExtraBuildCommands0 cc
+    + ''
+      ln -s "${compiler-rt.out}/lib" "$rsrc/lib"
+      ln -s "${compiler-rt.out}/share" "$rsrc/share"
+    '';
+
+  bootstrapArchive = (
+    derivation {
+      inherit system;
+      name = "bootstrap-archive";
+      pname = "bootstrap-archive";
+      version = "9.9.9";
+      builder = "${bootstrap-files.stage0}/libexec/ld-elf.so.1";
+      args = [ "${bootstrap-files.stage0}/bin/bash" ./unpack-bootstrap-files.sh ];
+      LD_LIBRARY_PATH = "${bootstrap-files.stage0}/lib";
+      src = bootstrap-files.stage0;
+      inherit (bootstrap-files) stage1;
+    }
+  );
+
+  linkBS = (
+    attrs:
+    derivation (
+      attrs
+      // {
+        inherit system;
+        name = attrs.name or (builtins.baseNameOf (builtins.elemAt attrs.paths 0));
+        src = bootstrapArchive;
+        builder = "${bootstrapArchive}/bin/bash";
+        args = [ ./linkBS.sh ];
+        PATH = "${bootstrapArchive}/bin";
+        paths = attrs.paths;
+      }
+    )
+  );
+
+  # commented linkBS entries are provided but unused
+  bootstrapTools = {
+    expand-response-params = "";
+    bsdcp = linkBS { paths = [ "bin/bsdcp" ]; };
+    patchelf = linkBS { paths = [ "bin/patchelf" ]; };
+    bash = linkBS {
+      paths = [
+        "bin/bash"
+        "bin/sh"
+      ];
+      shell = "bin/bash";
+      shellPath = "/bin/bash";
     };
-    coreutils = trivialBuilder rec {
-      inherit (localSystem) system;
+    curl = linkBS {
+      paths = [
+        "bin/curl"
+      ];
+    };
+    llvmPackages = {
+      clang-unwrapped = linkBS {
+        paths = [
+          "bin/clang"
+          "bin/clang++"
+          "bin/cpp"
+        ];
+        version = "16";
+      };
+      libunwind = linkBS {
+        name = "libunwind";
+        paths = [
+          "lib/libunwind.a"
+          "lib/libunwind.so"
+          "lib/libunwind.so.1"
+          "lib/libunwind.so.1.0"
+          "lib/libunwind_shared.so"
+        ];
+      };
+    };
+    coreutils = linkBS {
       name = "coreutils";
-      ver = "8.31";
-      url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz";
-      sha256 = "1zg9m79x1i2nifj4kb0waf9x3i5h6ydkypkjnbsb9rnwis8rqypz";
-      configureArgs = [ "--disable-nls"
-                        "--without-libintl-prefix"
-                        "--without-libiconv-prefix"
-                        "--without-gmp"
-                        "--without-libpth-prefix"
-                      ];
+      paths = map (str: "bin/" + str) [
+        "base64"
+        "basename"
+        "cat"
+        "chcon"
+        "chgrp"
+        "chmod"
+        "chown"
+        "chroot"
+        "cksum"
+        "comm"
+        "cp"
+        "csplit"
+        "cut"
+        "date"
+        "dd"
+        "df"
+        "dir"
+        "dircolors"
+        "dirname"
+        "du"
+        "echo"
+        "env"
+        "expand"
+        "expr"
+        "factor"
+        "false"
+        "fmt"
+        "fold"
+        "groups"
+        "head"
+        "hostid"
+        "id"
+        "install"
+        "join"
+        "kill"
+        "link"
+        "ln"
+        "logname"
+        "ls"
+        "md5sum"
+        "mkdir"
+        "mkfifo"
+        "mknod"
+        "mktemp"
+        "mv"
+        "nice"
+        "nl"
+        "nohup"
+        "nproc"
+        "numfmt"
+        "od"
+        "paste"
+        "pathchk"
+        "pinky"
+        "pr"
+        "printenv"
+        "printf"
+        "ptx"
+        "pwd"
+        "readlink"
+        "realpath"
+        "rm"
+        "rmdir"
+        "runcon"
+        "seq"
+        "shred"
+        "shuf"
+        "sleep"
+        "sort"
+        "split"
+        "stat"
+        "stdbuf"
+        "stty"
+        "sum"
+        "tac"
+        "tail"
+        "tee"
+        "test"
+        "timeout"
+        "touch"
+        "tr"
+        "true"
+        "truncate"
+        "tsort"
+        "tty"
+        "uname"
+        "unexpand"
+        "uniq"
+        "unlink"
+        "users"
+        "vdir"
+        "wc"
+        "who"
+        "whoami"
+        "yes"
+        "["
+      ];
     };
-    findutils = trivialBuilder rec {
-      inherit (localSystem) system;
-      name = "findutils";
-      ver = "4.7.0";
-      url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz";
-      sha256 = "16kqz9yz98dasmj70jwf5py7jk558w96w0vgp3zf9xsqk3gzpzn5";
-      configureArgs = [ "--disable-nls"
-                        "--without-libintl-prefix"
-                        "--without-libiconv-prefix"
-                        "--without-gmp"
-                        "--without-libpth-prefix"
-                      ];
-    };
-    diffutils = trivialBuilder rec {
-      inherit (localSystem) system;
+    diffutils = linkBS {
       name = "diffutils";
-      ver = "3.7";
-      url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz";
-      sha256 = "09isrg0isjinv8c535nxsi1s86wfdfzml80dbw41dj9x3hiad9xk";
-      configureArgs = [ "--disable-nls"
-                        "--without-libintl-prefix"
-                        "--without-libiconv-prefix"
-                        "--without-libsigsegv-prefix"
-                      ];
+      paths = map (str: "bin/" + str) [
+        "diff"
+        "cmp"
+        #"diff3"
+        #"sdiff"
+      ];
     };
-    grep = trivialBuilder rec {
-      inherit (localSystem) system;
-      name = "grep";
-      ver = "3.4";
-      url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz";
-      sha256 = "1yy33kiwrxrwj2nxa4fg15bvmwyghqbs8qwkdvy5phm784f7brjq";
-      configureArgs = [ "--disable-nls"
-                        "--without-libintl-prefix"
-                        "--without-libiconv-prefix"
-                        "--disable-perl-regexp"
-                        "--without-libsegsegv-prefix"
-                      ];
+    findutils = linkBS {
+      name = "findutils";
+      paths = [
+        "bin/find"
+        "bin/xargs"
+      ];
     };
-    patch = trivialBuilder rec {
-      inherit (localSystem) system;
-      name = "patch";
-      ver = "2.7.6";
-      url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz";
-      sha256 = "1zfqy4rdcy279vwn2z1kbv19dcfw25d2aqy9nzvdkq5bjzd0nqdc";
+    iconv = linkBS { paths = [ "bin/iconv" ]; };
+    patch = linkBS { paths = [ "bin/patch" ]; };
+    gnutar = linkBS { paths = [ "bin/tar" ]; };
+    gawk = linkBS {
+      paths = [
+        "bin/awk"
+        "bin/gawk"
+      ];
     };
-    gawk = trivialBuilder rec {
-      inherit (localSystem) system;
-      name = "gawk";
-      ver = "5.0.1";
-      url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz";
-      sha256 = "15570p7g2x54asvr2fsc56sxzmm08fbk4mzpcs5n92fp9vq8cklf";
-      configureArgs = [ "--disable-nls"
-                        "--disable-mpfr"
-                        "--without-libintl-prefix"
-                        "--without-libiconv-prefix"
-                        "--without-libsegsegv-prefix"
-                      ];
+    gnumake = linkBS { paths = [ "bin/make" ]; };
+    gnugrep = linkBS {
+      paths = [
+        "bin/grep"
+        "bin/egrep"
+        "bin/fgrep"
+      ];
     };
-    cpio = trivialBuilder rec {
-      inherit (localSystem) system;
-      name = "cpio";
-      ver = "2.13";
-      url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.gz";
-      sha256 = "126vyg4a8wcdwh6npgvxy6gq433bzgz3ph37hmjpycc4r7cp0x78";
-      configureArgs = [ "--disable-nls"
-                        "--without-libintl-prefix"
-                        "--without-libiconv-prefix"
-                      ];
+    gnused = linkBS { paths = [ "bin/sed" ]; };
+    gzip = linkBS {
+      paths = [
+        "bin/gzip"
+        #"bin/gunzip"
+      ];
     };
-    sed = trivialBuilder rec {
-      inherit (localSystem) system;
-      name = "sed";
-      ver = "4.8";
-      url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz";
-      sha256 = "0cznxw73fzv1n3nj2zsq6nf73rvsbxndp444xkpahdqvlzz0r6zp";
-      configureArgs = [ "--disable-nls"
-                        "--without-libintl-prefix"
-                        "--without-libiconv-prefix"
-                      ];
+    bzip2 = linkBS { paths = [ "bin/bzip2" ]; };
+    xz = linkBS {
+      paths = [
+        "bin/xz"
+        "bin/unxz"
+      ];
     };
-    cacert = fetchURL rec {
-      url = "https://curl.haxx.se/ca/cacert-2020-01-01.pem";
-      sha256 = "07q808n307gzaga93abpf6an7c3rd35p18psdc1dd83lspgp1xxd";
-      executable = false;
+    cacert = linkBS {
+      paths = [
+        "etc/ssl/certs"
+        "nix-support/setup-hook"
+      ];
     };
-    curl = trivialBuilder rec {
-      inherit (localSystem) system;
-      name = "curl";
-      ver = "7.68.0";
-      url = "https://curl.haxx.se/download/${name}-${ver}.tar.xz";
-      sha256 = "0nh3j90w6b97wqcgxjfq55qhkz9s38955fbhwzv2fsi7483j895p";
-      configureArgs = [ "--disable-nls"
-                        "--disable-ares"
-                        "--disable-debug"
-                        "--disable-ldap"
-                        "--disable-ldaps"
-                        "--disable-rtsp"
-                        "--disable-dict"
-                        "--disable-telnet"
-                        "--disable-tftp"
-                        "--disable-pop3"
-                        "--disable-imap"
-                        "--disable-smb"
-                        "--disable-smtp"
-                        "--disable-gopher"
-                        "--disable-manual"
-                        "--disable-verbose"
-                        "--disable-sspi"
-                        "--disable-tls-srp"
-                        "--disable-unix-sockets"
-                        "--without-brotli"
-                        "--without-gnutls"
-                        "--without-mbedtls"
-                        "--without-wolfssl"
-                        "--without-bearssl"
-                        "--without-libidn2"
-                        "--without-librtmp"
-                        "--without-nghttp2"
-                        "--with-ssl=/usr"
-                        "--with-ca-bundle=${cacert}"
-                      ];
+    binutils-unwrapped = linkBS {
+      name = "binutils";
+      paths = map (str: "bin/" + str) [
+        "ld"
+        #"as"
+        #"addr2line"
+        "ar"
+        #"c++filt"
+        #"elfedit"
+        #"gprof"
+        #"objdump"
+        "nm"
+        "objcopy"
+        "ranlib"
+        "readelf"
+        "size"
+        "strings"
+        "strip"
+      ];
+    };
+    freebsd = {
+      locales = linkBS { paths = [ "share/locale" ]; };
+      libc = linkBS {
+        name = "bootstrapLibs";
+        paths = [
+          "lib"
+          "include"
+          "share"
+          "libexec"
+        ];
+        pname = "libs";
+        version = "bootstrap";
+      };
+    };
+  };
+
+  mkStdenv =
+    {
+      name ? "freebsd",
+      overrides ?
+        prevStage: super: self:
+        { },
+      hascxx ? true,
+    }:
+    prevStage:
+    let
+      bsdcp =
+        prevStage.bsdcp or (prevStage.runCommand "bsdcp" { }
+          "mkdir -p $out/bin; cp ${prevStage.freebsd.cp}/bin/cp $out/bin/bsdcp"
+        );
+      initialPath = with prevStage; [
+        coreutils
+        gnutar
+        findutils
+        gnumake
+        gnused
+        patchelf
+        gnugrep
+        gawk
+        diffutils
+        patch
+        bash
+        xz
+        gzip
+        bzip2
+        bsdcp
+      ];
+      shell = "${prevStage.bash}/bin/bash";
+      stdenvNoCC = import ../generic {
+        inherit
+          config
+          initialPath
+          shell
+          fetchurlBoot
+          ;
+        name = "stdenvNoCC-${name}";
+        buildPlatform = localSystem;
+        hostPlatform = localSystem;
+        targetPlatform = localSystem;
+        cc = null;
+      };
+      fetchurlBoot = import ../../build-support/fetchurl {
+        inherit lib stdenvNoCC;
+        inherit (prevStage) curl;
+      };
+      stdenv = import ../generic {
+        inherit
+          config
+          initialPath
+          shell
+          fetchurlBoot
+          ;
+        name = "stdenv-${name}";
+        buildPlatform = localSystem;
+        hostPlatform = localSystem;
+        targetPlatform = localSystem;
+        extraNativeBuildInputs = [
+          ./unpack-source.sh
+          ./always-patchelf.sh
+        ];
+        cc = lib.makeOverridable (import ../../build-support/cc-wrapper) {
+          inherit lib stdenvNoCC;
+          name = "${name}-cc";
+          inherit (prevStage.freebsd) libc;
+          inherit (prevStage) gnugrep coreutils expand-response-params;
+          libcxx = prevStage.llvmPackages.libcxx or null;
+          runtimeShell = shell;
+          propagateDoc = false;
+          nativeTools = false;
+          nativeLibc = false;
+          cc = prevStage.llvmPackages.clang-unwrapped;
+          isClang = true;
+          extraPackages = lib.optionals hascxx [
+            prevStage.llvmPackages.compiler-rt
+          ];
+          nixSupport = {
+            libcxx-cxxflags = lib.optionals (!hascxx) [ "-isystem ${prevStage.freebsd.libc}/include/c++/v1" ];
+          };
+          extraBuildCommands = lib.optionalString hascxx (
+            mkExtraBuildCommands prevStage.llvmPackages.clang-unwrapped prevStage.llvmPackages.compiler-rt
+          );
+          bintools = lib.makeOverridable (import ../../build-support/bintools-wrapper) {
+            inherit lib stdenvNoCC;
+            name = "${name}-bintools";
+            inherit (prevStage.freebsd) libc;
+            inherit (prevStage) gnugrep coreutils expand-response-params;
+            runtimeShell = shell;
+            bintools = prevStage.binutils-unwrapped;
+            propagateDoc = false;
+            nativeTools = false;
+            nativeLibc = false;
+          };
+        };
+        overrides = overrides prevStage;
+        preHook = ''
+          export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}"
+          export NIX_ENFORCE_NO_NATIVE="''${NIX_ENFORCE_NO_NATIVE-1}"
+          export PATH_LOCALE=${prevStage.freebsd.localesReal or prevStage.freebsd.locales}/share/locale
+        '';
+      };
+    in
+    {
+      inherit config overlays stdenv;
     };
-    bashExe = "${bash}/bin/bash";
 in
 [
-
-  ({}: {
-    __raw = true;
-
-    bootstrapTools = derivation ({
-      inherit system;
-      inherit make bash coreutils findutils
-        diffutils grep patch gawk cpio sed
-        curl;
-
-      name = "trivial-bootstrap-tools";
-      builder = bashExe;
-      args = [ ./trivial-bootstrap.sh ];
-      buildInputs = [ make ];
-      mkdir = "/bin/mkdir";
-      ln = "/bin/ln";
-    } // lib.optionalAttrs config.contentAddressedByDefault {
-      __contentAddressed = true;
-      outputHashAlgo = "sha256";
-      outputHashMode = "recursive";
-    });
-  })
-
-  ({ bootstrapTools, ... }: rec {
-    __raw = true;
-
-    inherit bootstrapTools;
-
-    fetchurl = import ../../build-support/fetchurl {
-      inherit lib;
-      stdenvNoCC = stdenv;
-      curl = bootstrapTools;
-    };
-
-    stdenv = import ../generic {
-      name = "stdenv-freebsd-boot-1";
-      buildPlatform = localSystem;
-      hostPlatform = localSystem;
-      targetPlatform = localSystem;
-      inherit config;
-      initialPath = [ "/" "/usr" ];
-      shell = "${bootstrapTools}/bin/bash";
-      fetchurlBoot = null;
-      cc = null;
-      overrides = self: super: {
-      };
-    };
-  })
-
-  (prevStage: {
-    __raw = true;
-
-    inherit (prevStage) bootstrapTools;
-
-    stdenv = import ../generic {
-      name = "stdenv-freebsd-boot-0";
-      inherit config;
-      initialPath = [ prevStage.bootstrapTools ];
-      inherit (prevStage.stdenv)
-        buildPlatform hostPlatform targetPlatform
-        shell;
-      fetchurlBoot = prevStage.fetchurl;
-      cc = null;
-    };
-  })
-
-  (prevStage: {
-    inherit config overlays;
-    stdenv = import ../generic rec {
-      name = "stdenv-freebsd-boot-3";
-      inherit config;
-
-      inherit (prevStage.stdenv)
-        buildPlatform hostPlatform targetPlatform
-        initialPath shell fetchurlBoot;
-
-      cc = lib.makeOverridable (import ../../build-support/cc-wrapper) {
-        inherit lib;
-        nativeTools  = true;
-        nativePrefix = "/usr";
-        nativeLibc   = true;
-        stdenvNoCC = prevStage.stdenv;
-        buildPackages = {
-          inherit (prevStage) stdenv;
-        };
-        cc           = {
-          name    = "clang-9.9.9";
-          cc      = "/usr";
-          outPath = prevStage.bootstrapTools;
-        };
-        isClang      = true;
-        bintools = import ../../build-support/bintools-wrapper {
+  (
+    { }:
+    mkStdenv {
+      name = "freebsd-boot-0";
+      hascxx = false;
+      overrides = prevStage: self: super: {
+        # this one's goal is to build foundational libs like libc and libcxx. we want to override literally every possible bin package we can with bootstrap tools
+        # we CAN'T import LLVM because the compiler built here is used to build the final compiler and the final compiler must not be built by the bootstrap compiler
+        inherit (bootstrapTools)
+          patchelf
+          bash
+          curl
+          coreutils
+          diffutils
+          findutils
+          iconv
+          patch
+          gnutar
+          gawk
+          gnumake
+          gnugrep
+          gnused
+          gzip
+          bzip2
+          xz
+          cacert
+          ;
+        binutils-unwrapped = builtins.removeAttrs bootstrapTools.binutils-unwrapped [ "src" ];
+        fetchurl = import ../../build-support/fetchurl {
           inherit lib;
-          stdenvNoCC = prevStage.stdenv;
-          nativeTools  = true;
-          nativeLibc   = true;
-          propagateDoc = false;
-          nativePrefix = "/usr";
-          bintools     = { name = "${name}-binutils";
-                           outPath = prevStage.bootstrapTools; };
+          inherit (self) stdenvNoCC;
+          inherit (prevStage) curl;
+        };
+        gettext = super.gettext.overrideAttrs {
+          NIX_CFLAGS_COMPILE = "-DHAVE_ICONV=1"; # we clearly have iconv. what do you want?
+        };
+        curlReal = super.curl;
+        tzdata = super.tzdata.overrideAttrs { NIX_CFLAGS_COMPILE = "-DHAVE_GETTEXT=0"; };
+
+        # make it so libcxx/libunwind are built in this stdenv and not the next
+        freebsd = super.freebsd.overrideScope (self': super': {
+          inherit (prevStage.freebsd) locales;
+              stdenvNoLibcxx =
+                self.overrideCC (self.stdenv // { name = "stdenv-freebsd-boot-0.4"; })
+                  (
+                    self.stdenv.cc.override {
+                      name = "freebsd-boot-0.4-cc";
+                      libc = self.freebsd.libc;
+                      bintools = self.stdenv.cc.bintools.override {
+                        name = "freebsd-boot-0.4-bintools";
+                        libc = self.freebsd.libc;
+                      };
+                    }
+                  );
+        });
+        llvmPackages = super.llvmPackages // {
+          libcxx =
+            (super.llvmPackages.libcxx.override {
+              stdenv = self.overrideCC (self.stdenv // { name = "stdenv-freebsd-boot-0.5"; }) (
+                self.stdenv.cc.override {
+                  name = "freebsd-boot-0.5-cc";
+                  libc = self.freebsd.libc;
+                  bintools = self.stdenv.cc.bintools.override {
+                    name = "freebsd-boot-0.5-bintools";
+                    libc = self.freebsd.libc;
+                  };
+                  extraPackages = [
+                    self.llvmPackages.compiler-rt
+                  ];
+                  extraBuildCommands = mkExtraBuildCommands self.llvmPackages.clang-unwrapped self.llvmPackages.compiler-rt;
+                }
+              );
+            }).overrideAttrs
+              (
+                self': super': {
+                  NIX_CFLAGS_COMPILE = "-nostdlib++";
+                  NIX_LDFLAGS = "--allow-shlib-undefined";
+                  cmakeFlags = builtins.filter (x: x != "-DCMAKE_SHARED_LINKER_FLAGS=-nostdlib") super'.cmakeFlags;
+                }
+              );
         };
       };
-
-      preHook = "export NIX_NO_SELF_RPATH=1";
+    } bootstrapTools
+  )
+  (mkStdenv {
+    name = "freebsd-boot-1";
+    overrides = prevStage: self: super: {
+      # this one's goal is to build all the tools that get imported into the final stdenv.
+      # we can import the foundational libs from boot-0
+      # we can import bins and libs that DON'T get imported OR LINKED into the final stdenv from boot-0
+      curl = prevStage.curlReal;
+      curlReal = super.curl;
+      cacert = prevStage.cacert;
+      inherit (prevStage)
+        fetchurl
+        python3
+        bison
+        perl
+        cmake
+        ninja
+        ;
+      freebsd = super.freebsd.overrideScope (
+        self': super': {
+          locales = prevStage.freebsd.locales;
+          localesReal = super'.locales;
+          libc = prevStage.freebsd.libc;
+        }
+      );
+      llvmPackages = super.llvmPackages // {
+        libcxx = prevStage.llvmPackages.libcxx;
+      };
+    };
+  })
+  (mkStdenv {
+    name = "freebsd";
+    overrides = prevStage: self: super: {
+      __bootstrapArchive = bootstrapArchive;
+      curl = prevStage.curlReal;
+      cacert = prevStage.cacert;
+      inherit (prevStage) fetchurl;
+      freebsd = super.freebsd.overrideScope (
+        self': super': { localesPrev = prevStage.freebsd.localesReal; }
+      );
+      haskellPackages = super.haskellPackages.override {
+        overrides = (
+          self: super: {
+            digest = super.digest.overrideAttrs {
+              postPatch = ''
+                sed -E -i -e 's/ && !os\(freebsd\)//' digest.cabal
+              '';
+            };
+          }
+        );
+      };
     };
   })
-
 ]
diff --git a/pkgs/stdenv/freebsd/linkBS.sh b/pkgs/stdenv/freebsd/linkBS.sh
new file mode 100644
index 000000000000..19b491d2c3c4
--- /dev/null
+++ b/pkgs/stdenv/freebsd/linkBS.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+for path in $paths; do
+    if ! [ -e "$src/$path" ]; then
+        echo "Error: $path does not exist"
+        exit 1
+    fi
+    mkdir -p $out/$(dirname $path)
+    ln -s $src/$path $out/$path
+done
diff --git a/pkgs/stdenv/freebsd/trivial-bootstrap.sh b/pkgs/stdenv/freebsd/trivial-bootstrap.sh
deleted file mode 100644
index 34b4dbabc2bb..000000000000
--- a/pkgs/stdenv/freebsd/trivial-bootstrap.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-set -e
-set -o nounset
-set -o pipefail
-
-echo Building the trivial bootstrap environment...
-#echo
-#echo Needed FreeBSD packages:
-#echo findutils gcpio gawk gnugrep coreutils bash gsed gtar gmake xar binutils gpatch lbzip2 diffutils
-
-$mkdir -p $out/bin
-
-ln () {
-  if [ ! -z "${2:-}" ]; then
-    if [ -f "$out/bin/$2" ]; then
-      echo "$2 exists"
-      exit 1
-    fi
-  fi
-  if test ! -f "$1"; then
-    echo Target "$2" does not exist
-    exit 1
-  fi
-  # TODO: check that destination directory exists
-  if [ ! -z "${2:-}" ]; then
-    $ln -s "$1" "$out/bin/$2"
-  else
-    $ln -s "$1" "$out/bin/"
-  fi
-}
-
-ln $bash/bin/bash
-ln $make/bin/make
-
-ln /bin/sh
-
-for i in b2sum base32 base64 basename basenc cat chcon chgrp chmod \
-    chown chroot cksum comm cp csplit cut date dd df dir dircolors \
-    dirname du echo env expand expr factor false fmt fold install \
-    groups head hostid id join kill link ln logname ls md5sum mkdir \
-    mkfifo mknod mktemp mv nice nl nohup nproc numfmt od paste pathchk \
-    pinky pr printenv printf ptx pwd readlink realpath rm rmdir runcon \
-    seq sha1sum sha224sum sha256sum sha384sum sha512sum shred shuf \
-    sleep sort split stat stdbuf stty sum sync tac tee test timeout \
-    touch tr true truncate tsort tty uname unexpand uniq unlink uptime \
-    users vdir wc who whoami yes
-do
-    ln "$coreutils/bin/$i" "$i"
-done
-
-for i in find xargs; do
-    ln "$findutils/bin/$i" "$i"
-done
-
-for i in diff diff3 sdiff; do
-    ln "$diffutils/bin/$i" "$i"
-done
-
-for i in grep egrep fgrep; do
-    ln "$grep/bin/$i" "$i"
-done
-
-ln /usr/bin/locale
-
-ln /usr/bin/more
-
-ln /usr/bin/hexdump # for bitcoin
-
-ln /usr/bin/bzip2
-ln /usr/bin/bunzip2
-ln /usr/bin/bzip2recover
-
-ln /usr/bin/xz
-ln /usr/bin/unxz
-ln /usr/bin/lzma
-ln /usr/bin/unlzma
-
-ln /bin/ps
-ln /bin/hostname
-ln /usr/bin/cmp
-ln $sed/bin/sed
-ln /usr/bin/tar tar
-ln $gawk/bin/gawk
-ln $gawk/bin/gawk awk
-ln $cpio/bin/cpio
-ln $curl/bin/curl curl
-ln /usr/bin/gzip
-ln /usr/bin/gunzip
-ln /usr/bin/tail tail # note that we are not using gtail!!!
-ln /usr/bin/less less
-ln $patch/bin/patch patch
-ln /usr/bin/which which
-
-## binutils
-# pkg info -l binutils | grep usr/local/bin
-ln /usr/bin/addr2line
-ln /usr/bin/ar
-ln /usr/bin/as
-ln /usr/bin/c++filt
-#ln /usr/bin/dwp
-#ln /usr/bin/elfedit
-ln /usr/bin/gprof
-ln /usr/bin/ld
-#ln /usr/bin/ld.bfd
-#ln /usr/bin/ld.gold
-ln /usr/bin/nm
-ln /usr/bin/objcopy
-ln /usr/bin/objdump
-ln /usr/bin/ranlib
-ln /usr/bin/readelf
-ln /usr/bin/size
-ln /usr/bin/strings
-ln /usr/bin/strip
-
-ln /usr/bin/cc
-ln /usr/bin/cpp
-ln /usr/bin/c++
-
-#pkg info -l llvm37 | grep usr/local/bin
diff --git a/pkgs/stdenv/freebsd/trivial-builder.nix b/pkgs/stdenv/freebsd/trivial-builder.nix
deleted file mode 100644
index 64265081f542..000000000000
--- a/pkgs/stdenv/freebsd/trivial-builder.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ system, name, ver, url, sha256, configureArgs ? [], executable ? false } :
-
-let fetchURL = import <nix/fetchurl.nix>;
-
-in derivation {
-  inherit system configureArgs;
-  name = "trivial-bootstrap-${name}-${ver}";
-  dname = "${name}-${ver}";
-  src = fetchURL {
-    inherit url sha256 executable;
-  };
-  builder = ./trivial-builder.sh;
-}
diff --git a/pkgs/stdenv/freebsd/trivial-builder.sh b/pkgs/stdenv/freebsd/trivial-builder.sh
deleted file mode 100755
index ac5601b5ba0c..000000000000
--- a/pkgs/stdenv/freebsd/trivial-builder.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-export PATH=/bin:/sbin:/usr/bin:/usr/sbin
-
-tar -zxvf $src
-cd $dname
-mkdir -p $out/bin
-./configure --prefix=$out $configureArgs
-make
-make install
diff --git a/pkgs/stdenv/freebsd/unpack-bootstrap-files.sh b/pkgs/stdenv/freebsd/unpack-bootstrap-files.sh
new file mode 100644
index 000000000000..dd06679cdc3f
--- /dev/null
+++ b/pkgs/stdenv/freebsd/unpack-bootstrap-files.sh
@@ -0,0 +1,56 @@
+$src/libexec/ld-elf.so.1 $src/bin/mkdir $out
+$src/libexec/ld-elf.so.1 $src/bin/tar -I "$src/libexec/ld-elf.so.1 $src/bin/xz" -C $out -xf $stage1
+export LD_LIBRARY_PATH=$out/lib
+
+BADLIST=ld-elf.so.1
+
+oobpatch() {
+    $out/libexec/ld-elf.so.1 $src/bin/cp $1 ./tmp
+    $out/libexec/ld-elf.so.1 $out/bin/patchelf --set-rpath $out/lib --set-interpreter $out/libexec/ld-elf.so.1 ./tmp
+    $out/libexec/ld-elf.so.1 $src/bin/mv ./tmp $1
+    BADLIST="$BADLIST|${1##*/}"
+}
+
+oobpatch $out/bin/patchelf
+oobpatch $out/lib/libthr.so.3
+oobpatch $out/lib/libc.so.7
+
+for f in $($out/libexec/ld-elf.so.1 $out/bin/find $out/lib -type f); do
+    $out/libexec/ld-elf.so.1 $out/bin/grep -E "$BADLIST" <<<"$f" && continue
+    $out/libexec/ld-elf.so.1 $out/bin/patchelf --set-rpath $out/lib $f
+done
+for f in $out/bin/* $out/bin/.*; do
+    $out/libexec/ld-elf.so.1 $out/bin/grep -E "$BADLIST" <<<"$f" &>/dev/null && continue
+    $out/libexec/ld-elf.so.1 $out/bin/patchelf --set-rpath $out/lib --set-interpreter $out/libexec/ld-elf.so.1 $f
+done
+
+unset LD_LIBRARY_PATH
+export PATH=$out/bin
+
+# sanity check
+$out/bin/true || exit 1
+
+# scorched earth
+for f in $(find $out -type f); do
+    while true; do
+        BADMAN="$(strings $f | grep -o '/nix/store/.*' | grep -v "$out" | head -n1)"
+        if [ -z "$BADMAN" ]; then
+            break
+        fi
+        echo scorch $f
+        BADMAN="$(echo "$BADMAN" | cut -d/ -f-4)"
+        GOODMAN="$out"
+        if [ ${#GOODMAN} -gt ${#BADMAN} ]; then
+            echo "Can't patch $f: $BADMAN too short"
+            break
+        fi
+        while ! [ ${#GOODMAN} -eq ${#BADMAN} ]; do
+            GOODMAN="/$GOODMAN"
+        done
+        if ! sed -E -i -e "s@$BADMAN@$GOODMAN@g" $f; then
+            echo "Can't patch $f: sed failed"
+            break
+        fi
+    done
+done
+echo $out
diff --git a/pkgs/stdenv/freebsd/unpack-source.sh b/pkgs/stdenv/freebsd/unpack-source.sh
new file mode 100644
index 000000000000..aa5e89f05c2d
--- /dev/null
+++ b/pkgs/stdenv/freebsd/unpack-source.sh
@@ -0,0 +1,41 @@
+unpackCmdHooks+=(_FreeBSDUnpackSource)
+
+_FreeBSDUnpackSource() {
+    local fn="$1"
+    local destination
+
+    if [ -d "$fn" ]; then
+
+        destination="$(stripHash "$fn")"
+
+        if [ -e "$destination" ]; then
+            echo "Cannot copy $fn to $destination: destination already exists!"
+            echo "Did you specify two \"srcs\" with the same \"name\"?"
+            return 1
+        fi
+
+        # We can't preserve hardlinks because they may have been
+        # introduced by store optimization, which might break things
+        # in the build.
+        bsdcp -a -- "$fn" "$destination"
+        chmod -R +w "$destination"
+
+    else
+
+        case "$fn" in
+            *.tar.xz | *.tar.lzma | *.txz)
+                # Don't rely on tar knowing about .xz.
+                xz -d < "$fn" | tar xf - --warning=no-timestamp
+                ;;
+            *.tar | *.tar.* | *.tgz | *.tbz2 | *.tbz)
+                # GNU tar can automatically select the decompression method
+                # (info "(tar) gzip").
+                tar xf "$fn" --warning=no-timestamp
+                ;;
+            *)
+                return 1
+                ;;
+        esac
+
+    fi
+}

From 9dbd5a9a9db3498d192ac25d0d1b75f04b5a5784 Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Wed, 17 Jul 2024 02:08:06 -0700
Subject: [PATCH 027/175] [squashme] do the requested changes

---
 maintainers/scripts/bootstrap-files/README.md |    6 +-
 .../bootstrap-files/refresh-tarballs.bash     |    2 +
 .../x86_64-unknown-freebsd.nix                |   13 +
 ...rious.txt => bootstrap-tools-spurious.txt} | 1320 -----------------
 pkgs/stdenv/freebsd/default.nix               |   33 +-
 .../freebsd/make-bootstrap-tools-cross.nix    |   22 +
 ...rap-files.nix => make-bootstrap-tools.nix} |   43 +-
 pkgs/stdenv/freebsd/unpack-bootstrap-files.sh |    2 +-
 pkgs/top-level/all-packages.nix               |    2 +
 pkgs/top-level/release-cross.nix              |   17 +-
 pkgs/top-level/release.nix                    |    9 +
 11 files changed, 95 insertions(+), 1374 deletions(-)
 create mode 100644 pkgs/stdenv/freebsd/bootstrap-files/x86_64-unknown-freebsd.nix
 rename pkgs/stdenv/freebsd/{bootstrap-files-spurious.txt => bootstrap-tools-spurious.txt} (76%)
 create mode 100644 pkgs/stdenv/freebsd/make-bootstrap-tools-cross.nix
 rename pkgs/stdenv/freebsd/{bootstrap-files.nix => make-bootstrap-tools.nix} (69%)

diff --git a/maintainers/scripts/bootstrap-files/README.md b/maintainers/scripts/bootstrap-files/README.md
index d40ab5212ab0..4bd7d8c58937 100644
--- a/maintainers/scripts/bootstrap-files/README.md
+++ b/maintainers/scripts/bootstrap-files/README.md
@@ -6,9 +6,9 @@ binaries (without the reliance on external inputs):
 - `bootstrap-tools`: an archive with the compiler toolchain and other
   helper tools enough to build the rest of the `nixpkgs`.
 - initial binaries needed to unpack `bootstrap-tools.*`. On `linux`
-  it's just `busybox`, on `darwin` it is unpack.nar.xz which contains
-  the binaries and script needed to unpack the tools. These binaries
-  can be executed directly from the store.
+  it's just `busybox`, on `darwin` and `freebsd` it is unpack.nar.xz
+  which contains the binaries and script needed to unpack the tools.
+  These binaries can be executed directly from the store.
 
 These are called "bootstrap files".
 
diff --git a/maintainers/scripts/bootstrap-files/refresh-tarballs.bash b/maintainers/scripts/bootstrap-files/refresh-tarballs.bash
index e7bf27f24046..eb4aa1667cd7 100755
--- a/maintainers/scripts/bootstrap-files/refresh-tarballs.bash
+++ b/maintainers/scripts/bootstrap-files/refresh-tarballs.bash
@@ -95,6 +95,7 @@ CROSS_TARGETS=(
     powerpc64-unknown-linux-gnuabielfv2
     powerpc64le-unknown-linux-gnu
     riscv64-unknown-linux-gnu
+    x86_64-unknown-freebsd
 )
 
 is_cross() {
@@ -163,6 +164,7 @@ for target in "${targets[@]}"; do
     case "$target" in
         *linux*) nixpkgs_prefix="pkgs/stdenv/linux" ;;
         *darwin*) nixpkgs_prefix="pkgs/stdenv/darwin" ;;
+        *freebsd*) nixpkgs_prefix="pkgs/stdenv/freebsd" ;;
         *) die "don't know where to put '$target'" ;;
     esac
 
diff --git a/pkgs/stdenv/freebsd/bootstrap-files/x86_64-unknown-freebsd.nix b/pkgs/stdenv/freebsd/bootstrap-files/x86_64-unknown-freebsd.nix
new file mode 100644
index 000000000000..bc43eef9efc4
--- /dev/null
+++ b/pkgs/stdenv/freebsd/bootstrap-files/x86_64-unknown-freebsd.nix
@@ -0,0 +1,13 @@
+{
+  unpack = import <nix/fetchurl.nix> {
+    url = "http://192.168.122.1:8000/result/on-server/unpack.nar.xz";
+    hash = "sha256-y6quCU9JKnKBdHDcUkdkM0ypWDT2cdSiqR1WqA+8ozE=";
+    name = "boostrapUnpacked";
+    unpack = true;
+  };
+  bootstrapTools = import <nix/fetchurl.nix> {
+    url = "http://192.168.122.1:8000/result/on-server/bootstrap-tools.tar.xz";
+    hash = "sha256-ypIOxsB8a/RPupki0ZTjb+vuE+ibtmS8e3DazeolHj8=";
+    name = "bootstrapTools.tar.xz";
+  };
+}
diff --git a/pkgs/stdenv/freebsd/bootstrap-files-spurious.txt b/pkgs/stdenv/freebsd/bootstrap-tools-spurious.txt
similarity index 76%
rename from pkgs/stdenv/freebsd/bootstrap-files-spurious.txt
rename to pkgs/stdenv/freebsd/bootstrap-tools-spurious.txt
index 8f44810450d1..074e1f15ed5f 100644
--- a/pkgs/stdenv/freebsd/bootstrap-files-spurious.txt
+++ b/pkgs/stdenv/freebsd/bootstrap-tools-spurious.txt
@@ -104,1241 +104,6 @@ etc/profile.d/gawk.sh
 etc/ssl/ct_log_list.cnf
 etc/ssl/ct_log_list.cnf.dist
 etc/ssl/openssl.cnf.dist
-include/__libunwind_config.h
-include/a.out.h
-include/arpa/ftp.h
-include/arpa/telnet.h
-include/arpa/tftp.h
-include/autosprintf.h
-include/bitstring.h
-include/bsm/audit_domain.h
-include/bsm/audit_errno.h
-include/bsm/audit_fcntl.h
-include/bsm/audit_internal.h
-include/bsm/audit_kevents.h
-include/bsm/audit_record.h
-include/bsm/audit_socket_type.h
-include/c++/v1/__bsd_locale_fallbacks.h
-include/c++/v1/__charconv/chars_format.h
-include/c++/v1/__charconv/from_chars_result.h
-include/c++/v1/__charconv/tables.h
-include/c++/v1/__charconv/to_chars_base_10.h
-include/c++/v1/__charconv/to_chars_result.h
-include/c++/v1/__chrono/formatter.h
-include/c++/v1/__chrono/ostream.h
-include/c++/v1/__chrono/parser_std_format_spec.h
-include/c++/v1/__coroutine/coroutine_handle.h
-include/c++/v1/__coroutine/coroutine_traits.h
-include/c++/v1/__coroutine/noop_coroutine_handle.h
-include/c++/v1/__coroutine/trivial_awaitables.h
-include/c++/v1/__expected/bad_expected_access.h
-include/c++/v1/__expected/expected.h
-include/c++/v1/__expected/unexpect.h
-include/c++/v1/__expected/unexpected.h
-include/c++/v1/__format/buffer.h
-include/c++/v1/__format/container_adaptor.h
-include/c++/v1/__format/escaped_output_table.h
-include/c++/v1/__format/extended_grapheme_cluster_table.h
-include/c++/v1/__format/format_arg.h
-include/c++/v1/__format/format_arg_store.h
-include/c++/v1/__format/format_args.h
-include/c++/v1/__format/format_context.h
-include/c++/v1/__format/format_functions.h
-include/c++/v1/__format/format_string.h
-include/c++/v1/__format/format_to_n_result.h
-include/c++/v1/__format/formatter_bool.h
-include/c++/v1/__format/formatter_char.h
-include/c++/v1/__format/formatter_floating_point.h
-include/c++/v1/__format/formatter_integer.h
-include/c++/v1/__format/formatter_integral.h
-include/c++/v1/__format/formatter_output.h
-include/c++/v1/__format/formatter_pointer.h
-include/c++/v1/__format/formatter_string.h
-include/c++/v1/__format/formatter_tuple.h
-include/c++/v1/__format/parser_std_format_spec.h
-include/c++/v1/__format/range_default_formatter.h
-include/c++/v1/__format/range_formatter.h
-include/c++/v1/__format/unicode.h
-include/c++/v1/__fwd/span.h
-include/c++/v1/__iterator/iterator_with_data.h
-include/c++/v1/__memory_resource/monotonic_buffer_resource.h
-include/c++/v1/__memory_resource/pool_options.h
-include/c++/v1/__memory_resource/synchronized_pool_resource.h
-include/c++/v1/__memory_resource/unsynchronized_pool_resource.h
-include/c++/v1/__ranges/all.h
-include/c++/v1/__ranges/as_rvalue_view.h
-include/c++/v1/__ranges/common_view.h
-include/c++/v1/__ranges/copyable_box.h
-include/c++/v1/__ranges/counted.h
-include/c++/v1/__ranges/drop_view.h
-include/c++/v1/__ranges/drop_while_view.h
-include/c++/v1/__ranges/elements_view.h
-include/c++/v1/__ranges/empty_view.h
-include/c++/v1/__ranges/filter_view.h
-include/c++/v1/__ranges/iota_view.h
-include/c++/v1/__ranges/istream_view.h
-include/c++/v1/__ranges/join_view.h
-include/c++/v1/__ranges/lazy_split_view.h
-include/c++/v1/__ranges/non_propagating_cache.h
-include/c++/v1/__ranges/owning_view.h
-include/c++/v1/__ranges/range_adaptor.h
-include/c++/v1/__ranges/rbegin.h
-include/c++/v1/__ranges/ref_view.h
-include/c++/v1/__ranges/rend.h
-include/c++/v1/__ranges/reverse_view.h
-include/c++/v1/__ranges/single_view.h
-include/c++/v1/__ranges/split_view.h
-include/c++/v1/__ranges/take_view.h
-include/c++/v1/__ranges/take_while_view.h
-include/c++/v1/__ranges/transform_view.h
-include/c++/v1/__ranges/views.h
-include/c++/v1/__ranges/zip_view.h
-include/c++/v1/__std_stream
-include/c++/v1/__support/android/locale_bionic.h
-include/c++/v1/__support/fuchsia/xlocale.h
-include/c++/v1/__support/ibm/gettod_zos.h
-include/c++/v1/__support/ibm/locale_mgmt_zos.h
-include/c++/v1/__support/ibm/nanosleep.h
-include/c++/v1/__support/ibm/xlocale.h
-include/c++/v1/__support/musl/xlocale.h
-include/c++/v1/__support/newlib/xlocale.h
-include/c++/v1/__support/openbsd/xlocale.h
-include/c++/v1/__support/solaris/floatingpoint.h
-include/c++/v1/__support/solaris/wchar.h
-include/c++/v1/__support/solaris/xlocale.h
-include/c++/v1/__support/win32/locale_win32.h
-include/c++/v1/__support/xlocale/__nop_locale_mgmt.h
-include/c++/v1/__support/xlocale/__posix_l_fallback.h
-include/c++/v1/__support/xlocale/__strtonum_fallback.h
-include/c++/v1/__type_traits/make_32_64_or_128_bit.h
-include/c++/v1/any
-include/c++/v1/barrier
-include/c++/v1/ccomplex
-include/c++/v1/cfloat
-include/c++/v1/charconv
-include/c++/v1/codecvt
-include/c++/v1/complex
-include/c++/v1/complex.h
-include/c++/v1/coroutine
-include/c++/v1/csetjmp
-include/c++/v1/cstdbool
-include/c++/v1/ctgmath
-include/c++/v1/cuchar
-include/c++/v1/execution
-include/c++/v1/expected
-include/c++/v1/experimental/__config
-include/c++/v1/experimental/__memory
-include/c++/v1/experimental/algorithm
-include/c++/v1/experimental/coroutine
-include/c++/v1/experimental/deque
-include/c++/v1/experimental/forward_list
-include/c++/v1/experimental/functional
-include/c++/v1/experimental/iterator
-include/c++/v1/experimental/list
-include/c++/v1/experimental/map
-include/c++/v1/experimental/memory_resource
-include/c++/v1/experimental/propagate_const
-include/c++/v1/experimental/regex
-include/c++/v1/experimental/set
-include/c++/v1/experimental/simd
-include/c++/v1/experimental/string
-include/c++/v1/experimental/type_traits
-include/c++/v1/experimental/unordered_map
-include/c++/v1/experimental/unordered_set
-include/c++/v1/experimental/utility
-include/c++/v1/experimental/vector
-include/c++/v1/format
-include/c++/v1/latch
-include/c++/v1/libcxx.imp
-include/c++/v1/memory_resource
-include/c++/v1/module.modulemap
-include/c++/v1/numbers
-include/c++/v1/ranges
-include/c++/v1/scoped_allocator
-include/c++/v1/semaphore
-include/c++/v1/source_location
-include/c++/v1/span
-include/c++/v1/stdatomic.h
-include/c++/v1/strstream
-include/c++/v1/tgmath.h
-include/c++/v1/typeindex
-include/c++/v1/uchar.h
-include/cam/ata/ata_all.h
-include/cam/cam.h
-include/cam/cam_ccb.h
-include/cam/cam_compat.h
-include/cam/cam_debug.h
-include/cam/cam_iosched.h
-include/cam/cam_periph.h
-include/cam/cam_queue.h
-include/cam/cam_sim.h
-include/cam/cam_xpt.h
-include/cam/cam_xpt_internal.h
-include/cam/cam_xpt_periph.h
-include/cam/cam_xpt_sim.h
-include/cam/mmc/mmc.h
-include/cam/mmc/mmc_all.h
-include/cam/mmc/mmc_bus.h
-include/cam/nvme/nvme_all.h
-include/cam/scsi/scsi_all.h
-include/cam/scsi/scsi_cd.h
-include/cam/scsi/scsi_ch.h
-include/cam/scsi/scsi_da.h
-include/cam/scsi/scsi_enc.h
-include/cam/scsi/scsi_enc_internal.h
-include/cam/scsi/scsi_iu.h
-include/cam/scsi/scsi_message.h
-include/cam/scsi/scsi_pass.h
-include/cam/scsi/scsi_pt.h
-include/cam/scsi/scsi_sa.h
-include/cam/scsi/scsi_ses.h
-include/cam/scsi/scsi_sg.h
-include/cam/scsi/scsi_targetio.h
-include/cam/scsi/smp_all.h
-include/cpio.h
-include/dev/acpica/acpi_hpet.h
-include/dev/acpica/acpiio.h
-include/dev/agp/agpreg.h
-include/dev/ciss/cissio.h
-include/dev/ciss/cissreg.h
-include/dev/ciss/cissvar.h
-include/dev/evdev/input-event-codes.h
-include/dev/evdev/input.h
-include/dev/evdev/uinput.h
-include/dev/filemon
-include/dev/firewire/firewire.h
-include/dev/firewire/firewire_phy.h
-include/dev/firewire/firewirereg.h
-include/dev/firewire/fwdma.h
-include/dev/firewire/fwmem.h
-include/dev/firewire/fwohcireg.h
-include/dev/firewire/fwohcivar.h
-include/dev/firewire/fwphyreg.h
-include/dev/firewire/iec13213.h
-include/dev/firewire/iec68113.h
-include/dev/firewire/if_fwevar.h
-include/dev/firewire/if_fwipvar.h
-include/dev/firewire/sbp.h
-include/dev/hid/hid.h
-include/dev/hid/hidraw.h
-include/dev/hwpmc/hwpmc_amd.h
-include/dev/hwpmc/hwpmc_arm64.h
-include/dev/hwpmc/hwpmc_armv7.h
-include/dev/hwpmc/hwpmc_cmn600.h
-include/dev/hwpmc/hwpmc_core.h
-include/dev/hwpmc/hwpmc_dmc620.h
-include/dev/hwpmc/hwpmc_powerpc.h
-include/dev/hwpmc/hwpmc_riscv.h
-include/dev/hwpmc/hwpmc_soft.h
-include/dev/hwpmc/hwpmc_tsc.h
-include/dev/hwpmc/hwpmc_uncore.h
-include/dev/hwpmc/pmc_events.h
-include/dev/hwpmc/pmu_dmc620_reg.h
-include/dev/hyperv/hv_snapshot.h
-include/dev/hyperv/hyperv.h
-include/dev/ic/cd1400.h
-include/dev/ic/cd180.h
-include/dev/ic/i8237.h
-include/dev/ic/i8253reg.h
-include/dev/ic/i82586.h
-include/dev/ic/i8259.h
-include/dev/ic/nec765.h
-include/dev/ic/ns16550.h
-include/dev/ic/quicc.h
-include/dev/ic/via6522reg.h
-include/dev/ic/z8530.h
-include/dev/iicbus/ds1307reg.h
-include/dev/iicbus/ds3231reg.h
-include/dev/iicbus/iic.h
-include/dev/iicbus/iic_recover_bus.h
-include/dev/iicbus/iicbus.h
-include/dev/iicbus/iicoc.h
-include/dev/iicbus/iiconf.h
-include/dev/io
-include/dev/mfi/mfi_ioctl.h
-include/dev/mfi/mfireg.h
-include/dev/mfi/mfivar.h
-include/dev/mlx5/mlx5io.h
-include/dev/mmc/bridge.h
-include/dev/mmc/mmc_fdt_helpers.h
-include/dev/mmc/mmc_helpers.h
-include/dev/mmc/mmc_ioctl.h
-include/dev/mmc/mmc_private.h
-include/dev/mmc/mmc_subr.h
-include/dev/mmc/mmcbrvar.h
-include/dev/mmc/mmcreg.h
-include/dev/mmc/mmcvar.h
-include/dev/mpt/mpilib/mpi.h
-include/dev/mpt/mpilib/mpi_cnfg.h
-include/dev/mpt/mpilib/mpi_fc.h
-include/dev/mpt/mpilib/mpi_init.h
-include/dev/mpt/mpilib/mpi_ioc.h
-include/dev/mpt/mpilib/mpi_lan.h
-include/dev/mpt/mpilib/mpi_log_fc.h
-include/dev/mpt/mpilib/mpi_log_sas.h
-include/dev/mpt/mpilib/mpi_raid.h
-include/dev/mpt/mpilib/mpi_sas.h
-include/dev/mpt/mpilib/mpi_targ.h
-include/dev/mpt/mpilib/mpi_tool.h
-include/dev/mpt/mpilib/mpi_type.h
-include/dev/nvme/nvme.h
-include/dev/ofw/ofw_bus.h
-include/dev/ofw/ofw_bus_subr.h
-include/dev/ofw/ofw_cpu.h
-include/dev/ofw/ofw_graph.h
-include/dev/ofw/ofw_pci.h
-include/dev/ofw/ofw_subr.h
-include/dev/ofw/ofwpci.h
-include/dev/ofw/ofwvar.h
-include/dev/ofw/openfirm.h
-include/dev/ofw/openfirmio.h
-include/dev/pbio
-include/dev/pci/pcireg.h
-include/dev/ppbus/lpt.h
-include/dev/ppbus/lptio.h
-include/dev/ppbus/ppb_1284.h
-include/dev/ppbus/ppb_msq.h
-include/dev/ppbus/ppbconf.h
-include/dev/ppbus/ppbio.h
-include/dev/ppbus/ppi.h
-include/dev/pwm/ofw_pwm.h
-include/dev/pwm/pwmbus.h
-include/dev/pwm/pwmc.h
-include/dev/smbus/smb.h
-include/dev/smbus/smbconf.h
-include/dev/smbus/smbus.h
-include/dev/speaker
-include/dev/tcp_log
-include/dev/usb/ufm_ioctl.h
-include/dev/usb/uftdiio.h
-include/dev/usb/uled_ioctl.h
-include/dev/usb/usb.h
-include/dev/usb/usb_bus.h
-include/dev/usb/usb_busdma.h
-include/dev/usb/usb_cdc.h
-include/dev/usb/usb_controller.h
-include/dev/usb/usb_core.h
-include/dev/usb/usb_debug.h
-include/dev/usb/usb_dev.h
-include/dev/usb/usb_device.h
-include/dev/usb/usb_dynamic.h
-include/dev/usb/usb_endian.h
-include/dev/usb/usb_fdt_support.h
-include/dev/usb/usb_freebsd.h
-include/dev/usb/usb_freebsd_loader.h
-include/dev/usb/usb_generic.h
-include/dev/usb/usb_hub.h
-include/dev/usb/usb_hub_private.h
-include/dev/usb/usb_ioctl.h
-include/dev/usb/usb_mbuf.h
-include/dev/usb/usb_msctest.h
-include/dev/usb/usb_pci.h
-include/dev/usb/usb_pf.h
-include/dev/usb/usb_process.h
-include/dev/usb/usb_request.h
-include/dev/usb/usb_transfer.h
-include/dev/usb/usb_util.h
-include/dev/usb/usbdi.h
-include/dev/usb/usbdi_util.h
-include/dev/usb/usbhid.h
-include/dev/veriexec/veriexec_ioctl.h
-include/dev/vkbd
-include/dev/wg/if_wg.h
-include/elf.h
-include/fmtmsg.h
-include/fs/cuse/cuse_defs.h
-include/fs/cuse/cuse_ioctl.h
-include/fs/devfs/devfs.h
-include/fs/devfs/devfs_int.h
-include/fs/fdescfs
-include/fs/msdosfs/bootsect.h
-include/fs/msdosfs/bpb.h
-include/fs/msdosfs/denode.h
-include/fs/msdosfs/direntry.h
-include/fs/msdosfs/fat.h
-include/fs/msdosfs/msdosfsmount.h
-include/fs/nfs/nfs.h
-include/fs/nfs/nfs_var.h
-include/fs/nfs/nfscl.h
-include/fs/nfs/nfsclstate.h
-include/fs/nfs/nfsdport.h
-include/fs/nfs/nfskpiport.h
-include/fs/nfs/nfsm_subs.h
-include/fs/nfs/nfsport.h
-include/fs/nfs/nfsproto.h
-include/fs/nfs/nfsrvcache.h
-include/fs/nfs/nfsrvstate.h
-include/fs/nfs/nfsv4_errstr.h
-include/fs/nfs/rpcv2.h
-include/fs/nfs/xdr_subs.h
-include/fs/nullfs
-include/fs/procfs
-include/fs/smbfs/smbfs.h
-include/fs/smbfs/smbfs_node.h
-include/fs/smbfs/smbfs_subr.h
-include/fs/udf/ecma167-udf.h
-include/fs/udf/osta.h
-include/fs/udf/udf.h
-include/fs/udf/udf_mount.h
-include/fs/unionfs
-include/ftw.h
-include/gawkapi.h
-include/gelf.h
-include/geom/cache
-include/geom/concat
-include/geom/eli/g_eli.h
-include/geom/eli/pkcs5v2.h
-include/geom/gate
-include/geom/geom.h
-include/geom/geom_ctl.h
-include/geom/geom_dbg.h
-include/geom/geom_disk.h
-include/geom/geom_flashmap.h
-include/geom/geom_int.h
-include/geom/geom_slice.h
-include/geom/geom_vfs.h
-include/geom/journal
-include/geom/label/g_label.h
-include/geom/label/g_label_msdosfs.h
-include/geom/mirror
-include/geom/mountver
-include/geom/multipath
-include/geom/nop
-include/geom/raid/g_raid.h
-include/geom/raid/md_ddf.h
-include/geom/raid3
-include/geom/shsec
-include/geom/stripe
-include/geom/union
-include/geom/virstor/binstream.h
-include/geom/virstor/g_virstor.h
-include/geom/virstor/g_virstor_md.h
-include/gettext-po.h
-include/gnumake.h
-include/gssapi/gssapi.h
-include/gssapi.h
-include/hesiod.h
-include/i386/asm.h
-include/i386/asmacros.h
-include/i386/atomic.h
-include/i386/counter.h
-include/i386/cpufunc.h
-include/i386/md_var.h
-include/i386/pcpu.h
-include/i386/pcpu_aux.h
-include/i386/pmap.h
-include/i386/proc.h
-include/i386/profile.h
-include/i386/segments.h
-include/i386/vmparam.h
-include/iso646.h
-include/isofs/cd9660/cd9660_mount.h
-include/isofs/cd9660/cd9660_node.h
-include/isofs/cd9660/cd9660_rrip.h
-include/isofs/cd9660/iso.h
-include/isofs/cd9660/iso_rrip.h
-include/libelf.h
-include/libprocstat.h
-include/libunwind.h
-include/login_cap.h
-include/machine/_bus.h
-include/machine/acpica_machdep.h
-include/machine/apm_bios.h
-include/machine/asan.h
-include/machine/asm.h
-include/machine/asmacros.h
-include/machine/atomic.h
-include/machine/bus.h
-include/machine/bus_dma.h
-include/machine/clock.h
-include/machine/counter.h
-include/machine/cpufunc.h
-include/machine/cputypes.h
-include/machine/csan.h
-include/machine/db_machdep.h
-include/machine/dump.h
-include/machine/efi.h
-include/machine/exec.h
-include/machine/fdt.h
-include/machine/float.h
-include/machine/gdb_machdep.h
-include/machine/in_cksum.h
-include/machine/intr_machdep.h
-include/machine/iodev.h
-include/machine/iommu.h
-include/machine/kdb.h
-include/machine/limits.h
-include/machine/md_var.h
-include/machine/memdev.h
-include/machine/metadata.h
-include/machine/minidump.h
-include/machine/msan.h
-include/machine/nexusvar.h
-include/machine/npx.h
-include/machine/ofw_machdep.h
-include/machine/pc/bios.h
-include/machine/pc/display.h
-include/machine/pci_cfgreg.h
-include/machine/pcpu.h
-include/machine/pcpu_aux.h
-include/machine/pmc_mdep.h
-include/machine/profile.h
-include/machine/ptrace.h
-include/machine/pvclock.h
-include/machine/reloc.h
-include/machine/resource.h
-include/machine/sf_buf.h
-include/machine/sgx.h
-include/machine/sgxreg.h
-include/machine/sigframe.h
-include/machine/smp.h
-include/machine/stack.h
-include/machine/stdarg.h
-include/machine/sysarch.h
-include/machine/tls.h
-include/machine/trap.h
-include/machine/tss.h
-include/machine/vdso.h
-include/machine/vmm.h
-include/machine/vmm_dev.h
-include/machine/vmm_instruction_emul.h
-include/machine/vmm_snapshot.h
-include/md4.h
-include/memstat.h
-include/monetary.h
-include/mpool.h
-include/mqueue.h
-include/net/altq/altq.h
-include/net/altq/altq_cbq.h
-include/net/altq/altq_cdnr.h
-include/net/altq/altq_classq.h
-include/net/altq/altq_codel.h
-include/net/altq/altq_fairq.h
-include/net/altq/altq_hfsc.h
-include/net/altq/altq_priq.h
-include/net/altq/altq_red.h
-include/net/altq/altq_rio.h
-include/net/altq/altq_rmclass.h
-include/net/altq/altq_rmclass_debug.h
-include/net/altq/altq_var.h
-include/net/altq/if_altq.h
-include/net/bpf.h
-include/net/bpf_buffer.h
-include/net/bpf_jitter.h
-include/net/bpf_zerocopy.h
-include/net/bpfdesc.h
-include/net/bridgestp.h
-include/net/debugnet.h
-include/net/debugnet_int.h
-include/net/dlt.h
-include/net/ethernet.h
-include/net/firewire.h
-include/net/ieee8023ad_lacp.h
-include/net/ieee_oui.h
-include/net/if_arp.h
-include/net/if_bridgevar.h
-include/net/if_clone.h
-include/net/if_enc.h
-include/net/if_gif.h
-include/net/if_gre.h
-include/net/if_ipsec.h
-include/net/if_lagg.h
-include/net/if_llatbl.h
-include/net/if_llc.h
-include/net/if_mib.h
-include/net/if_ovpn.h
-include/net/if_pflog.h
-include/net/if_pfsync.h
-include/net/if_private.h
-include/net/if_stf.h
-include/net/if_strings.h
-include/net/if_tap.h
-include/net/if_tun.h
-include/net/if_types.h
-include/net/if_var.h
-include/net/if_vlan_var.h
-include/net/if_vxlan.h
-include/net/iflib.h
-include/net/ifq.h
-include/net/infiniband.h
-include/net/mp_ring.h
-include/net/mppc.h
-include/net/netisr.h
-include/net/netisr_internal.h
-include/net/netmap.h
-include/net/netmap_legacy.h
-include/net/netmap_user.h
-include/net/netmap_virt.h
-include/net/paravirt.h
-include/net/pfil.h
-include/net/pfkeyv2.h
-include/net/pfvar.h
-include/net/ppp_defs.h
-include/net/radix.h
-include/net/rndis.h
-include/net/route/fib_algo.h
-include/net/route/nhgrp_var.h
-include/net/route/nhop.h
-include/net/route/nhop_utils.h
-include/net/route/nhop_var.h
-include/net/route/route_ctl.h
-include/net/route/route_debug.h
-include/net/route/route_var.h
-include/net/rss_config.h
-include/net/sff8436.h
-include/net/sff8472.h
-include/net/slcompress.h
-include/net/toeplitz.h
-include/net80211/_ieee80211.h
-include/net80211/ieee80211.h
-include/net80211/ieee80211_action.h
-include/net80211/ieee80211_adhoc.h
-include/net80211/ieee80211_ageq.h
-include/net80211/ieee80211_alq.h
-include/net80211/ieee80211_amrr.h
-include/net80211/ieee80211_crypto.h
-include/net80211/ieee80211_dfs.h
-include/net80211/ieee80211_freebsd.h
-include/net80211/ieee80211_hostap.h
-include/net80211/ieee80211_ht.h
-include/net80211/ieee80211_input.h
-include/net80211/ieee80211_ioctl.h
-include/net80211/ieee80211_mesh.h
-include/net80211/ieee80211_monitor.h
-include/net80211/ieee80211_node.h
-include/net80211/ieee80211_phy.h
-include/net80211/ieee80211_power.h
-include/net80211/ieee80211_proto.h
-include/net80211/ieee80211_radiotap.h
-include/net80211/ieee80211_ratectl.h
-include/net80211/ieee80211_regdomain.h
-include/net80211/ieee80211_rssadapt.h
-include/net80211/ieee80211_scan.h
-include/net80211/ieee80211_scan_sw.h
-include/net80211/ieee80211_sta.h
-include/net80211/ieee80211_superg.h
-include/net80211/ieee80211_tdma.h
-include/net80211/ieee80211_var.h
-include/net80211/ieee80211_vht.h
-include/net80211/ieee80211_wds.h
-include/net80211/ieee80211_wps.h
-include/netgraph/bluetooth/include/ng_bluetooth.h
-include/netgraph/bluetooth/include/ng_btsocket.h
-include/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
-include/netgraph/bluetooth/include/ng_btsocket_l2cap.h
-include/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
-include/netgraph/bluetooth/include/ng_btsocket_sco.h
-include/netgraph/bluetooth/include/ng_hci.h
-include/netgraph/bluetooth/include/ng_l2cap.h
-include/netgraph/bluetooth/include/ng_ubt.h
-include/netgraph/netflow/netflow.h
-include/netgraph/netflow/netflow_v9.h
-include/netgraph/netflow/ng_netflow.h
-include/netgraph/netgraph.h
-include/netgraph/ng_UI.h
-include/netgraph/ng_async.h
-include/netgraph/ng_bpf.h
-include/netgraph/ng_bridge.h
-include/netgraph/ng_car.h
-include/netgraph/ng_checksum.h
-include/netgraph/ng_cisco.h
-include/netgraph/ng_deflate.h
-include/netgraph/ng_device.h
-include/netgraph/ng_echo.h
-include/netgraph/ng_eiface.h
-include/netgraph/ng_etf.h
-include/netgraph/ng_ether.h
-include/netgraph/ng_ether_echo.h
-include/netgraph/ng_frame_relay.h
-include/netgraph/ng_gif.h
-include/netgraph/ng_gif_demux.h
-include/netgraph/ng_hole.h
-include/netgraph/ng_hub.h
-include/netgraph/ng_iface.h
-include/netgraph/ng_ip_input.h
-include/netgraph/ng_ipfw.h
-include/netgraph/ng_ksocket.h
-include/netgraph/ng_l2tp.h
-include/netgraph/ng_lmi.h
-include/netgraph/ng_macfilter.h
-include/netgraph/ng_message.h
-include/netgraph/ng_mppc.h
-include/netgraph/ng_nat.h
-include/netgraph/ng_one2many.h
-include/netgraph/ng_parse.h
-include/netgraph/ng_patch.h
-include/netgraph/ng_pipe.h
-include/netgraph/ng_ppp.h
-include/netgraph/ng_pppoe.h
-include/netgraph/ng_pptpgre.h
-include/netgraph/ng_pred1.h
-include/netgraph/ng_rfc1490.h
-include/netgraph/ng_sample.h
-include/netgraph/ng_socket.h
-include/netgraph/ng_socketvar.h
-include/netgraph/ng_source.h
-include/netgraph/ng_split.h
-include/netgraph/ng_tag.h
-include/netgraph/ng_tcpmss.h
-include/netgraph/ng_tee.h
-include/netgraph/ng_tty.h
-include/netgraph/ng_vjc.h
-include/netgraph/ng_vlan.h
-include/netgraph/ng_vlan_rotate.h
-include/netgraph/qos.h
-include/netinet/cc/cc.h
-include/netinet/cc/cc_cubic.h
-include/netinet/cc/cc_module.h
-include/netinet/cc/cc_newreno.h
-include/netinet/dccp.h
-include/netinet/icmp6.h
-include/netinet/icmp_var.h
-include/netinet/if_ether.h
-include/netinet/igmp.h
-include/netinet/igmp_var.h
-include/netinet/in_fib.h
-include/netinet/in_kdtrace.h
-include/netinet/in_pcb_var.h
-include/netinet/in_rss.h
-include/netinet/in_var.h
-include/netinet/ip6.h
-include/netinet/ip_auth.h
-include/netinet/ip_carp.h
-include/netinet/ip_carp_nl.h
-include/netinet/ip_compat.h
-include/netinet/ip_divert.h
-include/netinet/ip_dstlist.h
-include/netinet/ip_dummynet.h
-include/netinet/ip_ecn.h
-include/netinet/ip_encap.h
-include/netinet/ip_fil.h
-include/netinet/ip_frag.h
-include/netinet/ip_fw.h
-include/netinet/ip_htable.h
-include/netinet/ip_icmp.h
-include/netinet/ip_lookup.h
-include/netinet/ip_mroute.h
-include/netinet/ip_nat.h
-include/netinet/ip_options.h
-include/netinet/ip_pool.h
-include/netinet/ip_proxy.h
-include/netinet/ip_rules.h
-include/netinet/ip_scan.h
-include/netinet/ip_state.h
-include/netinet/ip_sync.h
-include/netinet/ip_var.h
-include/netinet/ipf_rb.h
-include/netinet/ipl.h
-include/netinet/netdump
-include/netinet/pim.h
-include/netinet/pim_var.h
-include/netinet/radix_ipf.h
-include/netinet/sctp.h
-include/netinet/sctp_asconf.h
-include/netinet/sctp_auth.h
-include/netinet/sctp_bsd_addr.h
-include/netinet/sctp_constants.h
-include/netinet/sctp_crc32.h
-include/netinet/sctp_header.h
-include/netinet/sctp_indata.h
-include/netinet/sctp_input.h
-include/netinet/sctp_kdtrace.h
-include/netinet/sctp_lock_bsd.h
-include/netinet/sctp_os.h
-include/netinet/sctp_os_bsd.h
-include/netinet/sctp_output.h
-include/netinet/sctp_pcb.h
-include/netinet/sctp_peeloff.h
-include/netinet/sctp_structs.h
-include/netinet/sctp_sysctl.h
-include/netinet/sctp_timer.h
-include/netinet/sctp_uio.h
-include/netinet/sctp_var.h
-include/netinet/sctputil.h
-include/netinet/tcp_accounting.h
-include/netinet/tcp_ecn.h
-include/netinet/tcp_fastopen.h
-include/netinet/tcp_hpts.h
-include/netinet/tcp_log_buf.h
-include/netinet/tcp_lro.h
-include/netinet/tcp_offload.h
-include/netinet/tcp_pcap.h
-include/netinet/tcp_ratelimit.h
-include/netinet/tcp_seq.h
-include/netinet/tcp_stacks/rack_bbr_common.h
-include/netinet/tcp_stacks/sack_filter.h
-include/netinet/tcp_stacks/tailq_hash.h
-include/netinet/tcp_stacks/tcp_bbr.h
-include/netinet/tcp_stacks/tcp_rack.h
-include/netinet/tcp_syncache.h
-include/netinet/tcp_timer.h
-include/netinet/tcpip.h
-include/netinet/toecore.h
-include/netinet/udp_var.h
-include/netinet/udplite.h
-include/netinet6/icmp6.h
-include/netinet6/in6_fib.h
-include/netinet6/in6_ifattach.h
-include/netinet6/in6_pcb.h
-include/netinet6/in6_rss.h
-include/netinet6/in6_var.h
-include/netinet6/ip6.h
-include/netinet6/ip6_ecn.h
-include/netinet6/ip6_mroute.h
-include/netinet6/ip6_var.h
-include/netinet6/ip_fw_nat64.h
-include/netinet6/ip_fw_nptv6.h
-include/netinet6/mld6.h
-include/netinet6/mld6_var.h
-include/netinet6/nd6.h
-include/netinet6/pim6.h
-include/netinet6/pim6_var.h
-include/netinet6/raw_ip6.h
-include/netinet6/scope6_var.h
-include/netinet6/sctp6_var.h
-include/netinet6/send.h
-include/netinet6/tcp6_var.h
-include/netinet6/udp6_var.h
-include/netipsec/ah.h
-include/netipsec/ah_var.h
-include/netipsec/esp.h
-include/netipsec/esp_var.h
-include/netipsec/ipcomp.h
-include/netipsec/ipcomp_var.h
-include/netipsec/ipsec.h
-include/netipsec/ipsec6.h
-include/netipsec/ipsec_support.h
-include/netipsec/key.h
-include/netipsec/key_debug.h
-include/netipsec/key_var.h
-include/netipsec/keydb.h
-include/netipsec/keysock.h
-include/netipsec/xform.h
-include/netlink/ktest_netlink_message_writer.h
-include/netlink/netlink.h
-include/netlink/netlink_bitset.h
-include/netlink/netlink_ctl.h
-include/netlink/netlink_debug.h
-include/netlink/netlink_generic.h
-include/netlink/netlink_linux.h
-include/netlink/netlink_message_parser.h
-include/netlink/netlink_message_writer.h
-include/netlink/netlink_route.h
-include/netlink/netlink_snl.h
-include/netlink/netlink_snl_generic.h
-include/netlink/netlink_snl_route.h
-include/netlink/netlink_snl_route_compat.h
-include/netlink/netlink_snl_route_parsers.h
-include/netlink/netlink_sysevent.h
-include/netlink/netlink_var.h
-include/netlink/route/common.h
-include/netlink/route/ifaddrs.h
-include/netlink/route/interface.h
-include/netlink/route/neigh.h
-include/netlink/route/nexthop.h
-include/netlink/route/route.h
-include/netlink/route/route_var.h
-include/netpfil/pf/pf.h
-include/netpfil/pf/pf_altq.h
-include/netpfil/pf/pf_mtag.h
-include/netsmb/netbios.h
-include/netsmb/smb.h
-include/netsmb/smb_conn.h
-include/netsmb/smb_dev.h
-include/netsmb/smb_rq.h
-include/netsmb/smb_subr.h
-include/netsmb/smb_tran.h
-include/netsmb/smb_trantcp.h
-include/nfs/krpc.h
-include/nfs/nfs_kdtrace.h
-include/nfs/nfs_lock.h
-include/nfs/nfs_mountcommon.h
-include/nfs/nfsdiskless.h
-include/nfs/nfsproto.h
-include/nfs/nfssvc.h
-include/nfs/xdr_subs.h
-include/nfsclient/nfs.h
-include/nfsclient/nfsargs.h
-include/nfsclient/nfsmount.h
-include/nfsclient/nfsnode.h
-include/nfsclient/nfsstats.h
-include/nfsserver/nfs.h
-include/nfsserver/nfsrvstats.h
-include/nss.h
-include/nsswitch.h
-include/printf.h
-include/proc_service.h
-include/protocols/dumprestore.h
-include/protocols/routed.h
-include/protocols/rwhod.h
-include/protocols/talkd.h
-include/protocols/timed.h
-include/res_update.h
-include/rpc/auth_kerb.h
-include/rpc/des.h
-include/rpc/des_crypt.h
-include/rpc/key_prot.h
-include/rpc/nettype.h
-include/rpc/pmap_rmt.h
-include/rpc/raw.h
-include/rpc/rpc_com.h
-include/rpc/rpcb_prot.x
-include/rpc/rpcsec_gss.h
-include/rpc/rpcsec_tls.h
-include/rpc/svc_dg.h
-include/rpcsvc/bootparam_prot.h
-include/rpcsvc/bootparam_prot.x
-include/rpcsvc/crypt.h
-include/rpcsvc/crypt.x
-include/rpcsvc/key_prot.h
-include/rpcsvc/key_prot.x
-include/rpcsvc/klm_prot.h
-include/rpcsvc/klm_prot.x
-include/rpcsvc/mount.h
-include/rpcsvc/mount.x
-include/rpcsvc/nfs_prot.h
-include/rpcsvc/nfs_prot.x
-include/rpcsvc/nis.h
-include/rpcsvc/nis.x
-include/rpcsvc/nis_cache.h
-include/rpcsvc/nis_cache.x
-include/rpcsvc/nis_callback.h
-include/rpcsvc/nis_callback.x
-include/rpcsvc/nis_db.h
-include/rpcsvc/nis_object.x
-include/rpcsvc/nis_tags.h
-include/rpcsvc/nislib.h
-include/rpcsvc/nlm_prot.h
-include/rpcsvc/nlm_prot.x
-include/rpcsvc/rex.h
-include/rpcsvc/rex.x
-include/rpcsvc/rnusers.h
-include/rpcsvc/rnusers.x
-include/rpcsvc/rquota.h
-include/rpcsvc/rquota.x
-include/rpcsvc/rstat.h
-include/rpcsvc/rstat.x
-include/rpcsvc/rwall.h
-include/rpcsvc/rwall.x
-include/rpcsvc/sm_inter.h
-include/rpcsvc/sm_inter.x
-include/rpcsvc/spray.h
-include/rpcsvc/spray.x
-include/rpcsvc/yp.h
-include/rpcsvc/yp.x
-include/rpcsvc/yppasswd.h
-include/rpcsvc/yppasswd.x
-include/rpcsvc/ypupdate_prot.h
-include/rpcsvc/ypupdate_prot.x
-include/rpcsvc/ypxfrd.h
-include/rpcsvc/ypxfrd.x
-include/security/audit/audit.h
-include/security/audit/audit_ioctl.h
-include/security/audit/audit_private.h
-include/security/mac_biba
-include/security/mac_bsdextended/mac_bsdextended.h
-include/security/mac_bsdextended/ugidfw_internal.h
-include/security/mac_lomac
-include/security/mac_mls
-include/security/mac_partition
-include/security/mac_veriexec/mac_veriexec.h
-include/security/mac_veriexec/mac_veriexec_internal.h
-include/sha224.h
-include/sha384.h
-include/sha512t.h
-include/skein.h
-include/skein_freebsd.h
-include/skein_iv.h
-include/skein_port.h
-include/stab.h
-include/stdalign.h
-include/stdbool.h
-include/stddef.h
-include/stdnoreturn.h
-include/sys/_atomic64e.h
-include/sys/_atomic_subword.h
-include/sys/_blockcount.h
-include/sys/_bus_dma.h
-include/sys/_eventhandler.h
-include/sys/_ffcounter.h
-include/sys/_rmlock.h
-include/sys/_semaphore.h
-include/sys/_stack.h
-include/sys/_stdarg.h
-include/sys/_task.h
-include/sys/_tls_variant_i.h
-include/sys/_unrhdr.h
-include/sys/aac_ioctl.h
-include/sys/abi_compat.h
-include/sys/acct.h
-include/sys/agpio.h
-include/sys/aio.h
-include/sys/alq.h
-include/sys/apm.h
-include/sys/arb.h
-include/sys/asan.h
-include/sys/assym.h
-include/sys/ata.h
-include/sys/atomic_common.h
-include/sys/atomic_san.h
-include/sys/backlight.h
-include/sys/bio.h
-include/sys/bitstring.h
-include/sys/blist.h
-include/sys/blockcount.h
-include/sys/boot.h
-include/sys/boottrace.h
-include/sys/buf.h
-include/sys/buf_ring.h
-include/sys/bus.h
-include/sys/bus_dma.h
-include/sys/bus_dma_internal.h
-include/sys/bus_san.h
-include/sys/busdma_bufalloc.h
-include/sys/cdio.h
-include/sys/cdrio.h
-include/sys/cfictl.h
-include/sys/clock.h
-include/sys/compressor.h
-include/sys/cons.h
-include/sys/copyright.h
-include/sys/counter.h
-include/sys/coverage.h
-include/sys/cpu.h
-include/sys/cpuctl.h
-include/sys/crc16.h
-include/sys/csan.h
-include/sys/ctf.h
-include/sys/ctype.h
-include/sys/devctl.h
-include/sys/devmap.h
-include/sys/disk/apm.h
-include/sys/disk/gpt.h
-include/sys/disk/mbr.h
-include/sys/diskmbr.h
-include/sys/dkstat.h
-include/sys/domain.h
-include/sys/dtrace_bsd.h
-include/sys/dvdio.h
-include/sys/efi.h
-include/sys/efiio.h
-include/sys/eui64.h
-include/sys/eventhandler.h
-include/sys/eventvar.h
-include/sys/exec.h
-include/sys/fail.h
-include/sys/fdcio.h
-include/sys/firmware.h
-include/sys/fnv_hash.h
-include/sys/gmon.h
-include/sys/gpio.h
-include/sys/gpt.h
-include/sys/gsb_crc32.h
-include/sys/gtaskqueue.h
-include/sys/hash.h
-include/sys/hhook.h
-include/sys/iconv.h
-include/sys/imgact.h
-include/sys/imgact_aout.h
-include/sys/imgact_binmisc.h
-include/sys/imgact_elf.h
-include/sys/interrupt.h
-include/sys/intr.h
-include/sys/ioctl_compat.h
-include/sys/iov.h
-include/sys/iov_schema.h
-include/sys/ipmi.h
-include/sys/joystick.h
-include/sys/kbio.h
-include/sys/kcov.h
-include/sys/kdb.h
-include/sys/kern_prefetch.h
-include/sys/kernel.h
-include/sys/khelp.h
-include/sys/kobj.h
-include/sys/kpilite.h
-include/sys/ksem.h
-include/sys/kthread.h
-include/sys/ktls.h
-include/sys/ktrace.h
-include/sys/libkern.h
-include/sys/link_aout.h
-include/sys/linker_set.h
-include/sys/lockf.h
-include/sys/lockstat.h
-include/sys/loginclass.h
-include/sys/mbuf.h
-include/sys/mchain.h
-include/sys/md4.h
-include/sys/mdioctl.h
-include/sys/membarrier.h
-include/sys/memdesc.h
-include/sys/memrange.h
-include/sys/module_khelp.h
-include/sys/mouse.h
-include/sys/mpt_ioctl.h
-include/sys/mqueue.h
-include/sys/msan.h
-include/sys/msgbuf.h
-include/sys/namei.h
-include/sys/nvpair.h
-include/sys/pciio.h
-include/sys/pcpu.h
-include/sys/pctrie.h
-include/sys/physmem.h
-include/sys/pidctrl.h
-include/sys/pipe.h
-include/sys/pmc.h
-include/sys/pmckern.h
-include/sys/pmclog.h
-include/sys/posix4.h
-include/sys/power.h
-include/sys/priv.h
-include/sys/prng.h
-include/sys/protosw.h
-include/sys/ptio.h
-include/sys/ptrace.h
-include/sys/qmath.h
-include/sys/queue_mergesort.h
-include/sys/racct.h
-include/sys/rangeset.h
-include/sys/rctl.h
-include/sys/reboot.h
-include/sys/refcount.h
-include/sys/reg.h
-include/sys/regression.h
-include/sys/rman.h
-include/sys/rmlock.h
-include/sys/rwlock.h
-include/sys/sbuf.h
-include/sys/sdt.h
-include/sys/sema.h
-include/sys/serial.h
-include/sys/sf_buf.h
-include/sys/sglist.h
-include/sys/sleepqueue.h
-include/sys/slicer.h
-include/sys/smp.h
-include/sys/smr.h
-include/sys/sndstat.h
-include/sys/snoop.h
-include/sys/sockbuf.h
-include/sys/sockopt.h
-include/sys/specialfd.h
-include/sys/spigenio.h
-include/sys/stack.h
-include/sys/stats.h
-include/sys/stddef.h
-include/sys/syscallsubr.h
-include/sys/sysent.h
-include/sys/sysproto.h
-include/sys/systm.h
-include/sys/taskqueue.h
-include/sys/terminal.h
-include/sys/thr.h
-include/sys/tiio.h
-include/sys/tim_filter.h
-include/sys/timeet.h
-include/sys/timeffc.h
-include/sys/timepps.h
-include/sys/timers.h
-include/sys/timetc.h
-include/sys/timex.h
-include/sys/tslog.h
-include/sys/tty.h
-include/sys/ttydevsw.h
-include/sys/ttydisc.h
-include/sys/ttyhook.h
-include/sys/ttyqueue.h
-include/sys/turnstile.h
-include/sys/umtx.h
-include/sys/umtxvar.h
-include/sys/vdso.h
-include/sys/vmem.h
-include/sys/watchdog.h
-include/tar.h
-include/teken/teken.h
-include/tgmath.h
-include/timeconv.h
-include/timers.h
-include/uchar.h
-include/ufs/ffs/ffs_extern.h
-include/ufs/ffs/fs.h
-include/ufs/ffs/softdep.h
-include/ufs/ufs/acl.h
-include/ufs/ufs/dinode.h
-include/ufs/ufs/dir.h
-include/ufs/ufs/dirhash.h
-include/ufs/ufs/extattr.h
-include/ufs/ufs/gjournal.h
-include/ufs/ufs/inode.h
-include/ufs/ufs/ufs_extern.h
-include/ufs/ufs/ufsmount.h
-include/ulimit.h
-include/unwind.h
-include/unwind_arm_ehabi.h
-include/unwind_itanium.h
-include/varargs.h
-include/vm/_vm_phys.h
-include/vm/memguard.h
-include/vm/redzone.h
-include/vm/swap_pager.h
-include/vm/uma_dbg.h
-include/vm/uma_int.h
-include/vm/vm_domainset.h
-include/vm/vm_dumpset.h
-include/vm/vm_extern.h
-include/vm/vm_kern.h
-include/vm/vm_object.h
-include/vm/vm_page.h
-include/vm/vm_pageout.h
-include/vm/vm_pagequeue.h
-include/vm/vm_pager.h
-include/vm/vm_phys.h
-include/vm/vm_radix.h
-include/vm/vm_reserv.h
-include/vm/vnode_pager.h
-include/wordexp.h
-include/x86/acpica_machdep.h
-include/x86/apicreg.h
-include/x86/apicvar.h
-include/x86/apm_bios.h
-include/x86/bus.h
-include/x86/bus_dma.h
-include/x86/busdma_impl.h
-include/x86/clock.h
-include/x86/cputypes.h
-include/x86/dump.h
-include/x86/fdt.h
-include/x86/float.h
-include/x86/ifunc.h
-include/x86/init.h
-include/x86/intr_machdep.h
-include/x86/iommu.h
-include/x86/kvm.h
-include/x86/legacyvar.h
-include/x86/mca.h
-include/x86/metadata.h
-include/x86/mptable.h
-include/x86/ofw_machdep.h
-include/x86/pci_cfgreg.h
-include/x86/ppireg.h
-include/x86/ptrace.h
-include/x86/pvclock.h
-include/x86/sigframe.h
-include/x86/stack.h
-include/x86/stdarg.h
-include/x86/sysarch.h
-include/x86/timerreg.h
-include/x86/tls.h
-include/x86/trap.h
-include/x86/ucode.h
-include/x86/vdso.h
-include/x86/vmware.h
-include/x86/x86_smp.h
-include/x86/x86_var.h
-include/xlocale/_monetary.h
-include/xlocale/_uchar.h
 lib/LLVMPolly.so
 lib/LLVMgold.so
 lib/bash/Makefile.sample
@@ -1380,91 +145,6 @@ lib/bash/uname
 lib/bash/unlink
 lib/bash/whoami
 lib/charset.alias
-lib/clang/16/include/__clang_cuda_builtin_vars.h
-lib/clang/16/include/__clang_cuda_cmath.h
-lib/clang/16/include/__clang_cuda_complex_builtins.h
-lib/clang/16/include/__clang_cuda_device_functions.h
-lib/clang/16/include/__clang_cuda_intrinsics.h
-lib/clang/16/include/__clang_cuda_libdevice_declares.h
-lib/clang/16/include/__clang_cuda_math.h
-lib/clang/16/include/__clang_cuda_math_forward_declares.h
-lib/clang/16/include/__clang_cuda_runtime_wrapper.h
-lib/clang/16/include/__clang_cuda_texture_intrinsics.h
-lib/clang/16/include/__clang_hip_cmath.h
-lib/clang/16/include/__clang_hip_libdevice_declares.h
-lib/clang/16/include/__clang_hip_math.h
-lib/clang/16/include/__clang_hip_runtime_wrapper.h
-lib/clang/16/include/__clang_hip_stdlib.h
-lib/clang/16/include/altivec.h
-lib/clang/16/include/ammintrin.h
-lib/clang/16/include/arm64intr.h
-lib/clang/16/include/arm_acle.h
-lib/clang/16/include/arm_bf16.h
-lib/clang/16/include/arm_cde.h
-lib/clang/16/include/arm_cmse.h
-lib/clang/16/include/arm_fp16.h
-lib/clang/16/include/arm_mve.h
-lib/clang/16/include/arm_neon.h
-lib/clang/16/include/arm_neon_sve_bridge.h
-lib/clang/16/include/arm_sve.h
-lib/clang/16/include/armintr.h
-lib/clang/16/include/builtins.h
-lib/clang/16/include/clzerointrin.h
-lib/clang/16/include/cuda_wrappers/algorithm
-lib/clang/16/include/cuda_wrappers/cmath
-lib/clang/16/include/cuda_wrappers/complex
-lib/clang/16/include/cuda_wrappers/new
-lib/clang/16/include/fma4intrin.h
-lib/clang/16/include/hexagon_circ_brev_intrinsics.h
-lib/clang/16/include/hexagon_protos.h
-lib/clang/16/include/hexagon_types.h
-lib/clang/16/include/htmintrin.h
-lib/clang/16/include/htmxlintrin.h
-lib/clang/16/include/hvx_hexagon_protos.h
-lib/clang/16/include/ia32intrin.h
-lib/clang/16/include/iso646.h
-lib/clang/16/include/larchintrin.h
-lib/clang/16/include/lwpintrin.h
-lib/clang/16/include/mm3dnow.h
-lib/clang/16/include/module.modulemap
-lib/clang/16/include/msa.h
-lib/clang/16/include/mwaitxintrin.h
-lib/clang/16/include/nmmintrin.h
-lib/clang/16/include/opencl-c-base.h
-lib/clang/16/include/opencl-c.h
-lib/clang/16/include/openmp_wrappers/__clang_openmp_device_functions.h
-lib/clang/16/include/openmp_wrappers/cmath
-lib/clang/16/include/openmp_wrappers/complex
-lib/clang/16/include/openmp_wrappers/complex.h
-lib/clang/16/include/openmp_wrappers/complex_cmath.h
-lib/clang/16/include/openmp_wrappers/math.h
-lib/clang/16/include/openmp_wrappers/new
-lib/clang/16/include/ppc_wrappers/bmi2intrin.h
-lib/clang/16/include/ppc_wrappers/bmiintrin.h
-lib/clang/16/include/ppc_wrappers/emmintrin.h
-lib/clang/16/include/ppc_wrappers/immintrin.h
-lib/clang/16/include/ppc_wrappers/mm_malloc.h
-lib/clang/16/include/ppc_wrappers/mmintrin.h
-lib/clang/16/include/ppc_wrappers/pmmintrin.h
-lib/clang/16/include/ppc_wrappers/smmintrin.h
-lib/clang/16/include/ppc_wrappers/tmmintrin.h
-lib/clang/16/include/ppc_wrappers/x86gprintrin.h
-lib/clang/16/include/ppc_wrappers/x86intrin.h
-lib/clang/16/include/ppc_wrappers/xmmintrin.h
-lib/clang/16/include/prfchwintrin.h
-lib/clang/16/include/rdpruintrin.h
-lib/clang/16/include/riscv_vector.h
-lib/clang/16/include/s390intrin.h
-lib/clang/16/include/tbmintrin.h
-lib/clang/16/include/tgmath.h
-lib/clang/16/include/vadefs.h
-lib/clang/16/include/vecintrin.h
-lib/clang/16/include/velintrin.h
-lib/clang/16/include/velintrin_approx.h
-lib/clang/16/include/velintrin_gen.h
-lib/clang/16/include/wasm_simd128.h
-lib/clang/16/include/x86intrin.h
-lib/clang/16/include/xopintrin.h
 lib/engines-3/capi.so
 lib/engines-3/devcrypto.so
 lib/engines-3/loader_attic.so
diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index b67aa88752c7..d16e2a3f0959 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -7,28 +7,17 @@
   config,
   overlays,
   crossOverlays ? [ ],
+  bootstrapFiles ?
+    let table = {
+      x86_64-freebsd = import ./bootstrap-files/x86_64-unknown-freebsd.nix;
+    };
+    files = table.${localSystem.system} or (throw "unsupported platform ${localSystem.system} for the pure FreeBSD stdenv");
+    in files
 }:
 
 assert crossSystem == localSystem;
 let
   inherit (localSystem) system;
-  bootstrap-urls-table = {
-    x86_64-freebsd = {
-      stage0 = {
-        url = "http://192.168.122.1:8000/stage0.nar.xz";
-        hash = "sha256-iGPBcwzDLJFroXwE/ADW+aUevywZCOher4mg9Ysx2j4=";
-        name = "bootstrap-files0";
-        unpack = true;
-      };
-      stage1 = {
-        url = "http://192.168.122.1:8000/stage1.tar.xz";
-        hash = "sha256-i0VBzbMPnSSmPjh5CYOQXTYCbSBbfa5omA0xZ2fjDlU=";
-        name = "bootstrap-files1.tar.xz";
-      };
-    };
-  };
-  fetchurlBoot = import <nix/fetchurl.nix>;
-  bootstrap-files = builtins.mapAttrs (k: fetchurlBoot) bootstrap-urls-table.${localSystem.system};
   mkExtraBuildCommands0 = cc: ''
     rsrc="$out/resource-root"
     mkdir "$rsrc"
@@ -49,11 +38,11 @@ let
       name = "bootstrap-archive";
       pname = "bootstrap-archive";
       version = "9.9.9";
-      builder = "${bootstrap-files.stage0}/libexec/ld-elf.so.1";
-      args = [ "${bootstrap-files.stage0}/bin/bash" ./unpack-bootstrap-files.sh ];
-      LD_LIBRARY_PATH = "${bootstrap-files.stage0}/lib";
-      src = bootstrap-files.stage0;
-      inherit (bootstrap-files) stage1;
+      builder = "${bootstrapFiles.unpack}/libexec/ld-elf.so.1";
+      args = [ "${bootstrapFiles.unpack}/bin/bash" ./unpack-bootstrap-files.sh ];
+      LD_LIBRARY_PATH = "${bootstrapFiles.unpack}/lib";
+      src = bootstrapFiles.unpack;
+      inherit (bootstrapFiles) bootstrapTools;
     }
   );
 
diff --git a/pkgs/stdenv/freebsd/make-bootstrap-tools-cross.nix b/pkgs/stdenv/freebsd/make-bootstrap-tools-cross.nix
new file mode 100644
index 000000000000..65d9812460fb
--- /dev/null
+++ b/pkgs/stdenv/freebsd/make-bootstrap-tools-cross.nix
@@ -0,0 +1,22 @@
+{system ? builtins.currentSystem}:
+
+let
+  inherit (releaseLib) lib;
+  releaseLib = import ../../top-level/release-lib.nix {
+    # We're not using any functions from release-lib.nix that look at
+    # supportedSystems.
+    supportedSystems = [];
+  };
+
+  make = crossSystem: import ./make-bootstrap-tools.nix {
+    pkgs = releaseLib.pkgsForCross crossSystem system;
+  };
+in lib.mapAttrs (n: make) (with lib.systems.examples; {
+  # NOTE: Only add platforms for which there are files in `./bootstrap-files`
+  # or for which you plan to request the tarball upload soon. See the
+  #   maintainers/scripts/bootstrap-files/README.md
+  # on how to request an upload.
+  # Sort following the sorting in `./default.nix` `bootstrapFiles` argument.
+
+  x86_64-unknown-freebsd = x86_64-freebsd;
+})
diff --git a/pkgs/stdenv/freebsd/bootstrap-files.nix b/pkgs/stdenv/freebsd/make-bootstrap-tools.nix
similarity index 69%
rename from pkgs/stdenv/freebsd/bootstrap-files.nix
rename to pkgs/stdenv/freebsd/make-bootstrap-tools.nix
index 2f1e05bbfd81..d65c420fa1b7 100644
--- a/pkgs/stdenv/freebsd/bootstrap-files.nix
+++ b/pkgs/stdenv/freebsd/make-bootstrap-tools.nix
@@ -1,28 +1,21 @@
-{ system }:
-((import <nixpkgs> { }).callPackage (
-  {
-    stdenv,
-    pkgsCross,
-    runCommand,
-    lib,
-    buildPackages,
-  }:
+{ pkgs ? import ../../.. {} }:
   let
-    pkgs = pkgsCross.${system};
+    inherit (pkgs) runCommand lib;
+    # splicing doesn't seem to work right here
+    inherit (pkgs.buildPackages) nix rsync;
     pack-all =
       packCmd: name: pkgs: fixups:
       (runCommand name {
         requiredSystemFeatures = [ "recursive-nix" ];
+        nativeBuildInputs = [ nix rsync ];
       } ''
-        nix_store=${lib.getBin buildPackages.nix}/bin/nix-store
-        rsync=${lib.getExe buildPackages.rsync}
         base=$PWD
-        requisites="$($nix_store --query --requisites ${lib.concatStringsSep " " pkgs} | tac)"
+        requisites="$(nix-store --query --requisites ${lib.concatStringsSep " " pkgs} | tac)"
 
         rm -f $base/nix-support/propagated-build-inputs
         for f in $requisites; do
           cd $f
-          $rsync --chmod="+w" -av . $base
+          rsync --chmod="+w" -av . $base
         done
         cd $base
 
@@ -42,18 +35,18 @@
         rm .nix-socket
         ${packCmd}
       '');
-    nar-all = pack-all "$nix_store --dump . | xz -9 -T $NIX_BUILD_CORES >$out";
-    tar-all = pack-all "XZ_OPT=\"-9 -T $NIX_BUILD_CORES\" tar cJf $out .";
+    nar-all = pack-all "nix-store --dump . | xz -9 -e -T $NIX_BUILD_CORES >$out";
+    tar-all = pack-all "XZ_OPT=\"-9 -e -T $NIX_BUILD_CORES\" tar cJf $out --hard-dereference --sort=name --numeric-owner --owner=0 --group=0 --mtime=@1 .";
     coreutils-big = pkgs.coreutils.override { singleBinary = false; };
     mkdir = runCommand "mkdir" { coreutils = coreutils-big; } ''
       mkdir -p $out/bin
       cp $coreutils/bin/mkdir $out/bin
     '';
-  in {
-  bootstrap-files0 = nar-all "${system}-bootstrap-files0.nar.xz" (with pkgs; [bash mkdir xz gnutar]) ''
+  in rec {
+  unpack = nar-all "unpack.nar.xz" (with pkgs; [bash mkdir xz gnutar]) ''
     rm -rf include lib/*.a lib/i18n lib/bash share
   '';
-  bootstrap-files1 = tar-all "${system}-bootstrap-files1.tar.xz" (
+  bootstrap-tools = tar-all "bootstrap-tools.tar.xz" (
     with pkgs;
     [
       (runCommand "bsdcp" { } "mkdir -p $out/bin; cp ${freebsd.cp}/bin/cp $out/bin/bsdcp")
@@ -97,9 +90,13 @@
     # - manually identify the point where files have no longer been accessed after the patching phase
     # - use your favorite text editor to snip out the time column, the /nix/store/###-bootstrap-archive/ prefix, and the files that have not been used during bootstrap
     # - turn off atime if it was off before since it will degrade performance
-    # - manually remove from the list the following; they are not marked as atime'd even though they are used
-    #   - bin/strings           # used only during bootstrap
+    # - manually remove bin/strings from the list, since it will be used only during bootstrap
+    # - manually remove all files under include and lib/clang/*/include from the list in order to improve forward compatibility (and since they are very small)
     # - plop it here
-  ) "xargs rm -f <${./bootstrap-files-spurious.txt}";
+  ) "xargs rm -f <${./bootstrap-tools-spurious.txt}";
+  build = runCommand "build" { } ''
+    mkdir -p $out/on-server
+    ln -s ${unpack} $out/on-server/unpack.nar.xz
+    ln -s ${bootstrap-tools} $out/on-server/bootstrap-tools.tar.xz
+  '';
 }
-) { })
diff --git a/pkgs/stdenv/freebsd/unpack-bootstrap-files.sh b/pkgs/stdenv/freebsd/unpack-bootstrap-files.sh
index dd06679cdc3f..a1de70d1886b 100644
--- a/pkgs/stdenv/freebsd/unpack-bootstrap-files.sh
+++ b/pkgs/stdenv/freebsd/unpack-bootstrap-files.sh
@@ -1,5 +1,5 @@
 $src/libexec/ld-elf.so.1 $src/bin/mkdir $out
-$src/libexec/ld-elf.so.1 $src/bin/tar -I "$src/libexec/ld-elf.so.1 $src/bin/xz" -C $out -xf $stage1
+$src/libexec/ld-elf.so.1 $src/bin/tar -I "$src/libexec/ld-elf.so.1 $src/bin/xz" -C $out -xf $bootstrapTools
 export LD_LIBRARY_PATH=$out/lib
 
 BADLIST=ld-elf.so.1
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b2018bdc1ec2..45fcfda2bfda 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3353,6 +3353,8 @@ with pkgs;
     }
   else if stdenv.hostPlatform.isLinux then
     callPackage ../stdenv/linux/make-bootstrap-tools.nix {}
+  else if stdenv.hostPlatform.isFreeBSD then
+    callPackage ../stdenv/freebsd/make-bootstrap-tools.nix {}
   else throw "freshBootstrapTools: unknown hostPlatform ${stdenv.hostPlatform.config}";
 
   boxes = callPackage ../tools/text/boxes { };
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 4b41dc5bdcd2..1ce8f8f709e2 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -266,14 +266,18 @@ in
 
   /* Cross-built bootstrap tools for every supported platform */
   bootstrapTools = let
-    tools = import ../stdenv/linux/make-bootstrap-tools-cross.nix { system = "x86_64-linux"; };
-    meta = {
+    linuxTools = import ../stdenv/linux/make-bootstrap-tools-cross.nix { system = "x86_64-linux"; };
+    freebsdTools = import ../stdenv/freebsd/make-bootstrap-tools-cross.nix { system = "x86_64-linux"; };
+    linuxMeta = {
       maintainers = [ maintainers.dezgeg ];
     };
-    mkBootstrapToolsJob = drv:
+    freebsdMeta = {
+      maintainers = [ maintainers.rhelmot ];
+    };
+    mkBootstrapToolsJob = meta: drv:
       assert elem drv.system supportedSystems;
       hydraJob' (addMetaAttrs meta drv);
-  in mapAttrsRecursiveCond (as: !isDerivation as) (name: mkBootstrapToolsJob)
+    linux = mapAttrsRecursiveCond (as: !isDerivation as) (name: mkBootstrapToolsJob linuxMeta)
     # The `bootstrapTools.${platform}.bootstrapTools` derivation
     # *unpacks* the bootstrap-files using their own `busybox` binary,
     # so it will fail unless buildPlatform.canExecute hostPlatform.
@@ -281,7 +285,10 @@ in
     # attribute, so there is no way to detect this -- we must add it
     # as a special case.  We filter the "test" attribute (only from
      # *cross*-built bootstrapTools) for the same reason.
-    (mapAttrs (_: v: removeAttrs v ["bootstrapTools" "test"]) tools);
+     (mapAttrs (_: v: removeAttrs v ["bootstrapTools" "test"]) linuxTools);
+    freebsd = mapAttrsRecursiveCond (as: !isDerivation as) (name: mkBootstrapToolsJob freebsdMeta)
+     freebsdTools;
+  in linux // freebsd;
 
   # Cross-built nixStatic for platforms for enabled-but-unsupported platforms
   mips64el-nixCrossStatic = mapTestOnCross systems.examples.mips64el-linux-gnuabi64 nixCrossStatic;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 8df22c6ced83..1a8f82d7e589 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -22,6 +22,7 @@
     "x86_64-apple-darwin"
     "x86_64-unknown-linux-gnu"
     "x86_64-unknown-linux-musl"
+    "x86_64-unknown-freebsd"
   ]
   # Strip most of attributes when evaluating to spare memory usage
 , scrubJobs ? true
@@ -249,6 +250,14 @@ let
               # TODO: Re-enable once the new bootstrap-tools are in place.
               #inherit (bootstrap.test-pkgs) stdenv;
             }
+          else if hasSuffix "-freebsd" config then
+            let
+              bootstrap = import ../stdenv/freebsd/make-bootstrap-tools.nix {
+                localSystem = { inherit config; };
+              };
+            in {
+              inherit (bootstrap) build;  # test does't exist yet
+            }
           else
             abort "No bootstrap implementation for system: ${config}"
         );

From 37affb5b7636bec2f22f981b1b3f05ad588f3d41 Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Fri, 19 Jul 2024 11:05:25 -0700
Subject: [PATCH 028/175] [squashme] Remove some hacks

---
 pkgs/stdenv/freebsd/default.nix | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index d16e2a3f0959..fee9682685eb 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -518,22 +518,10 @@ in
     overrides = prevStage: self: super: {
       __bootstrapArchive = bootstrapArchive;
       curl = prevStage.curlReal;
-      cacert = prevStage.cacert;
       inherit (prevStage) fetchurl;
       freebsd = super.freebsd.overrideScope (
         self': super': { localesPrev = prevStage.freebsd.localesReal; }
       );
-      haskellPackages = super.haskellPackages.override {
-        overrides = (
-          self: super: {
-            digest = super.digest.overrideAttrs {
-              postPatch = ''
-                sed -E -i -e 's/ && !os\(freebsd\)//' digest.cabal
-              '';
-            };
-          }
-        );
-      };
     };
   })
 ]

From 4ee5ad5929e61334cd3bf246d475952b0580a1eb Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Fri, 19 Jul 2024 22:30:25 -0700
Subject: [PATCH 029/175] [squashme] fix eval-nixpkgs-unstable-jobset

---
 pkgs/top-level/release.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 1a8f82d7e589..3102c902c34f 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -253,7 +253,9 @@ let
           else if hasSuffix "-freebsd" config then
             let
               bootstrap = import ../stdenv/freebsd/make-bootstrap-tools.nix {
-                localSystem = { inherit config; };
+                pkgs = import ../.. {
+                  localSystem = { inherit config; };
+                };
               };
             in {
               inherit (bootstrap) build;  # test does't exist yet

From 4cdf4202b25e1439618d0821413483a86b1aa4c8 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Sat, 20 Jul 2024 07:51:18 +0200
Subject: [PATCH 030/175] pv: migrate to pkgs/by-name

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

diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/by-name/pv/pv/package.nix
similarity index 100%
rename from pkgs/tools/misc/pv/default.nix
rename to pkgs/by-name/pv/pv/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b2018bdc1ec2..5433f593d2bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11919,8 +11919,6 @@ with pkgs;
 
   pure-prompt = callPackage ../shells/zsh/pure-prompt { };
 
-  pv = callPackage ../tools/misc/pv { };
-
   pwgen = callPackage ../tools/security/pwgen { };
 
   pwgen-secure = callPackage ../tools/security/pwgen-secure { };

From 9175ef35404f748e82cee49dc25cc180e48ca233 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Sat, 20 Jul 2024 07:52:25 +0200
Subject: [PATCH 031/175] pv: 1.8.10 -> 1.8.12

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

diff --git a/pkgs/by-name/pv/pv/package.nix b/pkgs/by-name/pv/pv/package.nix
index 309a78c5400c..2b52759c3b78 100644
--- a/pkgs/by-name/pv/pv/package.nix
+++ b/pkgs/by-name/pv/pv/package.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pv";
-  version = "1.8.10";
+  version = "1.8.12";
 
   src = fetchurl {
     url = "https://www.ivarch.com/programs/sources/pv-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-1MkMF8/NRKqWuYI3cx5PgR4HHUwgUqaJ0tgeZnH1cbE=";
+    hash = "sha256-lof53u2wnQ3ADYDDBpHwyRKCwNXY+n1qKghch0LCzXw=";
   };
 
   meta = {

From 1bde538a7acf85263912ce5c351387320e358d52 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jul 2024 08:13:54 +0000
Subject: [PATCH 032/175] cyme: 1.7.0 -> 1.8.1

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

diff --git a/pkgs/by-name/cy/cyme/package.nix b/pkgs/by-name/cy/cyme/package.nix
index 5bdeaf1c9c18..33c3471719af 100644
--- a/pkgs/by-name/cy/cyme/package.nix
+++ b/pkgs/by-name/cy/cyme/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cyme";
-  version = "1.7.0";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "tuna-f1sh";
     repo = "cyme";
     rev = "v${version}";
-    hash = "sha256-iDwH4gSpt1XkwMBj0Ut26c9PpsHcxFrRE6VuBNhpIHk=";
+    hash = "sha256-Rq7ykD6L+DrDNz+d++ztv+fmoSSNCoeC1YfXiIJiXzM=";
   };
 
-  cargoHash = "sha256-bzOqk0nXhqq4WX9razPo1q6BkEl4VZ5QMPiNEwHO/eM=";
+  cargoHash = "sha256-XvU8r4bmI18qp+1O3nsJG3RTiiNxfKksRgkSBMsja5s=";
 
   nativeBuildInputs = [
     pkg-config

From a350402ac295830988a9b7e89c469ee20227ab8c Mon Sep 17 00:00:00 2001
From: toastal <toastal@posteo.net>
Date: Tue, 16 Jul 2024 03:56:43 +0700
Subject: [PATCH 033/175] =?UTF-8?q?zfs=5Funstable:=202.2.4-unstable-2024-0?=
 =?UTF-8?q?5-29=20=E2=86=92=202.2.4-unstable-2024-07-15?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fixes a use-after-free
---
 pkgs/os-specific/linux/zfs/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix
index 28401bf4adfa..3a83cd376250 100644
--- a/pkgs/os-specific/linux/zfs/unstable.nix
+++ b/pkgs/os-specific/linux/zfs/unstable.nix
@@ -22,13 +22,13 @@ callPackage ./generic.nix args {
   # IMPORTANT: Always use a tagged release candidate or commits from the
   # zfs-<version>-staging branch, because this is tested by the OpenZFS
   # maintainers.
-  version = "2.2.4-unstable-2024-05-29";
-  rev = "2eab4f7b396a1abb9adf7cab82d6ff47f9d78e9b";
+  version = "2.2.4-unstable-2024-07-15";
+  rev = "/54ef0fdf60a8e7633c38cb46e1f5bcfcec792f4e";
 
   isUnstable = true;
   tests = [
     nixosTests.zfs.unstable
   ];
 
-  hash = "sha256-xcEiZRHsFtIWvjy47kaLai/No/XYfhkJ5+zi/1KWqUE=";
+  hash = "sha256-7vZeIzA2yDW/gSCcS2AM3+C9qbRIbA9XbCRUxikW2+M=";
 }

From 72f2df014702d2ed9614496b5deccca5ba2a4932 Mon Sep 17 00:00:00 2001
From: toastal <toastal@posteo.net>
Date: Tue, 16 Jul 2024 15:14:03 +0700
Subject: [PATCH 034/175] Linux 6.10 compat patches

Since this is *zfs_unstable*, & these patches are merged. It seems like
this could let folks test out 6.10 as others have had sucess while
setting the new bar to 6.9.
---
 pkgs/os-specific/linux/zfs/unstable.nix | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix
index 3a83cd376250..faf3514dba3e 100644
--- a/pkgs/os-specific/linux/zfs/unstable.nix
+++ b/pkgs/os-specific/linux/zfs/unstable.nix
@@ -3,6 +3,7 @@
 , stdenv
 , linuxKernel
 , nixosTests
+, fetchpatch
 , ...
 } @ args:
 
@@ -14,9 +15,9 @@ callPackage ./generic.nix args {
   # this attribute is the correct one for this package.
   kernelModuleAttribute = "zfs_unstable";
   # check the release notes for compatible kernels
-  kernelCompatible = kernel.kernelOlder "6.10";
+  kernelCompatible = kernel.kernelOlder "6.11";
 
-  latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_8;
+  latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_9;
 
   # this package should point to a version / git revision compatible with the latest kernel release
   # IMPORTANT: Always use a tagged release candidate or commits from the
@@ -30,5 +31,23 @@ callPackage ./generic.nix args {
     nixosTests.zfs.unstable
   ];
 
+  # 6.10 patches approved+merged to the default branch, not in staging yet
+  # https://github.com/openzfs/zfs/pull/16250
+  extraPatches = [
+    (fetchpatch {
+      url = "https://github.com/openzfs/zfs/commit/7ca7bb7fd723a91366ce767aea53c4f5c2d65afb.patch";
+      hash = "sha256-vUX4lgywh5ox6DjtIfeC90KjbLoW3Ol0rK/L65jOENo=";
+    })
+    (fetchpatch {
+      url = "https://github.com/openzfs/zfs/commit/e951dba48a6330aca9c161c50189f6974e6877f0.patch";
+      hash = "sha256-A1h0ZLY+nlReBMTlEm3O9kwBqto1cgsZdnJsHpR6hw0=";
+    })
+    (fetchpatch {
+      url = "https://github.com/openzfs/zfs/commit/b409892ae5028965a6fe98dde1346594807e6e45.patch";
+      hash = "sha256-pW1b8ktglFhwVRapTB5th9UCyjyrPmCVPg53nMENax8=";
+    })
+
+  ];
+
   hash = "sha256-7vZeIzA2yDW/gSCcS2AM3+C9qbRIbA9XbCRUxikW2+M=";
 }

From 37a736fb859236ddbaa5002c6ed3e1f35e908828 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Sat, 20 Jul 2024 00:31:33 -0400
Subject: [PATCH 035/175] wv: fix build with clang 16 and on Darwin

- Clang 16 makes implicit int conversions and incompatible function pointer types errors by default. Turn these into warnings; and
- Work around and issue with case-insensitive filesystems that prevents building on Darwin.
---
 pkgs/tools/misc/wv/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/tools/misc/wv/default.nix
index 0d2443be9f9b..f05465ac1475 100644
--- a/pkgs/tools/misc/wv/default.nix
+++ b/pkgs/tools/misc/wv/default.nix
@@ -22,13 +22,19 @@ stdenv.mkDerivation (finalAttrs: {
     "PKG_CONFIG=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config"
   ];
 
+  env.NIX_CFLAGS_COMPILE =
+    # Suppress incompatible function pointer and int conversion errors when building with newer versions of clang 16.
+    lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types -Wno-error=int-conversion";
+
   hardeningDisable = [ "format" ];
 
   enableParallelBuilding = true;
 
-  # autoreconfHook fails hard if these two files do not exist
+  # autoreconfHook fails hard if these two files do not exist.
+  # The extra move is to work around case-insensitive filesystems.
   postPatch = ''
-    touch AUTHORS ChangeLog
+    touch AUTHORS
+    mv CHANGELOG ChangeLog~ && mv ChangeLog~ ChangeLog
   '';
 
   meta = {

From 71a5b13367158b1decfea24e1d66309d6f0954d4 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Sat, 20 Jul 2024 00:36:42 -0400
Subject: [PATCH 036/175] synfigstudio: fix build with clang 16 and add Darwin
 support

- Set the language version to C++14, so Synfig Studio can continue using the deprecated APIs; and
- Add the framesworks needed to build Synfig Studio on Darwin.
---
 .../graphics/synfigstudio/default.nix             | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix
index c20f10ee0d1b..3ef849cc864e 100644
--- a/pkgs/applications/graphics/synfigstudio/default.nix
+++ b/pkgs/applications/graphics/synfigstudio/default.nix
@@ -8,6 +8,7 @@
 
 , boost
 , cairo
+, darwin
 , gettext
 , glibmm
 , gtk3
@@ -71,6 +72,10 @@ let
     configureFlags = [
       "--with-boost=${boost.dev}"
       "--with-boost-libdir=${boost.out}/lib"
+    ] ++ lib.optionals stdenv.cc.isClang [
+      # Newer versions of clang default to C++17, but synfig and some of its dependencies use deprecated APIs that
+      # are removed in C++17. Setting the language version to C++14 allows it to build.
+      "CXXFLAGS=-std=c++14"
     ];
 
     nativeBuildInputs = [
@@ -94,6 +99,8 @@ let
       fribidi
       openexr
       fftw
+    ] ++ lib.optionals stdenv.isDarwin [
+      darwin.apple_sdk.frameworks.Foundation
     ];
   };
 in
@@ -111,6 +118,12 @@ stdenv.mkDerivation {
     ./bootstrap.sh
   '';
 
+  configureFlags = lib.optionals stdenv.cc.isClang [
+    # Newer versions of clang default to C++17, but synfig and some of its dependencies use deprecated APIs that
+    # are removed in C++17. Setting the language version to C++14 allows it to build.
+    "CXXFLAGS=-std=c++14"
+  ];
+
   nativeBuildInputs = [
     pkg-config
     autoreconfHook
@@ -148,6 +161,6 @@ stdenv.mkDerivation {
     homepage = "http://www.synfig.org";
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.goibhniu ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }

From 7ce464459d12260e715c8519bb18e2239c322a32 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Sat, 20 Jul 2024 00:30:46 -0400
Subject: [PATCH 037/175] wv2: fix build with clang 16 and on Darwin

- Set the language version to C++14, so Synfig Studio can continue using the deprecated APIs; and
- Explicitly link gobject-2.0 on Darwin to avoid missing symbol errors when linking.
---
 pkgs/tools/misc/wv2/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/tools/misc/wv2/default.nix b/pkgs/tools/misc/wv2/default.nix
index 14420c1c3908..3a7bd5d395a6 100644
--- a/pkgs/tools/misc/wv2/default.nix
+++ b/pkgs/tools/misc/wv2/default.nix
@@ -10,6 +10,15 @@ stdenv.mkDerivation rec {
 
   patches = [ ./fix-include.patch ];
 
+  # Newer versions of clang default to C++17, which removes some deprecated APIs such as bind1st.
+  # Setting the language version to C++14 makes them available again.
+  cmakeFlags = lib.optionals stdenv.cc.isClang [ (lib.cmakeFeature "CMAKE_CXX_STANDARD" "14") ];
+
+  # Linking gobject explicitly fixes missing symbols (such as missing `_g_object_unref`) on Darwin.
+  preConfigure = lib.optionalString stdenv.isDarwin ''
+    export NIX_LDFLAGS+=" $(pkg-config gobject-2.0 --libs)"
+  '';
+
   nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ libgsf glib libxml2 ];
 

From 40321f03b4cb61747c96385ec7decfb4f42b416d Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Sat, 20 Jul 2024 00:34:58 -0400
Subject: [PATCH 038/175] vipsdisp: fix build with clang

The build fails with clang due to trying to declare a variable in a case. Clang requires it to be in a new block.
---
 pkgs/applications/graphics/vipsdisp/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/applications/graphics/vipsdisp/default.nix b/pkgs/applications/graphics/vipsdisp/default.nix
index 9d0a75767289..fdfb17d20542 100644
--- a/pkgs/applications/graphics/vipsdisp/default.nix
+++ b/pkgs/applications/graphics/vipsdisp/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , lib
 , fetchFromGitHub
+, fetchpatch2
 , meson
 , ninja
 , pkg-config
@@ -21,6 +22,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-a8wqDTVZnhqk0zHAuGvwjtJTM0irN2tkRIjx6sIteV0=";
   };
 
+  patches = [
+    # Fixes build with clang
+    (fetchpatch2 {
+      url = "https://github.com/jcupitt/vipsdisp/commit/e95888153838d6e58d5b9fd7c08e3d03db38e8b1.patch?full_index=1";
+      hash = "sha256-MtQ9AMvl2MkHSLyOuwFVbmNiCEoPPnrK3EoUdvqEtOo=";
+    })
+  ];
+
   postPatch = ''
     chmod +x ./meson_post_install.py
     patchShebangs ./meson_post_install.py

From c494d17409bab08666a9dda600d4146dbbd9df45 Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Sat, 20 Jul 2024 09:17:49 -0700
Subject: [PATCH 039/175] [squashme] remove unused/bad code

---
 pkgs/stdenv/freebsd/default.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index fee9682685eb..80251015df11 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -248,12 +248,6 @@ let
         "bin/unxz"
       ];
     };
-    cacert = linkBS {
-      paths = [
-        "etc/ssl/certs"
-        "nix-support/setup-hook"
-      ];
-    };
     binutils-unwrapped = linkBS {
       name = "binutils";
       paths = map (str: "bin/" + str) [
@@ -425,7 +419,6 @@ in
           gzip
           bzip2
           xz
-          cacert
           ;
         binutils-unwrapped = builtins.removeAttrs bootstrapTools.binutils-unwrapped [ "src" ];
         fetchurl = import ../../build-support/fetchurl {
@@ -492,7 +485,6 @@ in
       # we can import bins and libs that DON'T get imported OR LINKED into the final stdenv from boot-0
       curl = prevStage.curlReal;
       curlReal = super.curl;
-      cacert = prevStage.cacert;
       inherit (prevStage)
         fetchurl
         python3
@@ -501,6 +493,7 @@ in
         cmake
         ninja
         ;
+      fetchurlReal = super.fetchurl;
       freebsd = super.freebsd.overrideScope (
         self': super': {
           locales = prevStage.freebsd.locales;
@@ -518,7 +511,7 @@ in
     overrides = prevStage: self: super: {
       __bootstrapArchive = bootstrapArchive;
       curl = prevStage.curlReal;
-      inherit (prevStage) fetchurl;
+      fetchurl = prevStage.fetchurlReal;
       freebsd = super.freebsd.overrideScope (
         self': super': { localesPrev = prevStage.freebsd.localesReal; }
       );

From 3cf427ebe33c0e3ab254545b1fe43fe755a0e4ab Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Sat, 20 Jul 2024 09:21:23 -0700
Subject: [PATCH 040/175] [squashme] rename linkBS to linkBootstrap

---
 pkgs/stdenv/freebsd/default.nix | 50 ++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index 80251015df11..2a2259e84012 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -46,7 +46,7 @@ let
     }
   );
 
-  linkBS = (
+  linkBootstrap = (
     attrs:
     derivation (
       attrs
@@ -55,19 +55,19 @@ let
         name = attrs.name or (builtins.baseNameOf (builtins.elemAt attrs.paths 0));
         src = bootstrapArchive;
         builder = "${bootstrapArchive}/bin/bash";
-        args = [ ./linkBS.sh ];
+        args = [ ./linkBootstrap.sh ];
         PATH = "${bootstrapArchive}/bin";
         paths = attrs.paths;
       }
     )
   );
 
-  # commented linkBS entries are provided but unused
+  # commented linkBootstrap entries are provided but unused
   bootstrapTools = {
     expand-response-params = "";
-    bsdcp = linkBS { paths = [ "bin/bsdcp" ]; };
-    patchelf = linkBS { paths = [ "bin/patchelf" ]; };
-    bash = linkBS {
+    bsdcp = linkBootstrap { paths = [ "bin/bsdcp" ]; };
+    patchelf = linkBootstrap { paths = [ "bin/patchelf" ]; };
+    bash = linkBootstrap {
       paths = [
         "bin/bash"
         "bin/sh"
@@ -75,13 +75,13 @@ let
       shell = "bin/bash";
       shellPath = "/bin/bash";
     };
-    curl = linkBS {
+    curl = linkBootstrap {
       paths = [
         "bin/curl"
       ];
     };
     llvmPackages = {
-      clang-unwrapped = linkBS {
+      clang-unwrapped = linkBootstrap {
         paths = [
           "bin/clang"
           "bin/clang++"
@@ -89,7 +89,7 @@ let
         ];
         version = "16";
       };
-      libunwind = linkBS {
+      libunwind = linkBootstrap {
         name = "libunwind";
         paths = [
           "lib/libunwind.a"
@@ -100,7 +100,7 @@ let
         ];
       };
     };
-    coreutils = linkBS {
+    coreutils = linkBootstrap {
       name = "coreutils";
       paths = map (str: "bin/" + str) [
         "base64"
@@ -201,7 +201,7 @@ let
         "["
       ];
     };
-    diffutils = linkBS {
+    diffutils = linkBootstrap {
       name = "diffutils";
       paths = map (str: "bin/" + str) [
         "diff"
@@ -210,45 +210,45 @@ let
         #"sdiff"
       ];
     };
-    findutils = linkBS {
+    findutils = linkBootstrap {
       name = "findutils";
       paths = [
         "bin/find"
         "bin/xargs"
       ];
     };
-    iconv = linkBS { paths = [ "bin/iconv" ]; };
-    patch = linkBS { paths = [ "bin/patch" ]; };
-    gnutar = linkBS { paths = [ "bin/tar" ]; };
-    gawk = linkBS {
+    iconv = linkBootstrap { paths = [ "bin/iconv" ]; };
+    patch = linkBootstrap { paths = [ "bin/patch" ]; };
+    gnutar = linkBootstrap { paths = [ "bin/tar" ]; };
+    gawk = linkBootstrap {
       paths = [
         "bin/awk"
         "bin/gawk"
       ];
     };
-    gnumake = linkBS { paths = [ "bin/make" ]; };
-    gnugrep = linkBS {
+    gnumake = linkBootstrap { paths = [ "bin/make" ]; };
+    gnugrep = linkBootstrap {
       paths = [
         "bin/grep"
         "bin/egrep"
         "bin/fgrep"
       ];
     };
-    gnused = linkBS { paths = [ "bin/sed" ]; };
-    gzip = linkBS {
+    gnused = linkBootstrap { paths = [ "bin/sed" ]; };
+    gzip = linkBootstrap {
       paths = [
         "bin/gzip"
         #"bin/gunzip"
       ];
     };
-    bzip2 = linkBS { paths = [ "bin/bzip2" ]; };
-    xz = linkBS {
+    bzip2 = linkBootstrap { paths = [ "bin/bzip2" ]; };
+    xz = linkBootstrap {
       paths = [
         "bin/xz"
         "bin/unxz"
       ];
     };
-    binutils-unwrapped = linkBS {
+    binutils-unwrapped = linkBootstrap {
       name = "binutils";
       paths = map (str: "bin/" + str) [
         "ld"
@@ -269,8 +269,8 @@ let
       ];
     };
     freebsd = {
-      locales = linkBS { paths = [ "share/locale" ]; };
-      libc = linkBS {
+      locales = linkBootstrap { paths = [ "share/locale" ]; };
+      libc = linkBootstrap {
         name = "bootstrapLibs";
         paths = [
           "lib"

From 8d347301212df2d4e7509396e858c9a0555e5792 Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Sat, 20 Jul 2024 09:23:29 -0700
Subject: [PATCH 041/175] [squashme] elaborate comment on
 unpack-bootstrap-files.sh

---
 pkgs/stdenv/freebsd/unpack-bootstrap-files.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/stdenv/freebsd/unpack-bootstrap-files.sh b/pkgs/stdenv/freebsd/unpack-bootstrap-files.sh
index a1de70d1886b..dfbf860ac8c9 100644
--- a/pkgs/stdenv/freebsd/unpack-bootstrap-files.sh
+++ b/pkgs/stdenv/freebsd/unpack-bootstrap-files.sh
@@ -30,7 +30,8 @@ export PATH=$out/bin
 # sanity check
 $out/bin/true || exit 1
 
-# scorched earth
+# meticulously replace every nix store path with the right one
+# to work with binaries, make sure the path remains the same length by prefixing pathsep chars
 for f in $(find $out -type f); do
     while true; do
         BADMAN="$(strings $f | grep -o '/nix/store/.*' | grep -v "$out" | head -n1)"

From aca2ed897385f619370e69d7d92aec3f483353c7 Mon Sep 17 00:00:00 2001
From: Sam <30577766+Samasaur1@users.noreply.github.com>
Date: Sat, 6 Jul 2024 21:39:29 -0700
Subject: [PATCH 042/175] fichub-cli: init at 0.10.3

---
 pkgs/by-name/fi/fichub-cli/package.nix | 62 ++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 pkgs/by-name/fi/fichub-cli/package.nix

diff --git a/pkgs/by-name/fi/fichub-cli/package.nix b/pkgs/by-name/fi/fichub-cli/package.nix
new file mode 100644
index 000000000000..3d62d7b2a304
--- /dev/null
+++ b/pkgs/by-name/fi/fichub-cli/package.nix
@@ -0,0 +1,62 @@
+{ lib, python3Packages, fetchPypi }:
+
+python3Packages.buildPythonApplication rec {
+  pname = "fichub-cli";
+  version = "0.10.3";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "fichub_cli";
+    inherit version;
+    hash = "sha256-MTExXpuCwi/IfNDUVLMcxfFRwHHNfGJerHkHnh6/hls=";
+  };
+
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
+    platformdirs
+    beautifulsoup4
+    click
+    click-plugins
+    colorama
+    loguru
+    requests
+    tqdm
+    typer
+  ];
+
+  pythonImportsCheck = [
+    "fichub_cli"
+  ];
+
+  nativeCheckInputs = with python3Packages; [
+    pytestCheckHook
+  ];
+
+  # The package tries to create a file under the home directory on import
+  preCheck = ''
+    export HOME=$(mktemp -d)
+  '';
+
+  pytestFlagsArray = [
+    # pytest exits with a code of 5 if no tests are selected.
+    # handle this specific case as not an error
+    "|| ([ $? = 5 ] || exit $?)"
+  ];
+
+  disabledTestPaths = [
+    # Loading tests tries to download something from pypi.org
+    "tests/test_cli.py"
+  ];
+
+  meta = {
+    description = "CLI for the fichub.net API";
+    changelog = "https://github.com/FicHub/fichub-cli/releases/tag/v${version}";
+    mainProgram = "fichub_cli";
+    homepage = "https://github.com/FicHub/fichub-cli";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.samasaur ];
+  };
+}

From c3c71a980930ace618d2b3cbec95803ecdfe2b9d Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Sat, 20 Jul 2024 16:40:02 -0700
Subject: [PATCH 043/175] [squashme] finish rename

---
 pkgs/stdenv/freebsd/{linkBS.sh => linkBootstrap.sh} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename pkgs/stdenv/freebsd/{linkBS.sh => linkBootstrap.sh} (100%)

diff --git a/pkgs/stdenv/freebsd/linkBS.sh b/pkgs/stdenv/freebsd/linkBootstrap.sh
similarity index 100%
rename from pkgs/stdenv/freebsd/linkBS.sh
rename to pkgs/stdenv/freebsd/linkBootstrap.sh

From 1dc50908f18b68f03c8afc96851690d81f2e7c8e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Jul 2024 05:35:12 +0000
Subject: [PATCH 044/175] rehex: 0.61.1 -> 0.62.0

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

diff --git a/pkgs/applications/editors/rehex/default.nix b/pkgs/applications/editors/rehex/default.nix
index e48d45cb7d27..5bbad94a71b0 100644
--- a/pkgs/applications/editors/rehex/default.nix
+++ b/pkgs/applications/editors/rehex/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rehex";
-  version = "0.61.1";
+  version = "0.62.0";
 
   src = fetchFromGitHub {
     owner = "solemnwarning";
     repo = pname;
     rev = version;
-    hash = "sha256-/m4s5BW33I9g9hi5j3Vtui271w8Jv91+rQrI3qpO5Og=";
+    hash = "sha256-YHecsYEgVBiisz/GKHBBA4qEcRFGWTDAptljDdoLS9A=";
   };
 
   nativeBuildInputs = [ pkg-config which zip ]

From 108b524ea2279cfd96a729a3d062836523d7b53a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Jul 2024 09:04:23 +0000
Subject: [PATCH 045/175] remnote: 1.16.59 -> 1.16.72

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

diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix
index 1079de98b1d2..b0a3fc50d88b 100644
--- a/pkgs/by-name/re/remnote/package.nix
+++ b/pkgs/by-name/re/remnote/package.nix
@@ -6,10 +6,10 @@
 }:
 let
   pname = "remnote";
-  version = "1.16.59";
+  version = "1.16.72";
   src = fetchurl {
     url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage";
-    hash = "sha256-mF+6QL7ApPX1BAoPMbPGBUCJVNfa4W4VVu0E3MTzens=";
+    hash = "sha256-BoKxQ8ngfShm7tC+ojgIR8krq82gJOdbGy8/K7yDRLM=";
   };
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
 in

From cc12cb0eed3ecc8f5cd54a49ab4561d4b01e6ac7 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 21 Jul 2024 12:19:14 +0200
Subject: [PATCH 046/175] lurk: 0.3.4 -> 0.3.6

---
 pkgs/development/tools/lurk/default.nix | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/lurk/default.nix b/pkgs/development/tools/lurk/default.nix
index 2393f9336ca4..e82445b8a7f4 100644
--- a/pkgs/development/tools/lurk/default.nix
+++ b/pkgs/development/tools/lurk/default.nix
@@ -1,20 +1,26 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "lurk";
-  version = "0.3.4";
+  version = "0.3.6";
 
   src = fetchFromGitHub {
     owner = "jakwai01";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-7Yi77IsP/tmzrTvBVgIj2+fOXYKCT59pILeEuGuk4Y4=";
+    hash = "sha256-u37q5AJe6zsPNe5L+k3uVP7r92X4v3qhApPKYndZif4=";
   };
 
-  cargoHash = "sha256-Cvtg9msoYkIIlaUw4hxWy2wSrE1uORR/2R2Geq4SI4w=";
+  cargoHash = "sha256-1hKyrlCDsOe+F88lg4+I5JMxG44CN2MOLi4GlaDBctk=";
+
+  postPatch = ''
+    substituteInPlace src/lib.rs \
+      --replace-fail '/usr/bin/ls' 'ls'
+  '';
 
   meta = with lib; {
     description = "Simple and pretty alternative to strace";
@@ -23,6 +29,9 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/jakwai01/lurk/releases/tag/${src.rev}";
     license = licenses.agpl3Only;
     maintainers = with maintainers; [ figsoda ];
-    platforms = [ "i686-linux" "x86_64-linux" ];
+    platforms = [
+      "i686-linux"
+      "x86_64-linux"
+    ];
   };
 }

From 4ffad1d876ddfad9b584c8040693154f9f6240f7 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 21 Jul 2024 20:39:57 +0200
Subject: [PATCH 047/175] jool: 4.1.11 -> 4.1.12

---
 pkgs/os-specific/linux/jool/source.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix
index 59c224cef6dc..b0849becd75c 100644
--- a/pkgs/os-specific/linux/jool/source.nix
+++ b/pkgs/os-specific/linux/jool/source.nix
@@ -1,11 +1,11 @@
 { fetchFromGitHub }:
 
 rec {
-  version = "4.1.11";
+  version = "4.1.12";
   src = fetchFromGitHub {
     owner = "NICMx";
     repo = "Jool";
     rev = "refs/tags/v${version}";
-    hash = "sha256-fTYUdtU51/zOBbd568QtfUYnqWl+ZN9uSbE29tJC6UM=";
+    hash = "sha256-NJitXmWWEEglg4jag0mRZlmbf5+0sT08/pCssry5zD0=";
   };
 }

From de3c22d39008d997c34635d8e047a217543085e4 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 21 Jul 2024 20:43:45 +0200
Subject: [PATCH 048/175] jool: reformat

---
 pkgs/os-specific/linux/jool/cli.nix     | 42 +++++++++++++++++--------
 pkgs/os-specific/linux/jool/default.nix | 20 ++++++++----
 2 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/pkgs/os-specific/linux/jool/cli.nix b/pkgs/os-specific/linux/jool/cli.nix
index 904bb7366f7e..222cff9700d4 100644
--- a/pkgs/os-specific/linux/jool/cli.nix
+++ b/pkgs/os-specific/linux/jool/cli.nix
@@ -1,5 +1,12 @@
-{ lib, stdenv, fetchFromGitHub, nixosTests
-, autoreconfHook, pkg-config, libnl, iptables
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  nixosTests,
+  autoreconfHook,
+  pkg-config,
+  libnl,
+  iptables,
 }:
 
 let
@@ -12,31 +19,40 @@ stdenv.mkDerivation {
 
   src = sourceAttrs.src;
 
-  patches = [
-    ./validate-config.patch
-  ];
+  patches = [ ./validate-config.patch ];
 
   outputs = [
     "out"
     "man"
   ];
 
-  nativeBuildInputs = [ autoreconfHook pkg-config ];
-  buildInputs = [ libnl iptables ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+  buildInputs = [
+    libnl
+    iptables
+  ];
 
-  makeFlags = [ "-C" "src/usr" ];
+  makeFlags = [
+    "-C"
+    "src/usr"
+  ];
 
   prePatch = ''
     sed -e 's%^XTABLES_SO_DIR = .*%XTABLES_SO_DIR = '"$out"'/lib/xtables%g' -i src/usr/iptables/Makefile
   '';
 
-  passthru.tests = { inherit (nixosTests) jool; };
+  passthru.tests = {
+    inherit (nixosTests) jool;
+  };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.jool.mx/";
     description = "Fairly compliant SIIT and Stateful NAT64 for Linux - CLI tools";
-    platforms = platforms.linux;
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ fpletz ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ fpletz ];
   };
 }
diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix
index 91276cbc11b1..edbc3359386f 100644
--- a/pkgs/os-specific/linux/jool/default.nix
+++ b/pkgs/os-specific/linux/jool/default.nix
@@ -1,4 +1,10 @@
-{ lib, stdenv, fetchFromGitHub, kernel, nixosTests }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  kernel,
+  nixosTests,
+}:
 
 let
   sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; };
@@ -23,13 +29,15 @@ stdenv.mkDerivation {
 
   installTargets = "modules_install";
 
-  passthru.tests = { inherit (nixosTests) jool; };
+  passthru.tests = {
+    inherit (nixosTests) jool;
+  };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.jool.mx/";
     description = "Fairly compliant SIIT and Stateful NAT64 for Linux - kernel modules";
-    platforms = platforms.linux;
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ fpletz ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ fpletz ];
   };
 }

From dd3219954a6f441427dde730dd8f51cb9642b161 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 21 Jul 2024 20:47:57 +0200
Subject: [PATCH 049/175] iperf3: 3.16 -> 3.17.1

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

diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix
index ffb1d5c4627a..69f8e4249339 100644
--- a/pkgs/tools/networking/iperf/3.nix
+++ b/pkgs/tools/networking/iperf/3.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "iperf";
-  version = "3.16";
+  version = "3.17.1";
 
   src = fetchurl {
     url = "https://downloads.es.net/pub/iperf/iperf-${version}.tar.gz";
-    hash = "sha256-zHQMa76hBDmMw+RmvvxRWiWJbsheRKZi1fSnZ7nPcT4=";
+    hash = "sha256-hEBMqEMbWV6GxHPY8j2LsQKBAAHxX+r2EO/9OzGHiKo=";
   };
 
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ lksctp-tools ];

From f2a93325465c5ad1f600642019c48a6c88a02a41 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 21 Jul 2024 20:49:37 +0200
Subject: [PATCH 050/175] iperf3: reformat

---
 pkgs/tools/networking/iperf/3.nix | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix
index 69f8e4249339..27b4e6ca37b4 100644
--- a/pkgs/tools/networking/iperf/3.nix
+++ b/pkgs/tools/networking/iperf/3.nix
@@ -1,4 +1,11 @@
-{ lib, stdenv, fetchurl, openssl, fetchpatch, lksctp-tools }:
+{
+  lib,
+  stdenv,
+  fetchurl,
+  openssl,
+  fetchpatch,
+  lksctp-tools,
+}:
 
 stdenv.mkDerivation rec {
   pname = "iperf";
@@ -10,11 +17,12 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ lksctp-tools ];
-  configureFlags = [
-    "--with-openssl=${openssl.dev}"
-  ];
+  configureFlags = [ "--with-openssl=${openssl.dev}" ];
 
-  outputs = [ "out" "man" ];
+  outputs = [
+    "out"
+    "man"
+  ];
 
   patches = lib.optionals stdenv.hostPlatform.isMusl [
     (fetchpatch {
@@ -29,11 +37,11 @@ stdenv.mkDerivation rec {
     ln -s $man/share/man/man1/iperf3.1 $man/share/man/man1/iperf.1
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://software.es.net/iperf/";
     description = "Tool to measure IP bandwidth using UDP or TCP";
-    platforms = platforms.unix;
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ fpletz ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fpletz ];
   };
 }

From dbebdd67d71ca9ae4d51184c25dae72e18c67780 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 21 Jul 2024 21:20:03 +0200
Subject: [PATCH 051/175] di: 4.48.0.1 -> 4.53

---
 pkgs/tools/system/di/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/system/di/default.nix b/pkgs/tools/system/di/default.nix
index 06d91305909c..aecfcdbaef1e 100644
--- a/pkgs/tools/system/di/default.nix
+++ b/pkgs/tools/system/di/default.nix
@@ -1,19 +1,23 @@
-{ lib, stdenv, fetchurl }:
+{
+  lib,
+  stdenv,
+  fetchurl,
+}:
 
 stdenv.mkDerivation rec {
   pname = "di";
-  version = "4.48.0.1";
+  version = "4.53";
 
   src = fetchurl {
-    url = "https://gentoo.com/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-YFCFRDGeq2h/UXKme/NnnCuFdtw2Vim6Y3SbytaItGc=";
+    url = "mirror://sourceforge/diskinfo-di/${pname}-${version}.tar.gz";
+    sha256 = "sha256-AN1b78EdrI1lposkj9NBWKLmqFDC5OKrd1lMeaoB6D4=";
   };
 
-  makeFlags = [ "INSTALL_DIR=$(out)" ];
+  makeFlags = [ "PREFIX=$(out)" ];
 
   meta = with lib; {
     description = "Disk information utility; displays everything 'df' does and more";
-    homepage = "https://gentoo.com/di/";
+    homepage = "https://diskinfo-di.sourceforge.io/";
     license = licenses.zlib;
     maintainers = with maintainers; [ manveru ];
     platforms = platforms.all;

From dc57d69c0e01539029513b020e5d1386ece2fa53 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 21 Jul 2024 22:47:25 +0200
Subject: [PATCH 052/175] libusbmuxd: 2.0.2+date=2023-04-30 -> 2.1.0

---
 pkgs/development/libraries/libusbmuxd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix
index 33c821302cb2..f1b3c811f645 100644
--- a/pkgs/development/libraries/libusbmuxd/default.nix
+++ b/pkgs/development/libraries/libusbmuxd/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libusbmuxd";
-  version = "2.0.2+date=2023-04-30";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "libimobiledevice";
     repo = pname;
-    rev = "f47c36f5bd2a653a3bd7fb1cf1d2c50b0e6193fb";
-    hash = "sha256-ojFnFD0lcdJLP27oFukwzkG5THx1QE+tRBsaMj4ZCc4=";
+    rev = version;
+    hash = "sha256-coQqNGPsqrOYbBjO0eQZQNK8ZTB+ZzfMWvQ6Z1by9PY=";
   };
 
   nativeBuildInputs = [

From 94197a82bcbbced0528431b530a5be03eb04b7e7 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 21 Jul 2024 22:48:13 +0200
Subject: [PATCH 053/175] libusbmuxd: reformat

---
 .../libraries/libusbmuxd/default.nix          | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix
index f1b3c811f645..cb77300acec0 100644
--- a/pkgs/development/libraries/libusbmuxd/default.nix
+++ b/pkgs/development/libraries/libusbmuxd/default.nix
@@ -1,10 +1,11 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, autoreconfHook
-, pkg-config
-, libplist
-, libimobiledevice-glue
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  pkg-config,
+  libplist,
+  libimobiledevice-glue,
 }:
 
 stdenv.mkDerivation rec {
@@ -32,11 +33,11 @@ stdenv.mkDerivation rec {
     export RELEASE_VERSION=${version}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Client library to multiplex connections from and to iOS devices";
     homepage = "https://github.com/libimobiledevice/libusbmuxd";
-    license = licenses.lgpl21Plus;
-    platforms = platforms.unix;
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.unix;
     maintainers = [ ];
   };
 }

From 62959e0bb9d47c260208b2ef23f1c4caf20a6e96 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 21 Jul 2024 22:49:26 +0200
Subject: [PATCH 054/175] libusbmuxd: move to by-name

---
 .../default.nix => by-name/li/libusbmuxd/package.nix}           | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/libraries/libusbmuxd/default.nix => by-name/li/libusbmuxd/package.nix} (100%)

diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/by-name/li/libusbmuxd/package.nix
similarity index 100%
rename from pkgs/development/libraries/libusbmuxd/default.nix
rename to pkgs/by-name/li/libusbmuxd/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 80d4b6cb5233..d1132524163e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22659,8 +22659,6 @@ with pkgs;
 
   libusbgx = callPackage ../development/libraries/libusbgx { };
 
-  libusbmuxd = callPackage ../development/libraries/libusbmuxd { };
-
   libusbsio = callPackage ../development/libraries/libusbsio { };
 
   libucontext = callPackage ../development/libraries/libucontext { };

From de322fa088a58888721e07ef157ebb6f2601d1f3 Mon Sep 17 00:00:00 2001
From: Nathan Henrie <nate@n8henrie.com>
Date: Sun, 21 Jul 2024 17:08:24 -0600
Subject: [PATCH 055/175] nixos/espanso: add n8henrie to maintainers

I help maintain espanso and would like to help maintain both the package
and the module.
---
 nixos/modules/services/desktops/espanso.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/desktops/espanso.nix b/nixos/modules/services/desktops/espanso.nix
index a2c4b77b9046..4a9bff9267a4 100644
--- a/nixos/modules/services/desktops/espanso.nix
+++ b/nixos/modules/services/desktops/espanso.nix
@@ -3,7 +3,7 @@
 with lib;
 let cfg = config.services.espanso;
 in {
-  meta = { maintainers = with lib.maintainers; [ numkem ]; };
+  meta = { maintainers = with lib.maintainers; [ n8henrie numkem ]; };
 
   options = {
     services.espanso = {

From e0eb2db3b1a165c3dbe2d76c812f0b702cfec6d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 22 Jul 2024 07:23:59 +0000
Subject: [PATCH 056/175] step-ca: 0.26.2 -> 0.27.2

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

diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix
index 7fb581daf3e1..e918fd989e8a 100644
--- a/pkgs/tools/security/step-ca/default.nix
+++ b/pkgs/tools/security/step-ca/default.nix
@@ -13,16 +13,16 @@
 
 buildGoModule rec {
   pname = "step-ca";
-  version = "0.26.2";
+  version = "0.27.2";
 
   src = fetchFromGitHub {
     owner = "smallstep";
     repo = "certificates";
     rev = "refs/tags/v${version}";
-    hash = "sha256-sLHmeF/yh74/qsoF/DrYSAbULG9Nsvd6bvUT4tSVHdQ=";
+    hash = "sha256-G+oahvBbMW8vs1DublFAC1rREmQ7Q1r7rNNS0+gnfPE=";
   };
 
-  vendorHash = "sha256-TISPM6bYzS0TpmopQLBns/rQqPKLDHK1job003vpFiQ=";
+  vendorHash = "sha256-gQEGCbVgtKIaUgBkfpVwLXoUg1EUhaQFn9JZvV5Rjhc=";
 
   ldflags = [
     "-w"

From d2d3b359ad23331ca7cbb3bf17787cac9b23e68e Mon Sep 17 00:00:00 2001
From: Javi Merino <merino.jav@gmail.com>
Date: Fri, 12 Jul 2024 11:47:38 +0100
Subject: [PATCH 057/175] tmuxPlugins.tmux-pass: init at 0-unstable-2020-02-28

---
 pkgs/misc/tmux-plugins/default.nix | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index e049f92c3041..d05d6831febd 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -479,6 +479,35 @@ in rec {
     };
   };
 
+  pass = mkTmuxPlugin {
+    pluginName = "pass";
+    version = "0-unstable-2020-02-28";
+    rtpFilePath = "plugin.tmux";
+    src = pkgs.fetchFromGitHub {
+      owner = "rafi";
+      repo = "tmux-pass";
+      rev = "76b1c98911d56928063a41bc93a2d9e81818ef4c";
+      sha256 = "sha256-bamz4IZrozo5R7jt+z7YKyrogawPqsZ9cTJi9osjVoA=";
+    };
+
+    nativeBuildInputs = [ pkgs.makeWrapper ];
+    postInstall = ''
+      rm $target/README.md
+      rm -r $target/test
+
+      wrapProgram $target/scripts/main.sh \
+        --prefix PATH : ${with pkgs; lib.makeBinPath ( [
+          findutils fzf gnugrep gnused ncurses pkgs.pass tmux
+        ] )}
+    '';
+
+    meta = with lib; {
+      description = "Password-store browser using fzf in tmux";
+      homepage = "https://github.com/rafi/tmux-pass";
+      license = licenses.unlicense;
+    };
+  };
+
   plumb = mkTmuxPlugin rec {
     pluginName = "plumb";
     version = "0.1.1";

From b48fd49e1d598a4442587d61a700a4062cbc6303 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 22 Jul 2024 11:24:53 +0200
Subject: [PATCH 058/175] lemminx: use headless jdk for maven

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

diff --git a/pkgs/by-name/le/lemminx/package.nix b/pkgs/by-name/le/lemminx/package.nix
index 609411993e81..32ecf1dc6cda 100644
--- a/pkgs/by-name/le/lemminx/package.nix
+++ b/pkgs/by-name/le/lemminx/package.nix
@@ -46,7 +46,8 @@ maven.buildMavenPackage rec {
     "org.junit.platform:junit-platform-launcher:1.10.0"
   ];
 
-  mvnHash = "sha256-LSnClLdAuqSyyT7O4f4aVaPBxdkkZQz60wTmqwQuzdU=";
+  mvnJdk = jdk_headless;
+  mvnHash = "sha256-jIvYUATcNUZZmZcXbUMqyHGX4CYiXqL0jkji+zrCYJY=";
 
   buildOffline = true;
 

From 5ca88a0439abe81a64b6d0f3031d877e387a9f1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 22 Jul 2024 11:25:13 +0200
Subject: [PATCH 059/175] java-language-server: use headless jdk for maven

---
 pkgs/development/tools/java/java-language-server/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/java/java-language-server/default.nix b/pkgs/development/tools/java/java-language-server/default.nix
index 94b771dc53cb..723937f8f535 100644
--- a/pkgs/development/tools/java/java-language-server/default.nix
+++ b/pkgs/development/tools/java/java-language-server/default.nix
@@ -23,6 +23,7 @@ maven.buildMavenPackage rec {
   };
 
   mvnFetchExtraArgs.dontConfigure = true;
+  mvnJdk = jdk_headless;
   mvnHash = "sha256-2uthmSjFQ43N5lgV11DsxuGce+ZptZsmRLTgjDo0M2w=";
 
   nativeBuildInputs = [ jdk_headless makeWrapper ];

From 5cc38f8dd972429ec7717f1a51df176799f3dbe2 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 20 Jul 2024 22:40:28 +0800
Subject: [PATCH 060/175] pantheon.elementary-terminal: 6.1.2 -> 6.2.0

https://github.com/elementary/terminal/compare/6.1.2...6.2.0
---
 .../pantheon/apps/elementary-terminal/default.nix     | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
index 7109b8372b7d..a0efe9432965 100644
--- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
@@ -5,7 +5,6 @@
 , pkg-config
 , meson
 , ninja
-, python3
 , vala
 , desktop-file-utils
 , gtk3
@@ -21,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-terminal";
-  version = "6.1.2";
+  version = "6.2.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "terminal";
     rev = version;
-    sha256 = "sha256-k+xowr9HmOUgNkn25uj+oV7AtG9EZfgFDop0Z+H7b3Q=";
+    sha256 = "sha256-o5hMrsn6OBk/2ycCDdT8n6gQUWcRuoaHqnmkODnJ6B8=";
   };
 
   nativeBuildInputs = [
@@ -35,7 +34,6 @@ stdenv.mkDerivation rec {
     meson
     ninja
     pkg-config
-    python3
     vala
     wrapGAppsHook3
     xvfb-run
@@ -51,11 +49,6 @@ stdenv.mkDerivation rec {
     vte
   ];
 
-  postPatch = ''
-    chmod +x meson/post_install.py
-    patchShebangs meson/post_install.py
-  '';
-
   passthru = {
     updateScript = nix-update-script { };
   };

From 9819035759da078b686bd26327a6488a2b1836c7 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 20 Jul 2024 22:40:51 +0800
Subject: [PATCH 061/175] pantheon.sideload: 6.2.1 -> 6.2.2

https://github.com/elementary/sideload/compare/6.2.1...6.2.2
---
 pkgs/desktops/pantheon/apps/sideload/default.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/pkgs/desktops/pantheon/apps/sideload/default.nix
index 0f4736990cf3..1178e3603360 100644
--- a/pkgs/desktops/pantheon/apps/sideload/default.nix
+++ b/pkgs/desktops/pantheon/apps/sideload/default.nix
@@ -11,7 +11,6 @@
 , meson
 , ninja
 , pkg-config
-, python3
 , vala
 , libxml2
 , wrapGAppsHook4
@@ -19,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sideload";
-  version = "6.2.1";
+  version = "6.2.2";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "sha256-BkU2lANn2KNaElL/JZ3TPVZIjh8eM3//ZiO4lFBIMm8=";
+    sha256 = "sha256-7qwjZpEvB0eHIRsXv8jU7fVhbCIYI6tqJYmYvZR8oLo=";
   };
 
   nativeBuildInputs = [
@@ -34,7 +33,6 @@ stdenv.mkDerivation rec {
     meson
     ninja
     pkg-config
-    python3
     vala
     wrapGAppsHook4
   ];
@@ -47,11 +45,6 @@ stdenv.mkDerivation rec {
     libxml2
   ];
 
-  postPatch = ''
-    chmod +x meson/post_install.py
-    patchShebangs meson/post_install.py
-  '';
-
   passthru = {
     updateScript = nix-update-script { };
   };

From 89c66e3e685d88af9d388b44557a68cbda4dcb3b Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 22 Jul 2024 20:45:56 +0800
Subject: [PATCH 062/175] cinnamon.cinnamon-common: 6.2.4 -> 6.2.7

https://github.com/linuxmint/cinnamon/compare/6.2.4...6.2.7
---
 pkgs/desktops/cinnamon/cinnamon-common/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
index d7d3975bb1ef..ffca0b823085 100644
--- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
@@ -71,13 +71,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "cinnamon-common";
-  version = "6.2.4";
+  version = "6.2.7";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon";
     rev = version;
-    hash = "sha256-zWSz49ESzuftrE4caTxa+9Zvyz2rdmGgRz2hZO2OWtc=";
+    hash = "sha256-j9Jk/mG/EYQUyVCBMJ7B4ZFiSSb3fl+TgQ+wvSSpcwo=";
   };
 
   patches = [

From 7aea12755b2ebe9f2356f919c185149bda39d082 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 22 Jul 2024 20:46:34 +0800
Subject: [PATCH 063/175] cinnamon.nemo: 6.2.4 -> 6.2.6

https://github.com/linuxmint/nemo/compare/6.2.4...6.2.6
---
 pkgs/desktops/cinnamon/nemo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix
index b2f7a8a9a949..ba5c3fda7d58 100644
--- a/pkgs/desktops/cinnamon/nemo/default.nix
+++ b/pkgs/desktops/cinnamon/nemo/default.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nemo";
-  version = "6.2.4";
+  version = "6.2.6";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    sha256 = "sha256-mlu/bC1+2rhEQvqIAcTBgYii8t4ELsLc1x0ApcBqx6o=";
+    sha256 = "sha256-2gUIdAKpdL2obfK5lmlwRgyeeIkiFLO8LBdem1hBzkU=";
   };
 
   patches = [

From 145fc14814dfab69fa4ff2678a0835e7af1981d7 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 22 Jul 2024 20:46:54 +0800
Subject: [PATCH 064/175] pix: 3.4.2 -> 3.4.3

https://github.com/linuxmint/pix/compare/3.4.2...3.4.3
---
 pkgs/by-name/pi/pix/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pi/pix/package.nix b/pkgs/by-name/pi/pix/package.nix
index ca16fe960dca..b7804eafeae1 100644
--- a/pkgs/by-name/pi/pix/package.nix
+++ b/pkgs/by-name/pi/pix/package.nix
@@ -33,13 +33,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pix";
-  version = "3.4.2";
+  version = "3.4.3";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    sha256 = "sha256-Ra+5hXSNPRc2LvTeEYwg1xSnIYgrpfvTrpPwzuTXhdU=";
+    sha256 = "sha256-WL9EW7oKeQwufw1VYDigbqAt52GQTpc5RgDEmnKO6vc=";
   };
 
   nativeBuildInputs = [

From 4265a3e7206f1fd9ca09944c9e16836258228917 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 22 Jul 2024 20:48:17 +0800
Subject: [PATCH 065/175] warpinator: 1.8.5 -> 1.8.6

https://github.com/linuxmint/warpinator/compare/1.8.5...1.8.6
---
 pkgs/by-name/wa/warpinator/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wa/warpinator/package.nix b/pkgs/by-name/wa/warpinator/package.nix
index 0544858d66b7..c01cb066490e 100644
--- a/pkgs/by-name/wa/warpinator/package.nix
+++ b/pkgs/by-name/wa/warpinator/package.nix
@@ -36,13 +36,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "warpinator";
-  version = "1.8.5";
+  version = "1.8.6";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-PODQvdi4CARHOyDG0dal6ge8icyFnvJXOdhqEcbcrAk=";
+    hash = "sha256-GJp2iRB3F42pSfYd2FLpmDTZ1zqt8thdRPAHu9/ns5E=";
   };
 
   nativeBuildInputs = [

From fa9799de5c232da2d5eac56f6f1b7dcde2767e57 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 22 Jul 2024 20:49:35 +0800
Subject: [PATCH 066/175] xreader: 4.2.1 -> 4.2.2

https://github.com/linuxmint/xreader/compare/4.2.1...4.2.2
---
 pkgs/by-name/xr/xreader/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xr/xreader/package.nix b/pkgs/by-name/xr/xreader/package.nix
index 94386d42815f..08ea7ad793ae 100644
--- a/pkgs/by-name/xr/xreader/package.nix
+++ b/pkgs/by-name/xr/xreader/package.nix
@@ -27,13 +27,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xreader";
-  version = "4.2.1";
+  version = "4.2.2";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    sha256 = "sha256-+q0fZA72m5T5ZB6bYWPWdQGxLpwjNp5Vak2TzaGwGWQ=";
+    sha256 = "sha256-c3oZ+PAsu180mlriQlF86TCBAnehLBv9Nc0SCtSkUuQ=";
   };
 
   nativeBuildInputs = [

From cacbab4eef602b0caf6105c4dc325fd9497ff708 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 22 Jul 2024 20:50:01 +0800
Subject: [PATCH 067/175] xviewer: 3.4.5 -> 3.4.6

https://github.com/linuxmint/xviewer/compare/3.4.5...3.4.6
---
 pkgs/by-name/xv/xviewer/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xv/xviewer/package.nix b/pkgs/by-name/xv/xviewer/package.nix
index a00ef0bf6efe..5dd4fd007ee8 100644
--- a/pkgs/by-name/xv/xviewer/package.nix
+++ b/pkgs/by-name/xv/xviewer/package.nix
@@ -27,13 +27,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xviewer";
-  version = "3.4.5";
+  version = "3.4.6";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    sha256 = "sha256-J6KDkGPbcRBofsJVmd+1IEapSfSd3ftjz0AggvBI8ck=";
+    sha256 = "sha256-J1IlgHKyNGJTn1sIU3q02eTgWqyeRm2leFIhtKPIdhg=";
   };
 
   nativeBuildInputs = [

From 54cfad47c4613c6270eb48d6e9a3ad79d0580b53 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 22 Jul 2024 20:50:39 +0800
Subject: [PATCH 068/175] timeshift: 24.06.2 -> 24.06.3

https://github.com/linuxmint/timeshift/compare/24.06.2...24.06.3
---
 pkgs/applications/backup/timeshift/unwrapped.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix
index e9d6e5795c5a..534145c19cbe 100644
--- a/pkgs/applications/backup/timeshift/unwrapped.nix
+++ b/pkgs/applications/backup/timeshift/unwrapped.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "timeshift";
-  version = "24.06.2";
+  version = "24.06.3";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "timeshift";
     rev = version;
-    hash = "sha256-/Rk95fAAquPrKwRchIgU8p9dpwvEV25ku1rknbJNlJc=";
+    hash = "sha256-npYiUSAPzr6g29ilQ1JELxqR1VbOR7TNMkdx37n92kk=";
   };
 
   patches = [

From dd94c2b1949668aefae3a3259f155091327db1c9 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 22 Jul 2024 20:51:22 +0800
Subject: [PATCH 069/175] xed-editor: 3.6.5 -> 3.6.6

https://github.com/linuxmint/xed/compare/3.6.5...3.6.6
---
 pkgs/by-name/xe/xed-editor/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xe/xed-editor/package.nix b/pkgs/by-name/xe/xed-editor/package.nix
index 4078721a085f..35dc31e9e46c 100644
--- a/pkgs/by-name/xe/xed-editor/package.nix
+++ b/pkgs/by-name/xe/xed-editor/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xed-editor";
-  version = "3.6.5";
+  version = "3.6.6";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "xed";
     rev = version;
-    sha256 = "sha256-FG8SlMyhee0W88Pt3oW1tsFyy/KeCOE+QlDbE6hzjcg=";
+    sha256 = "sha256-Lpdv8mX3GDzXH1FGGdmgK9b8P3EY7ETuEhGfSwc6IIE=";
   };
 
   patches = [

From b95b05d0a5bf9082bbbe6ab083ec317f3148d57a Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 22 Jul 2024 20:54:35 +0800
Subject: [PATCH 070/175] folder-color-switcher: 1.6.3 -> 1.6.4

https://github.com/linuxmint/folder-color-switcher/compare/35aa5b9839935fc3415ba6b7c77171459e7325fa...c9d1a2b9c7f40ff7bb77ee74a277988bb8a4adf2
---
 pkgs/by-name/fo/folder-color-switcher/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fo/folder-color-switcher/package.nix b/pkgs/by-name/fo/folder-color-switcher/package.nix
index 9870ed046d34..b338b84d0771 100644
--- a/pkgs/by-name/fo/folder-color-switcher/package.nix
+++ b/pkgs/by-name/fo/folder-color-switcher/package.nix
@@ -7,14 +7,14 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "folder-color-switcher";
-  version = "1.6.3";
+  version = "1.6.4";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     # They don't really do tags, this is just a named commit.
-    rev = "35aa5b9839935fc3415ba6b7c77171459e7325fa";
-    sha256 = "sha256-2ItjQ3CO1kG2QdAEqNxlrZ1AOfHmUBCE99kLalU7AUc=";
+    rev = "c9d1a2b9c7f40ff7bb77ee74a277988bb8a4adf2";
+    sha256 = "sha256-5k0YybA40MefqQixNFyQFMuy7t4aSGsI3BK0RbZDu28=";
   };
 
   nativeBuildInputs = [

From d67092b4c4ece85c4cf38eeab1a639f119c9363b Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 22 Jul 2024 21:03:45 +0800
Subject: [PATCH 071/175] mint-l-icons: 1.7.1 -> 1.7.2

https://github.com/linuxmint/mint-l-icons/compare/f5edf5683c7e7e51da2c0e66a9a288d5342edc63...ee03e6dad0b1f9e25847977eae42766e2ddd4877
---
 pkgs/by-name/mi/mint-l-icons/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mi/mint-l-icons/package.nix b/pkgs/by-name/mi/mint-l-icons/package.nix
index f1333ee44c18..8de1c8be2d22 100644
--- a/pkgs/by-name/mi/mint-l-icons/package.nix
+++ b/pkgs/by-name/mi/mint-l-icons/package.nix
@@ -9,14 +9,14 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "mint-l-icons";
-  version = "1.7.1";
+  version = "1.7.2";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     # https://github.com/linuxmint/mint-l-icons/issues/11
-    rev = "f5edf5683c7e7e51da2c0e66a9a288d5342edc63";
-    hash = "sha256-MKrynS9W5kHRwCKwkXMsUx43KIhtGMaYYWhb/j+vDpk=";
+    rev = "ee03e6dad0b1f9e25847977eae42766e2ddd4877";
+    hash = "sha256-OKlkqDp9mZOeM4M9QN9H0WH4k+5eMEUshvadaV6qhBA=";
   };
 
   propagatedBuildInputs = [

From 976ead65c8840afabeda804af90db9d12a56c674 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 22 Jul 2024 13:31:42 +0000
Subject: [PATCH 072/175] python312Packages.libknot: 3.3.7 -> 3.3.8

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

diff --git a/pkgs/development/python-modules/libknot/default.nix b/pkgs/development/python-modules/libknot/default.nix
index 7800dbd0f6b5..effdecfa624f 100644
--- a/pkgs/development/python-modules/libknot/default.nix
+++ b/pkgs/development/python-modules/libknot/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "libknot";
-  version = "3.3.7";
+  version = "3.3.8";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-3t/YYP7Hnua3fZ4PPN59BcPKHWukygUlcBGfNPOjJAE=";
+    hash = "sha256-RG2NOFQC6rxeutawn3ArZy9uNLn+gPmEqrv1E0YYJx4=";
   };
 
   postPatch = ''

From ab66e0577d6c80ec58244e9f561787731521c74c Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 22 Jul 2024 21:37:28 +0800
Subject: [PATCH 073/175] sticky: 1.21 -> 1.22

https://github.com/linuxmint/sticky/compare/1.21...1.22
---
 pkgs/applications/misc/sticky/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/sticky/default.nix b/pkgs/applications/misc/sticky/default.nix
index 62b3b40f03b0..dd54d9c64591 100644
--- a/pkgs/applications/misc/sticky/default.nix
+++ b/pkgs/applications/misc/sticky/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sticky";
-  version = "1.21";
+  version = "1.22";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-EH5EyvI3iAZr+aSV3DKM9RLkPmUcwKKXlOXSU0ECsPI=";
+    hash = "sha256-JrzBME1d4qvGjF2zdiqCX7h+sFadLsRQqZKnQj7elHs=";
   };
 
   postPatch = ''

From a1e46148164ec676f22c73634f8ccf236d23ba46 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 22 Jul 2024 21:38:11 +0800
Subject: [PATCH 074/175] xapp: 2.8.4 -> 2.8.5

https://github.com/linuxmint/xapp/compare/2.8.4...2.8.5
---
 pkgs/by-name/xa/xapp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xa/xapp/package.nix b/pkgs/by-name/xa/xapp/package.nix
index d6f4536eef8b..a483513d30ef 100644
--- a/pkgs/by-name/xa/xapp/package.nix
+++ b/pkgs/by-name/xa/xapp/package.nix
@@ -22,7 +22,7 @@
 
 stdenv.mkDerivation rec {
   pname = "xapp";
-  version = "2.8.4";
+  version = "2.8.5";
 
   outputs = [ "out" "dev" ];
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-Q82UI2GEv2g01pcrvn8JBOf9FgjbG0c1qfSINx0CouQ=";
+    hash = "sha256-HGWaa1S+maphP9colWdWSzGyoA0f4vJkF889X5/rzvs=";
   };
 
   # Recommended by upstream, which enables the build of xapp-debug.

From f2c069fa05372a45f150b82f2bdf00c861cdcad4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 22 Jul 2024 14:47:00 +0000
Subject: [PATCH 075/175] dae: 0.6.0 -> 0.7.0

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

diff --git a/pkgs/tools/networking/dae/default.nix b/pkgs/tools/networking/dae/default.nix
index ad17eb9f257d..52adba063ee5 100644
--- a/pkgs/tools/networking/dae/default.nix
+++ b/pkgs/tools/networking/dae/default.nix
@@ -6,17 +6,17 @@
 }:
 buildGoModule rec {
   pname = "dae";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "daeuniverse";
     repo = "dae";
     rev = "v${version}";
-    hash = "sha256-RO0XsGyIgf2PQekiC71HirEPp2SQDJpiAbjg7TyaGVQ=";
+    hash = "sha256-9iwrwQGpryGyEUVB2reodIxuEQHkXPA4P5IYKj18elI=";
     fetchSubmodules = true;
   };
 
-  vendorHash = "sha256-KFe0hGAXn4mrWCsU91cfUZc21SgJes6XXFhAKrqmULE=";
+  vendorHash = "sha256-AtYLxR7Fw3+IOSeuPXlq4vMsnS+7MMaFANZDg0yvCl8=";
 
   proxyVendor = true;
 

From e7b3b91fa25189af50174bef740b431afdf7b80a Mon Sep 17 00:00:00 2001
From: Litchi Pi <litchi.pi@proton.me>
Date: Mon, 15 Jul 2024 09:32:27 +0200
Subject: [PATCH 076/175] python311Packages.extruct: 0.16.0 -> 0.17.0

Signed-off-by: Litchi Pi <litchi.pi@proton.me>
---
 pkgs/development/python-modules/extruct/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/extruct/default.nix b/pkgs/development/python-modules/extruct/default.nix
index f7ede7184112..bc4c50ef292b 100644
--- a/pkgs/development/python-modules/extruct/default.nix
+++ b/pkgs/development/python-modules/extruct/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "extruct";
-  version = "0.16.0";
+  version = "0.17.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "scrapinghub";
     repo = "extruct";
     rev = "refs/tags/v${version}";
-    hash = "sha256-6lAb17EoR0FKyIOb9hk1jcpmPtZ7vClfuCrDZ83XBeg=";
+    hash = "sha256-CfhIqbhrZkJ232grhHxrmj4H1/Bq33ZXe8kovSOWSK0=";
   };
 
   nativeBuildInputs = [ setuptools ];

From d5b23b1e24a9860f65973c5757e10af291a7b691 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Mon, 22 Jul 2024 19:50:48 +0100
Subject: [PATCH 077/175] python312Packages.html-sanitizer: 2.3.1 -> 2.4.4

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

diff --git a/pkgs/development/python-modules/html-sanitizer/default.nix b/pkgs/development/python-modules/html-sanitizer/default.nix
index 71b174c87735..5a3ff0947db8 100644
--- a/pkgs/development/python-modules/html-sanitizer/default.nix
+++ b/pkgs/development/python-modules/html-sanitizer/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "html-sanitizer";
-  version = "2.3.1";
+  version = "2.4.4";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "matthiask";
     repo = "html-sanitizer";
     rev = "refs/tags/${version}";
-    hash = "sha256-NWJLD70783Ie6efyCvGopxMIlP3rLz0uM/D1rLQwBXE=";
+    hash = "sha256-6OWFLsuefeDzQ1uHnLmboKDgrbY/xJCwqsSQlDaJlRs=";
   };
 
   nativeBuildInputs = [ hatchling ];

From 53ce10ad902f982f2f0f61014d775d96faab5eb1 Mon Sep 17 00:00:00 2001
From: squalus <squalus@squalus.net>
Date: Mon, 22 Jul 2024 12:29:53 -0700
Subject: [PATCH 078/175] gpodder: fix build

Switch to Python 3.11 since the release version does not work on Python 3.12

Fixes #328584
---
 pkgs/applications/audio/gpodder/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix
index eff5bd76c9f2..61e33cae9026 100644
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@@ -6,13 +6,12 @@
 , gobject-introspection
 , gtk3
 , intltool
-, python3
-, python3Packages
+, python311Packages
 , wrapGAppsHook3
 , xdg-utils
 }:
 
-python3Packages.buildPythonApplication rec {
+python311Packages.buildPythonApplication rec {
   pname = "gpodder";
   version = "3.11.4";
   format = "other";
@@ -40,12 +39,11 @@ python3Packages.buildPythonApplication rec {
   ];
 
   buildInputs = [
-    python3
     gtk3
     adwaita-icon-theme
   ];
 
-  nativeCheckInputs = with python3Packages; [
+  nativeCheckInputs = with python311Packages; [
     minimock
     pytest
     pytest-httpserver
@@ -54,7 +52,7 @@ python3Packages.buildPythonApplication rec {
 
   doCheck = true;
 
-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = with python311Packages; [
     feedparser
     dbus-python
     mygpoclient

From ab7becf0474922ff0745e281d21eeb03c85fb27b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 20:04:12 +0000
Subject: [PATCH 079/175] build(deps): bump cachix/install-nix-action from 26
 to 27

Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 26 to 27.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/8887e596b4ee1134dae06b98d573bd674693f47c...ba0dd844c9180cbf77aa72a116d6fbc515d0e87b)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/basic-eval.yml                 | 2 +-
 .github/workflows/check-by-name.yml              | 2 +-
 .github/workflows/check-maintainers-sorted.yaml  | 2 +-
 .github/workflows/check-nix-format.yml           | 2 +-
 .github/workflows/check-shell.yml                | 4 ++--
 .github/workflows/editorconfig.yml               | 2 +-
 .github/workflows/manual-nixos.yml               | 2 +-
 .github/workflows/manual-nixpkgs.yml             | 2 +-
 .github/workflows/nix-parse.yml                  | 2 +-
 .github/workflows/update-terraform-providers.yml | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml
index 43213cf2df44..f3c67533fb82 100644
--- a/.github/workflows/basic-eval.yml
+++ b/.github/workflows/basic-eval.yml
@@ -19,7 +19,7 @@ jobs:
     # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback
     steps:
     - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-    - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26
+    - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27
     - uses: cachix/cachix-action@ad2ddac53f961de1989924296a1f236fcfbaa4fc # v15
       with:
         # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
diff --git a/.github/workflows/check-by-name.yml b/.github/workflows/check-by-name.yml
index 0c0727eba122..f9d1846c8798 100644
--- a/.github/workflows/check-by-name.yml
+++ b/.github/workflows/check-by-name.yml
@@ -94,7 +94,7 @@ jobs:
           base=$(mktemp -d)
           git worktree add "$base" "$(git rev-parse HEAD^1)"
           echo "base=$base" >> "$GITHUB_ENV"
-      - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26
+      - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27
         if: env.mergedSha
       - name: Fetching the pinned tool
         if: env.mergedSha
diff --git a/.github/workflows/check-maintainers-sorted.yaml b/.github/workflows/check-maintainers-sorted.yaml
index e620e6563ebb..e9883d313b2c 100644
--- a/.github/workflows/check-maintainers-sorted.yaml
+++ b/.github/workflows/check-maintainers-sorted.yaml
@@ -20,7 +20,7 @@ jobs:
           sparse-checkout: |
             lib
             maintainers
-      - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26
+      - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27
         with:
           # explicitly enable sandbox
           extra_nix_config: sandbox = true
diff --git a/.github/workflows/check-nix-format.yml b/.github/workflows/check-nix-format.yml
index fc8711a7cd1b..8bef5f6d676a 100644
--- a/.github/workflows/check-nix-format.yml
+++ b/.github/workflows/check-nix-format.yml
@@ -26,7 +26,7 @@ jobs:
           # This should not be a URL, because it would allow PRs to run arbitrary code in CI!
           rev=$(jq -r .rev ci/pinned-nixpkgs.json)
           echo "url=https://github.com/NixOS/nixpkgs/archive/$rev.tar.gz" >> "$GITHUB_ENV"
-      - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26
+      - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27
         with:
           # explicitly enable sandbox
           extra_nix_config: sandbox = true
diff --git a/.github/workflows/check-shell.yml b/.github/workflows/check-shell.yml
index bac117f26d66..b20c7581cf39 100644
--- a/.github/workflows/check-shell.yml
+++ b/.github/workflows/check-shell.yml
@@ -13,7 +13,7 @@ jobs:
         with:
           # pull_request_target checks out the base branch by default
           ref: refs/pull/${{ github.event.pull_request.number }}/merge
-      - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26
+      - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27
       - name: Build shell
         run: nix-build shell.nix
 
@@ -24,6 +24,6 @@ jobs:
         with:
           # pull_request_target checks out the base branch by default
           ref: refs/pull/${{ github.event.pull_request.number }}/merge
-      - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26
+      - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27
       - name: Build shell
         run: nix-build shell.nix
diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml
index 50bf0a868fb6..a7a0f81dbc09 100644
--- a/.github/workflows/editorconfig.yml
+++ b/.github/workflows/editorconfig.yml
@@ -28,7 +28,7 @@ jobs:
       with:
         # pull_request_target checks out the base branch by default
         ref: refs/pull/${{ github.event.pull_request.number }}/merge
-    - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26
+    - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27
       with:
         # nixpkgs commit is pinned so that it doesn't break
         # editorconfig-checker 2.4.0
diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml
index 20f092932ffd..fa433f36e2c9 100644
--- a/.github/workflows/manual-nixos.yml
+++ b/.github/workflows/manual-nixos.yml
@@ -18,7 +18,7 @@ jobs:
         with:
           # pull_request_target checks out the base branch by default
           ref: refs/pull/${{ github.event.pull_request.number }}/merge
-      - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26
+      - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27
         with:
           # explicitly enable sandbox
           extra_nix_config: sandbox = true
diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml
index 45486fa96a7a..8e245ad3d05a 100644
--- a/.github/workflows/manual-nixpkgs.yml
+++ b/.github/workflows/manual-nixpkgs.yml
@@ -20,7 +20,7 @@ jobs:
         with:
           # pull_request_target checks out the base branch by default
           ref: refs/pull/${{ github.event.pull_request.number }}/merge
-      - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26
+      - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27
         with:
           # explicitly enable sandbox
           extra_nix_config: sandbox = true
diff --git a/.github/workflows/nix-parse.yml b/.github/workflows/nix-parse.yml
index 19f3e8b5fd22..5842d72c8f6a 100644
--- a/.github/workflows/nix-parse.yml
+++ b/.github/workflows/nix-parse.yml
@@ -29,7 +29,7 @@ jobs:
         # pull_request_target checks out the base branch by default
         ref: refs/pull/${{ github.event.pull_request.number }}/merge
       if: ${{ env.CHANGED_FILES && env.CHANGED_FILES != '' }}
-    - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26
+    - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27
       with:
         nix_path: nixpkgs=channel:nixpkgs-unstable
     - name: Parse all changed or added nix files
diff --git a/.github/workflows/update-terraform-providers.yml b/.github/workflows/update-terraform-providers.yml
index a3c088ca4c76..7e839227ee31 100644
--- a/.github/workflows/update-terraform-providers.yml
+++ b/.github/workflows/update-terraform-providers.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-      - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26
+      - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27
         with:
           nix_path: nixpkgs=channel:nixpkgs-unstable
       - name: setup

From 90e99f54dc24457b43fd178492a52bf9e4d702e2 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sat, 13 Jul 2024 14:06:42 -0400
Subject: [PATCH 080/175] python312Packages.mautrix: 0.20.4 -> 0.20.6

Diff: https://github.com/mautrix/python/compare/refs/tags/v0.20.4...v0.20.6

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

diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix
index fc2bb57ced92..9895f6417184 100644
--- a/pkgs/development/python-modules/mautrix/default.nix
+++ b/pkgs/development/python-modules/mautrix/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "mautrix";
-  version = "0.20.4";
+  version = "0.20.6";
   format = "setuptools";
 
   disabled = pythonOlder "3.10";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "mautrix";
     repo = "python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-A9d/r4Caeo4tO82/MMXgU5xKvXRDnK0iQUm8AFhDPLM=";
+    hash = "sha256-g6y2u3ipSp5HoakHqd/ryPlyA+kR7zO6uY4AqfqbwiE=";
   };
 
   propagatedBuildInputs = [

From 738b237e324628c146f6af13586bda34de1aaa02 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 22 Jul 2024 20:45:03 +0000
Subject: [PATCH 081/175] qrtool: 0.11.2 -> 0.11.3

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

diff --git a/pkgs/by-name/qr/qrtool/package.nix b/pkgs/by-name/qr/qrtool/package.nix
index 2ae9805af816..c761e4c17863 100644
--- a/pkgs/by-name/qr/qrtool/package.nix
+++ b/pkgs/by-name/qr/qrtool/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "qrtool";
-  version = "0.11.2";
+  version = "0.11.3";
 
   src = fetchFromGitHub {
     owner = "sorairolake";
     repo = "qrtool";
     rev = "v${version}";
-    sha256 = "sha256-l6OVNCIw69fAX4mhnG3U1PBdmWHMD1JJMtiOgRrv198=";
+    sha256 = "sha256-TA4JuFd01gOzLDFYzuP0Ohk+Bd6lT3oZF9sFY9KjOfM=";
   };
 
-  cargoHash = "sha256-1sYX54h/HQzotOOTQEdmhtQZAm+KD5G3BXnEbWSzQGA=";
+  cargoHash = "sha256-bcrwf7Ufd7o2FPIxEReZGy9EANdWNOgoFBHzSdoYTlI=";
 
   nativeBuildInputs = [ asciidoctor installShellFiles ];
 

From 71ea012e77d4a8ec4ee5da9fa066ed380684fd91 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 22 Jul 2024 23:50:42 +0200
Subject: [PATCH 082/175] ktfmt: 0.47 -> 0.51

Diff: https://github.com/facebook/ktfmt/compare/refs/tags/v0.47...v0.51
---
 pkgs/by-name/kt/ktfmt/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/kt/ktfmt/package.nix b/pkgs/by-name/kt/ktfmt/package.nix
index 3e0063a9e37d..e5beaecde945 100644
--- a/pkgs/by-name/kt/ktfmt/package.nix
+++ b/pkgs/by-name/kt/ktfmt/package.nix
@@ -2,18 +2,18 @@
 
 maven.buildMavenPackage rec {
   pname = "ktfmt";
-  version = "0.47";
+  version = "0.51";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "ktfmt";
     rev = "refs/tags/v${version}";
-    hash = "sha256-vdvKHTTD84OAQacv/VE/5BxYdW4n3bxPUHF2MdH+sQQ=";
+    hash = "sha256-TIYV/V6vtGTTSLFf9dcKo8Ezx61e7Vvz3vQvbh0Kj/Y=";
   };
 
   patches = [ ./pin-default-maven-plugin-versions.patch ];
 
-  mvnHash = "sha256-iw28HS0WMFC9BKQKr0v33D77rMQeIMKjXduqPcYU1XA=";
+  mvnHash = "sha256-f/Uwc0ynROEKl2+zsgqj5ctRu1QcNblF5suU/0+fvKw=";
 
   mvnParameters = "-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z";
 

From 00809ce805f35f2f5acb1d0c43c426bc3a77860c Mon Sep 17 00:00:00 2001
From: Redhawk18 <redhawk76767676@gmail.com>
Date: Mon, 22 Jul 2024 18:01:41 -0400
Subject: [PATCH 083/175] xmrig-mo: 6.21.0-mo2 -> 6.21.3-mo15

---
 pkgs/applications/misc/xmrig/moneroocean.nix | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/misc/xmrig/moneroocean.nix b/pkgs/applications/misc/xmrig/moneroocean.nix
index 2ad32055707b..61b802a9cf6b 100644
--- a/pkgs/applications/misc/xmrig/moneroocean.nix
+++ b/pkgs/applications/misc/xmrig/moneroocean.nix
@@ -1,30 +1,19 @@
 { lib
 , fetchFromGitHub
-, fetchpatch
 , xmrig
 }:
 
 xmrig.overrideAttrs (oldAttrs: rec {
   pname = "xmrig-mo";
-  version = "6.21.0-mo2";
+  version = "6.21.3-mo15";
 
   src = fetchFromGitHub {
     owner = "MoneroOcean";
     repo = "xmrig";
     rev = "v${version}";
-    hash = "sha256-OKyJcmhlY8gfDKyBf83KHhokp4qA8EDyessTwKReaD8=";
+    hash = "sha256-eLI41O7SQUgNHFuMNT4W4pjAGDFe2plXuXmZH8QyCZ0=";
   };
 
-  patches = [
-    # Fix build against gcc-13 due to missing <stdexcept> include
-    #   https://github.com/MoneroOcean/xmrig/pull/123
-    (fetchpatch {
-      name = "gcc-13.patch";
-      url = "https://github.com/MoneroOcean/xmrig/commit/7d3ea51d68049c35e9d4c75732c751eefbc5ab29.patch";
-      hash = "sha256-iNrtZ8LxNJMzn8kXLhYGEFAy0ughfOZobDVRImpVPC0=";
-    })
-  ];
-
   meta = with lib; {
     description = "Fork of the XMRig CPU miner with support for algorithm switching";
     homepage = "https://github.com/MoneroOcean/xmrig";

From 251fc16a08d50a53957c4ac30e0bbf4d0eed0ee8 Mon Sep 17 00:00:00 2001
From: Redhawk18 <redhawk76767676@gmail.com>
Date: Mon, 22 Jul 2024 18:03:23 -0400
Subject: [PATCH 084/175] maintainers: add redhawk as a xmrig-mo maintainer

---
 pkgs/applications/misc/xmrig/moneroocean.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/xmrig/moneroocean.nix b/pkgs/applications/misc/xmrig/moneroocean.nix
index 61b802a9cf6b..edac4b34b052 100644
--- a/pkgs/applications/misc/xmrig/moneroocean.nix
+++ b/pkgs/applications/misc/xmrig/moneroocean.nix
@@ -20,6 +20,6 @@ xmrig.overrideAttrs (oldAttrs: rec {
     license = licenses.gpl3Plus;
     mainProgram = "xmrig";
     platforms = platforms.unix;
-    maintainers = with maintainers; [ j0hax ];
+    maintainers = with maintainers; [ j0hax redhawk ];
   };
 })

From 9c076eb6153e1019c40d50a101de3d88b59154e9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 22 Jul 2024 22:39:00 +0000
Subject: [PATCH 085/175] bonsai: 1.1.0 -> 1.2.0

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

diff --git a/pkgs/by-name/bo/bonsai/package.nix b/pkgs/by-name/bo/bonsai/package.nix
index 98b19be7e6fc..186c77f6c81c 100644
--- a/pkgs/by-name/bo/bonsai/package.nix
+++ b/pkgs/by-name/bo/bonsai/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bonsai";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromSourcehut {
     owner = "~stacyharper";
     repo = "bonsai";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Wsr76OQOIqRPCx/8GK9NovxxPZ3dEP8pSo8wgMK1Hfo=";
+    hash = "sha256-Ggk+OKaRE+kVa8/ij3znuY3b0dT2F5F1CSse4l0MAA8=";
   };
 
   nativeBuildInputs = [

From 9b32f5d25cf70851dcc63c4b23b15289c6f7c3ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 22 Jul 2024 22:52:25 +0000
Subject: [PATCH 086/175] libserdes: 7.6.1 -> 7.6.2

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

diff --git a/pkgs/development/libraries/libserdes/default.nix b/pkgs/development/libraries/libserdes/default.nix
index 11d10ff64d7c..ec66c2da3da0 100644
--- a/pkgs/development/libraries/libserdes/default.nix
+++ b/pkgs/development/libraries/libserdes/default.nix
@@ -13,7 +13,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libserdes";
-  version = "7.6.1";
+  version = "7.6.2";
 
   src = fetchFromGitHub {
     owner = "confluentinc";

From 2f9e1de7a4774fe27aa092412357fd20e6b76109 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 22 Jul 2024 23:06:03 +0000
Subject: [PATCH 087/175] neovide: 0.13.2 -> 0.13.3

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

diff --git a/pkgs/by-name/ne/neovide/package.nix b/pkgs/by-name/ne/neovide/package.nix
index 0d73f15d37dd..232bc4664eea 100644
--- a/pkgs/by-name/ne/neovide/package.nix
+++ b/pkgs/by-name/ne/neovide/package.nix
@@ -26,16 +26,16 @@
 
 rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
   pname = "neovide";
-  version = "0.13.2";
+  version = "0.13.3";
 
   src = fetchFromGitHub {
     owner = "neovide";
     repo = "neovide";
     rev = version;
-    hash = "sha256-4pTMG/CUHFNMJxGGEm0Pz3gGhAzOpy69lAZyg2lwor8=";
+    hash = "sha256-u10JxMvXC/FIobeolWJElBZuCiJ3xIUg4F0vLom7/S0=";
   };
 
-  cargoHash = "sha256-gN7W/EO4D0NbjUVTnoYZr2334hWG5jn6SJFdDnHpImo=";
+  cargoHash = "sha256-j8++watC7RBc1zn8m7Jg0Zl/iKXSrld+q62GiaLxGCo=";
 
   SKIA_SOURCE_DIR =
     let

From 9817a8c5766bcab4d97d05712c8f3f8bcc801df1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 22 Jul 2024 23:54:32 +0000
Subject: [PATCH 088/175] gscreenshot: 3.6.1 -> 3.6.2

---
 pkgs/applications/graphics/gscreenshot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/gscreenshot/default.nix b/pkgs/applications/graphics/gscreenshot/default.nix
index 09b81ac37cb7..4d6b724ee822 100644
--- a/pkgs/applications/graphics/gscreenshot/default.nix
+++ b/pkgs/applications/graphics/gscreenshot/default.nix
@@ -18,13 +18,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "gscreenshot";
-  version = "3.6.1";
+  version = "3.6.2";
 
   src = fetchFromGitHub {
     owner = "thenaterhood";
     repo = "${pname}";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-JQnXjKl+BBSblHT0qQgz8iie33wnwfPSkFnZM5xNE7k=";
+    sha256 = "sha256-dYmdM9QtemVKggEmMMcprVIM1fe02jQOyBPniy7p9ns=";
   };
 
   # needed for wrapGAppsHook3 to function

From eee2cc8a9bcc0297dd3dad88e68659601e2a8e10 Mon Sep 17 00:00:00 2001
From: redyf <mateusalvespereira7@gmail.com>
Date: Mon, 22 Jul 2024 21:08:43 -0300
Subject: [PATCH 089/175] audacity: 3.6.0 -> 3.6.1

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

diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index 7ec35673f417..907399f90639 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -62,13 +62,13 @@
 
 stdenv.mkDerivation rec {
   pname = "audacity";
-  version = "3.6.0";
+  version = "3.6.1";
 
   src = fetchFromGitHub {
     owner = "audacity";
     repo = "audacity";
     rev = "Audacity-${version}";
-    hash = "sha256-ZNOcWc4JKF69ZTD8pe1A3yrAMEE3rqbzPOOQslv+utU=";
+    hash = "sha256-MZ/u4wUUhDo1Mm9jxOY4MtzeV2797meT4HjYi5bCSM0=";
   };
 
   postPatch = ''

From 4874d8db3647829ed1a2c17867679462cb06063b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 00:56:13 +0000
Subject: [PATCH 090/175] fast-float: 6.1.1 -> 6.1.2

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

diff --git a/pkgs/by-name/fa/fast-float/package.nix b/pkgs/by-name/fa/fast-float/package.nix
index 3ed19d0a5e67..b757ab28df06 100644
--- a/pkgs/by-name/fa/fast-float/package.nix
+++ b/pkgs/by-name/fa/fast-float/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fast-float";
-  version = "6.1.1";
+  version = "6.1.2";
 
   src = fetchFromGitHub {
     owner = "fastfloat";
     repo = "fast_float";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-acaTUI+SWKSgmyJ+J4PzR5U7UtunbRiVuf5OsTf1Hko=";
+    hash = "sha256-1QH9XvY981nSKCjb2nK3tDFHkJy9N1zGNX0dACRjTxE=";
   };
 
   nativeBuildInputs = [

From 07a71bbc9aac238d8f852fec4cba9b2c3218d7a6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 23 Jul 2024 03:00:31 +0200
Subject: [PATCH 091/175] esphome: 2024.7.0 -> 2024.7.1

https://github.com/esphome/esphome/releases/tag/2024.7.1
---
 pkgs/tools/misc/esphome/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix
index 55e3f56a0471..ea979101e93b 100644
--- a/pkgs/tools/misc/esphome/default.nix
+++ b/pkgs/tools/misc/esphome/default.nix
@@ -19,14 +19,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "esphome";
-  version = "2024.7.0";
+  version = "2024.7.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-bQGsLt8+WPaQfQ9ReKGrIS1O071LkpAxJerfHO3E0Oc=";
+    hash = "sha256-V44c4+bU3pUO6S8qhI7O4GvKqo3lXB8rqLrKNkuODVc=";
   };
 
   nativeBuildInputs = with python.pkgs; [

From 03946f9b1034b399dca3f825e192a0bb45d3851e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 01:03:08 +0000
Subject: [PATCH 092/175] dumbpipe: 0.12.0 -> 0.13.0

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

diff --git a/pkgs/by-name/du/dumbpipe/package.nix b/pkgs/by-name/du/dumbpipe/package.nix
index af033939728d..dd1c3fcf76f4 100644
--- a/pkgs/by-name/du/dumbpipe/package.nix
+++ b/pkgs/by-name/du/dumbpipe/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "dumbpipe";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "n0-computer";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-UCPg917stw8zE6B0hdHyzq98icHpr+Z3b5RL4sZim1w=";
+    hash = "sha256-n/gmkOtCO07paWLKHSNtoTRCgdynMi5cG6johjsuDbU=";
   };
 
-  cargoHash = "sha256-qHdU7t73rBXwU8E2HdErFFlnG8r9H3zcXQSA37h0LFA=";
+  cargoHash = "sha256-YfieNhhqvW8nU6GZFgWa0oBuCfUSr2AhxpFOFusIYCY=";
 
   buildInputs = lib.optionals stdenv.isDarwin (
     with darwin.apple_sdk.frameworks; [

From fd3f5e4b4980081aed0ea50a0f3719a071b3afc4 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 23 Jul 2024 07:59:55 +0800
Subject: [PATCH 093/175] cinnamon.nemo-emblems: 6.2.0 -> 6.2.1

https://github.com/linuxmint/nemo-extensions/compare/6.2.0...nemo-emblems-6.2.1
---
 .../nemo-extensions/nemo-emblems/default.nix         | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-emblems/default.nix b/pkgs/desktops/cinnamon/nemo-extensions/nemo-emblems/default.nix
index bd9f808638f2..a0bff1d11f66 100644
--- a/pkgs/desktops/cinnamon/nemo-extensions/nemo-emblems/default.nix
+++ b/pkgs/desktops/cinnamon/nemo-extensions/nemo-emblems/default.nix
@@ -4,12 +4,16 @@
 , cinnamon-translations
 }:
 
-let
-  srcs = import ../srcs.nix { inherit fetchFromGitHub; };
-in
 python3.pkgs.buildPythonApplication rec {
   pname = "nemo-emblems";
-  inherit (srcs) version src;
+  version = "6.2.1";
+
+  src = fetchFromGitHub {
+    owner = "linuxmint";
+    repo = "nemo-extensions";
+    rev = "nemo-emblems-${version}";
+    hash = "sha256-HfWZntG+SHrzkN4fa3qYj9+fM6zF32qFquL/InoUi/k=";
+  };
 
   format = "setuptools";
 

From 7e5462a7833c10530b9a459f4fbf647b742a7deb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 01:43:54 +0000
Subject: [PATCH 094/175] minijinja: 2.0.3 -> 2.1.0

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

diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix
index c5117f038e09..a8e12a81331a 100644
--- a/pkgs/by-name/mi/minijinja/package.nix
+++ b/pkgs/by-name/mi/minijinja/package.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "minijinja";
-  version = "2.0.3";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "mitsuhiko";
     repo = "minijinja";
     rev = version;
-    hash = "sha256-3Frgeudh1Z4gpQJqyLxBZKi7gr4GIGLv7gW4Qf3LdVs=";
+    hash = "sha256-R+OY5RIKX5AkP/sRkU1SoFAeFpFPjiMOuow9nEG30W0=";
   };
 
-  cargoHash = "sha256-7ohhnuy8baELLDvf0FfdJmSf62wtmnEfI2rl9yZp03w=";
+  cargoHash = "sha256-PiR7uq8VnD3vrYHeUh6QJ+yx4UxIq7pr17TNXpksfiA=";
 
   # The tests relies on the presence of network connection
   doCheck = false;

From 1b23dc7dc251107b986291a6d86e554b0938bfac Mon Sep 17 00:00:00 2001
From: Someone Serge <sergei.kozlukov@aalto.fi>
Date: Tue, 23 Jul 2024 02:20:27 +0000
Subject: [PATCH 095/175] python312Packages.triton: rename from openai-triton

To match the github and PyPi names and the org name
---
 .../triton-llvm}/package.nix                  |  0
 .../0000-dont-download-ptxas.patch            |  0
 ...ble-version-key-for-non-cuda-targets.patch |  0
 .../{openai-triton => triton}/bin.nix         |  0
 .../binary-hashes.nix                         |  0
 .../{openai-triton => triton}/default.nix     |  2 +-
 .../{openai-triton => triton}/prefetch.sh     |  0
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/python-aliases.nix             |  4 +++
 pkgs/top-level/python-packages.nix            | 28 +++++++++----------
 10 files changed, 20 insertions(+), 15 deletions(-)
 rename pkgs/by-name/{op/openai-triton-llvm => tr/triton-llvm}/package.nix (100%)
 rename pkgs/development/python-modules/{openai-triton => triton}/0000-dont-download-ptxas.patch (100%)
 rename pkgs/development/python-modules/{openai-triton => triton}/0001-ptxas-disable-version-key-for-non-cuda-targets.patch (100%)
 rename pkgs/development/python-modules/{openai-triton => triton}/bin.nix (100%)
 rename pkgs/development/python-modules/{openai-triton => triton}/binary-hashes.nix (100%)
 rename pkgs/development/python-modules/{openai-triton => triton}/default.nix (98%)
 rename pkgs/development/python-modules/{openai-triton => triton}/prefetch.sh (100%)

diff --git a/pkgs/by-name/op/openai-triton-llvm/package.nix b/pkgs/by-name/tr/triton-llvm/package.nix
similarity index 100%
rename from pkgs/by-name/op/openai-triton-llvm/package.nix
rename to pkgs/by-name/tr/triton-llvm/package.nix
diff --git a/pkgs/development/python-modules/openai-triton/0000-dont-download-ptxas.patch b/pkgs/development/python-modules/triton/0000-dont-download-ptxas.patch
similarity index 100%
rename from pkgs/development/python-modules/openai-triton/0000-dont-download-ptxas.patch
rename to pkgs/development/python-modules/triton/0000-dont-download-ptxas.patch
diff --git a/pkgs/development/python-modules/openai-triton/0001-ptxas-disable-version-key-for-non-cuda-targets.patch b/pkgs/development/python-modules/triton/0001-ptxas-disable-version-key-for-non-cuda-targets.patch
similarity index 100%
rename from pkgs/development/python-modules/openai-triton/0001-ptxas-disable-version-key-for-non-cuda-targets.patch
rename to pkgs/development/python-modules/triton/0001-ptxas-disable-version-key-for-non-cuda-targets.patch
diff --git a/pkgs/development/python-modules/openai-triton/bin.nix b/pkgs/development/python-modules/triton/bin.nix
similarity index 100%
rename from pkgs/development/python-modules/openai-triton/bin.nix
rename to pkgs/development/python-modules/triton/bin.nix
diff --git a/pkgs/development/python-modules/openai-triton/binary-hashes.nix b/pkgs/development/python-modules/triton/binary-hashes.nix
similarity index 100%
rename from pkgs/development/python-modules/openai-triton/binary-hashes.nix
rename to pkgs/development/python-modules/triton/binary-hashes.nix
diff --git a/pkgs/development/python-modules/openai-triton/default.nix b/pkgs/development/python-modules/triton/default.nix
similarity index 98%
rename from pkgs/development/python-modules/openai-triton/default.nix
rename to pkgs/development/python-modules/triton/default.nix
index c51fc9bb590f..b3b94211a776 100644
--- a/pkgs/development/python-modules/openai-triton/default.nix
+++ b/pkgs/development/python-modules/triton/default.nix
@@ -197,7 +197,7 @@ buildPythonPackage rec {
     # and pythonImportsCheck is commented back.
     import-triton =
       runCommand "import-triton"
-        { nativeBuildInputs = [ (python.withPackages (ps: [ ps.openai-triton ])) ]; }
+        { nativeBuildInputs = [ (python.withPackages (ps: [ ps.triton ])) ]; }
         ''
           python << \EOF
           import triton
diff --git a/pkgs/development/python-modules/openai-triton/prefetch.sh b/pkgs/development/python-modules/triton/prefetch.sh
similarity index 100%
rename from pkgs/development/python-modules/openai-triton/prefetch.sh
rename to pkgs/development/python-modules/triton/prefetch.sh
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 0213cda22988..1999720651b3 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1026,6 +1026,7 @@ mapAliases ({
   onevpl-intel-gpu = lib.warn "onevpl-intel-gpu has been renamed to vpl-gpu-rt" vpl-gpu-rt; # Added 2024-06-04
   opa = throw "opa has been removed from nixpkgs as upstream has abandoned the project"; # Added 2023-03-21
   opam_1_2 = throw "'opam_1_2' has been renamed to/replaced by 'opam'"; # Added 2023-03-08
+  openai-triton-llvm = triton-llvm;
   openafs_1_8 = openafs; # Added 2022-08-22
   openapi-generator-cli-unstable = throw "openapi-generator-cli-unstable was removed as it was not being updated; consider openapi-generator-cli instead"; # Added 2024-01-02
   openbangla-keyboard = throw "openbangla-keyboard has been replaced by ibus-engines.openbangla-keyboard and fcitx5-openbangla-keyboard"; # added 2023-10-10
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 9c34f6c19fef..b83138a6df9f 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -339,6 +339,10 @@ mapAliases ({
   notifymuch = throw "notifymuch has been promoted to a top-level attribute name: `pkgs.notifymuch`"; # added 2022-10-02
   Nuitka = nuitka; # added 2023-02-19
   ntlm-auth = throw "ntlm-auth has been removed, because it relies on the md4 implementation provided by openssl. Use pyspnego instead.";
+  openai-triton = triton;
+  openai-triton-cuda = triton-cuda;
+  openai-triton-no-cuda = triton-no-cuda;
+  openai-triton-bin = triton-bin;
   openapi-schema-pydantic = throw "openapi-schema-pydantic has been removed, since it is no longer maintained"; # added 2023-10-30
   opencv3 = throw "opencv3 has been removed as it is obsolete"; # added 2023-10-12
   opsdroid_get_image_size = opsdroid-get-image-size; # added 2023-10-16
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0f0a5a8072c2..169796fa0f83 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9367,20 +9367,6 @@ self: super: with self; {
 
   open-meteo = callPackage ../development/python-modules/open-meteo { };
 
-  openai-triton = callPackage ../development/python-modules/openai-triton {
-    llvm = pkgs.openai-triton-llvm;
-  };
-
-  openai-triton-cuda = self.openai-triton.override {
-    cudaSupport = true;
-  };
-
-  openai-triton-no-cuda = self.openai-triton.override {
-    cudaSupport = false;
-  };
-
-  openai-triton-bin = callPackage ../development/python-modules/openai-triton/bin.nix { };
-
   openai-whisper = callPackage ../development/python-modules/openai-whisper { };
 
   openant = callPackage ../development/python-modules/openant { };
@@ -15755,6 +15741,20 @@ self: super: with self; {
 
   trio-websocket = callPackage ../development/python-modules/trio-websocket { };
 
+  triton = callPackage ../development/python-modules/triton {
+    llvm = pkgs.triton-llvm;
+  };
+
+  triton-cuda = self.triton.override {
+    cudaSupport = true;
+  };
+
+  triton-no-cuda = self.triton.override {
+    cudaSupport = false;
+  };
+
+  triton-bin = callPackage ../development/python-modules/triton/bin.nix { };
+
   tritonclient = callPackage ../development/python-modules/tritonclient { };
 
   troposphere = callPackage ../development/python-modules/troposphere { };

From a9fb147ea79f89635379ebeebc433f5d3f1d97ec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 02:38:18 +0000
Subject: [PATCH 096/175] sqldef: 0.17.13 -> 0.17.14

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

diff --git a/pkgs/development/tools/sqldef/default.nix b/pkgs/development/tools/sqldef/default.nix
index 3beb967c7c56..7fb9377b8bfc 100644
--- a/pkgs/development/tools/sqldef/default.nix
+++ b/pkgs/development/tools/sqldef/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "sqldef";
-  version = "0.17.13";
+  version = "0.17.14";
 
   src = fetchFromGitHub {
     owner = "k0kubun";
     repo = "sqldef";
     rev = "v${version}";
-    hash = "sha256-GaVNc1zhc+uZwrtxh8S+eB+0jFZCqW1VNs+lLhYsiJ0=";
+    hash = "sha256-APitl7BZPmMXmW1e45FE3Z6BaWd8pNeL0QQomQb7wgg=";
   };
 
   proxyVendor = true;

From 8feb484974b635d39e57a582e6b7406031cb2ab7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 03:03:44 +0000
Subject: [PATCH 097/175] halo: 2.17.1 -> 2.17.2

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

diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix
index b250752edae9..c5a3ada6d0a3 100644
--- a/pkgs/by-name/ha/halo/package.nix
+++ b/pkgs/by-name/ha/halo/package.nix
@@ -7,10 +7,10 @@
 }:
 stdenv.mkDerivation rec {
   pname = "halo";
-  version = "2.17.1";
+  version = "2.17.2";
   src = fetchurl {
     url = "https://github.com/halo-dev/halo/releases/download/v${version}/${pname}-${version}.jar";
-    hash = "sha256-bleY8e7JYwOenSif+3GB5wNmTy3lSt2CAmyX50toeKc=";
+    hash = "sha256-8adbW13DsNCWzME7hRA5AUr/bOZVXl4LlVuIFZwpmXM=";
   };
 
   nativeBuildInputs = [

From 33825e39121822f5091ddf1ebf062047e9d0160f Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Sun, 21 Jul 2024 23:58:56 -0700
Subject: [PATCH 098/175] linuxKernel.packages.hpuefi-mod: init at 3.05

---
 pkgs/os-specific/linux/hpuefi-mod/default.nix | 43 +++++++++++++++++++
 pkgs/top-level/linux-kernels.nix              |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/os-specific/linux/hpuefi-mod/default.nix

diff --git a/pkgs/os-specific/linux/hpuefi-mod/default.nix b/pkgs/os-specific/linux/hpuefi-mod/default.nix
new file mode 100644
index 000000000000..201d1ea50153
--- /dev/null
+++ b/pkgs/os-specific/linux/hpuefi-mod/default.nix
@@ -0,0 +1,43 @@
+{
+  stdenv,
+  fetchzip,
+  kernel,
+  lib,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "hpuefi-mod";
+  version = "3.05";
+
+  src = fetchzip {
+    url = "https://ftp.hp.com/pub/softpaq/sp150501-151000/sp150953.tgz";
+    hash = "sha256-ofzqu5Y2g+QU0myJ4SF39ZJGXH1zXzX1Ys2FhXVTQKE=";
+    stripRoot = false;
+  };
+
+  nativeBuildInputs = kernel.moduleBuildDependencies;
+  strictDeps = true;
+
+  makeFlags = [
+    "KVERS=${kernel.modDirVersion}"
+    "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+    "DESTDIR=$(out)"
+  ];
+
+  unpackPhase = ''
+    tar -xzf "$src/non-rpms/hpuefi-mod-${finalAttrs.version}.tgz"
+    cd hpuefi-mod-${finalAttrs.version}
+  '';
+
+  prePatch = ''
+    substituteInPlace "Makefile" \
+      --replace depmod \#
+  '';
+
+  meta = {
+    homepage = "https://ftp.hp.com/pub/caps-softpaq/cmit/linuxtools/HP_LinuxTools.html";
+    description = "Kernel module for managing BIOS settings and updating BIOS firmware on supported HP computers";
+    license = lib.licenses.gpl2Only; # See "License" section in ./non-rpms/hpuefi-mod-*.tgz/README
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ tomodachi94 ];
+  };
+})
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 28dfc585d66d..74566d1704f0 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -604,6 +604,8 @@ in {
 
     hid-tmff2 = callPackage ../os-specific/linux/hid-tmff2 { };
 
+    hpuefi-mod = callPackage ../os-specific/linux/hpuefi-mod { };
+
     drbd = callPackage ../os-specific/linux/drbd/driver.nix { };
 
   } // lib.optionalAttrs config.allowAliases {

From cd31ef5aec87ff2a6369601d4383f364ea7af53f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 04:15:42 +0000
Subject: [PATCH 099/175] python312Packages.amaranth: 0.5.0 -> 0.5.1

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

diff --git a/pkgs/development/python-modules/amaranth/default.nix b/pkgs/development/python-modules/amaranth/default.nix
index 0bf6d2515ef2..2490deb1dbba 100644
--- a/pkgs/development/python-modules/amaranth/default.nix
+++ b/pkgs/development/python-modules/amaranth/default.nix
@@ -21,14 +21,14 @@
 buildPythonPackage rec {
   pname = "amaranth";
   format = "pyproject";
-  version = "0.5.0";
+  version = "0.5.1";
   disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "amaranth-lang";
     repo = "amaranth";
     rev = "refs/tags/v${version}";
-    hash = "sha256-+EV2NgYSuCbYTQKeBUN+/D0attfrJ3cso7U6RjLEIbg=";
+    hash = "sha256-76wuxWz6RikFFJH+5kte57GcVhusJKtcMo5M/2U+Cl8=";
   };
 
   nativeBuildInputs = [

From 5fcdd9aba80b86eb9a7c499c8f79c04dac3a2691 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 04:40:56 +0000
Subject: [PATCH 100/175] python312Packages.sqlite-anyio: 0.2.2 -> 0.2.3

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

diff --git a/pkgs/development/python-modules/sqlite-anyio/default.nix b/pkgs/development/python-modules/sqlite-anyio/default.nix
index bc9fd2ffcb23..5883df4587cb 100644
--- a/pkgs/development/python-modules/sqlite-anyio/default.nix
+++ b/pkgs/development/python-modules/sqlite-anyio/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "sqlite-anyio";
-  version = "0.2.2";
+  version = "0.2.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "davidbrochart";
     repo = "sqlite-anyio";
     rev = "refs/tags/v${version}";
-    hash = "sha256-lOUGT9SUxvzTvTDpiwx7Oa+0o3/lnrJ9xxMYFQAmFZk=";
+    hash = "sha256-cZyTpFmYD0l20Cmxl+Hwfh3oVkWvtXD45dMpcSwA2QE=";
   };
 
   build-system = [ hatchling ];

From 69793c5fdc93074a012c24d2d0d999d738953998 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 04:55:13 +0000
Subject: [PATCH 101/175] sendme: 0.11.0 -> 0.12.0

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

diff --git a/pkgs/by-name/se/sendme/package.nix b/pkgs/by-name/se/sendme/package.nix
index c807fd5bbcb6..0054e560becd 100644
--- a/pkgs/by-name/se/sendme/package.nix
+++ b/pkgs/by-name/se/sendme/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "sendme";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "n0-computer";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-OBsVy1pCvybTp5IvqjBC20ofPxx/4thJELKhkb1FRHk=";
+    hash = "sha256-3fD09NAHpuE5Me5bn87afUrnrsaRVZscPUavioIT4q0=";
   };
 
-  cargoHash = "sha256-sS0BCA4K+U0AfScY3v8AnKJxb5w8yFAFjbBr+nSFRN8=";
+  cargoHash = "sha256-TGEoD/PEFnuheTKVdTJVB5XEobrQFLk8JoEBFELj/pY=";
 
   buildInputs = lib.optionals stdenv.isDarwin (
     with darwin.apple_sdk.frameworks; [

From 9b49c19908817acf0a99d41f1a110fcd57bd4c27 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 05:16:37 +0000
Subject: [PATCH 102/175] viceroy: 0.10.1 -> 0.10.2

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

diff --git a/pkgs/development/tools/viceroy/default.nix b/pkgs/development/tools/viceroy/default.nix
index e2eb4ac2a4a5..973db805a092 100644
--- a/pkgs/development/tools/viceroy/default.nix
+++ b/pkgs/development/tools/viceroy/default.nix
@@ -2,18 +2,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "viceroy";
-  version = "0.10.1";
+  version = "0.10.2";
 
   src = fetchFromGitHub {
     owner = "fastly";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-B6+ooPsKSsZNVyf9ObRM+iXYCsev3hztst4lU2z1p7A=";
+    hash = "sha256-ZzzEKpD32mHn1qae002rtKNEmv2Spf3yvxpYZqHmx/I=";
   };
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
-  cargoHash = "sha256-vu/x5SAHUx/L/gBQ22spXHHpc39E+Eg7olFNRimVB2s=";
+  cargoHash = "sha256-4Zmgp9QKyxCArQicYJ7/8Rn15wfnYVoiWAA919p3Njo=";
 
   cargoTestFlags = [
     "--package viceroy-lib"

From 404d0aa7f78189305835b50a4ea308025b733b68 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 05:56:34 +0000
Subject: [PATCH 103/175] cnquery: 11.12.1 -> 11.13.2

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

diff --git a/pkgs/tools/security/cnquery/default.nix b/pkgs/tools/security/cnquery/default.nix
index ea73abc2e9ff..777302c56e5f 100644
--- a/pkgs/tools/security/cnquery/default.nix
+++ b/pkgs/tools/security/cnquery/default.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "cnquery";
-  version = "11.12.1";
+  version = "11.13.2";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnquery";
     rev = "refs/tags/v${version}";
-    hash = "sha256-5C7VpqXmopJfk+rg1aPxrqFvQbXvdkCsdluJL0R7HFs=";
+    hash = "sha256-2ESHNLbIrXbOLa8zWlcpxfbNQY0a3pLbw/M0W5peRyo=";
   };
 
   subPackages = [ "apps/cnquery" ];
 
-  vendorHash = "sha256-PFDHcmvEkwJiPqPVA7s76CFKJOg8ublXzpPyWxNfXjo=";
+  vendorHash = "sha256-BQolVU05o2G9pVmncsJ42OSY9YXHaBY/JV8SNN0GOhY=";
 
   ldflags = [
     "-w"

From 30afe6ea5c75c825933f949b2a036bc4198e2af6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 06:23:33 +0000
Subject: [PATCH 104/175] ccache: 4.10.1 -> 4.10.2

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

diff --git a/pkgs/by-name/cc/ccache/package.nix b/pkgs/by-name/cc/ccache/package.nix
index f685076d6727..9984771b7ce9 100644
--- a/pkgs/by-name/cc/ccache/package.nix
+++ b/pkgs/by-name/cc/ccache/package.nix
@@ -20,7 +20,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ccache";
-  version = "4.10.1";
+  version = "4.10.2";
 
   src = fetchFromGitHub {
     owner = "ccache";
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
         exit 1
       fi
     '';
-    hash = "sha256-CUQ16VthGl2vtixOv8UGI9gCsb6iEVD9XHKAYivWMrw=";
+    hash = "sha256-j7Cjr5R/fN/1C6hR9400Y/hwgG++qjPvo9PYyetzrx0=";
   };
 
   outputs = [

From fc45ab0fdfc6a38db85f34fd4e4879c9d1ba2558 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 06:29:25 +0000
Subject: [PATCH 105/175] tuba: 0.8.1 -> 0.8.2

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

diff --git a/pkgs/applications/misc/tuba/default.nix b/pkgs/applications/misc/tuba/default.nix
index e548d61fee78..a84da1c0381f 100644
--- a/pkgs/applications/misc/tuba/default.nix
+++ b/pkgs/applications/misc/tuba/default.nix
@@ -35,13 +35,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tuba";
-  version = "0.8.1";
+  version = "0.8.2";
 
   src = fetchFromGitHub {
     owner = "GeopJr";
     repo = "Tuba";
     rev = "v${version}";
-    hash = "sha256-dN915sPBttnrcOuhUJjEtdojOQi9VRLmc+t1RvWmx64=";
+    hash = "sha256-nBNb2Hqv2AumwYoQnYZnH6YGp9wGr1o9vRO8YOty214=";
   };
 
   nativeBuildInputs = [

From 0af444a75aa9f1d12b4c15c267536299055ce91c Mon Sep 17 00:00:00 2001
From: Moritz Sanft <58110325+msanft@users.noreply.github.com>
Date: Tue, 23 Jul 2024 08:20:37 +0200
Subject: [PATCH 106/175] pythonPackages.pyfwup: init at 0.4.0

---
 .../python-modules/pyfwup/default.nix         | 50 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyfwup/default.nix

diff --git a/pkgs/development/python-modules/pyfwup/default.nix b/pkgs/development/python-modules/pyfwup/default.nix
new file mode 100644
index 000000000000..2956c34b4685
--- /dev/null
+++ b/pkgs/development/python-modules/pyfwup/default.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pyusb,
+  tqdm,
+  libusb1,
+  setuptools,
+  setuptools-git-versioning,
+  pythonOlder,
+}:
+
+buildPythonPackage rec {
+  pname = "pyfwup";
+  version = "0.4.0";
+
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "greatscottgadgets";
+    repo = "pyfwup";
+    rev = "refs/tags/${version}";
+    hash = "sha256-JSaAEGobdLqpSj9yvKrAsXfdkHpXSCcuGYRxz2QJqck=";
+  };
+
+  dependencies = [
+    pyusb
+    tqdm
+    libusb1
+  ];
+
+  build-system = [
+    setuptools
+    setuptools-git-versioning
+  ];
+
+  pythonImportsCheck = [
+    "fwup"
+    "fwup_utils"
+  ];
+
+  meta = {
+    description = "Python FirmWare UPgrader";
+    homepage = "https://github.com/greatscottgadgets/pyfwup";
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.msanft ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9e978ef41b43..6244c4730aa2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11322,6 +11322,10 @@ self: super: with self; {
 
   pyfuse3 = callPackage ../development/python-modules/pyfuse3 { };
 
+  pyfwup = callPackage ../development/python-modules/pyfwup {
+    inherit (pkgs) libusb1;
+  };
+
   pyfxa = callPackage ../development/python-modules/pyfxa { };
 
   pyfzf = callPackage ../development/python-modules/pyfzf {

From 097b63d4246af4a317d4703a1f16e62c69a3b60a Mon Sep 17 00:00:00 2001
From: Dawid Dziurla <dawidd0811@gmail.com>
Date: Sat, 20 Jan 2024 12:52:43 +0100
Subject: [PATCH 107/175] nixos/gdm: autologin unlocks keyring when possible

---
 nixos/modules/services/x11/display-managers/gdm.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 1a39b365db5f..6a915a3f2f09 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -310,8 +310,11 @@ in
 
       gdm-autologin.text = ''
         auth      requisite     pam_nologin.so
-
         auth      required      pam_succeed_if.so uid >= 1000 quiet
+        ${lib.optionalString pamCfg.login.enableGnomeKeyring ''
+          auth       [success=ok default=1]      ${pkgs.gnome.gdm}/lib/security/pam_gdm.so
+          auth       optional                    ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so
+        ''}
         auth      required      pam_permit.so
 
         account   sufficient    pam_unix.so

From f51f7f3bd348d8786150b7b3611d4ecc89237038 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 08:18:51 +0000
Subject: [PATCH 108/175] flyctl: 0.2.88 -> 0.2.94

---
 pkgs/development/web/flyctl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix
index 58e17cd8a838..bc1ca7484287 100644
--- a/pkgs/development/web/flyctl/default.nix
+++ b/pkgs/development/web/flyctl/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "flyctl";
-  version = "0.2.88";
+  version = "0.2.94";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    hash = "sha256-eGeYCMwl4m9I+KYfLdh/zYb6xnJxYAI4bbJrtfv2ioA=";
+    hash = "sha256-yw8c3afGmriEoewSA8gIcuVDfRUwXqG46fi36GCGQBM=";
   };
 
-  vendorHash = "sha256-c4hTDqJ7ss8iCf3FVuQHTe1Nsbzb7R6f2+evhzey1PE=";
+  vendorHash = "sha256-L5tQ45Dujnef31Fs05mK5u+6zaGyJi1HkipOvkmra/0=";
 
   subPackages = [ "." ];
 

From ee743e160cd0b0eb27e4841553507fdb56633b11 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 23 Jul 2024 10:56:37 +0200
Subject: [PATCH 109/175] python312Packages.tencentcloud-sdk-python: 3.0.1194
 -> 3.0.1195

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1194...3.0.1195

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1195/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 d38101d71807..33abc5413792 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.1194";
+  version = "3.0.1195";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-dXjy28Cj0lPnl04eQYi4/jVnzmloEh0Be/38JXghEhI=";
+    hash = "sha256-UOX4ptB2yMUxMRjiQEUYZqLVXVr1je5bSYplwH7yGQA=";
   };
 
   build-system = [ setuptools ];

From 4d99ec85a96d908ae18016d86196decadf2f6b93 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 23 Jul 2024 10:59:50 +0200
Subject: [PATCH 110/175] python312Packages.pyexploitdb: 0.2.26 -> 0.2.27

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 c4ec39d36138..3b481d9b2344 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.26";
+  version = "0.2.27";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pyExploitDb";
     inherit version;
-    hash = "sha256-6sfFFOHb77Gef5K0f/7rmZhNvUFCMP+bcsmXuXVVRn4=";
+    hash = "sha256-XNSTb/vOzesaMCzu5ZLAPFfJ2Nta/hUo/vPbtQJsSd8=";
   };
 
   build-system = [ setuptools ];

From b9a17a6e7eda0fb21fffb02c20da7f725c731eea Mon Sep 17 00:00:00 2001
From: Savyasachee Jha <genghizkhan91@hawkradius.com>
Date: Tue, 23 Jul 2024 15:02:37 +0530
Subject: [PATCH 111/175] firefly-iii: 6.1.18 -> 6.1.19

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

diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix
index d8495f64e299..5425fd2da084 100644
--- a/pkgs/by-name/fi/firefly-iii/package.nix
+++ b/pkgs/by-name/fi/firefly-iii/package.nix
@@ -12,15 +12,15 @@
 
 let
   pname = "firefly-iii";
-  version = "6.1.18";
+  version = "6.1.19";
   phpPackage = php83;
-  npmDepsHash = "sha256-MoxkNxfVeIFkiNVzfehQ9FpC65kBj8ZmvwaRf4MVRIg=";
+  npmDepsHash = "sha256-/oz0raI0/AV5NamvMWxlUdiQbVsSKHRplsw2/KrMOwg=";
 
   src = fetchFromGitHub {
     owner = "firefly-iii";
     repo = "firefly-iii";
     rev = "v${version}";
-    hash = "sha256-mA7gvKhHouUUz1Aix7253O/+VcufoEFwdcJeZxnazEo=";
+    hash = "sha256-SIvYRmCCzQI+qUr5aA78NQLLmO+EPO1ZEL7vcqJ5puw=";
   };
 in
 
@@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   composerStrictValidation = true;
   strictDeps = true;
 
-  vendorHash = "sha256-EpMypgj6lZDz6T94bGoCUH9IVwh7VB4Ds08AcCsreRw=";
+  vendorHash = "sha256-qps/dWubCVqqvzgSizJJvx2MUzRZKiMeQCnWz08Ft+E=";
 
   npmDeps = fetchNpmDeps {
     inherit src;

From b7028b345be7d1caa57074df8d59fee7a2d70b06 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Tue, 23 Jul 2024 10:40:23 +0100
Subject: [PATCH 112/175] step-cli: fix hash missmatch

---
 pkgs/by-name/st/step-cli/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/st/step-cli/package.nix b/pkgs/by-name/st/step-cli/package.nix
index 184fe36c2755..d0d4aacce489 100644
--- a/pkgs/by-name/st/step-cli/package.nix
+++ b/pkgs/by-name/st/step-cli/package.nix
@@ -13,7 +13,7 @@ in
       owner = "smallstep";
       repo = "cli";
       rev = "refs/tags/v${version}";
-      hash = "sha256-lM42KlTgOch6AwQIzvjQNH1wVfFikVI9rVgH2/2KyJE=";
+      hash = "sha256-9w7rUtlLa1kl9oVboWZWj4eoZh+pPdGsEEQDWYdEMns=";
     };
 
     ldflags = [

From 2afa4a16e11a446e326d28341c0ebb33f2bf1670 Mon Sep 17 00:00:00 2001
From: Chris Williams <chris@chrispwill.com>
Date: Tue, 23 Jul 2024 19:38:43 +1000
Subject: [PATCH 113/175] maintainers: adding chrispwill

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index af21a01d2d92..7b49bcd6e4d8 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3619,6 +3619,12 @@
     githubId = 1438690;
     name = "Chris Pickard";
   };
+  chrispwill = {
+    email = "chris@chrispwill.com";
+    github = "chrispwill";
+    githubId = 271099;
+    name = "Chris Williams";
+  };
   chrisrosset = {
     email = "chris@rosset.org.uk";
     github = "chrisrosset";

From 63332fe9e77f5c221f341ebf3e4afea11f8e9156 Mon Sep 17 00:00:00 2001
From: Chris Williams <chris@chrispwill.com>
Date: Sat, 13 Jul 2024 17:53:04 +1000
Subject: [PATCH 114/175] tweego: init at 2.1.1

---
 pkgs/by-name/tw/tweego/package.nix | 31 ++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 pkgs/by-name/tw/tweego/package.nix

diff --git a/pkgs/by-name/tw/tweego/package.nix b/pkgs/by-name/tw/tweego/package.nix
new file mode 100644
index 000000000000..16c01c105265
--- /dev/null
+++ b/pkgs/by-name/tw/tweego/package.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+buildGoModule rec {
+  pname = "tweego";
+  version = "2.1.1";
+
+  src = fetchFromGitHub {
+    owner = "tmedwards";
+    repo = "tweego";
+    rev = "v${version}";
+    hash = "sha256-LE85mSByTz7uFjs0XtrpfD7OARoMPE56FpjFw+FlGYw=";
+  };
+
+  proxyVendor = true;
+  vendorHash = "sha256-1O27CiCXgrD0RC+3jrVxAiq/RnI2s1FW2/uoBAd1fF8=";
+
+  preBuild = ''
+    go mod tidy
+  '';
+
+  meta = {
+    description = "Free (gratis and libre) command line compiler for Twine/Twee story formats, written in Go";
+    homepage = "https://www.motoslave.net/tweego";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [chrispwill];
+    mainProgram = "tweego";
+  };
+}

From 5498489c9383ce1d0cf408f356e8bae9589d6d27 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 09:50:43 +0000
Subject: [PATCH 115/175] python312Packages.unstructured: 0.14.10 -> 0.15.0

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

diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix
index 1201850f54b9..4b15a756ea29 100644
--- a/pkgs/development/python-modules/unstructured/default.nix
+++ b/pkgs/development/python-modules/unstructured/default.nix
@@ -57,7 +57,7 @@
   grpcio,
 }:
 let
-  version = "0.14.10";
+  version = "0.15.0";
   optional-dependencies = {
     huggingflace = [
       langdetect
@@ -100,7 +100,7 @@ buildPythonPackage {
     owner = "Unstructured-IO";
     repo = "unstructured";
     rev = "refs/tags/${version}";
-    hash = "sha256-h+sTqI0wLK+ZZR6bdQxKSVtXRvR2ovJ4YbvsXLTZ8Aw=";
+    hash = "sha256-O44zmD+giqnfrEoKjU/+AkDykZdn2jLjpm+X65Em2KY=";
   };
 
   propagatedBuildInputs = [

From e80982341ee3a40da4ca1e29ee6d05297b5f1d11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 23 Jul 2024 11:59:07 +0200
Subject: [PATCH 116/175] knot-dns: 3.3.7 -> 3.3.8

https://gitlab.nic.cz/knot/knot-dns/-/releases/v3.3.8
---
 pkgs/servers/dns/knot-dns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index d9d6b2fd57b8..589c98a23138 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "knot-dns";
-  version = "3.3.7";
+  version = "3.3.8";
 
   src = fetchurl {
     url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "18ceb398578342e9a3d5b75f2423945a2f8d1d7c730f24f4d2aa4a24b50e831d";
+    sha256 = "498de8338489a625673797f7ecc921fa4490c826afbfa42fa66922b525089e6a";
   };
 
   outputs = [ "bin" "out" "dev" ];

From 01b21d1d6538c0b33dbb8a50ca7599b2aa658538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 23 Jul 2024 02:58:25 -0700
Subject: [PATCH 117/175] boinc: 8.0.2 -> 8.0.4

Diff: https://github.com/BOINC/boinc/compare/client_release/8.0/8.0.2...client_release/8.0/8.0.4

Changelog: https://github.com/BOINC/boinc/releases/tag/client_release%2F8.0%2F8.0.3
           https://github.com/BOINC/boinc/releases/tag/client_release%2F8.0%2F8.0.4
---
 pkgs/applications/science/misc/boinc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix
index cd0ebefe067d..b8b57857c02a 100644
--- a/pkgs/applications/science/misc/boinc/default.nix
+++ b/pkgs/applications/science/misc/boinc/default.nix
@@ -27,14 +27,14 @@
 
 stdenv.mkDerivation rec {
   pname = "boinc";
-  version = "8.0.2";
+  version = "8.0.4";
 
   src = fetchFromGitHub {
     name = "${pname}-${version}-src";
     owner = "BOINC";
     repo = "boinc";
     rev = "client_release/${lib.versions.majorMinor version}/${version}";
-    hash = "sha256-e0zEdiN3QQHj6MNGd1pfaZf3o9rOpCTmuNSJQb3sss4=";
+    hash = "sha256-dp0zRMIG0PGXhth+Cc8FDhzl5X/4ud3GFCdE7wqPL/c=";
   };
 
   nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ];

From cb210c2cac057322f93c927a4b9806ee75320957 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 23 Jul 2024 03:20:57 -0700
Subject: [PATCH 118/175] code-server: 4.89.1 -> 4.91.1

Diff: https://github.com/coder/code-server/compare/v4.89.1...v4.91.1

Changelog: https://github.com/coder/code-server/blob/v4.91.1/CHANGELOG.md
---
 pkgs/servers/code-server/default.nix | 9 +++++----
 pkgs/top-level/all-packages.nix      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix
index 0fd434ab1009..5fd0f7867dcd 100644
--- a/pkgs/servers/code-server/default.nix
+++ b/pkgs/servers/code-server/default.nix
@@ -71,18 +71,18 @@ let
   # To compute the commit when upgrading this derivation, do:
   # `$ git rev-parse <git-rev>` where <git-rev> is the git revision of the `src`
   # Example: `$ git rev-parse v4.16.1`
-  commit = "effc6e95b4ad1c5ac5f9083ec06663ba4a2e005c";
+  commit = "1962f48b7f71772dc2c060dbaa5a6b4c0792a549";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "code-server";
-  version = "4.89.1";
+  version = "4.91.1";
 
   src = fetchFromGitHub {
     owner = "coder";
     repo = "code-server";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-exFt7dgy076MJJKDzTRRlTVjucfIXVaXKgurYfJ1Uvo=";
+    hash = "sha256-w0+lg/DcxKLrAz6DQGQ9+yPn42LrQ95Yn16IKNfqPvE=";
   };
 
   yarnCache = stdenv.mkDerivation {
@@ -114,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash = "sha256-BYz7ym+tsdbExUNOL3GV0wSMYuy4Q0GadZterH0ZGM0=";
+    outputHash = "sha256-LCmygPid6VJqR1PCOMk/Hc6bo4nwsLwYr7O1p3FQVvQ=";
   };
 
   nativeBuildInputs = [
@@ -311,6 +311,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
+    changelog = "https://github.com/coder/code-server/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     description = "Run VS Code on a remote server";
     longDescription = ''
       code-server is VS Code running on a remote server, accessible through the
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5353924ee1d2..cdc399edc1f2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -34810,7 +34810,7 @@ with pkgs;
   };
 
   code-server = callPackage ../servers/code-server {
-    nodejs = nodejs_18;
+    nodejs = nodejs_20;
     inherit (darwin.apple_sdk.frameworks) AppKit Cocoa CoreServices Security;
     inherit (darwin) cctools;
     inherit (nodePackages) node-gyp;

From bfdda83429563a73252ace0c980b4b10282d9fd8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 23 Jul 2024 12:36:31 +0200
Subject: [PATCH 119/175] prometheus-knot-exporter: 3.3.7 -> 3.3.8

---
 pkgs/servers/monitoring/prometheus/knot-exporter.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/pkgs/servers/monitoring/prometheus/knot-exporter.nix
index 047727dbebb3..55324b9af88d 100644
--- a/pkgs/servers/monitoring/prometheus/knot-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/knot-exporter.nix
@@ -6,13 +6,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "knot-exporter";
-  version = "3.3.7";
+  version = "3.3.8";
   pyproject = true;
 
   src = fetchPypi {
     pname = "knot_exporter";
     inherit version;
-    hash = "sha256-5vAoUXXU4hxyRyIytWom40yp0pusshBmCbs0w6+tvF4=";
+    hash = "sha256-c6J2c9UpuLOW9rUif+k76PUb7Mh2WIH5Nn3alKaVNyw=";
   };
 
   nativeBuildInputs = [

From fd067e42dc7cd4054120f49e9e4e58546b31ec3e Mon Sep 17 00:00:00 2001
From: toonn <toonn@toonn.io>
Date: Tue, 23 Jul 2024 12:55:09 +0200
Subject: [PATCH 120/175] ffmpeg_7: Reenable withAVFoundation

This was disabled in #322724 after #328424 provided a patch fixing it.
---
 pkgs/development/libraries/ffmpeg/generic.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 63c0a1d834d0..b1cdff716deb 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -39,8 +39,7 @@
 , withAribcaption ? withFullDeps && lib.versionAtLeast version "6.1" # ARIB STD-B24 Caption Decoder/Renderer
 , withAss ? withHeadlessDeps && stdenv.hostPlatform == stdenv.buildPlatform # (Advanced) SubStation Alpha subtitle rendering
 , withAudioToolbox ? withHeadlessDeps && stdenv.isDarwin # Apple AudioToolbox
-# Compiling ffmpeg 7 with AVFoundation on x86_64-darwin currently fails with "error: incompatible pointer to integer conversion passing 'NSString *const' to parameter of type 'enum AVMediaType' [-Wint-conversion] NSArray *devices = getDevicesWithMediaType(AVMediaTypeAudio);"
-, withAvFoundation ? withHeadlessDeps && stdenv.isDarwin && !(lib.versionAtLeast version "7" && stdenv.hostPlatform.isx86) # Apple AVFoundation framework
+, withAvFoundation ? withHeadlessDeps && stdenv.isDarwin # Apple AVFoundation framework
 , withAvisynth ? withFullDeps # AviSynth script files reading
 , withBluray ? withFullDeps # BluRay reading
 , withBs2b ? withFullDeps # bs2b DSP library

From b0c3089aff3190fad2f3165ed18d8b48e9967a71 Mon Sep 17 00:00:00 2001
From: toonn <toonn@toonn.io>
Date: Tue, 23 Jul 2024 12:57:29 +0200
Subject: [PATCH 121/175] ffmpeg_7-full: Reenable withQuirc

This was disabled in #322724 after #328420 fixed quirc.
---
 pkgs/development/libraries/ffmpeg/generic.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index b1cdff716deb..17ee1776e7e9 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -93,8 +93,7 @@
 , withPlacebo ? withFullDeps && !stdenv.isDarwin # libplacebo video processing library
 , withPulse ? withSmallDeps && stdenv.isLinux # Pulseaudio input support
 , withQrencode ? withFullDeps && lib.versionAtLeast version "7" # QR encode generation
-# On runtime fails with dyld[25216]: Library not loaded: libquirc.so.1.2 (Seems to not link the libary correctly)
-, withQuirc ? withFullDeps && lib.versionAtLeast version "7" && !stdenv.isDarwin # QR decoding
+, withQuirc ? withFullDeps && lib.versionAtLeast version "7" # QR decoding
 , withRav1e ? withFullDeps # AV1 encoder (focused on speed and safety)
 , withRtmp ? withFullDeps # RTMP[E] support
 , withSamba ? withFullDeps && !stdenv.isDarwin && withGPLv3 # Samba protocol

From d1163a9f12b6a83d43298d9eedf5f8277258de65 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 11:21:21 +0000
Subject: [PATCH 122/175] trealla: 2.53.48 -> 2.55.3

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

diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix
index b52d24a34178..7be1d05f17ee 100644
--- a/pkgs/by-name/tr/trealla/package.nix
+++ b/pkgs/by-name/tr/trealla/package.nix
@@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [
 ];
 stdenv.mkDerivation (finalAttrs: {
   pname = "trealla";
-  version = "2.53.48";
+  version = "2.55.3";
 
   src = fetchFromGitHub {
     owner = "trealla-prolog";
     repo = "trealla";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-yxx4Mi1CrgFWIWbRq2wsNs6D7OL1OkeA4QyTYf158aU=";
+    hash = "sha256-a/CaeSJMHecJ6OVsodzSrINs8dsrFoDAUMy/T/Xkt7U=";
   };
 
   postPatch = ''

From b8f0521be9dddc0dfd865207338926db69e092c6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 11:31:13 +0000
Subject: [PATCH 123/175] wttrbar: 0.10.4 -> 0.10.5

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

diff --git a/pkgs/by-name/wt/wttrbar/package.nix b/pkgs/by-name/wt/wttrbar/package.nix
index 370630423c78..d4e41919c569 100644
--- a/pkgs/by-name/wt/wttrbar/package.nix
+++ b/pkgs/by-name/wt/wttrbar/package.nix
@@ -8,18 +8,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wttrbar";
-  version = "0.10.4";
+  version = "0.10.5";
 
   src = fetchFromGitHub {
     owner = "bjesus";
     repo = "wttrbar";
     rev = version;
-    hash = "sha256-2DaFbwzxpV5vNOey9me/Tj5t9idszTZHoj1cl4RkoeE=";
+    hash = "sha256-u+JrmpXDH+9tsjATs6xLjjQmuBWCuE9daPlJUWfcm+A=";
   };
 
   buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Security SystemConfiguration ]);
 
-  cargoHash = "sha256-rbsRW+c3rzHCMwFQAS22tIfbwudaqpVmRsGXFKOEWkQ=";
+  cargoHash = "sha256-UUIDiTXGWezbPVjz5OqFivnmLaIJ/yZYBgob4CAt43s=";
 
   passthru.updateScript = nix-update-script { };
 

From d283b4d9a2874e510e0d529ce78b559900ff7fdc Mon Sep 17 00:00:00 2001
From: Jan Kremer <mail@jankremer.eu>
Date: Tue, 23 Jul 2024 13:41:36 +0200
Subject: [PATCH 124/175] markdown-oxide: 0.0.21 -> 0.23.1-unstable-2024-07-20

---
 pkgs/by-name/ma/markdown-oxide/Cargo.lock  | 25 +++++++++++++++++++---
 pkgs/by-name/ma/markdown-oxide/package.nix | 22 +++++++++++--------
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ma/markdown-oxide/Cargo.lock b/pkgs/by-name/ma/markdown-oxide/Cargo.lock
index 74fc34f93894..8ebe7f14ce2b 100644
--- a/pkgs/by-name/ma/markdown-oxide/Cargo.lock
+++ b/pkgs/by-name/ma/markdown-oxide/Cargo.lock
@@ -335,6 +335,12 @@ dependencies = [
  "const-random",
 ]
 
+[[package]]
+name = "do-notation"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3e16a80c1dda2cf52fa07106427d3d798b6331dca8155fcb8c39f7fc78f6dd2"
+
 [[package]]
 name = "either"
 version = "1.8.1"
@@ -433,6 +439,17 @@ dependencies = [
  "slab",
 ]
 
+[[package]]
+name = "fuzzydate"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7265f35cc1f40c655aad829323a1daef5f21fd38904f6ed9bd5ec3df3cbd851c"
+dependencies = [
+ "chrono",
+ "lazy_static",
+ "thiserror",
+]
+
 [[package]]
 name = "generic-array"
 version = "0.14.7"
@@ -532,9 +549,9 @@ dependencies = [
 
 [[package]]
 name = "itertools"
-version = "0.10.5"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
 dependencies = [
  "either",
 ]
@@ -625,11 +642,13 @@ dependencies = [
 
 [[package]]
 name = "markdown-oxide"
-version = "0.1.0"
+version = "0.23.1"
 dependencies = [
  "anyhow",
  "chrono",
  "config",
+ "do-notation",
+ "fuzzydate",
  "indexmap",
  "itertools",
  "nanoid",
diff --git a/pkgs/by-name/ma/markdown-oxide/package.nix b/pkgs/by-name/ma/markdown-oxide/package.nix
index 58a1453ef7fd..481dc7f402dc 100644
--- a/pkgs/by-name/ma/markdown-oxide/package.nix
+++ b/pkgs/by-name/ma/markdown-oxide/package.nix
@@ -1,17 +1,18 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
   pname = "markdown-oxide";
-  version = "0.0.21";
+  version = "0.23.1-unstable-2024-07-20";
 
   src = fetchFromGitHub {
     owner = "Feel-ix-343";
     repo = "markdown-oxide";
-    rev = "v${version}";
-    hash = "sha256-PrsTHAlFFeqyZTsoKvoe19P2ed7xDtOlBgoKftFytVw=";
+    rev = "0f1542a54a44de8313087f6c60e6ecd54f52ede5";
+    hash = "sha256-zxJZnhN2cN3sNd+PHi2jYuHDDA4ekEVIi3X52Z/8TGM=";
   };
 
   cargoLock = {
@@ -24,8 +25,11 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "Markdown LSP server inspired by Obsidian";
     homepage = "https://github.com/Feel-ix-343/markdown-oxide";
-    license = with licenses; [ cc0 ];
-    maintainers = with maintainers; [ linsui ];
+    license = with licenses; [ gpl3Only ];
+    maintainers = with maintainers; [
+      linsui
+      jukremer
+    ];
     mainProgram = "markdown-oxide";
   };
 }

From 5aaf334b768ed098850fd82c48d047389fa3217b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 11:49:11 +0000
Subject: [PATCH 125/175] roddhjav-apparmor-rules: 0-unstable-2024-07-12 ->
 0-unstable-2024-07-20

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

diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
index 9fe79b3acc41..996e51627905 100644
--- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
+++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "roddhjav-apparmor-rules";
-  version = "0-unstable-2024-07-12";
+  version = "0-unstable-2024-07-20";
 
   src = fetchFromGitHub {
     owner = "roddhjav";
     repo = "apparmor.d";
-    rev = "bd1239b46a006d3cb227fc6fffcf95cf684e1ea2";
-    hash = "sha256-gVm3z7bKUQlIBP6Jdy6OIYhb4juQ663gMzV5aoPr+iA=";
+    rev = "d9ca201519ddd361987860efccf95babbe24163c";
+    hash = "sha256-cftNBgsoKnqlV8Lu41prvaNQ3AhTnHb3CvzGv+D1kU4=";
   };
 
   dontConfigure = true;

From aaf4754c48ff5002ec7eb6db087f7944968a8c72 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 11:55:17 +0000
Subject: [PATCH 126/175] gogdl: 1.1.0 -> 1.1.1

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

diff --git a/pkgs/games/gogdl/default.nix b/pkgs/games/gogdl/default.nix
index 5e47713f314c..dacf8a2f9fc5 100644
--- a/pkgs/games/gogdl/default.nix
+++ b/pkgs/games/gogdl/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonApplication rec {
   pname = "gogdl";
-  version = "1.1.0";
+  version = "1.1.1";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "Heroic-Games-Launcher";
     repo = "heroic-gogdl";
-    rev = "7c9a6f43043e04763d4b06d09f420bda2baa98ce";
-    hash = "sha256-9SJ/DjxqYmvaVxEGxhnalZkr9yZhEOb0AzXYPBfUss4=";
+    rev = "b1d9792f4b6c60382a88f09d03d6ed63afcc0310";
+    hash = "sha256-/J50pRbc3iua86HES/3RUIeamz/abh8wo0c/yegC4cM=";
   };
 
   disabled = pythonOlder "3.8";

From 17f4b371b9ce0240a903f81ad60c619f462d67fa Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Tue, 23 Jul 2024 15:06:28 +0300
Subject: [PATCH 127/175] python3Packages.aplpy: fix build

---
 .../development/python-modules/aplpy/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/aplpy/default.nix b/pkgs/development/python-modules/aplpy/default.nix
index 5869fd85e308..af4e8cfec72d 100644
--- a/pkgs/development/python-modules/aplpy/default.nix
+++ b/pkgs/development/python-modules/aplpy/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     hash = "sha256-KCdmBwQWt7IfHsjq7pWlbSISEpfQZDyt+SQSTDaUCV4=";
   };
 
-  # Fix build with Astropy 6 and Python 3.12.
+  # Fix build with Astropy 6.1, Python 3.12 and matplotlib 3.9
   patches = [
     # https://github.com/aplpy/aplpy/pull/496
     (fetchpatch {
@@ -45,6 +45,16 @@ buildPythonPackage rec {
       url = "https://github.com/aplpy/aplpy/commit/468be394970b39f1aaa6debef51eb674e2dd86d8.patch";
       hash = "sha256-/ovLrFOKb3RQ8TZSviuOV6EYNgz0gtrhVWZLFJBrzFg=";
     })
+    # https://github.com/aplpy/aplpy/pull/500
+    (fetchpatch {
+      url = "https://github.com/aplpy/aplpy/commit/c9049261b3724821f4d309d85fe73cabcc04d890.patch";
+      hash = "sha256-ivdXLh1Z+WG3EL5u1wO+lqz6X1AP6WpyoZix5YiqW0w=";
+    })
+    # https://github.com/aplpy/aplpy/pull/503
+    (fetchpatch {
+      url = "https://github.com/aplpy/aplpy/commit/edc2aa9770b72bd3ac42db95a6e027b276be9c31.patch";
+      hash = "sha256-QUZenY3XQ/T2tl5apxZUqjf4ACjOzJWb+1AUp5limi4=";
+    })
   ];
 
   nativeBuildInputs = [
@@ -81,9 +91,5 @@ buildPythonPackage rec {
     homepage = "http://aplpy.github.io";
     license = licenses.mit;
     maintainers = with maintainers; [ smaret ];
-    # Tests fail due to expired matplotlib deprecations:
-    #
-    # > (`matplotlib.cm' has no attribute 'get_cmap'`)
-    broken = true;
   };
 }

From 4542cc7e336ac6946d38e7b14d15c820574ac606 Mon Sep 17 00:00:00 2001
From: Dennis Wuitz <dennish@wuitz.de>
Date: Thu, 18 Jul 2024 22:24:12 +0200
Subject: [PATCH 128/175] treewide: remove openai-triton (alias) references

The repository moved out of the openai org, so it doesn't make sense to
prefix the package with it.

(cherry picked from commit af13bb4513647eec3c3790c5272dbd4aa190d208)
---
 pkgs/by-name/tr/triton-llvm/package.nix                   | 6 +++---
 .../development/python-modules/openai-whisper/default.nix | 4 ++--
 pkgs/development/python-modules/openllm/default.nix       | 4 ++--
 pkgs/development/python-modules/torch/bin.nix             | 4 ++--
 pkgs/development/python-modules/torch/default.nix         | 8 ++++----
 pkgs/development/python-modules/triton/bin.nix            | 6 +++---
 pkgs/development/python-modules/triton/default.nix        | 4 ++--
 pkgs/development/python-modules/xformers/default.nix      | 4 ++--
 pkgs/development/rocm-modules/5/miopengemm/default.nix    | 2 +-
 pkgs/top-level/aliases.nix                                | 2 +-
 pkgs/top-level/python-aliases.nix                         | 8 ++++----
 pkgs/top-level/python-packages.nix                        | 8 ++++----
 pkgs/top-level/release-cuda.nix                           | 2 +-
 13 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/pkgs/by-name/tr/triton-llvm/package.nix b/pkgs/by-name/tr/triton-llvm/package.nix
index 7b6f40662a75..90a45c133c73 100644
--- a/pkgs/by-name/tr/triton-llvm/package.nix
+++ b/pkgs/by-name/tr/triton-llvm/package.nix
@@ -36,7 +36,7 @@ let
   llvmTargetsToBuild' = [ "AMDGPU" "NVPTX" ] ++ builtins.map inferNativeTarget llvmTargetsToBuild;
 
   # This LLVM version can't seem to find pygments/pyyaml,
-  # but a later update will likely fix this (openai-triton-2.1.0)
+  # but a later update will likely fix this (triton-2.1.0)
   python =
     if buildTests
     then python3Packages.python.withPackages (p: with p; [ psutil pygments pyyaml ])
@@ -44,7 +44,7 @@ let
 
   isNative = stdenv.hostPlatform == stdenv.buildPlatform;
 in stdenv.mkDerivation (finalAttrs: {
-  pname = "openai-triton-llvm";
+  pname = "triton-llvm";
   version = "17.0.0-c5dede880d17";
 
   outputs = [
@@ -55,7 +55,7 @@ in stdenv.mkDerivation (finalAttrs: {
     "man"
   ];
 
-  # See https://github.com/openai/triton/blob/main/python/setup.py
+  # See https://github.com/triton-lang/triton/blob/main/python/setup.py
   # and https://github.com/ptillet/triton-llvm-releases/releases
   src = fetchFromGitHub {
     owner = "llvm";
diff --git a/pkgs/development/python-modules/openai-whisper/default.nix b/pkgs/development/python-modules/openai-whisper/default.nix
index d6933e1aeea1..06d4a1f55d9a 100644
--- a/pkgs/development/python-modules/openai-whisper/default.nix
+++ b/pkgs/development/python-modules/openai-whisper/default.nix
@@ -15,7 +15,7 @@
   more-itertools,
   numba,
   numpy,
-  openai-triton,
+  triton,
   tiktoken,
   torch,
   tqdm,
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     tiktoken
     torch
     tqdm
-  ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform openai-triton) [ openai-triton ];
+  ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform triton) [ triton ];
 
   preCheck = ''
     export HOME=$TMPDIR
diff --git a/pkgs/development/python-modules/openllm/default.nix b/pkgs/development/python-modules/openllm/default.nix
index 5d5af060d846..ccb32de341ea 100644
--- a/pkgs/development/python-modules/openllm/default.nix
+++ b/pkgs/development/python-modules/openllm/default.nix
@@ -40,7 +40,7 @@
   tabulate,
   tiktoken,
   transformers,
-  openai-triton,
+  triton,
   xformers,
 }:
 
@@ -117,7 +117,7 @@ buildPythonPackage rec {
       # auto-gptq
     ]; # ++ autogptq.optional-dependencies.triton;
     grpc = [ bentoml ] ++ bentoml.optional-dependencies.grpc;
-    mpt = [ openai-triton ];
+    mpt = [ triton ];
     openai = [
       openai
       tiktoken
diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix
index ec6843deac98..d5b267277b55 100644
--- a/pkgs/development/python-modules/torch/bin.nix
+++ b/pkgs/development/python-modules/torch/bin.nix
@@ -22,7 +22,7 @@
   jinja2,
   networkx,
   filelock,
-  openai-triton,
+  triton,
 }:
 
 let
@@ -88,7 +88,7 @@ buildPythonPackage {
     jinja2
     networkx
     filelock
-  ] ++ lib.optionals (stdenv.isLinux && stdenv.isx86_64) [ openai-triton ];
+  ] ++ lib.optionals (stdenv.isLinux && stdenv.isx86_64) [ triton ];
 
   postInstall = ''
     # ONNX conversion
diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix
index 40f26d282183..ee7015abd8e6 100644
--- a/pkgs/development/python-modules/torch/default.nix
+++ b/pkgs/development/python-modules/torch/default.nix
@@ -53,9 +53,9 @@
   cffi,
   click,
   typing-extensions,
-  # ROCm build and `torch.compile` requires `openai-triton`
+  # ROCm build and `torch.compile` requires `triton`
   tritonSupport ? (!stdenv.isDarwin),
-  openai-triton,
+  triton,
 
   # Unit tests
   hypothesis,
@@ -486,7 +486,7 @@ buildPythonPackage rec {
       CoreServices
       libobjc
     ]
-    ++ lib.optionals tritonSupport [ openai-triton ]
+    ++ lib.optionals tritonSupport [ triton ]
     ++ lib.optionals MPISupport [ mpi ]
     ++ lib.optionals rocmSupport [ rocmtoolkit_joined ];
 
@@ -514,7 +514,7 @@ buildPythonPackage rec {
 
     # torch/csrc requires `pybind11` at runtime
     pybind11
-  ] ++ lib.optionals tritonSupport [ openai-triton ];
+  ] ++ lib.optionals tritonSupport [ triton ];
 
   propagatedCxxBuildInputs =
     [ ] ++ lib.optionals MPISupport [ mpi ] ++ lib.optionals rocmSupport [ rocmtoolkit_joined ];
diff --git a/pkgs/development/python-modules/triton/bin.nix b/pkgs/development/python-modules/triton/bin.nix
index bdf722bbc0fc..cbec8d0ceae6 100644
--- a/pkgs/development/python-modules/triton/bin.nix
+++ b/pkgs/development/python-modules/triton/bin.nix
@@ -80,12 +80,12 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Language and compiler for custom Deep Learning operations";
-    homepage = "https://github.com/openai/triton/";
-    changelog = "https://github.com/openai/triton/releases/tag/v${version}";
+    homepage = "https://github.com/triton-lang/triton/";
+    changelog = "https://github.com/triton-lang/triton/releases/tag/v${version}";
     # Includes NVIDIA's ptxas, but redistributions of the binary are not limited.
     # https://docs.nvidia.com/cuda/eula/index.html
     # triton's license is MIT.
-    # openai-triton-bin includes ptxas binary, therefore unfreeRedistributable is set.
+    # triton-bin includes ptxas binary, therefore unfreeRedistributable is set.
     license = with licenses; [
       unfreeRedistributable
       mit
diff --git a/pkgs/development/python-modules/triton/default.nix b/pkgs/development/python-modules/triton/default.nix
index b3b94211a776..771f57f77535 100644
--- a/pkgs/development/python-modules/triton/default.nix
+++ b/pkgs/development/python-modules/triton/default.nix
@@ -53,7 +53,7 @@ buildPythonPackage rec {
       ./0000-dont-download-ptxas.patch
     ]
     ++ lib.optionals (!cudaSupport) [
-      # openai-triton wants to get ptxas version even if ptxas is not
+      # triton wants to get ptxas version even if ptxas is not
       # used, resulting in ptxas not found error.
       ./0001-ptxas-disable-version-key-for-non-cuda-targets.patch
     ];
@@ -127,7 +127,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     filelock
-    # openai-triton uses setuptools at runtime:
+    # triton uses setuptools at runtime:
     # https://github.com/NixOS/nixpkgs/pull/286763/#discussion_r1480392652
     setuptools
   ];
diff --git a/pkgs/development/python-modules/xformers/default.nix b/pkgs/development/python-modules/xformers/default.nix
index 9a7b7bbef2b1..530f00211086 100644
--- a/pkgs/development/python-modules/xformers/default.nix
+++ b/pkgs/development/python-modules/xformers/default.nix
@@ -18,7 +18,7 @@
   fairscale,
   scipy,
   cmake,
-  openai-triton,
+  triton,
   networkx,
   #, apex
   einops,
@@ -103,7 +103,7 @@ buildPythonPackage {
     scipy
     cmake
     networkx
-    openai-triton
+    triton
     # apex
     einops
     transformers
diff --git a/pkgs/development/rocm-modules/5/miopengemm/default.nix b/pkgs/development/rocm-modules/5/miopengemm/default.nix
index 342bd950b1fb..c86a4f5b1eda 100644
--- a/pkgs/development/rocm-modules/5/miopengemm/default.nix
+++ b/pkgs/development/rocm-modules/5/miopengemm/default.nix
@@ -67,7 +67,7 @@ in stdenv.mkDerivation (finalAttrs: {
     openblas
   ] ++ lib.optionals buildBenchmarks [
     clblast
-    python3Packages.openai-triton
+    python3Packages.triton
   ];
 
   cmakeFlags = [
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 1999720651b3..99116ed6f119 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1026,7 +1026,6 @@ mapAliases ({
   onevpl-intel-gpu = lib.warn "onevpl-intel-gpu has been renamed to vpl-gpu-rt" vpl-gpu-rt; # Added 2024-06-04
   opa = throw "opa has been removed from nixpkgs as upstream has abandoned the project"; # Added 2023-03-21
   opam_1_2 = throw "'opam_1_2' has been renamed to/replaced by 'opam'"; # Added 2023-03-08
-  openai-triton-llvm = triton-llvm;
   openafs_1_8 = openafs; # Added 2022-08-22
   openapi-generator-cli-unstable = throw "openapi-generator-cli-unstable was removed as it was not being updated; consider openapi-generator-cli instead"; # Added 2024-01-02
   openbangla-keyboard = throw "openbangla-keyboard has been replaced by ibus-engines.openbangla-keyboard and fcitx5-openbangla-keyboard"; # added 2023-10-10
@@ -1400,6 +1399,7 @@ mapAliases ({
   transfig = fig2dev; # Added 2022-02-15
   transifex-client = transifex-cli; # Added 2023-12-29
   trezor_agent = trezor-agent; # Added 2024-01-07
+  openai-triton-llvm = triton-llvm; # added 2024-07-18
   trustedGrub = throw "trustedGrub has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10
   trustedGrub-for-HP = throw "trustedGrub-for-HP has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10
   tumpa = throw "tumpa has been removed, as it is broken"; # Added 2024-07-15
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index b83138a6df9f..8824c33ed1a4 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -339,10 +339,10 @@ mapAliases ({
   notifymuch = throw "notifymuch has been promoted to a top-level attribute name: `pkgs.notifymuch`"; # added 2022-10-02
   Nuitka = nuitka; # added 2023-02-19
   ntlm-auth = throw "ntlm-auth has been removed, because it relies on the md4 implementation provided by openssl. Use pyspnego instead.";
-  openai-triton = triton;
-  openai-triton-cuda = triton-cuda;
-  openai-triton-no-cuda = triton-no-cuda;
-  openai-triton-bin = triton-bin;
+  openai-triton = triton; # added 2024-07-18
+  openai-triton-bin = triton-bin; # added 2024-07-18
+  openai-triton-cuda = triton-cuda; # added 2024-07-18
+  openai-triton-no-cuda = triton-no-cuda; # added 2024-07-18
   openapi-schema-pydantic = throw "openapi-schema-pydantic has been removed, since it is no longer maintained"; # added 2023-10-30
   opencv3 = throw "opencv3 has been removed as it is obsolete"; # added 2023-10-12
   opsdroid_get_image_size = opsdroid-get-image-size; # added 2023-10-16
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 169796fa0f83..6b4e3ae10ba7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4572,7 +4572,7 @@ self: super: with self; {
   oelint-parser = callPackage ../development/python-modules/oelint-parser { };
 
   openllm = callPackage ../development/python-modules/openllm {
-    openai-triton = self.openai-triton-cuda;
+    triton = self.triton-cuda;
   };
 
   openllm-client = callPackage ../development/python-modules/openllm-client { };
@@ -15566,13 +15566,13 @@ self: super: with self; {
   torch-pitch-shift = callPackage ../development/python-modules/torch-pitch-shift { };
 
   torch-bin = callPackage ../development/python-modules/torch/bin.nix {
-    openai-triton = self.openai-triton-bin;
+    triton = self.triton-bin;
   };
 
   torchsnapshot = callPackage ../development/python-modules/torchsnapshot { };
 
   torchWithCuda = self.torch.override {
-    openai-triton = self.openai-triton-cuda;
+    triton = self.triton-cuda;
     cudaSupport = true;
     rocmSupport = false;
   };
@@ -15582,7 +15582,7 @@ self: super: with self; {
   };
 
   torchWithRocm = self.torch.override {
-    openai-triton = self.openai-triton-no-cuda;
+    triton = self.triton-no-cuda;
     rocmSupport = true;
     cudaSupport = false;
   };
diff --git a/pkgs/top-level/release-cuda.nix b/pkgs/top-level/release-cuda.nix
index 49f288c2facf..d5614c55b98d 100644
--- a/pkgs/top-level/release-cuda.nix
+++ b/pkgs/top-level/release-cuda.nix
@@ -132,7 +132,7 @@ let
         mxnet = linux;
         numpy = linux; # Only affected by MKL?
         onnx = linux;
-        openai-triton = linux;
+        triton = linux;
         openai-whisper = linux;
         opencv4 = linux;
         opensfm = linux;

From 695edc7adef88f6c38894fe870a8d9c009a0b25c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 12:20:16 +0000
Subject: [PATCH 129/175] crowdin-cli: 4.0.0 -> 4.1.0

---
 pkgs/tools/text/crowdin-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/crowdin-cli/default.nix b/pkgs/tools/text/crowdin-cli/default.nix
index d5685a9c56c7..fd29f34dce43 100644
--- a/pkgs/tools/text/crowdin-cli/default.nix
+++ b/pkgs/tools/text/crowdin-cli/default.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation rec {
   pname = "crowdin-cli";
-  version = "4.0.0";
+  version = "4.1.0";
 
   src = fetchurl {
     url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip";
-    hash = "sha256-7KyQUnl2O/raQLcP5VsMCX3084Mn6HFfxjJmksAkWBc=";
+    hash = "sha256-Xmnyz48V9Mme+kSJnx80MWOQ2Hmy7C0ICeTujm0xx0Y=";
   };
 
   nativeBuildInputs = [ installShellFiles makeWrapper unzip ];

From f9e9e91587171c2e110cd454b556265a0dc24022 Mon Sep 17 00:00:00 2001
From: Joachim Ernst <155722885+helsinki-Jo@users.noreply.github.com>
Date: Tue, 23 Jul 2024 14:27:42 +0200
Subject: [PATCH 130/175] kerberos/heimdal: use jdk_headless in
 nativeCheckInputs (#329158)

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

diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index 73bb856de416..2dc1a9625dc1 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -26,7 +26,7 @@
 , SystemConfiguration
 
 , curl
-, jdk
+, jdk_headless
 , unzip
 , which
 
@@ -83,7 +83,7 @@ stdenv.mkDerivation {
   doCheck = true;
   nativeCheckInputs = [
     curl
-    jdk
+    jdk_headless
     unzip
     which
   ];

From 280f31043c2d97ba15926e8da0d879793c3f96c8 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 23 Jul 2024 13:29:05 +0100
Subject: [PATCH 131/175] CONTRIBUTING.md: allow using PRs to target
 `staging-next`

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 23a826d9a7b7..babbf48671e2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -382,7 +382,7 @@ The staging workflow exists to batch Hydra builds of many packages together.
 
 It works by directing commits that cause [mass rebuilds][mass-rebuild] to a separate `staging` branch that isn't directly built by Hydra.
 Regularly, the `staging` branch is _manually_ merged into a `staging-next` branch to be built by Hydra using the [`nixpkgs:staging-next` jobset](https://hydra.nixos.org/jobset/nixpkgs/staging-next).
-The `staging-next` branch should then only receive direct commits in order to fix Hydra builds.
+The `staging-next` branch should then only receive changes that fix Hydra builds.
 Once it is verified that there are no major regressions, it is merged into `master` using [a pull request](https://github.com/NixOS/nixpkgs/pulls?q=head%3Astaging-next).
 This is done manually in order to ensure it's a good use of Hydra's computing resources.
 By keeping the `staging-next` branch separate from `staging`, this batching does not block developers from merging changes into `staging`.

From 87f6deb55c64065419313d174ef924bbba35ce3f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 12:51:45 +0000
Subject: [PATCH 132/175] cargo-xwin: 0.17.2 -> 0.17.3

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

diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix
index 5b0a8c82beb2..78c6c9933e83 100644
--- a/pkgs/by-name/ca/cargo-xwin/package.nix
+++ b/pkgs/by-name/ca/cargo-xwin/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-xwin";
-  version = "0.17.2";
+  version = "0.17.3";
 
   src = fetchFromGitHub {
     owner = "rust-cross";
     repo = "cargo-xwin";
     rev = "v${version}";
-    hash = "sha256-lz1IykhdJy3540g6A5EpxGM2czM5psi/zZdKkgJd7BA=";
+    hash = "sha256-Lpcofb4yz1pR6dNJEnpkkCFdYjgt0qMzVP55kgKqjFA=";
   };
 
-  cargoHash = "sha256-qKLHrHQhjWysvOwVvlCjaQOoidUz42wEyJPyo/nz5Ro=";
+  cargoHash = "sha256-xVG1nET020rfMIjhIcCtNr9ZCj8SgQAvXePjyKSPjUs=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.Security

From 972265dc57c6c058656574fc97bb91d0e8fc56ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 12:52:18 +0000
Subject: [PATCH 133/175] rune: 0.13.3 -> 0.13.4

---
 pkgs/development/interpreters/rune/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/rune/default.nix b/pkgs/development/interpreters/rune/default.nix
index e6bdf5ea059d..f4dc8ef1f745 100644
--- a/pkgs/development/interpreters/rune/default.nix
+++ b/pkgs/development/interpreters/rune/default.nix
@@ -7,15 +7,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rune";
-  version = "0.13.3";
+  version = "0.13.4";
 
   src = fetchCrate {
     pname = "rune-cli";
     inherit version;
-    hash = "sha256-nrHduxHSX31nwqcBbgPT4WH64LXTruScocpqex4zxf4=";
+    hash = "sha256-+2eXTkn9yOMhvS8cFwAorLBNIPvIRwsPOsGCl3gtRSE=";
   };
 
-  cargoHash = "sha256-EjUzXb2r6lKV1fBL7KdseC9vmW2L0AjpowYo4j8Xpv8=";
+  cargoHash = "sha256-yMqxd7PlpEEVS0jJwProaVjKUsU5TuebGTMrWiMFsM8=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.CoreServices

From 9a0fbddf1910c3d5236d2acd348ff2c42c290f92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 23 Jul 2024 05:50:05 -0700
Subject: [PATCH 134/175] _1password-gui: 8.10.33 -> 8.10.36

---
 pkgs/applications/misc/1password-gui/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix
index 965d6b487a05..8ead2d634804 100644
--- a/pkgs/applications/misc/1password-gui/default.nix
+++ b/pkgs/applications/misc/1password-gui/default.nix
@@ -9,25 +9,25 @@
 let
 
   pname = "1password";
-  version = if channel == "stable" then "8.10.33" else "8.10.34-10.BETA";
+  version = if channel == "stable" then "8.10.36" else "8.10.34-10.BETA";
 
   sources = {
     stable = {
       x86_64-linux = {
         url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz";
-        hash = "sha256-njSvRi/sA7l5+XxfCpv3FY9SmCv5oPix9l2EZewZg1M=";
+        hash = "sha256-yUSU0np6li5zLfFOnebpv0+s1UQ6BdgI+28OvcxS3H8=";
       };
       aarch64-linux = {
         url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz";
-        hash = "sha256-g4RMTlBQvJQaPD/6scYjpe7NWrL6gkjvh5b9LubTWaE=";
+        hash = "sha256-KG0PJ/gwBd9+qYyraRqS/D58Y58VwLd8yCnYzPVWQAY=";
       };
       x86_64-darwin = {
         url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
-        hash = "sha256-YzAYMk3SR+paIQYAZCx840u/k77soy17F15owpqRAU0=";
+        hash = "sha256-vYhmA9N1izPRo3HPDouOpjJzMwK7LkCHuyYxBGkIPKM=";
       };
       aarch64-darwin = {
         url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
-        hash = "sha256-FlJnPMIv7mWh3dSACq01f16mB9EkVD2LOg3IIpvjwdY=";
+        hash = "sha256-v1eCh/cOpA5XcmamAqreKHRQ+waoBQtvvmNO4wvFq6A=";
       };
     };
     beta = {

From 57ed10cfde064e7ab19ac15896748168e9324abf Mon Sep 17 00:00:00 2001
From: Mathew Polzin <matt.polzin@gmail.com>
Date: Tue, 23 Jul 2024 07:45:06 -0500
Subject: [PATCH 135/175] bruno: 1.21.0 -> 1.22.0

---
 pkgs/by-name/br/bruno/package.nix            | 11 ++----
 pkgs/by-name/br/bruno/scroll-width-fix.patch | 37 --------------------
 2 files changed, 3 insertions(+), 45 deletions(-)
 delete mode 100644 pkgs/by-name/br/bruno/scroll-width-fix.patch

diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix
index 2cfbe91a085d..751dc2fbc74c 100644
--- a/pkgs/by-name/br/bruno/package.nix
+++ b/pkgs/by-name/br/bruno/package.nix
@@ -28,20 +28,20 @@ let
 in
 buildNpmPackage' rec {
   pname = "bruno";
-  version = "1.21.0";
+  version = "1.22.0";
 
   src = fetchFromGitHub {
     owner = "usebruno";
     repo = "bruno";
     rev = "v${version}";
-    hash = "sha256-k8pRSAQpE//qH7XRjSTXmxundgK5dmOQTRKP9D2RUdY=";
+    hash = "sha256-RcMmW1+XbQSVeaYnK7y8/WdQLYOIozyt9OCDAsSZ3HU=";
 
     postFetch = ''
       ${lib.getExe npm-lockfile-fix} $out/package-lock.json
     '';
   };
 
-  npmDepsHash = "sha256-aw4jOvlfZHCRrgoXT69XrMYe40YXULrfbVG1pQAFGr4=";
+  npmDepsHash = "sha256-157hm7h5FWuOuxoo6WTtlMPq5LcRZIsSt5NDg0pvim8=";
   npmFlags = [ "--legacy-peer-deps" ];
 
   nativeBuildInputs = [
@@ -73,11 +73,6 @@ buildNpmPackage' rec {
     })
   ];
 
-  patches = [
-    # Workaround to fix css issue in bruno due to electron difference between Nix and mainstream. https://github.com/NixOS/nixpkgs/issues/324176
-    ./scroll-width-fix.patch
-  ];
-
   postPatch = ''
     substituteInPlace scripts/build-electron.sh \
       --replace-fail 'if [ "$1" == "snap" ]; then' 'exit 0; if [ "$1" == "snap" ]; then'
diff --git a/pkgs/by-name/br/bruno/scroll-width-fix.patch b/pkgs/by-name/br/bruno/scroll-width-fix.patch
deleted file mode 100644
index e2a0326d1714..000000000000
--- a/pkgs/by-name/br/bruno/scroll-width-fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/packages/bruno-app/src/globalStyles.js b/packages/bruno-app/src/globalStyles.js
-index c2b16781..936449ed 100644
---- a/packages/bruno-app/src/globalStyles.js
-+++ b/packages/bruno-app/src/globalStyles.js
-@@ -163,32 +163,6 @@ const GlobalStyle = createGlobalStyle`
-   }
- 
- 
--  // scrollbar styling
--  // the below media query target non-macos devices
--  // (macos scrollbar styling is the ideal style reference)
--  @media not all and (pointer: coarse) {
--    * {
--      scrollbar-width: thin;
--      scrollbar-color: ${(props) => props.theme.scrollbar.color};
--    }
--    
--    *::-webkit-scrollbar {
--      width: 5px;
--    }
--    
--    *::-webkit-scrollbar-track {
--      background: transparent;
--      border-radius: 5px;
--    }
--    
--    *::-webkit-scrollbar-thumb {
--      background-color: ${(props) => props.theme.scrollbar.color};
--      border-radius: 14px;
--      border: 3px solid ${(props) => props.theme.scrollbar.color};
--    }
--  }
--
--
-   // codemirror
-   .CodeMirror {
-     .cm-variable-valid {

From bc7d89f9f65d3754e87184d9069f87ff626ddece Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 23 Jul 2024 05:55:00 -0700
Subject: [PATCH 136/175] _1password-gui-beta: 8.10.34-10.BETA ->
 8.10.38-13.BETA

---
 pkgs/applications/misc/1password-gui/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix
index 8ead2d634804..07ed8dcd573f 100644
--- a/pkgs/applications/misc/1password-gui/default.nix
+++ b/pkgs/applications/misc/1password-gui/default.nix
@@ -9,7 +9,7 @@
 let
 
   pname = "1password";
-  version = if channel == "stable" then "8.10.36" else "8.10.34-10.BETA";
+  version = if channel == "stable" then "8.10.36" else "8.10.38-13.BETA";
 
   sources = {
     stable = {
@@ -33,19 +33,19 @@ let
     beta = {
       x86_64-linux = {
         url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";
-        hash = "sha256-eX7D8D5KErFIQtyvg4oT+lR3A7sfRFpDMT7duigZTz0=";
+        hash = "sha256-SeB1Em2WuYvslBv//TROYTAB1asYFhC22IwhcwGi+Qs=";
       };
       aarch64-linux = {
         url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz";
-        hash = "sha256-dajdeU8TtD9Dbnp2MFedAl8tuQr275cUqGAnm/VF+OE=";
+        hash = "sha256-Ik5gL5FCxNANOKx/MSH7dCz3XEdLr7jxykaWhMQKUVw=";
       };
       x86_64-darwin = {
         url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
-        hash = "sha256-Dm8v7B8qDSBe1i7OJKQFn7YDPkw3Qj8YVtQkaQmdKuc=";
+        hash = "sha256-8cNxhRAOrn/A++APOMUxwrD3+a++ksRMzlmmnQ8J8/c=";
       };
       aarch64-darwin = {
         url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
-        hash = "sha256-QSxJoVPlOQU7hbvbuVcB/kf5umRjJQuygMkXq6lE1CQ=";
+        hash = "sha256-YkZbuCFvWHksLQYKJ3LQD2YDXj9qwHF4Gg8JbxBZsuc=";
       };
     };
   };

From 333cfd622a8cfcbced5b549aae6cd595ff8b6159 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 13:24:09 +0000
Subject: [PATCH 137/175] git-ignore: 1.3.3 -> 1.4.0

---
 pkgs/applications/version-management/git-ignore/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-ignore/default.nix b/pkgs/applications/version-management/git-ignore/default.nix
index b32b1aa52161..1210e31894e1 100644
--- a/pkgs/applications/version-management/git-ignore/default.nix
+++ b/pkgs/applications/version-management/git-ignore/default.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "git-ignore";
-  version = "1.3.3";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "sondr3";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-OVKRNj3tRi/PGY1m4rdpmH87laYzTkCiwoBc3txVJ3U=";
+    hash = "sha256-KIdhsbD9v2kCM2C/kSJCleyniEz4Bw7UxBsF762fnJs=";
   };
 
-  cargoHash = "sha256-dAQKL+sMThpTqBoN5MZvm8tQUJhaSH7lT8DwbjzFq40=";
+  cargoHash = "sha256-UicChl0wD2GSCCHAqF4/FKVq15g9qusNOnNJJW2B/nw=";
 
   nativeBuildInputs = [
     installShellFiles

From c20fa33d8b48bb1fb28e82ce8cb9c842e7b2a522 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 13:53:14 +0000
Subject: [PATCH 138/175] qrcode: 0-unstable-2024-06-05 ->
 0-unstable-2024-07-18

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

diff --git a/pkgs/by-name/qr/qrcode/package.nix b/pkgs/by-name/qr/qrcode/package.nix
index 2a02e8e2043e..0d919daf8137 100644
--- a/pkgs/by-name/qr/qrcode/package.nix
+++ b/pkgs/by-name/qr/qrcode/package.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation {
   pname = "qrcode";
-  version = "0-unstable-2024-06-05";
+  version = "0-unstable-2024-07-18";
 
   src = fetchFromGitHub {
     owner = "qsantos";
     repo = "qrcode";
-    rev = "822923d1b088c58e329c155baa5e5f3e83021947";
-    hash = "sha256-e/HnMOcfpGaQkPdp9zww08G4Rc1z0flA2Ghu57kKsQA=";
+    rev = "6e882a26a30ab9478ba98591ecc547614fb62b69";
+    hash = "sha256-wJL+XyYnI8crKVu+xwCioD5YcFjE5a92qkbOB7juw+s=";
   };
 
   makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];

From b8867d874fd597251f6d6e447b38f95b9b8ccca6 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 23 Jul 2024 15:55:29 +0200
Subject: [PATCH 139/175] grpc-health-check: init at unstable-2022-08-19

---
 pkgs/by-name/gr/grpc-health-check/package.nix | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 pkgs/by-name/gr/grpc-health-check/package.nix

diff --git a/pkgs/by-name/gr/grpc-health-check/package.nix b/pkgs/by-name/gr/grpc-health-check/package.nix
new file mode 100644
index 000000000000..5ef0efc6301a
--- /dev/null
+++ b/pkgs/by-name/gr/grpc-health-check/package.nix
@@ -0,0 +1,32 @@
+{ stdenv
+, fetchFromGitHub
+, rustPlatform
+, protobuf
+, lib
+}:
+
+rustPlatform.buildRustPackage {
+  pname = "grpc-health-check";
+  version = "unstable-2022-08-19";
+
+  src = fetchFromGitHub {
+    owner = "paypizza";
+    repo = "grpc-health-check";
+    rev = "f61bb5e10beadc5ed53144cc540d66e19fc510bd";
+    hash = "sha256-nKut9c1HHIacdRcmvlXe0GrtkgCWN6sxJ4ImO0CIDdo=";
+  };
+
+  cargoHash = "sha256-lz+815iE+oXBQ3PfqBO0QBpZY6x1SNR7OU7BjkRszzI=";
+
+  nativeBuildInputs = [ protobuf ];
+  # tests fail
+  doCheck = false;
+
+  meta = {
+    description = "Minimal, high performance, memory-friendly, safe implementation of the gRPC health checking protocol";
+    homepage = "https://github.com/paypizza/grpc-health-check";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ flokli ];
+    platforms = lib.platforms.unix;
+  };
+}

From 70cb462688b1f41b59bd32beb8b7ce72f214ab3a Mon Sep 17 00:00:00 2001
From: ppenguin <hieronymusv@gmail.com>
Date: Tue, 23 Jul 2024 16:09:25 +0200
Subject: [PATCH 140/175] keepassxc: fix file picker

---
 pkgs/applications/misc/keepassxc/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/misc/keepassxc/default.nix b/pkgs/applications/misc/keepassxc/default.nix
index a8e00ab7a132..663768e28dae 100644
--- a/pkgs/applications/misc/keepassxc/default.nix
+++ b/pkgs/applications/misc/keepassxc/default.nix
@@ -7,6 +7,7 @@
 , asciidoctor
 , botan3
 , curl
+, kio
 , libXi
 , libXtst
 , libargon2
@@ -115,6 +116,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     curl
     botan3
+    kio
     libXi
     libXtst
     libargon2

From de91c05902bc9b1b50b7cff5679a2158b8259366 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 23 Jul 2024 17:18:08 +0200
Subject: [PATCH 141/175] python312Packages.tlds: 20231103000 -> 2024071000

And configure nix-update as the update script, because the default python
update script does not find the tags, because it only checks for
releases.
---
 pkgs/development/python-modules/tlds/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tlds/default.nix b/pkgs/development/python-modules/tlds/default.nix
index b1248d18b283..e161c5495f59 100644
--- a/pkgs/development/python-modules/tlds/default.nix
+++ b/pkgs/development/python-modules/tlds/default.nix
@@ -3,18 +3,19 @@
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
+  nix-update-script,
 }:
 
 buildPythonPackage rec {
   pname = "tlds";
-  version = "2023110300";
+  version = "2024071000";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kichik";
     repo = "tlds";
     rev = "refs/tags/${version}";
-    hash = "sha256-rmKqY7Z4bBR4r+w4gH04g0Xm9N7QeMVcuFR3pB/pOQY=";
+    hash = "sha256-xt2IdF7V8NUW9nUg8x7XbMHLWir6CHAQcRIiH6ejV5M=";
   };
 
   nativeBuildInputs = [ setuptools ];
@@ -24,6 +25,8 @@ buildPythonPackage rec {
   # no tests
   doCheck = false;
 
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     description = "Automatically updated list of valid TLDs taken directly from IANA";
     homepage = "https://github.com/kichik/tlds";

From 99069476cab34e84fea7e8786152fb34488db8e5 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@tweag.io>
Date: Tue, 23 Jul 2024 17:33:57 +0200
Subject: [PATCH 142/175] Partially revert "build(deps): bump
 cachix/install-nix-action from 26 to 27"

This partially reverts commit ab7becf0474922ff0745e281d21eeb03c85fb27b.

The pkgs/by-name check doesn't work for newer Nix versions yet,
see https://github.com/NixOS/nixpkgs-check-by-name/issues/78
---
 .github/workflows/check-by-name.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/check-by-name.yml b/.github/workflows/check-by-name.yml
index f9d1846c8798..0c0727eba122 100644
--- a/.github/workflows/check-by-name.yml
+++ b/.github/workflows/check-by-name.yml
@@ -94,7 +94,7 @@ jobs:
           base=$(mktemp -d)
           git worktree add "$base" "$(git rev-parse HEAD^1)"
           echo "base=$base" >> "$GITHUB_ENV"
-      - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27
+      - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26
         if: env.mergedSha
       - name: Fetching the pinned tool
         if: env.mergedSha

From b719cb320b64f33ed3c3b1d9b9c0c96d1c7fe1d1 Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Tue, 23 Jul 2024 18:01:47 +0200
Subject: [PATCH 143/175] python3Packages.libpysal: 4.11.0 -> 4.12.0

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

diff --git a/pkgs/development/python-modules/libpysal/default.nix b/pkgs/development/python-modules/libpysal/default.nix
index 8ec004d6c481..bc6120a1c693 100644
--- a/pkgs/development/python-modules/libpysal/default.nix
+++ b/pkgs/development/python-modules/libpysal/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "libpysal";
-  version = "4.11.0";
+  version = "4.12.0";
   pyproject = true;
   disabled = pythonOlder "3.10";
 
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "pysal";
     repo = "libpysal";
     rev = "refs/tags/v${version}";
-    hash = "sha256-1JZ82wO0kisbTrhsn+BYeNZpkMJUEzuflQ6GqpAYH/c=";
+    hash = "sha256-m7jcTi51ngAXXWYJGkjMVA3KwAxL2aJysdjiS1pWEIQ=";
   };
 
   build-system = [ setuptools-scm ];
@@ -60,6 +60,7 @@ buildPythonPackage rec {
 
   # requires network access
   disabledTestPaths = [
+    "libpysal/graph/tests/test_summary.py"
     "libpysal/cg/tests/test_geoJSON.py"
     "libpysal/examples/tests/test_available.py"
     "libpysal/graph/tests/test_base.py"

From 2d71c78890b3b5cff3209b84caecc54b59fb9f1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Tue, 23 Jul 2024 12:07:07 -0400
Subject: [PATCH 144/175] formats.hocon: fix typo

---
 pkgs/pkgs-lib/formats/hocon/default.nix     | 4 ++--
 pkgs/pkgs-lib/formats/hocon/src/src/main.rs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/pkgs-lib/formats/hocon/default.nix b/pkgs/pkgs-lib/formats/hocon/default.nix
index d7ff1e85bda6..55354ddbd600 100644
--- a/pkgs/pkgs-lib/formats/hocon/default.nix
+++ b/pkgs/pkgs-lib/formats/hocon/default.nix
@@ -70,10 +70,10 @@ in
           }
         else
           assert lib.assertMsg (lib.isAttrs value) ''
-            Value of invalid type provided to `hocon.lib.mkSubstition`: ${lib.typeOf value}
+            Value of invalid type provided to `hocon.lib.mkSubstitution`: ${lib.typeOf value}
           '';
           assert lib.assertMsg (value ? "value") ''
-            Argument to `hocon.lib.mkSubstition` is missing a `value`:
+            Argument to `hocon.lib.mkSubstitution` is missing a `value`:
             ${builtins.toJSON value}
           '';
           {
diff --git a/pkgs/pkgs-lib/formats/hocon/src/src/main.rs b/pkgs/pkgs-lib/formats/hocon/src/src/main.rs
index 2e53f3fd5659..6809ed739159 100644
--- a/pkgs/pkgs-lib/formats/hocon/src/src/main.rs
+++ b/pkgs/pkgs-lib/formats/hocon/src/src/main.rs
@@ -77,12 +77,12 @@ fn parse_special_types(o: &Map<String, Value>) -> Option<HOCONValue> {
                     .get("value")
                     .expect("Missing value for substitution")
                     .as_str()
-                    .unwrap_or_else(|| panic!("Substition value is not a string: {:?}", o));
+                    .unwrap_or_else(|| panic!("Substitution value is not a string: {:?}", o));
                 let required = o
                     .get("required")
                     .unwrap_or(&Value::Bool(false))
                     .as_bool()
-                    .unwrap_or_else(|| panic!("Substition value is not a string: {:?}", o));
+                    .unwrap_or_else(|| panic!("Substitution value is not a string: {:?}", o));
 
                 debug_assert!(!value.contains('}'));
 

From b535b380d5a7c72324df0f1bea4c9360d0809683 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 16:18:20 +0000
Subject: [PATCH 145/175] phrase-cli: 2.31.0 -> 2.31.1

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

diff --git a/pkgs/tools/misc/phrase-cli/default.nix b/pkgs/tools/misc/phrase-cli/default.nix
index 20d8303f1979..1e503cd7bd54 100644
--- a/pkgs/tools/misc/phrase-cli/default.nix
+++ b/pkgs/tools/misc/phrase-cli/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "phrase-cli";
-  version = "2.31.0";
+  version = "2.31.1";
 
   src = fetchFromGitHub {
     owner = "phrase";
     repo = "phrase-cli";
     rev = version;
-    sha256 = "sha256-Hz+bp/2Gq99ZQvOWU6ODbxThuqKmGN+abspsj1PvXHA=";
+    sha256 = "sha256-UfkFIvaKfJIIH05zEnrtYzgifSmVrLVgjUtZNjRe/SQ=";
   };
 
   vendorHash = "sha256-pBIAcEmEWmjy1TE8EwZ3vmNmDdolyam/vxY5XHMXU+E=";

From eb0627014bb7828c9e310c13ce22faf2457d039c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 16:18:22 +0000
Subject: [PATCH 146/175] firebase-tools: 13.13.2 -> 13.13.3

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

diff --git a/pkgs/development/tools/firebase-tools/default.nix b/pkgs/development/tools/firebase-tools/default.nix
index 5ce768bad8b9..ff2af4cc5aae 100644
--- a/pkgs/development/tools/firebase-tools/default.nix
+++ b/pkgs/development/tools/firebase-tools/default.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "firebase-tools";
-  version = "13.13.2";
+  version = "13.13.3";
 
   src = fetchFromGitHub {
     owner = "firebase";
     repo = "firebase-tools";
     rev = "v${version}";
-    hash = "sha256-VjNH3eoJbgPkSDO3UqjxlXoaPE4ct0DMBxWhKbbjvVY=";
+    hash = "sha256-hhqPSNdDCyZzs8+QsC2FGRjiztMeKAMa5EOMGRprn4M=";
   };
 
-  npmDepsHash = "sha256-BJuGunibUe5tCvoUAWR2WJlmjrOc1o3wbtfMp3WdK50=";
+  npmDepsHash = "sha256-OqnJQbEC6UzT05iwJjVWrYG2RocrsPUIr8Owz21xtac=";
 
   postPatch = ''
     ln -s npm-shrinkwrap.json package-lock.json

From 515f7d01560c4da93c805d70d9937f5031666f07 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 16:18:44 +0000
Subject: [PATCH 147/175] balena-cli: 18.2.29 -> 18.2.33

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

diff --git a/pkgs/tools/admin/balena-cli/default.nix b/pkgs/tools/admin/balena-cli/default.nix
index 03cadd46a45f..e0a06ccb7f1d 100644
--- a/pkgs/tools/admin/balena-cli/default.nix
+++ b/pkgs/tools/admin/balena-cli/default.nix
@@ -18,16 +18,16 @@ let
   };
 in buildNpmPackage' rec {
   pname = "balena-cli";
-  version = "18.2.29";
+  version = "18.2.33";
 
   src = fetchFromGitHub {
     owner = "balena-io";
     repo = "balena-cli";
     rev = "v${version}";
-    hash = "sha256-y2dlyu/JEWeNQ8yBVO5pNwm3qnVe3BLAeW5poyOu0+A=";
+    hash = "sha256-DcdCIsvdqIJdBhL+K2mN2q6cWIgoKQKwFDK60pb4ckE=";
   };
 
-  npmDepsHash = "sha256-01w+fyepZbxpN3NvtXWYZDPsIbT6jm3DGNbJ6Ibm0dQ=";
+  npmDepsHash = "sha256-Z/xbKGmUi68Sdtvh2JowGqkLXIulvZhX8wW7w2+tBbg=";
 
   postPatch = ''
     ln -s npm-shrinkwrap.json package-lock.json

From bbb4e2f9e28148bc4d00f7f6e05bc54dfabe0264 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 23 Jul 2024 18:28:28 +0200
Subject: [PATCH 148/175] bind: 9.18.27 -> 9.18.28

https://downloads.isc.org/isc/bind9/cur/9.18/CHANGES
https://www.openwall.com/lists/oss-security/2024/07/23/1

Fixes: CVE-2024-1975, CVE-2024-4076, CVE-2024-1737, CVE-2024-0760
---
 pkgs/servers/dns/bind/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 7f3b8a4a169f..4690fa7693c6 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -24,11 +24,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bind";
-  version = "9.18.27";
+  version = "9.18.28";
 
   src = fetchurl {
     url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz";
-    hash = "sha256-6j89jPovaueMhyJ1HQCPVLwXo67Svj9zmet79fTNqPE=";
+    hash = "sha256-58zpoWX3thnu/Egy8KjcFrAF0p44kK7WAIxQbqKGpec=";
   };
 
   outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];

From e820a60e93b60e086478e949b987d067d95ad924 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 23 Jul 2024 13:29:05 +0100
Subject: [PATCH 149/175] CONTRIBUTING.md: point to the Matrix Staging room

---
 CONTRIBUTING.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index babbf48671e2..44d88a165305 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -379,10 +379,12 @@ See [this section][branch] to know when to use the release branches.
 [staging]: #staging
 
 The staging workflow exists to batch Hydra builds of many packages together.
+It is coordinated in the [Staging room](https://matrix.to/#/#staging:nixos.org) on Matrix.
 
 It works by directing commits that cause [mass rebuilds][mass-rebuild] to a separate `staging` branch that isn't directly built by Hydra.
 Regularly, the `staging` branch is _manually_ merged into a `staging-next` branch to be built by Hydra using the [`nixpkgs:staging-next` jobset](https://hydra.nixos.org/jobset/nixpkgs/staging-next).
-The `staging-next` branch should then only receive changes that fix Hydra builds.
+The `staging-next` branch should then only receive changes that fix Hydra builds;
+**for anything else, ask the [Staging room](https://matrix.to/#/#staging:nixos.org) first**.
 Once it is verified that there are no major regressions, it is merged into `master` using [a pull request](https://github.com/NixOS/nixpkgs/pulls?q=head%3Astaging-next).
 This is done manually in order to ensure it's a good use of Hydra's computing resources.
 By keeping the `staging-next` branch separate from `staging`, this batching does not block developers from merging changes into `staging`.

From 96031e8dd4abbd9625d1ad1ab00a8a1c050ce853 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Tue, 23 Jul 2024 12:28:48 -0400
Subject: [PATCH 150/175] treewide: fix uses of `finalAttrs.pname` in urls

---
 pkgs/applications/networking/pjsip/default.nix         | 2 +-
 pkgs/development/compilers/yosys/default.nix           | 2 +-
 pkgs/development/libraries/hidapi/default.nix          | 2 +-
 pkgs/development/libraries/unixODBCDrivers/default.nix | 8 ++++----
 pkgs/tools/backup/percona-xtrabackup/generic.nix       | 2 +-
 pkgs/tools/graphics/vulkan-cts/default.nix             | 4 ++--
 pkgs/tools/misc/file/default.nix                       | 4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix
index b267dee36909..f27a57012366 100644
--- a/pkgs/applications/networking/pjsip/default.nix
+++ b/pkgs/applications/networking/pjsip/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "2.14.1";
 
   src = fetchFromGitHub {
-    owner = finalAttrs.pname;
+    owner = "pjsip";
     repo = "pjproject";
     rev = "refs/tags/${finalAttrs.version}";
     hash = "sha256-LDA3o1QMrAxcGuOi/YRoMzXmw/wFkfDs2wweZuIJ2RY=";
diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index f90b7b31bbcd..5061dda5ac3d 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -80,7 +80,7 @@ in stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "YosysHQ";
     repo  = "yosys";
-    rev   = "refs/tags/${finalAttrs.pname}-${finalAttrs.version}";
+    rev   = "refs/tags/yosys-${finalAttrs.version}";
     hash  = "sha256-MJTtQvHsHvuo4aNNYSPxSMbeXCty66q83/sbp1Yiiv4=";
     fetchSubmodules = true;
     leaveDotGit = true;
diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix
index 5f698794abf3..05b915efb8f9 100644
--- a/pkgs/development/libraries/hidapi/default.nix
+++ b/pkgs/development/libraries/hidapi/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "libusb";
     repo = "hidapi";
-    rev = "${finalAttrs.pname}-${finalAttrs.version}";
+    rev = "hidapi-${finalAttrs.version}";
     sha256 = "sha256-p3uzBq5VxxQbVuy1lEHEEQdxXwnhQgJDIyAAWjVWNIg=";
   };
 
diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix
index 7e4a8b4f6cce..641d051c1c32 100644
--- a/pkgs/development/libraries/unixODBCDrivers/default.nix
+++ b/pkgs/development/libraries/unixODBCDrivers/default.nix
@@ -214,10 +214,10 @@
 
     src = fetchurl {
       url = {
-        x86_64-linux = "https://packages.microsoft.com/debian/11/prod/pool/main/m/${finalAttrs.pname}/${finalAttrs.pname}_${finalAttrs.version}_amd64.deb";
-        aarch64-linux = "https://packages.microsoft.com/debian/11/prod/pool/main/m/${finalAttrs.pname}/${finalAttrs.pname}_${finalAttrs.version}_arm64.deb";
-        x86_64-darwin = "https://download.microsoft.com/download/6/4/0/64006503-51e3-44f0-a6cd-a9b757d0d61b/${finalAttrs.pname}-${finalAttrs.version}-amd64.tar.gz";
-        aarch64-darwin = "https://download.microsoft.com/download/6/4/0/64006503-51e3-44f0-a6cd-a9b757d0d61b/${finalAttrs.pname}-${finalAttrs.version}-arm64.tar.gz";
+        x86_64-linux = "https://packages.microsoft.com/debian/11/prod/pool/main/m/msodbcsql${finalAttrs.versionMajor}/msodbcsql${finalAttrs.versionMajor}_${finalAttrs.version}_amd64.deb";
+        aarch64-linux = "https://packages.microsoft.com/debian/11/prod/pool/main/m/msodbcsql${finalAttrs.versionMajor}/msodbcsql${finalAttrs.versionMajor}_${finalAttrs.version}_arm64.deb";
+        x86_64-darwin = "https://download.microsoft.com/download/6/4/0/64006503-51e3-44f0-a6cd-a9b757d0d61b/msodbcsql${finalAttrs.versionMajor}-${finalAttrs.version}-amd64.tar.gz";
+        aarch64-darwin = "https://download.microsoft.com/download/6/4/0/64006503-51e3-44f0-a6cd-a9b757d0d61b/msodbcsql${finalAttrs.versionMajor}-${finalAttrs.version}-arm64.tar.gz";
       }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
       hash = {
         x86_64-linux = "sha256:1f0rmh1aynf1sqmjclbsyh2wz5jby0fixrwz71zp6impxpwvil52";
diff --git a/pkgs/tools/backup/percona-xtrabackup/generic.nix b/pkgs/tools/backup/percona-xtrabackup/generic.nix
index 6a6906cba33c..d81dee6f97f6 100644
--- a/pkgs/tools/backup/percona-xtrabackup/generic.nix
+++ b/pkgs/tools/backup/percona-xtrabackup/generic.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "percona";
     repo = "percona-xtrabackup";
-    rev = "${finalAttrs.pname}-${finalAttrs.version}";
+    rev = "percona-xtrabackup-${finalAttrs.version}";
     inherit hash fetchSubmodules;
   };
 
diff --git a/pkgs/tools/graphics/vulkan-cts/default.nix b/pkgs/tools/graphics/vulkan-cts/default.nix
index 6579b7e160de..b4e6db869a34 100644
--- a/pkgs/tools/graphics/vulkan-cts/default.nix
+++ b/pkgs/tools/graphics/vulkan-cts/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "VK-GL-CTS";
-    rev = "${finalAttrs.pname}-${finalAttrs.version}";
+    rev = "vulkan-cts-${finalAttrs.version}";
     hash = "sha256-JCepNBVHaN4KXRcLOZ2z7toBMri90tV7kjNWHRXRESE=";
   };
 
@@ -128,7 +128,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = with lib; {
     description = "Khronos Vulkan Conformance Tests";
     homepage = "https://github.com/KhronosGroup/VK-GL-CTS/blob/main/external/vulkancts/README.md";
-    changelog = "https://github.com/KhronosGroup/VK-GL-CTS/releases/tag/${finalAttrs.pname}-${finalAttrs.version}";
+    changelog = "https://github.com/KhronosGroup/VK-GL-CTS/releases/tag/vulkan-cts-${finalAttrs.version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ Flakebi ];
   };
diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index 09138dada763..f0bc89d466f5 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -14,8 +14,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     urls = [
-      "https://astron.com/pub/file/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"
-      "https://distfiles.macports.org/file/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"
+      "https://astron.com/pub/file/file-${finalAttrs.version}.tar.gz"
+      "https://distfiles.macports.org/file/file-${finalAttrs.version}.tar.gz"
     ];
     hash = "sha256-/Jf1ECm7DiyfTjv/79r2ePDgOe6HK53lwAKm0Jx4TYI=";
   };

From cce932597d1855d7c6155d759d72a084a8c179c5 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 23 Jul 2024 18:41:23 +0200
Subject: [PATCH 151/175] meshcentral: 1.1.24 -> 1.1.26

ChangeLogs:
* https://github.com/Ylianst/MeshCentral/releases/tag/1.1.25
* https://github.com/Ylianst/MeshCentral/releases/tag/1.1.26
---
 pkgs/tools/admin/meshcentral/default.nix  |    8 +-
 pkgs/tools/admin/meshcentral/package.json |   10 +-
 pkgs/tools/admin/meshcentral/yarn.lock    | 1839 +++++++++++----------
 3 files changed, 949 insertions(+), 908 deletions(-)

diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix
index 1e1563bcc915..7778659baa89 100644
--- a/pkgs/tools/admin/meshcentral/default.nix
+++ b/pkgs/tools/admin/meshcentral/default.nix
@@ -7,11 +7,11 @@
 }:
 
 yarn2nix-moretea.mkYarnPackage {
-  version = "1.1.24";
+  version = "1.1.26";
 
   src = fetchzip {
-    url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.24.tgz";
-    sha256 = "1x5ibbmdrd6yv3xv3qlcd2b1mj9wpdsfgcmrcjl3js34zrygmixc";
+    url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.26.tgz";
+    sha256 = "038gywymz0spsxkfz3gzgv6cpk1n4phx8r1h14wzq30pwkw90nr6";
   };
 
   patches = [ ./fix-js-include-paths.patch ];
@@ -21,7 +21,7 @@ yarn2nix-moretea.mkYarnPackage {
 
   offlineCache = fetchYarnDeps {
     yarnLock = ./yarn.lock;
-    hash = "sha256-L4rBVq/JhkcSQs/GrQJ+gcAV0vyi+9yS6B3p3O14IfE=";
+    hash = "sha256-FGlSxmIk6VP/NKZNLfYkFjUgY9m2VM0ZYoNq2b+zTHI=";
   };
 
   # Tarball has CRLF line endings. This makes patching difficult, so let's convert them.
diff --git a/pkgs/tools/admin/meshcentral/package.json b/pkgs/tools/admin/meshcentral/package.json
index f44046869c62..152ea6397796 100644
--- a/pkgs/tools/admin/meshcentral/package.json
+++ b/pkgs/tools/admin/meshcentral/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "1.1.24",
+  "version": "1.1.26",
   "keywords": [
     "Remote Device Management",
     "Remote Device Monitoring",
@@ -37,6 +37,7 @@
     "sample-config-advanced.json"
   ],
   "dependencies": {
+    "@yetzt/nedb": "1.8.0",
     "archiver": "7.0.0",
     "body-parser": "1.20.2",
     "cbor": "5.2.0",
@@ -48,10 +49,9 @@
     "ipcheck": "0.1.0",
     "minimist": "1.2.8",
     "multiparty": "4.2.3",
-    "@yetzt/nedb": "1.8.0",
     "node-forge": "1.3.1",
     "ua-parser-js": "1.0.37",
-    "ws": "8.14.2",
+    "ws": "8.17.1",
     "yauzl": "2.10.0"
   },
   "engines": {
@@ -64,13 +64,13 @@
   "readme": "readme.md",
   "optionalDependencies": {
     "passport": "*",
+    "connect-flash": "*",
     "passport-twitter": "*",
     "passport-google-oauth20": "*",
     "passport-github2": "*",
     "passport-azure-oauth2": "*",
     "jwt-simple": "*",
     "openid-client": "*",
-    "connect-flash": "*",
     "passport-saml": "*",
     "archiver": "7.0.0",
     "body-parser": "1.20.2",
@@ -86,7 +86,7 @@
     "@yetzt/nedb": "*",
     "node-forge": "1.3.1",
     "ua-parser-js": "1.0.37",
-    "ws": "8.14.2",
+    "ws": "8.17.1",
     "yauzl": "2.10.0",
     "node-windows": "0.1.14",
     "loadavg-windows": "1.1.1",
diff --git a/pkgs/tools/admin/meshcentral/yarn.lock b/pkgs/tools/admin/meshcentral/yarn.lock
index 8dab35726610..6a14517ab722 100644
--- a/pkgs/tools/admin/meshcentral/yarn.lock
+++ b/pkgs/tools/admin/meshcentral/yarn.lock
@@ -10,453 +10,445 @@
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.24"
 
-"@aws-crypto/ie11-detection@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@aws-crypto/ie11-detection/-/ie11-detection-3.0.0.tgz#640ae66b4ec3395cee6a8e94ebcd9f80c24cd688"
-  integrity sha512-341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q==
+"@aws-crypto/sha256-browser@5.2.0":
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz#153895ef1dba6f9fce38af550e0ef58988eb649e"
+  integrity sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==
   dependencies:
-    tslib "^1.11.1"
-
-"@aws-crypto/sha256-browser@3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-browser/-/sha256-browser-3.0.0.tgz#05f160138ab893f1c6ba5be57cfd108f05827766"
-  integrity sha512-8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ==
-  dependencies:
-    "@aws-crypto/ie11-detection" "^3.0.0"
-    "@aws-crypto/sha256-js" "^3.0.0"
-    "@aws-crypto/supports-web-crypto" "^3.0.0"
-    "@aws-crypto/util" "^3.0.0"
+    "@aws-crypto/sha256-js" "^5.2.0"
+    "@aws-crypto/supports-web-crypto" "^5.2.0"
+    "@aws-crypto/util" "^5.2.0"
     "@aws-sdk/types" "^3.222.0"
     "@aws-sdk/util-locate-window" "^3.0.0"
-    "@aws-sdk/util-utf8-browser" "^3.0.0"
-    tslib "^1.11.1"
+    "@smithy/util-utf8" "^2.0.0"
+    tslib "^2.6.2"
 
-"@aws-crypto/sha256-js@3.0.0", "@aws-crypto/sha256-js@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-3.0.0.tgz#f06b84d550d25521e60d2a0e2a90139341e007c2"
-  integrity sha512-PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ==
+"@aws-crypto/sha256-js@5.2.0", "@aws-crypto/sha256-js@^5.2.0":
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz#c4fdb773fdbed9a664fc1a95724e206cf3860042"
+  integrity sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==
   dependencies:
-    "@aws-crypto/util" "^3.0.0"
+    "@aws-crypto/util" "^5.2.0"
     "@aws-sdk/types" "^3.222.0"
-    tslib "^1.11.1"
+    tslib "^2.6.2"
 
-"@aws-crypto/supports-web-crypto@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@aws-crypto/supports-web-crypto/-/supports-web-crypto-3.0.0.tgz#5d1bf825afa8072af2717c3e455f35cda0103ec2"
-  integrity sha512-06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg==
+"@aws-crypto/supports-web-crypto@^5.2.0":
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz#a1e399af29269be08e695109aa15da0a07b5b5fb"
+  integrity sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==
   dependencies:
-    tslib "^1.11.1"
+    tslib "^2.6.2"
 
-"@aws-crypto/util@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@aws-crypto/util/-/util-3.0.0.tgz#1c7ca90c29293f0883468ad48117937f0fe5bfb0"
-  integrity sha512-2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w==
+"@aws-crypto/util@^5.2.0":
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@aws-crypto/util/-/util-5.2.0.tgz#71284c9cffe7927ddadac793c14f14886d3876da"
+  integrity sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==
   dependencies:
     "@aws-sdk/types" "^3.222.0"
-    "@aws-sdk/util-utf8-browser" "^3.0.0"
-    tslib "^1.11.1"
+    "@smithy/util-utf8" "^2.0.0"
+    tslib "^2.6.2"
 
-"@aws-sdk/client-cognito-identity@3.583.0":
-  version "3.583.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.583.0.tgz#f25360e29b46af8086f2b8f6bc6e51bcb5ac1c54"
-  integrity sha512-FrkVjrDRsXofw1F/iJqR/DOKPbIakIB+Dr04l25Em4PTWBj29NcQyYW49qcCHF0CPkqQpin8ASXDWzGv7A0yxg==
+"@aws-sdk/client-cognito-identity@3.616.0":
+  version "3.616.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.616.0.tgz#6b855f9625cac2c1df0992ce408bce74a41a6865"
+  integrity sha512-3yli0rchw7FuI8CmxUKW5z6TzrAJzBm9x+Se20Gqm0idXc2X2RT4Z8axtni5umBu8+4QWgNDZAr/WG6bR/JUGA==
   dependencies:
-    "@aws-crypto/sha256-browser" "3.0.0"
-    "@aws-crypto/sha256-js" "3.0.0"
-    "@aws-sdk/client-sso-oidc" "3.583.0"
-    "@aws-sdk/client-sts" "3.583.0"
-    "@aws-sdk/core" "3.582.0"
-    "@aws-sdk/credential-provider-node" "3.583.0"
-    "@aws-sdk/middleware-host-header" "3.577.0"
-    "@aws-sdk/middleware-logger" "3.577.0"
-    "@aws-sdk/middleware-recursion-detection" "3.577.0"
-    "@aws-sdk/middleware-user-agent" "3.583.0"
-    "@aws-sdk/region-config-resolver" "3.577.0"
-    "@aws-sdk/types" "3.577.0"
-    "@aws-sdk/util-endpoints" "3.583.0"
-    "@aws-sdk/util-user-agent-browser" "3.577.0"
-    "@aws-sdk/util-user-agent-node" "3.577.0"
-    "@smithy/config-resolver" "^3.0.0"
-    "@smithy/core" "^2.0.1"
-    "@smithy/fetch-http-handler" "^3.0.1"
-    "@smithy/hash-node" "^3.0.0"
-    "@smithy/invalid-dependency" "^3.0.0"
-    "@smithy/middleware-content-length" "^3.0.0"
-    "@smithy/middleware-endpoint" "^3.0.0"
-    "@smithy/middleware-retry" "^3.0.1"
-    "@smithy/middleware-serde" "^3.0.0"
-    "@smithy/middleware-stack" "^3.0.0"
-    "@smithy/node-config-provider" "^3.0.0"
-    "@smithy/node-http-handler" "^3.0.0"
-    "@smithy/protocol-http" "^4.0.0"
-    "@smithy/smithy-client" "^3.0.1"
-    "@smithy/types" "^3.0.0"
-    "@smithy/url-parser" "^3.0.0"
+    "@aws-crypto/sha256-browser" "5.2.0"
+    "@aws-crypto/sha256-js" "5.2.0"
+    "@aws-sdk/client-sso-oidc" "3.616.0"
+    "@aws-sdk/client-sts" "3.616.0"
+    "@aws-sdk/core" "3.616.0"
+    "@aws-sdk/credential-provider-node" "3.616.0"
+    "@aws-sdk/middleware-host-header" "3.616.0"
+    "@aws-sdk/middleware-logger" "3.609.0"
+    "@aws-sdk/middleware-recursion-detection" "3.616.0"
+    "@aws-sdk/middleware-user-agent" "3.616.0"
+    "@aws-sdk/region-config-resolver" "3.614.0"
+    "@aws-sdk/types" "3.609.0"
+    "@aws-sdk/util-endpoints" "3.614.0"
+    "@aws-sdk/util-user-agent-browser" "3.609.0"
+    "@aws-sdk/util-user-agent-node" "3.614.0"
+    "@smithy/config-resolver" "^3.0.5"
+    "@smithy/core" "^2.2.7"
+    "@smithy/fetch-http-handler" "^3.2.2"
+    "@smithy/hash-node" "^3.0.3"
+    "@smithy/invalid-dependency" "^3.0.3"
+    "@smithy/middleware-content-length" "^3.0.4"
+    "@smithy/middleware-endpoint" "^3.0.5"
+    "@smithy/middleware-retry" "^3.0.10"
+    "@smithy/middleware-serde" "^3.0.3"
+    "@smithy/middleware-stack" "^3.0.3"
+    "@smithy/node-config-provider" "^3.1.4"
+    "@smithy/node-http-handler" "^3.1.3"
+    "@smithy/protocol-http" "^4.0.4"
+    "@smithy/smithy-client" "^3.1.8"
+    "@smithy/types" "^3.3.0"
+    "@smithy/url-parser" "^3.0.3"
     "@smithy/util-base64" "^3.0.0"
     "@smithy/util-body-length-browser" "^3.0.0"
     "@smithy/util-body-length-node" "^3.0.0"
-    "@smithy/util-defaults-mode-browser" "^3.0.1"
-    "@smithy/util-defaults-mode-node" "^3.0.1"
-    "@smithy/util-endpoints" "^2.0.0"
-    "@smithy/util-middleware" "^3.0.0"
-    "@smithy/util-retry" "^3.0.0"
+    "@smithy/util-defaults-mode-browser" "^3.0.10"
+    "@smithy/util-defaults-mode-node" "^3.0.10"
+    "@smithy/util-endpoints" "^2.0.5"
+    "@smithy/util-middleware" "^3.0.3"
+    "@smithy/util-retry" "^3.0.3"
     "@smithy/util-utf8" "^3.0.0"
     tslib "^2.6.2"
 
-"@aws-sdk/client-sso-oidc@3.583.0":
-  version "3.583.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.583.0.tgz#71a00305f3d5d13041e6c2fff53cec62f621eb1f"
-  integrity sha512-LO3wmrFXPi2kNE46lD1XATfRrvdNxXd4DlTFouoWmr7lvqoUkcbmtkV2r/XChZA2z0HiDauphC1e8b8laJVeSg==
+"@aws-sdk/client-sso-oidc@3.616.0":
+  version "3.616.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.616.0.tgz#eb298b1c543465a5f7ebd28f8148d68654edf9d1"
+  integrity sha512-YY1hpYS/G1uRGjQf88dL8VLHkP/IjGxKeXdhy+JnzMdCkAWl3V9j0fEALw40NZe0x79gr6R2KUOUH/IKYQfUmg==
   dependencies:
-    "@aws-crypto/sha256-browser" "3.0.0"
-    "@aws-crypto/sha256-js" "3.0.0"
-    "@aws-sdk/client-sts" "3.583.0"
-    "@aws-sdk/core" "3.582.0"
-    "@aws-sdk/credential-provider-node" "3.583.0"
-    "@aws-sdk/middleware-host-header" "3.577.0"
-    "@aws-sdk/middleware-logger" "3.577.0"
-    "@aws-sdk/middleware-recursion-detection" "3.577.0"
-    "@aws-sdk/middleware-user-agent" "3.583.0"
-    "@aws-sdk/region-config-resolver" "3.577.0"
-    "@aws-sdk/types" "3.577.0"
-    "@aws-sdk/util-endpoints" "3.583.0"
-    "@aws-sdk/util-user-agent-browser" "3.577.0"
-    "@aws-sdk/util-user-agent-node" "3.577.0"
-    "@smithy/config-resolver" "^3.0.0"
-    "@smithy/core" "^2.0.1"
-    "@smithy/fetch-http-handler" "^3.0.1"
-    "@smithy/hash-node" "^3.0.0"
-    "@smithy/invalid-dependency" "^3.0.0"
-    "@smithy/middleware-content-length" "^3.0.0"
-    "@smithy/middleware-endpoint" "^3.0.0"
-    "@smithy/middleware-retry" "^3.0.1"
-    "@smithy/middleware-serde" "^3.0.0"
-    "@smithy/middleware-stack" "^3.0.0"
-    "@smithy/node-config-provider" "^3.0.0"
-    "@smithy/node-http-handler" "^3.0.0"
-    "@smithy/protocol-http" "^4.0.0"
-    "@smithy/smithy-client" "^3.0.1"
-    "@smithy/types" "^3.0.0"
-    "@smithy/url-parser" "^3.0.0"
+    "@aws-crypto/sha256-browser" "5.2.0"
+    "@aws-crypto/sha256-js" "5.2.0"
+    "@aws-sdk/core" "3.616.0"
+    "@aws-sdk/credential-provider-node" "3.616.0"
+    "@aws-sdk/middleware-host-header" "3.616.0"
+    "@aws-sdk/middleware-logger" "3.609.0"
+    "@aws-sdk/middleware-recursion-detection" "3.616.0"
+    "@aws-sdk/middleware-user-agent" "3.616.0"
+    "@aws-sdk/region-config-resolver" "3.614.0"
+    "@aws-sdk/types" "3.609.0"
+    "@aws-sdk/util-endpoints" "3.614.0"
+    "@aws-sdk/util-user-agent-browser" "3.609.0"
+    "@aws-sdk/util-user-agent-node" "3.614.0"
+    "@smithy/config-resolver" "^3.0.5"
+    "@smithy/core" "^2.2.7"
+    "@smithy/fetch-http-handler" "^3.2.2"
+    "@smithy/hash-node" "^3.0.3"
+    "@smithy/invalid-dependency" "^3.0.3"
+    "@smithy/middleware-content-length" "^3.0.4"
+    "@smithy/middleware-endpoint" "^3.0.5"
+    "@smithy/middleware-retry" "^3.0.10"
+    "@smithy/middleware-serde" "^3.0.3"
+    "@smithy/middleware-stack" "^3.0.3"
+    "@smithy/node-config-provider" "^3.1.4"
+    "@smithy/node-http-handler" "^3.1.3"
+    "@smithy/protocol-http" "^4.0.4"
+    "@smithy/smithy-client" "^3.1.8"
+    "@smithy/types" "^3.3.0"
+    "@smithy/url-parser" "^3.0.3"
     "@smithy/util-base64" "^3.0.0"
     "@smithy/util-body-length-browser" "^3.0.0"
     "@smithy/util-body-length-node" "^3.0.0"
-    "@smithy/util-defaults-mode-browser" "^3.0.1"
-    "@smithy/util-defaults-mode-node" "^3.0.1"
-    "@smithy/util-endpoints" "^2.0.0"
-    "@smithy/util-middleware" "^3.0.0"
-    "@smithy/util-retry" "^3.0.0"
+    "@smithy/util-defaults-mode-browser" "^3.0.10"
+    "@smithy/util-defaults-mode-node" "^3.0.10"
+    "@smithy/util-endpoints" "^2.0.5"
+    "@smithy/util-middleware" "^3.0.3"
+    "@smithy/util-retry" "^3.0.3"
     "@smithy/util-utf8" "^3.0.0"
     tslib "^2.6.2"
 
-"@aws-sdk/client-sso@3.583.0":
-  version "3.583.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.583.0.tgz#fa18cadd19abe80e0c0378b6cbe6225ed0296595"
-  integrity sha512-FNJ2MmiBtZZwgkj4+GLVrzqwmD6D8FBptrFZk7PnGkSf7v1Q8txYNI6gY938RRhYJ4lBW4cNbhPvWoDxAl90Hw==
+"@aws-sdk/client-sso@3.616.0":
+  version "3.616.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.616.0.tgz#d4bbb279daf6b4fde7ec2df9243526eb5119b0c0"
+  integrity sha512-hwW0u1f8U4dSloAe61/eupUiGd5Q13B72BuzGxvRk0cIpYX/2m0KBG8DDl7jW1b2QQ+CflTLpG2XUf2+vRJxGA==
   dependencies:
-    "@aws-crypto/sha256-browser" "3.0.0"
-    "@aws-crypto/sha256-js" "3.0.0"
-    "@aws-sdk/core" "3.582.0"
-    "@aws-sdk/middleware-host-header" "3.577.0"
-    "@aws-sdk/middleware-logger" "3.577.0"
-    "@aws-sdk/middleware-recursion-detection" "3.577.0"
-    "@aws-sdk/middleware-user-agent" "3.583.0"
-    "@aws-sdk/region-config-resolver" "3.577.0"
-    "@aws-sdk/types" "3.577.0"
-    "@aws-sdk/util-endpoints" "3.583.0"
-    "@aws-sdk/util-user-agent-browser" "3.577.0"
-    "@aws-sdk/util-user-agent-node" "3.577.0"
-    "@smithy/config-resolver" "^3.0.0"
-    "@smithy/core" "^2.0.1"
-    "@smithy/fetch-http-handler" "^3.0.1"
-    "@smithy/hash-node" "^3.0.0"
-    "@smithy/invalid-dependency" "^3.0.0"
-    "@smithy/middleware-content-length" "^3.0.0"
-    "@smithy/middleware-endpoint" "^3.0.0"
-    "@smithy/middleware-retry" "^3.0.1"
-    "@smithy/middleware-serde" "^3.0.0"
-    "@smithy/middleware-stack" "^3.0.0"
-    "@smithy/node-config-provider" "^3.0.0"
-    "@smithy/node-http-handler" "^3.0.0"
-    "@smithy/protocol-http" "^4.0.0"
-    "@smithy/smithy-client" "^3.0.1"
-    "@smithy/types" "^3.0.0"
-    "@smithy/url-parser" "^3.0.0"
+    "@aws-crypto/sha256-browser" "5.2.0"
+    "@aws-crypto/sha256-js" "5.2.0"
+    "@aws-sdk/core" "3.616.0"
+    "@aws-sdk/middleware-host-header" "3.616.0"
+    "@aws-sdk/middleware-logger" "3.609.0"
+    "@aws-sdk/middleware-recursion-detection" "3.616.0"
+    "@aws-sdk/middleware-user-agent" "3.616.0"
+    "@aws-sdk/region-config-resolver" "3.614.0"
+    "@aws-sdk/types" "3.609.0"
+    "@aws-sdk/util-endpoints" "3.614.0"
+    "@aws-sdk/util-user-agent-browser" "3.609.0"
+    "@aws-sdk/util-user-agent-node" "3.614.0"
+    "@smithy/config-resolver" "^3.0.5"
+    "@smithy/core" "^2.2.7"
+    "@smithy/fetch-http-handler" "^3.2.2"
+    "@smithy/hash-node" "^3.0.3"
+    "@smithy/invalid-dependency" "^3.0.3"
+    "@smithy/middleware-content-length" "^3.0.4"
+    "@smithy/middleware-endpoint" "^3.0.5"
+    "@smithy/middleware-retry" "^3.0.10"
+    "@smithy/middleware-serde" "^3.0.3"
+    "@smithy/middleware-stack" "^3.0.3"
+    "@smithy/node-config-provider" "^3.1.4"
+    "@smithy/node-http-handler" "^3.1.3"
+    "@smithy/protocol-http" "^4.0.4"
+    "@smithy/smithy-client" "^3.1.8"
+    "@smithy/types" "^3.3.0"
+    "@smithy/url-parser" "^3.0.3"
     "@smithy/util-base64" "^3.0.0"
     "@smithy/util-body-length-browser" "^3.0.0"
     "@smithy/util-body-length-node" "^3.0.0"
-    "@smithy/util-defaults-mode-browser" "^3.0.1"
-    "@smithy/util-defaults-mode-node" "^3.0.1"
-    "@smithy/util-endpoints" "^2.0.0"
-    "@smithy/util-middleware" "^3.0.0"
-    "@smithy/util-retry" "^3.0.0"
+    "@smithy/util-defaults-mode-browser" "^3.0.10"
+    "@smithy/util-defaults-mode-node" "^3.0.10"
+    "@smithy/util-endpoints" "^2.0.5"
+    "@smithy/util-middleware" "^3.0.3"
+    "@smithy/util-retry" "^3.0.3"
     "@smithy/util-utf8" "^3.0.0"
     tslib "^2.6.2"
 
-"@aws-sdk/client-sts@3.583.0":
-  version "3.583.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.583.0.tgz#d8109ab588689a616d987f6b1d4faacafe49f598"
-  integrity sha512-xDMxiemPDWr9dY2Q4AyixkRnk/hvS6fs6OWxuVCz1WO47YhaAfOsEGAgQMgDLLaOfj/oLU5D14uTNBEPGh4rBA==
+"@aws-sdk/client-sts@3.616.0":
+  version "3.616.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.616.0.tgz#9616c3693d9ae5232ccc12d570f46abe4ec49d2b"
+  integrity sha512-FP7i7hS5FpReqnysQP1ukQF1OUWy8lkomaOnbu15H415YUrfCp947SIx6+BItjmx+esKxPkEjh/fbCVzw2D6hQ==
   dependencies:
-    "@aws-crypto/sha256-browser" "3.0.0"
-    "@aws-crypto/sha256-js" "3.0.0"
-    "@aws-sdk/client-sso-oidc" "3.583.0"
-    "@aws-sdk/core" "3.582.0"
-    "@aws-sdk/credential-provider-node" "3.583.0"
-    "@aws-sdk/middleware-host-header" "3.577.0"
-    "@aws-sdk/middleware-logger" "3.577.0"
-    "@aws-sdk/middleware-recursion-detection" "3.577.0"
-    "@aws-sdk/middleware-user-agent" "3.583.0"
-    "@aws-sdk/region-config-resolver" "3.577.0"
-    "@aws-sdk/types" "3.577.0"
-    "@aws-sdk/util-endpoints" "3.583.0"
-    "@aws-sdk/util-user-agent-browser" "3.577.0"
-    "@aws-sdk/util-user-agent-node" "3.577.0"
-    "@smithy/config-resolver" "^3.0.0"
-    "@smithy/core" "^2.0.1"
-    "@smithy/fetch-http-handler" "^3.0.1"
-    "@smithy/hash-node" "^3.0.0"
-    "@smithy/invalid-dependency" "^3.0.0"
-    "@smithy/middleware-content-length" "^3.0.0"
-    "@smithy/middleware-endpoint" "^3.0.0"
-    "@smithy/middleware-retry" "^3.0.1"
-    "@smithy/middleware-serde" "^3.0.0"
-    "@smithy/middleware-stack" "^3.0.0"
-    "@smithy/node-config-provider" "^3.0.0"
-    "@smithy/node-http-handler" "^3.0.0"
-    "@smithy/protocol-http" "^4.0.0"
-    "@smithy/smithy-client" "^3.0.1"
-    "@smithy/types" "^3.0.0"
-    "@smithy/url-parser" "^3.0.0"
+    "@aws-crypto/sha256-browser" "5.2.0"
+    "@aws-crypto/sha256-js" "5.2.0"
+    "@aws-sdk/client-sso-oidc" "3.616.0"
+    "@aws-sdk/core" "3.616.0"
+    "@aws-sdk/credential-provider-node" "3.616.0"
+    "@aws-sdk/middleware-host-header" "3.616.0"
+    "@aws-sdk/middleware-logger" "3.609.0"
+    "@aws-sdk/middleware-recursion-detection" "3.616.0"
+    "@aws-sdk/middleware-user-agent" "3.616.0"
+    "@aws-sdk/region-config-resolver" "3.614.0"
+    "@aws-sdk/types" "3.609.0"
+    "@aws-sdk/util-endpoints" "3.614.0"
+    "@aws-sdk/util-user-agent-browser" "3.609.0"
+    "@aws-sdk/util-user-agent-node" "3.614.0"
+    "@smithy/config-resolver" "^3.0.5"
+    "@smithy/core" "^2.2.7"
+    "@smithy/fetch-http-handler" "^3.2.2"
+    "@smithy/hash-node" "^3.0.3"
+    "@smithy/invalid-dependency" "^3.0.3"
+    "@smithy/middleware-content-length" "^3.0.4"
+    "@smithy/middleware-endpoint" "^3.0.5"
+    "@smithy/middleware-retry" "^3.0.10"
+    "@smithy/middleware-serde" "^3.0.3"
+    "@smithy/middleware-stack" "^3.0.3"
+    "@smithy/node-config-provider" "^3.1.4"
+    "@smithy/node-http-handler" "^3.1.3"
+    "@smithy/protocol-http" "^4.0.4"
+    "@smithy/smithy-client" "^3.1.8"
+    "@smithy/types" "^3.3.0"
+    "@smithy/url-parser" "^3.0.3"
     "@smithy/util-base64" "^3.0.0"
     "@smithy/util-body-length-browser" "^3.0.0"
     "@smithy/util-body-length-node" "^3.0.0"
-    "@smithy/util-defaults-mode-browser" "^3.0.1"
-    "@smithy/util-defaults-mode-node" "^3.0.1"
-    "@smithy/util-endpoints" "^2.0.0"
-    "@smithy/util-middleware" "^3.0.0"
-    "@smithy/util-retry" "^3.0.0"
+    "@smithy/util-defaults-mode-browser" "^3.0.10"
+    "@smithy/util-defaults-mode-node" "^3.0.10"
+    "@smithy/util-endpoints" "^2.0.5"
+    "@smithy/util-middleware" "^3.0.3"
+    "@smithy/util-retry" "^3.0.3"
     "@smithy/util-utf8" "^3.0.0"
     tslib "^2.6.2"
 
-"@aws-sdk/core@3.582.0":
-  version "3.582.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.582.0.tgz#9ebb295290cba3d68738401fe4e3d51dfb0d1bfc"
-  integrity sha512-ofmD96IQc9g1dbyqlCyxu5fCG7kIl9p1NoN5+vGBUyLdbmPCV3Pdg99nRHYEJuv2MgGx5AUFGDPMHcqbJpnZIw==
+"@aws-sdk/core@3.616.0":
+  version "3.616.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.616.0.tgz#4d7f79cd62e545e6db677216a17dab84c2b4cda3"
+  integrity sha512-O/urkh2kECs/IqZIVZxyeyHZ7OR2ZWhLNK7btsVQBQvJKrEspLrk/Fp20Qfg5JDerQfBN83ZbyRXLJOOucdZpw==
   dependencies:
-    "@smithy/core" "^2.0.1"
-    "@smithy/protocol-http" "^4.0.0"
-    "@smithy/signature-v4" "^3.0.0"
-    "@smithy/smithy-client" "^3.0.1"
-    "@smithy/types" "^3.0.0"
+    "@smithy/core" "^2.2.7"
+    "@smithy/protocol-http" "^4.0.4"
+    "@smithy/signature-v4" "^4.0.0"
+    "@smithy/smithy-client" "^3.1.8"
+    "@smithy/types" "^3.3.0"
     fast-xml-parser "4.2.5"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-cognito-identity@3.583.0":
-  version "3.583.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.583.0.tgz#45468c8f3f73080cfdfd6708ab07e18c5cfdfb79"
-  integrity sha512-Z6VdDZApTxeI/n8qXBz3IkAdC0tL/mw+cz6EprqpkZG8bejHw78fVjeaVOBBkuskUikjwN4puv0SEJzoEMIqpA==
+"@aws-sdk/credential-provider-cognito-identity@3.616.0":
+  version "3.616.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.616.0.tgz#c8bf11bb125469905a96c3710cdee41ed35ab953"
+  integrity sha512-bcsf36gdGY2SpvTmoxd7t2235q+Rjg6xnTeCiKs9YuzbNezZ4FosqSORs7/vu2CvyaXWwV28909Q1boZ76v4TA==
   dependencies:
-    "@aws-sdk/client-cognito-identity" "3.583.0"
-    "@aws-sdk/types" "3.577.0"
-    "@smithy/property-provider" "^3.0.0"
-    "@smithy/types" "^3.0.0"
+    "@aws-sdk/client-cognito-identity" "3.616.0"
+    "@aws-sdk/types" "3.609.0"
+    "@smithy/property-provider" "^3.1.3"
+    "@smithy/types" "^3.3.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-env@3.577.0":
-  version "3.577.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.577.0.tgz#d587ea01a2288840e8483a236516c0f26cb4ba36"
-  integrity sha512-Jxu255j0gToMGEiqufP8ZtKI8HW90lOLjwJ3LrdlD/NLsAY0tOQf1fWc53u28hWmmNGMxmCrL2p66IOgMDhDUw==
+"@aws-sdk/credential-provider-env@3.609.0":
+  version "3.609.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.609.0.tgz#b3f32e5a8ff8b541e151eadadfb60283aa3d835e"
+  integrity sha512-v69ZCWcec2iuV9vLVJMa6fAb5xwkzN4jYIT8yjo2c4Ia/j976Q+TPf35Pnz5My48Xr94EFcaBazrWedF+kwfuQ==
   dependencies:
-    "@aws-sdk/types" "3.577.0"
-    "@smithy/property-provider" "^3.0.0"
-    "@smithy/types" "^3.0.0"
+    "@aws-sdk/types" "3.609.0"
+    "@smithy/property-provider" "^3.1.3"
+    "@smithy/types" "^3.3.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-http@3.582.0":
-  version "3.582.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.582.0.tgz#6ea9377461c4ce38d487ea0ae5888155f7c495a6"
-  integrity sha512-kGOUKw5ryPkDIYB69PjK3SicVLTbWB06ouFN2W1EvqUJpkQGPAUGzYcomKtt3mJaCTf/1kfoaHwARAl6KKSP8Q==
+"@aws-sdk/credential-provider-http@3.616.0":
+  version "3.616.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.616.0.tgz#207cbe3e74c6c55208fd4bf0ff59df6e765d2c41"
+  integrity sha512-1rgCkr7XvEMBl7qWCo5BKu3yAxJs71dRaZ55Xnjte/0ZHH6Oc93ZrHzyYy6UH6t0nZrH+FAuw7Yko2YtDDwDeg==
   dependencies:
-    "@aws-sdk/types" "3.577.0"
-    "@smithy/fetch-http-handler" "^3.0.1"
-    "@smithy/node-http-handler" "^3.0.0"
-    "@smithy/property-provider" "^3.0.0"
-    "@smithy/protocol-http" "^4.0.0"
-    "@smithy/smithy-client" "^3.0.1"
-    "@smithy/types" "^3.0.0"
-    "@smithy/util-stream" "^3.0.1"
+    "@aws-sdk/types" "3.609.0"
+    "@smithy/fetch-http-handler" "^3.2.2"
+    "@smithy/node-http-handler" "^3.1.3"
+    "@smithy/property-provider" "^3.1.3"
+    "@smithy/protocol-http" "^4.0.4"
+    "@smithy/smithy-client" "^3.1.8"
+    "@smithy/types" "^3.3.0"
+    "@smithy/util-stream" "^3.1.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-ini@3.583.0":
-  version "3.583.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.583.0.tgz#948ebd3ca257d7d9362d3294259e0be9526cd662"
-  integrity sha512-8I0oWNg/yps6ctjhEeL/qJ9BIa/+xXP7RPDQqFKZ2zBkWbmLLOoMWXRvl8uKUBD6qCe+DGmcu9skfVXeXSesEQ==
+"@aws-sdk/credential-provider-ini@3.616.0":
+  version "3.616.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.616.0.tgz#5bb726e969908a28e960d65016e7440b78056209"
+  integrity sha512-5gQdMr9cca3xV7FF2SxpxWGH2t6+t4o+XBGiwsHm8muEjf4nUmw7Ij863x25Tjt2viPYV0UStczSb5Sihp7bkA==
   dependencies:
-    "@aws-sdk/credential-provider-env" "3.577.0"
-    "@aws-sdk/credential-provider-process" "3.577.0"
-    "@aws-sdk/credential-provider-sso" "3.583.0"
-    "@aws-sdk/credential-provider-web-identity" "3.577.0"
-    "@aws-sdk/types" "3.577.0"
-    "@smithy/credential-provider-imds" "^3.0.0"
-    "@smithy/property-provider" "^3.0.0"
-    "@smithy/shared-ini-file-loader" "^3.0.0"
-    "@smithy/types" "^3.0.0"
+    "@aws-sdk/credential-provider-env" "3.609.0"
+    "@aws-sdk/credential-provider-http" "3.616.0"
+    "@aws-sdk/credential-provider-process" "3.614.0"
+    "@aws-sdk/credential-provider-sso" "3.616.0"
+    "@aws-sdk/credential-provider-web-identity" "3.609.0"
+    "@aws-sdk/types" "3.609.0"
+    "@smithy/credential-provider-imds" "^3.1.4"
+    "@smithy/property-provider" "^3.1.3"
+    "@smithy/shared-ini-file-loader" "^3.1.4"
+    "@smithy/types" "^3.3.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-node@3.583.0":
-  version "3.583.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.583.0.tgz#8ce316409d91cddca0c85851ca50726ee666cff5"
-  integrity sha512-yBNypBXny7zJH85SzxDj8s1mbLXv9c/Vbq0qR3R3POj2idZ6ywB/qlIRC1XwBuv49Wvg8kA1wKXk3K3jrpcVIw==
+"@aws-sdk/credential-provider-node@3.616.0":
+  version "3.616.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.616.0.tgz#0887ab7b9bab3031fe3ed8aaee2d4abb5091a67f"
+  integrity sha512-Se+u6DAxjDPjKE3vX1X2uxjkWgGq69BTo0uTB0vDUiWwBVgh16s9BsBhSAlKEH1CCbbJHvOg4YdTrzjwzqyClg==
   dependencies:
-    "@aws-sdk/credential-provider-env" "3.577.0"
-    "@aws-sdk/credential-provider-http" "3.582.0"
-    "@aws-sdk/credential-provider-ini" "3.583.0"
-    "@aws-sdk/credential-provider-process" "3.577.0"
-    "@aws-sdk/credential-provider-sso" "3.583.0"
-    "@aws-sdk/credential-provider-web-identity" "3.577.0"
-    "@aws-sdk/types" "3.577.0"
-    "@smithy/credential-provider-imds" "^3.0.0"
-    "@smithy/property-provider" "^3.0.0"
-    "@smithy/shared-ini-file-loader" "^3.0.0"
-    "@smithy/types" "^3.0.0"
+    "@aws-sdk/credential-provider-env" "3.609.0"
+    "@aws-sdk/credential-provider-http" "3.616.0"
+    "@aws-sdk/credential-provider-ini" "3.616.0"
+    "@aws-sdk/credential-provider-process" "3.614.0"
+    "@aws-sdk/credential-provider-sso" "3.616.0"
+    "@aws-sdk/credential-provider-web-identity" "3.609.0"
+    "@aws-sdk/types" "3.609.0"
+    "@smithy/credential-provider-imds" "^3.1.4"
+    "@smithy/property-provider" "^3.1.3"
+    "@smithy/shared-ini-file-loader" "^3.1.4"
+    "@smithy/types" "^3.3.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-process@3.577.0":
-  version "3.577.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.577.0.tgz#ba35b4f012563762bbd86a71989d366272ee0f07"
-  integrity sha512-Gin6BWtOiXxIgITrJ3Nwc+Y2P1uVT6huYR4EcbA/DJUPWyO0n9y5UFLewPvVbLkRn15JeEqErBLUrHclkiOKtw==
+"@aws-sdk/credential-provider-process@3.614.0":
+  version "3.614.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.614.0.tgz#b6b9382346dfe51c8fb448595ae55b930532c897"
+  integrity sha512-Q0SI0sTRwi8iNODLs5+bbv8vgz8Qy2QdxbCHnPk/6Cx6LMf7i3dqmWquFbspqFRd8QiqxStrblwxrUYZi09tkA==
   dependencies:
-    "@aws-sdk/types" "3.577.0"
-    "@smithy/property-provider" "^3.0.0"
-    "@smithy/shared-ini-file-loader" "^3.0.0"
-    "@smithy/types" "^3.0.0"
+    "@aws-sdk/types" "3.609.0"
+    "@smithy/property-provider" "^3.1.3"
+    "@smithy/shared-ini-file-loader" "^3.1.4"
+    "@smithy/types" "^3.3.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-sso@3.583.0":
-  version "3.583.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.583.0.tgz#468bb6ca9bd7b89370d5ec7865a8e29e98772abc"
-  integrity sha512-G/1EvL9tBezSiU+06tG4K/kOvFfPjnheT4JSXqjPM7+vjKzgp2jxp1J9MMd69zs4jVWon932zMeGgjrCplzMEg==
+"@aws-sdk/credential-provider-sso@3.616.0":
+  version "3.616.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.616.0.tgz#051b1a2eb31fa30866f2c1e95bbcf965911b16c3"
+  integrity sha512-3rsWs9GBi8Z8Gps5ROwqguxtw+J6OIg1vawZMLRNMqqZoBvbOToe9wEnpid8ylU+27+oG8uibJNlNuRyXApUjw==
   dependencies:
-    "@aws-sdk/client-sso" "3.583.0"
-    "@aws-sdk/token-providers" "3.577.0"
-    "@aws-sdk/types" "3.577.0"
-    "@smithy/property-provider" "^3.0.0"
-    "@smithy/shared-ini-file-loader" "^3.0.0"
-    "@smithy/types" "^3.0.0"
+    "@aws-sdk/client-sso" "3.616.0"
+    "@aws-sdk/token-providers" "3.614.0"
+    "@aws-sdk/types" "3.609.0"
+    "@smithy/property-provider" "^3.1.3"
+    "@smithy/shared-ini-file-loader" "^3.1.4"
+    "@smithy/types" "^3.3.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-web-identity@3.577.0":
-  version "3.577.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.577.0.tgz#294fb71fa832d9f55ea1c56678357efa3cd7ca55"
-  integrity sha512-ZGHGNRaCtJJmszb9UTnC7izNCtRUttdPlLdMkh41KPS32vfdrBDHs1JrpbZijItRj1xKuOXsiYSXLAaHGcLh8Q==
+"@aws-sdk/credential-provider-web-identity@3.609.0":
+  version "3.609.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.609.0.tgz#d29222d6894347ee89c781ea090d388656df1d2a"
+  integrity sha512-U+PG8NhlYYF45zbr1km3ROtBMYqyyj/oK8NRp++UHHeuavgrP+4wJ4wQnlEaKvJBjevfo3+dlIBcaeQ7NYejWg==
   dependencies:
-    "@aws-sdk/types" "3.577.0"
-    "@smithy/property-provider" "^3.0.0"
-    "@smithy/types" "^3.0.0"
+    "@aws-sdk/types" "3.609.0"
+    "@smithy/property-provider" "^3.1.3"
+    "@smithy/types" "^3.3.0"
     tslib "^2.6.2"
 
 "@aws-sdk/credential-providers@^3.186.0":
-  version "3.583.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.583.0.tgz#138f4894cd2f00730b618434bfc86caec253636c"
-  integrity sha512-aD/lw6LJW51f+LgdR54UxyGvXqWZs4HCT310Qf794qFItDWXqhHK4EgS1x41BgAvXPUx0+HSO8OI4eb+AklckA==
+  version "3.617.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.617.0.tgz#624fdd948b2dbd64e7b7be82983a09a8201b60c3"
+  integrity sha512-ZXzdnHI7Tfsk7Y2hezlhxFHlG2VM5tTWQPZ0qZ/cYCzZxyZfsmSFr/rMi6wJGB2J6ZDbbAohEoOWrEblHVq7Cw==
   dependencies:
-    "@aws-sdk/client-cognito-identity" "3.583.0"
-    "@aws-sdk/client-sso" "3.583.0"
-    "@aws-sdk/client-sts" "3.583.0"
-    "@aws-sdk/credential-provider-cognito-identity" "3.583.0"
-    "@aws-sdk/credential-provider-env" "3.577.0"
-    "@aws-sdk/credential-provider-http" "3.582.0"
-    "@aws-sdk/credential-provider-ini" "3.583.0"
-    "@aws-sdk/credential-provider-node" "3.583.0"
-    "@aws-sdk/credential-provider-process" "3.577.0"
-    "@aws-sdk/credential-provider-sso" "3.583.0"
-    "@aws-sdk/credential-provider-web-identity" "3.577.0"
-    "@aws-sdk/types" "3.577.0"
-    "@smithy/credential-provider-imds" "^3.0.0"
-    "@smithy/property-provider" "^3.0.0"
-    "@smithy/types" "^3.0.0"
+    "@aws-sdk/client-cognito-identity" "3.616.0"
+    "@aws-sdk/client-sso" "3.616.0"
+    "@aws-sdk/client-sts" "3.616.0"
+    "@aws-sdk/credential-provider-cognito-identity" "3.616.0"
+    "@aws-sdk/credential-provider-env" "3.609.0"
+    "@aws-sdk/credential-provider-http" "3.616.0"
+    "@aws-sdk/credential-provider-ini" "3.616.0"
+    "@aws-sdk/credential-provider-node" "3.616.0"
+    "@aws-sdk/credential-provider-process" "3.614.0"
+    "@aws-sdk/credential-provider-sso" "3.616.0"
+    "@aws-sdk/credential-provider-web-identity" "3.609.0"
+    "@aws-sdk/types" "3.609.0"
+    "@smithy/credential-provider-imds" "^3.1.4"
+    "@smithy/property-provider" "^3.1.3"
+    "@smithy/types" "^3.3.0"
     tslib "^2.6.2"
 
-"@aws-sdk/middleware-host-header@3.577.0":
-  version "3.577.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.577.0.tgz#a3fc626d409ec850296740478c64ef5806d8b878"
-  integrity sha512-9ca5MJz455CODIVXs0/sWmJm7t3QO4EUa1zf8pE8grLpzf0J94bz/skDWm37Pli13T3WaAQBHCTiH2gUVfCsWg==
+"@aws-sdk/middleware-host-header@3.616.0":
+  version "3.616.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.616.0.tgz#542dac3370374ba3733c96a6bb153e6fe53fafe6"
+  integrity sha512-mhNfHuGhCDZwYCABebaOvTgOM44UCZZRq2cBpgPZLVKP0ydAv5aFHXv01goexxXHqgHoEGx0uXWxlw0s2EpFDg==
   dependencies:
-    "@aws-sdk/types" "3.577.0"
-    "@smithy/protocol-http" "^4.0.0"
-    "@smithy/types" "^3.0.0"
+    "@aws-sdk/types" "3.609.0"
+    "@smithy/protocol-http" "^4.0.4"
+    "@smithy/types" "^3.3.0"
     tslib "^2.6.2"
 
-"@aws-sdk/middleware-logger@3.577.0":
-  version "3.577.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.577.0.tgz#6da3b13ae284fb3930961f0fc8e20b1f6cf8be30"
-  integrity sha512-aPFGpGjTZcJYk+24bg7jT4XdIp42mFXSuPt49lw5KygefLyJM/sB0bKKqPYYivW0rcuZ9brQ58eZUNthrzYAvg==
+"@aws-sdk/middleware-logger@3.609.0":
+  version "3.609.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.609.0.tgz#ed44d201f091b8bac908cbf14724c7a4d492553f"
+  integrity sha512-S62U2dy4jMDhDFDK5gZ4VxFdWzCtLzwbYyFZx2uvPYTECkepLUfzLic2BHg2Qvtu4QjX+oGE3P/7fwaGIsGNuQ==
   dependencies:
-    "@aws-sdk/types" "3.577.0"
-    "@smithy/types" "^3.0.0"
+    "@aws-sdk/types" "3.609.0"
+    "@smithy/types" "^3.3.0"
     tslib "^2.6.2"
 
-"@aws-sdk/middleware-recursion-detection@3.577.0":
-  version "3.577.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.577.0.tgz#fff76abc6d4521636f9e654ce5bf2c4c79249417"
-  integrity sha512-pn3ZVEd2iobKJlR3H+bDilHjgRnNrQ6HMmK9ZzZw89Ckn3Dcbv48xOv4RJvu0aU8SDLl/SNCxppKjeLDTPGBNA==
+"@aws-sdk/middleware-recursion-detection@3.616.0":
+  version "3.616.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.616.0.tgz#fa87c9d77c6f85d02b9cf8394f52b2d6334a63af"
+  integrity sha512-LQKAcrZRrR9EGez4fdCIVjdn0Ot2HMN12ChnoMGEU6oIxnQ2aSC7iASFFCV39IYfeMh7iSCPj7Wopqw8rAouzg==
   dependencies:
-    "@aws-sdk/types" "3.577.0"
-    "@smithy/protocol-http" "^4.0.0"
-    "@smithy/types" "^3.0.0"
+    "@aws-sdk/types" "3.609.0"
+    "@smithy/protocol-http" "^4.0.4"
+    "@smithy/types" "^3.3.0"
     tslib "^2.6.2"
 
-"@aws-sdk/middleware-user-agent@3.583.0":
-  version "3.583.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.583.0.tgz#5554b0de431cb3700368f01eb7425210fd3ee9a9"
-  integrity sha512-xVNXXXDWvBVI/AeVtSdA9SVumqxiZaESk/JpUn9GMkmtTKfter0Cweap+1iQ9j8bRAO0vNhmIkbcvdB1S4WVUw==
+"@aws-sdk/middleware-user-agent@3.616.0":
+  version "3.616.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.616.0.tgz#fe11d62e9cdc96a354c37968499fa32637a70f45"
+  integrity sha512-iMcAb4E+Z3vuEcrDsG6T2OBNiqWAquwahP9qepHqfmnmJqHr1mSHtXDYTGBNid31+621sUQmneUQ+fagpGAe4w==
   dependencies:
-    "@aws-sdk/types" "3.577.0"
-    "@aws-sdk/util-endpoints" "3.583.0"
-    "@smithy/protocol-http" "^4.0.0"
-    "@smithy/types" "^3.0.0"
+    "@aws-sdk/types" "3.609.0"
+    "@aws-sdk/util-endpoints" "3.614.0"
+    "@smithy/protocol-http" "^4.0.4"
+    "@smithy/types" "^3.3.0"
     tslib "^2.6.2"
 
-"@aws-sdk/region-config-resolver@3.577.0":
-  version "3.577.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.577.0.tgz#1fab6dc6c4ec3ad9a0352c1ce1a757464219fb00"
-  integrity sha512-4ChCFACNwzqx/xjg3zgFcW8Ali6R9C95cFECKWT/7CUM1D0MGvkclSH2cLarmHCmJgU6onKkJroFtWp0kHhgyg==
+"@aws-sdk/region-config-resolver@3.614.0":
+  version "3.614.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.614.0.tgz#9cebb31a5bcfea2a41891fff7f28d0164cde179a"
+  integrity sha512-vDCeMXvic/LU0KFIUjpC3RiSTIkkvESsEfbVHiHH0YINfl8HnEqR5rj+L8+phsCeVg2+LmYwYxd5NRz4PHxt5g==
   dependencies:
-    "@aws-sdk/types" "3.577.0"
-    "@smithy/node-config-provider" "^3.0.0"
-    "@smithy/types" "^3.0.0"
+    "@aws-sdk/types" "3.609.0"
+    "@smithy/node-config-provider" "^3.1.4"
+    "@smithy/types" "^3.3.0"
     "@smithy/util-config-provider" "^3.0.0"
-    "@smithy/util-middleware" "^3.0.0"
+    "@smithy/util-middleware" "^3.0.3"
     tslib "^2.6.2"
 
-"@aws-sdk/token-providers@3.577.0":
-  version "3.577.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.577.0.tgz#8f9e96ff42994dfd0b5b3692b583644ccda04893"
-  integrity sha512-0CkIZpcC3DNQJQ1hDjm2bdSy/Xjs7Ny5YvSsacasGOkNfk+FdkiQy6N67bZX3Zbc9KIx+Nz4bu3iDeNSNplnnQ==
+"@aws-sdk/token-providers@3.614.0":
+  version "3.614.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.614.0.tgz#88da04f6d4ce916b0b0f6e045676d04201fb47fd"
+  integrity sha512-okItqyY6L9IHdxqs+Z116y5/nda7rHxLvROxtAJdLavWTYDydxrZstImNgGWTeVdmc0xX2gJCI77UYUTQWnhRw==
   dependencies:
-    "@aws-sdk/types" "3.577.0"
-    "@smithy/property-provider" "^3.0.0"
-    "@smithy/shared-ini-file-loader" "^3.0.0"
-    "@smithy/types" "^3.0.0"
+    "@aws-sdk/types" "3.609.0"
+    "@smithy/property-provider" "^3.1.3"
+    "@smithy/shared-ini-file-loader" "^3.1.4"
+    "@smithy/types" "^3.3.0"
     tslib "^2.6.2"
 
-"@aws-sdk/types@3.577.0", "@aws-sdk/types@^3.222.0":
-  version "3.577.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.577.0.tgz#7700784d368ce386745f8c340d9d68cea4716f90"
-  integrity sha512-FT2JZES3wBKN/alfmhlo+3ZOq/XJ0C7QOZcDNrpKjB0kqYoKjhVKZ/Hx6ArR0czkKfHzBBEs6y40ebIHx2nSmA==
+"@aws-sdk/types@3.609.0", "@aws-sdk/types@^3.222.0":
+  version "3.609.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.609.0.tgz#06b39d799c9f197a7b43670243e8e78a3bf7d6a5"
+  integrity sha512-+Tqnh9w0h2LcrUsdXyT1F8mNhXz+tVYBtP19LpeEGntmvHwa2XzvLUCWpoIAIVsHp5+HdB2X9Sn0KAtmbFXc2Q==
   dependencies:
-    "@smithy/types" "^3.0.0"
+    "@smithy/types" "^3.3.0"
     tslib "^2.6.2"
 
-"@aws-sdk/util-endpoints@3.583.0":
-  version "3.583.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.583.0.tgz#1554d3b4124be21a72a519603e9727d973845504"
-  integrity sha512-ZC9mb2jq6BFXPYsUsD2tmYcnlmd+9PGNwnFNn8jk4abna5Jjk2wDknN81ybktmBR5ttN9W8ugmktuKtvAMIDCQ==
+"@aws-sdk/util-endpoints@3.614.0":
+  version "3.614.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.614.0.tgz#6564b0ffd7dc3728221e9f9821f5aab1cc58468e"
+  integrity sha512-wK2cdrXHH4oz4IomV/yrGkftU9A+ITB6nFL+rxxyO78is2ifHJpFdV4aqk4LSkXYPi6CXWNru/Dqc7yiKXgJPw==
   dependencies:
-    "@aws-sdk/types" "3.577.0"
-    "@smithy/types" "^3.0.0"
-    "@smithy/util-endpoints" "^2.0.0"
+    "@aws-sdk/types" "3.609.0"
+    "@smithy/types" "^3.3.0"
+    "@smithy/util-endpoints" "^2.0.5"
     tslib "^2.6.2"
 
 "@aws-sdk/util-locate-window@^3.0.0":
@@ -466,37 +458,30 @@
   dependencies:
     tslib "^2.6.2"
 
-"@aws-sdk/util-user-agent-browser@3.577.0":
-  version "3.577.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.577.0.tgz#d4d2cdb3a2b3d1c8b35f239ee9f7b2c87bee66ea"
-  integrity sha512-zEAzHgR6HWpZOH7xFgeJLc6/CzMcx4nxeQolZxVZoB5pPaJd3CjyRhZN0xXeZB0XIRCWmb4yJBgyiugXLNMkLA==
+"@aws-sdk/util-user-agent-browser@3.609.0":
+  version "3.609.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.609.0.tgz#aa15421b2e32ae8bc589dac2bd6e8969832ce588"
+  integrity sha512-fojPU+mNahzQ0YHYBsx0ZIhmMA96H+ZIZ665ObU9tl+SGdbLneVZVikGve+NmHTQwHzwkFsZYYnVKAkreJLAtA==
   dependencies:
-    "@aws-sdk/types" "3.577.0"
-    "@smithy/types" "^3.0.0"
+    "@aws-sdk/types" "3.609.0"
+    "@smithy/types" "^3.3.0"
     bowser "^2.11.0"
     tslib "^2.6.2"
 
-"@aws-sdk/util-user-agent-node@3.577.0":
-  version "3.577.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.577.0.tgz#0215ea10ead622a61b575a7181a4c51ae8e71449"
-  integrity sha512-XqvtFjbSMtycZTWVwDe8DRWovuoMbA54nhUoZwVU6rW9OSD6NZWGR512BUGHFaWzW0Wg8++Dj10FrKTG2XtqfA==
+"@aws-sdk/util-user-agent-node@3.614.0":
+  version "3.614.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.614.0.tgz#1e3f49a80f841a3f21647baed2adce01aac5beb5"
+  integrity sha512-15ElZT88peoHnq5TEoEtZwoXTXRxNrk60TZNdpl/TUBJ5oNJ9Dqb5Z4ryb8ofN6nm9aFf59GVAerFDz8iUoHBA==
   dependencies:
-    "@aws-sdk/types" "3.577.0"
-    "@smithy/node-config-provider" "^3.0.0"
-    "@smithy/types" "^3.0.0"
+    "@aws-sdk/types" "3.609.0"
+    "@smithy/node-config-provider" "^3.1.4"
+    "@smithy/types" "^3.3.0"
     tslib "^2.6.2"
 
-"@aws-sdk/util-utf8-browser@^3.0.0":
-  version "3.259.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.259.0.tgz#3275a6f5eb334f96ca76635b961d3c50259fd9ff"
-  integrity sha512-UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw==
-  dependencies:
-    tslib "^2.3.1"
-
 "@babel/cli@^7.16.0":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.24.6.tgz#fac1fb099dff635efa1110882063c44a211cf18c"
-  integrity sha512-Sm/YhG/0REw9SKByFHDf4hkk7PYsjcsOyZgHGz1nvab4tUTQ9N4XVv+ykK0Y+VCJ3OshA/7EDyxnwCd8NEP/mQ==
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.24.8.tgz#79eaa55a69c77cafbea3e87537fd1df5a5a2edf8"
+  integrity sha512-isdp+G6DpRyKc+3Gqxy2rjzgF7Zj9K0mzLNnxz+E/fgeag8qT3vVulX4gY9dGO1q0y+0lUv6V3a+uhUzMzrwXg==
   dependencies:
     "@jridgewell/trace-mapping" "^0.3.25"
     commander "^6.2.0"
@@ -509,162 +494,166 @@
     "@nicolo-ribaudo/chokidar-2" "2.1.8-no-fsevents.3"
     chokidar "^3.4.0"
 
-"@babel/code-frame@^7.24.6":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.6.tgz#ab88da19344445c3d8889af2216606d3329f3ef2"
-  integrity sha512-ZJhac6FkEd1yhG2AHOmfcXG4ceoLltoCVJjN5XsWN9BifBQr+cHJbWi0h68HZuSORq+3WtJ2z0hwF2NG1b5kcA==
+"@babel/code-frame@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.7.tgz#882fd9e09e8ee324e496bd040401c6f046ef4465"
+  integrity sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==
   dependencies:
-    "@babel/highlight" "^7.24.6"
+    "@babel/highlight" "^7.24.7"
     picocolors "^1.0.0"
 
-"@babel/compat-data@^7.24.6":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.24.6.tgz#b3600217688cabb26e25f8e467019e66d71b7ae2"
-  integrity sha512-aC2DGhBq5eEdyXWqrDInSqQjO0k8xtPRf5YylULqx8MCd6jBtzqfta/3ETMRpuKIc5hyswfO80ObyA1MvkCcUQ==
+"@babel/compat-data@^7.24.8":
+  version "7.24.9"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.24.9.tgz#53eee4e68f1c1d0282aa0eb05ddb02d033fc43a0"
+  integrity sha512-e701mcfApCJqMMueQI0Fb68Amflj83+dvAvHawoBpAz+GDjCIyGHzNwnefjsWJ3xiYAqqiQFoWbspGYBdb2/ng==
 
 "@babel/core@^7.16.5":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.6.tgz#8650e0e4b03589ebe886c4e4a60398db0a7ec787"
-  integrity sha512-qAHSfAdVyFmIvl0VHELib8xar7ONuSHrE2hLnsaWkYNTI68dmi1x8GYDhJjMI/e7XWal9QBlZkwbOnkcw7Z8gQ==
+  version "7.24.9"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.9.tgz#dc07c9d307162c97fa9484ea997ade65841c7c82"
+  integrity sha512-5e3FI4Q3M3Pbr21+5xJwCv6ZT6KmGkI0vw3Tozy5ODAQFTIWe37iT8Cr7Ice2Ntb+M3iSKCEWMB1MBgKrW3whg==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.24.6"
-    "@babel/generator" "^7.24.6"
-    "@babel/helper-compilation-targets" "^7.24.6"
-    "@babel/helper-module-transforms" "^7.24.6"
-    "@babel/helpers" "^7.24.6"
-    "@babel/parser" "^7.24.6"
-    "@babel/template" "^7.24.6"
-    "@babel/traverse" "^7.24.6"
-    "@babel/types" "^7.24.6"
+    "@babel/code-frame" "^7.24.7"
+    "@babel/generator" "^7.24.9"
+    "@babel/helper-compilation-targets" "^7.24.8"
+    "@babel/helper-module-transforms" "^7.24.9"
+    "@babel/helpers" "^7.24.8"
+    "@babel/parser" "^7.24.8"
+    "@babel/template" "^7.24.7"
+    "@babel/traverse" "^7.24.8"
+    "@babel/types" "^7.24.9"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/generator@^7.24.6", "@babel/generator@^7.4.0":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.6.tgz#dfac82a228582a9d30c959fe50ad28951d4737a7"
-  integrity sha512-S7m4eNa6YAPJRHmKsLHIDJhNAGNKoWNiWefz1MBbpnt8g9lvMDl1hir4P9bo/57bQEmuwEhnRU/AMWsD0G/Fbg==
+"@babel/generator@^7.24.8", "@babel/generator@^7.24.9", "@babel/generator@^7.4.0":
+  version "7.24.10"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.10.tgz#a4ab681ec2a78bbb9ba22a3941195e28a81d8e76"
+  integrity sha512-o9HBZL1G2129luEUlG1hB4N/nlYNWHnpwlND9eOMclRqqu1YDy2sSYVCFUZwl8I1Gxh+QSRrP2vD7EpUmFVXxg==
   dependencies:
-    "@babel/types" "^7.24.6"
+    "@babel/types" "^7.24.9"
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^2.5.1"
 
-"@babel/helper-annotate-as-pure@^7.24.6":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.6.tgz#517af93abc77924f9b2514c407bbef527fb8938d"
-  integrity sha512-DitEzDfOMnd13kZnDqns1ccmftwJTS9DMkyn9pYTxulS7bZxUxpMly3Nf23QQ6NwA4UB8lAqjbqWtyvElEMAkg==
+"@babel/helper-annotate-as-pure@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz#5373c7bc8366b12a033b4be1ac13a206c6656aab"
+  integrity sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==
   dependencies:
-    "@babel/types" "^7.24.6"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-compilation-targets@^7.24.6":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.6.tgz#4a51d681f7680043d38e212715e2a7b1ad29cb51"
-  integrity sha512-VZQ57UsDGlX/5fFA7GkVPplZhHsVc+vuErWgdOiysI9Ksnw0Pbbd6pnPiR/mmJyKHgyIW0c7KT32gmhiF+cirg==
+"@babel/helper-compilation-targets@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.8.tgz#b607c3161cd9d1744977d4f97139572fe778c271"
+  integrity sha512-oU+UoqCHdp+nWVDkpldqIQL/i/bvAv53tRqLG/s+cOXxe66zOYLU7ar/Xs3LdmBihrUMEUhwu6dMZwbNOYDwvw==
   dependencies:
-    "@babel/compat-data" "^7.24.6"
-    "@babel/helper-validator-option" "^7.24.6"
-    browserslist "^4.22.2"
+    "@babel/compat-data" "^7.24.8"
+    "@babel/helper-validator-option" "^7.24.8"
+    browserslist "^4.23.1"
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
-"@babel/helper-environment-visitor@^7.24.6":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.6.tgz#ac7ad5517821641550f6698dd5468f8cef78620d"
-  integrity sha512-Y50Cg3k0LKLMjxdPjIl40SdJgMB85iXn27Vk/qbHZCFx/o5XO3PSnpi675h1KEmmDb6OFArfd5SCQEQ5Q4H88g==
-
-"@babel/helper-function-name@^7.24.6":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.24.6.tgz#cebdd063386fdb95d511d84b117e51fc68fec0c8"
-  integrity sha512-xpeLqeeRkbxhnYimfr2PC+iA0Q7ljX/d1eZ9/inYbmfG2jpl8Lu3DyXvpOAnrS5kxkfOWJjioIMQsaMBXFI05w==
+"@babel/helper-environment-visitor@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz#4b31ba9551d1f90781ba83491dd59cf9b269f7d9"
+  integrity sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==
   dependencies:
-    "@babel/template" "^7.24.6"
-    "@babel/types" "^7.24.6"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-hoist-variables@^7.24.6":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.6.tgz#8a7ece8c26756826b6ffcdd0e3cf65de275af7f9"
-  integrity sha512-SF/EMrC3OD7dSta1bLJIlrsVxwtd0UpjRJqLno6125epQMJ/kyFmpTT4pbvPbdQHzCHg+biQ7Syo8lnDtbR+uA==
+"@babel/helper-function-name@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz#75f1e1725742f39ac6584ee0b16d94513da38dd2"
+  integrity sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==
   dependencies:
-    "@babel/types" "^7.24.6"
+    "@babel/template" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-module-imports@^7.24.6":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.6.tgz#65e54ffceed6a268dc4ce11f0433b82cfff57852"
-  integrity sha512-a26dmxFJBF62rRO9mmpgrfTLsAuyHk4e1hKTUkD/fcMfynt8gvEKwQPQDVxWhca8dHoDck+55DFt42zV0QMw5g==
+"@babel/helper-hoist-variables@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz#b4ede1cde2fd89436397f30dc9376ee06b0f25ee"
+  integrity sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==
   dependencies:
-    "@babel/types" "^7.24.6"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-module-transforms@^7.24.6":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.24.6.tgz#22346ed9df44ce84dee850d7433c5b73fab1fe4e"
-  integrity sha512-Y/YMPm83mV2HJTbX1Qh2sjgjqcacvOlhbzdCCsSlblOKjSYmQqEbO6rUniWQyRo9ncyfjT8hnUjlG06RXDEmcA==
+"@babel/helper-module-imports@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz#f2f980392de5b84c3328fc71d38bd81bbb83042b"
+  integrity sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.24.6"
-    "@babel/helper-module-imports" "^7.24.6"
-    "@babel/helper-simple-access" "^7.24.6"
-    "@babel/helper-split-export-declaration" "^7.24.6"
-    "@babel/helper-validator-identifier" "^7.24.6"
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-plugin-utils@^7.24.6":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.6.tgz#fa02a32410a15a6e8f8185bcbf608f10528d2a24"
-  integrity sha512-MZG/JcWfxybKwsA9N9PmtF2lOSFSEMVCpIRrbxccZFLJPrJciJdG/UhSh5W96GEteJI2ARqm5UAHxISwRDLSNg==
-
-"@babel/helper-simple-access@^7.24.6":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.24.6.tgz#1d6e04d468bba4fc963b4906f6dac6286cfedff1"
-  integrity sha512-nZzcMMD4ZhmB35MOOzQuiGO5RzL6tJbsT37Zx8M5L/i9KSrukGXWTjLe1knIbb/RmxoJE9GON9soq0c0VEMM5g==
+"@babel/helper-module-transforms@^7.24.9":
+  version "7.24.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.24.9.tgz#e13d26306b89eea569180868e652e7f514de9d29"
+  integrity sha512-oYbh+rtFKj/HwBQkFlUzvcybzklmVdVV3UU+mN7n2t/q3yGHbuVdNxyFvSBO1tfvjyArpHNcWMAzsSPdyI46hw==
   dependencies:
-    "@babel/types" "^7.24.6"
+    "@babel/helper-environment-visitor" "^7.24.7"
+    "@babel/helper-module-imports" "^7.24.7"
+    "@babel/helper-simple-access" "^7.24.7"
+    "@babel/helper-split-export-declaration" "^7.24.7"
+    "@babel/helper-validator-identifier" "^7.24.7"
 
-"@babel/helper-split-export-declaration@^7.24.6":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.6.tgz#e830068f7ba8861c53b7421c284da30ae656d7a3"
-  integrity sha512-CvLSkwXGWnYlF9+J3iZUvwgAxKiYzK3BWuo+mLzD/MDGOZDj7Gq8+hqaOkMxmJwmlv0iu86uH5fdADd9Hxkymw==
+"@babel/helper-plugin-utils@^7.24.7":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz#94ee67e8ec0e5d44ea7baeb51e571bd26af07878"
+  integrity sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==
+
+"@babel/helper-simple-access@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz#bcade8da3aec8ed16b9c4953b74e506b51b5edb3"
+  integrity sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==
   dependencies:
-    "@babel/types" "^7.24.6"
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-string-parser@^7.24.6":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.6.tgz#28583c28b15f2a3339cfafafeaad42f9a0e828df"
-  integrity sha512-WdJjwMEkmBicq5T9fm/cHND3+UlFa2Yj8ALLgmoSQAJZysYbBjw+azChSGPN4DSPLXOcooGRvDwZWMcF/mLO2Q==
-
-"@babel/helper-validator-identifier@^7.24.6":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.6.tgz#08bb6612b11bdec78f3feed3db196da682454a5e"
-  integrity sha512-4yA7s865JHaqUdRbnaxarZREuPTHrjpDT+pXoAZ1yhyo6uFnIEpS8VMu16siFOHDpZNKYv5BObhsB//ycbICyw==
-
-"@babel/helper-validator-option@^7.24.6":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.6.tgz#59d8e81c40b7d9109ab7e74457393442177f460a"
-  integrity sha512-Jktc8KkF3zIkePb48QO+IapbXlSapOW9S+ogZZkcO6bABgYAxtZcjZ/O005111YLf+j4M84uEgwYoidDkXbCkQ==
-
-"@babel/helpers@^7.24.6":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.6.tgz#cd124245299e494bd4e00edda0e4ea3545c2c176"
-  integrity sha512-V2PI+NqnyFu1i0GyTd/O/cTpxzQCYioSkUIRmgo7gFEHKKCg5w46+r/A6WeUR1+P3TeQ49dspGPNd/E3n9AnnA==
+"@babel/helper-split-export-declaration@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz#83949436890e07fa3d6873c61a96e3bbf692d856"
+  integrity sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==
   dependencies:
-    "@babel/template" "^7.24.6"
-    "@babel/types" "^7.24.6"
+    "@babel/types" "^7.24.7"
 
-"@babel/highlight@^7.24.6":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.6.tgz#6d610c1ebd2c6e061cade0153bf69b0590b7b3df"
-  integrity sha512-2YnuOp4HAk2BsBrJJvYCbItHx0zWscI1C3zgWkz+wDyD9I7GIVrfnLyrR4Y1VR+7p+chAEcrgRQYZAGIKMV7vQ==
+"@babel/helper-string-parser@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz#5b3329c9a58803d5df425e5785865881a81ca48d"
+  integrity sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==
+
+"@babel/helper-validator-identifier@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db"
+  integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==
+
+"@babel/helper-validator-option@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz#3725cdeea8b480e86d34df15304806a06975e33d"
+  integrity sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==
+
+"@babel/helpers@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.8.tgz#2820d64d5d6686cca8789dd15b074cd862795873"
+  integrity sha512-gV2265Nkcz7weJJfvDoAEVzC1e2OTDpkGbEsebse8koXUJUXPsCMi7sRo/+SPMuMZ9MtUPnGwITTnQnU5YjyaQ==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.24.6"
+    "@babel/template" "^7.24.7"
+    "@babel/types" "^7.24.8"
+
+"@babel/highlight@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.7.tgz#a05ab1df134b286558aae0ed41e6c5f731bf409d"
+  integrity sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.24.7"
     chalk "^2.4.2"
     js-tokens "^4.0.0"
     picocolors "^1.0.0"
 
 "@babel/node@^7.16.5":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.24.6.tgz#cefca562b9c569583431f1f07a0965101614b223"
-  integrity sha512-63bD/Kbh1Vl6HapTZLSsyaGlQhhpF1/GpyS1oJotroJKoamOgKKEEKk3iHZAkicjcr+n4V4zdB0V+8siv6AZ5Q==
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.24.8.tgz#4f03c13da11ac56d1a26b96eb17fd07ac8187498"
+  integrity sha512-4JgQZJOVDrMCe2OwP7g4nBEvv0kbTkWYVvkEhFdq8JdEhsy9J5E5ChibbIchTrntKB62lx2I7fVTdM+Se7KVFg==
   dependencies:
     "@babel/register" "^7.24.6"
     commander "^6.2.0"
@@ -673,28 +662,28 @@
     regenerator-runtime "^0.14.0"
     v8flags "^3.1.1"
 
-"@babel/parser@^7.24.6", "@babel/parser@^7.4.3":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.6.tgz#5e030f440c3c6c78d195528c3b688b101a365328"
-  integrity sha512-eNZXdfU35nJC2h24RznROuOpO94h6x8sg9ju0tT9biNtLZ2vuP8SduLqqV+/8+cebSLV9SJEAN5Z3zQbJG/M+Q==
+"@babel/parser@^7.24.7", "@babel/parser@^7.24.8", "@babel/parser@^7.4.3":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.8.tgz#58a4dbbcad7eb1d48930524a3fd93d93e9084c6f"
+  integrity sha512-WzfbgXOkGzZiXXCqk43kKwZjzwx4oulxZi3nq2TYL9mOjQv6kYwul9mz6ID36njuL7Xkp6nJEfok848Zj10j/w==
 
-"@babel/plugin-syntax-jsx@^7.24.6":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.6.tgz#bcca2964150437f88f65e3679e3d68762287b9c8"
-  integrity sha512-lWfvAIFNWMlCsU0DRUun2GpFwZdGTukLaHJqRh1JRb80NdAP5Sb1HDHB5X9P9OtgZHQl089UzQkpYlBq2VTPRw==
+"@babel/plugin-syntax-jsx@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz#39a1fa4a7e3d3d7f34e2acc6be585b718d30e02d"
+  integrity sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.6"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
 "@babel/plugin-transform-react-jsx@^7.16.5":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.24.6.tgz#4ca3660ca663d20095455571615d6263986cdfe4"
-  integrity sha512-pCtPHhpRZHfwdA5G1Gpk5mIzMA99hv0R8S/Ket50Rw+S+8hkt3wBWqdqHaPw0CuUYxdshUgsPiLQ5fAs4ASMhw==
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.24.7.tgz#17cd06b75a9f0e2bd076503400e7c4b99beedac4"
+  integrity sha512-+Dj06GDZEFRYvclU6k4bme55GKBEWUmByM/eoKuqg4zTNQHiApWRhQph5fxQB2wAEFvRzL1tOEj1RJ19wJrhoA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.24.6"
-    "@babel/helper-module-imports" "^7.24.6"
-    "@babel/helper-plugin-utils" "^7.24.6"
-    "@babel/plugin-syntax-jsx" "^7.24.6"
-    "@babel/types" "^7.24.6"
+    "@babel/helper-annotate-as-pure" "^7.24.7"
+    "@babel/helper-module-imports" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/plugin-syntax-jsx" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
 "@babel/register@^7.24.6":
   version "7.24.6"
@@ -707,38 +696,38 @@
     pirates "^4.0.6"
     source-map-support "^0.5.16"
 
-"@babel/template@^7.24.6", "@babel/template@^7.4.0":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.24.6.tgz#048c347b2787a6072b24c723664c8d02b67a44f9"
-  integrity sha512-3vgazJlLwNXi9jhrR1ef8qiB65L1RK90+lEQwv4OxveHnqC3BfmnHdgySwRLzf6akhlOYenT+b7AfWq+a//AHw==
+"@babel/template@^7.24.7", "@babel/template@^7.4.0":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.24.7.tgz#02efcee317d0609d2c07117cb70ef8fb17ab7315"
+  integrity sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==
   dependencies:
-    "@babel/code-frame" "^7.24.6"
-    "@babel/parser" "^7.24.6"
-    "@babel/types" "^7.24.6"
+    "@babel/code-frame" "^7.24.7"
+    "@babel/parser" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
-"@babel/traverse@^7.24.6", "@babel/traverse@^7.4.3":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.6.tgz#0941ec50cdeaeacad0911eb67ae227a4f8424edc"
-  integrity sha512-OsNjaJwT9Zn8ozxcfoBc+RaHdj3gFmCmYoQLUII1o6ZrUwku0BMg80FoOTPx+Gi6XhcQxAYE4xyjPTo4SxEQqw==
+"@babel/traverse@^7.24.7", "@babel/traverse@^7.24.8", "@babel/traverse@^7.4.3":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.8.tgz#6c14ed5232b7549df3371d820fbd9abfcd7dfab7"
+  integrity sha512-t0P1xxAPzEDcEPmjprAQq19NWum4K0EQPjMwZQZbHt+GiZqvjCHjj755Weq1YRPVzBI+3zSfvScfpnuIecVFJQ==
   dependencies:
-    "@babel/code-frame" "^7.24.6"
-    "@babel/generator" "^7.24.6"
-    "@babel/helper-environment-visitor" "^7.24.6"
-    "@babel/helper-function-name" "^7.24.6"
-    "@babel/helper-hoist-variables" "^7.24.6"
-    "@babel/helper-split-export-declaration" "^7.24.6"
-    "@babel/parser" "^7.24.6"
-    "@babel/types" "^7.24.6"
+    "@babel/code-frame" "^7.24.7"
+    "@babel/generator" "^7.24.8"
+    "@babel/helper-environment-visitor" "^7.24.7"
+    "@babel/helper-function-name" "^7.24.7"
+    "@babel/helper-hoist-variables" "^7.24.7"
+    "@babel/helper-split-export-declaration" "^7.24.7"
+    "@babel/parser" "^7.24.8"
+    "@babel/types" "^7.24.8"
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@^7.24.6", "@babel/types@^7.4.0":
-  version "7.24.6"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.6.tgz#ba4e1f59870c10dc2fa95a274ac4feec23b21912"
-  integrity sha512-WaMsgi6Q8zMgMth93GvWPXkhAIEobfsIkLTacoVZoK1J0CevIPGYY2Vo5YvJGqyHqXM6P4ppOYGsIRU8MM9pFQ==
+"@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.24.9", "@babel/types@^7.4.0":
+  version "7.24.9"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.9.tgz#228ce953d7b0d16646e755acf204f4cf3d08cc73"
+  integrity sha512-xm8XrMKz0IlUdocVbYJe0Z9xEgidU7msskG8BbhnTPK/HZ2z/7FP7ykqPgrUH+C+r414mNfNWam1f2vqOjqjYQ==
   dependencies:
-    "@babel/helper-string-parser" "^7.24.6"
-    "@babel/helper-validator-identifier" "^7.24.6"
+    "@babel/helper-string-parser" "^7.24.8"
+    "@babel/helper-validator-identifier" "^7.24.7"
     to-fast-properties "^2.0.0"
 
 "@colors/colors@1.6.0", "@colors/colors@^1.6.0":
@@ -772,9 +761,9 @@
     kuler "^2.0.0"
 
 "@discordjs/builders@^1.3.0":
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/@discordjs/builders/-/builders-1.8.1.tgz#5bca6e50a012492ecc03480ced53cbc7a1aac054"
-  integrity sha512-GkF+HM01FHy+NSoTaUPR8z44otfQgJ1AIsRxclYGUZDyUbdZEFyD/5QVv2Y1Flx6M+B0bQLzg2M9CJv5lGTqpA==
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/@discordjs/builders/-/builders-1.8.2.tgz#535d970331ee40f20dec9ef8079e43092f323ce9"
+  integrity sha512-6wvG3QaCjtMu0xnle4SoOIeFB4y6fKMN6WZfy3BMKJdQQtPLik8KGzDwBVL/+wTtcE/ZlFjgEk74GublyEVZ7g==
   dependencies:
     "@discordjs/formatters" "^0.4.0"
     "@discordjs/util" "^1.1.0"
@@ -879,9 +868,9 @@
   integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==
 
 "@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14":
-  version "1.4.15"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
-  integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz#3188bcb273a414b0d215fd22a58540b989b9409a"
+  integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==
 
 "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
   version "0.3.25"
@@ -961,9 +950,9 @@
     url-parse "^1.5.3"
 
 "@postman/tunnel-agent@^0.6.3":
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/@postman/tunnel-agent/-/tunnel-agent-0.6.3.tgz#23048d8d8618d453c571f03189e944afdc2292b7"
-  integrity sha512-k57fzmAZ2PJGxfOA4SGR05ejorHbVAa/84Hxh/2nAztjNXc4ZjOm9NUIk6/Z6LCrBvJZqjRZbN8e/nROVUPVdg==
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/@postman/tunnel-agent/-/tunnel-agent-0.6.4.tgz#30ceaadf0bd21cc0677ad5d1abd238b0fe27ca38"
+  integrity sha512-CJJlq8V7rNKhAw4sBfjixKpJW00SHqebqNUQKxMoepgeWZIbdPcD+rguRcivGhS4N12PymDcKgUgSD4rVC+RjQ==
   dependencies:
     safe-buffer "^5.0.1"
 
@@ -1025,77 +1014,84 @@
   resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
   integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
 
-"@smithy/abort-controller@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-3.0.0.tgz#5815f5d4618e14bf8d031bb98a99adabbb831168"
-  integrity sha512-p6GlFGBt9K4MYLu72YuJ523NVR4A8oHlC5M2JO6OmQqN8kAc/uh1JqLE+FizTokrSJGg0CSvC+BrsmGzKtsZKA==
+"@smithy/abort-controller@^3.1.1":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-3.1.1.tgz#291210611ff6afecfc198d0ca72d5771d8461d16"
+  integrity sha512-MBJBiidoe+0cTFhyxT8g+9g7CeVccLM0IOKKUMCNQ1CNMJ/eIfoo0RTfVrXOONEI1UCN1W+zkiHSbzUNE9dZtQ==
   dependencies:
-    "@smithy/types" "^3.0.0"
+    "@smithy/types" "^3.3.0"
     tslib "^2.6.2"
 
-"@smithy/config-resolver@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-3.0.0.tgz#d37b31e3202c5ce54d9bd2406dcde7c7b5073cbd"
-  integrity sha512-2GzOfADwYLQugYkKQhIyZyQlM05K+tMKvRnc6eFfZcpJGRfKoMUMYdPlBKmqHwQFXQKBrGV6cxL9oymWgDzvFw==
+"@smithy/config-resolver@^3.0.5":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-3.0.5.tgz#727978bba7ace754c741c259486a19d3083431fd"
+  integrity sha512-SkW5LxfkSI1bUC74OtfBbdz+grQXYiPYolyu8VfpLIjEoN/sHVBlLeGXMQ1vX4ejkgfv6sxVbQJ32yF2cl1veA==
   dependencies:
-    "@smithy/node-config-provider" "^3.0.0"
-    "@smithy/types" "^3.0.0"
+    "@smithy/node-config-provider" "^3.1.4"
+    "@smithy/types" "^3.3.0"
     "@smithy/util-config-provider" "^3.0.0"
-    "@smithy/util-middleware" "^3.0.0"
+    "@smithy/util-middleware" "^3.0.3"
     tslib "^2.6.2"
 
-"@smithy/core@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@smithy/core/-/core-2.0.1.tgz#8a7ac8faa0227912ce260bc3f976a5e254323920"
-  integrity sha512-rcMkjvwxH/bER+oZUPR0yTA0ELD6m3A+d92+CFkdF6HJFCBB1bXo7P5pm21L66XwTN01B6bUhSCQ7cymWRD8zg==
+"@smithy/core@^2.2.7":
+  version "2.2.8"
+  resolved "https://registry.yarnpkg.com/@smithy/core/-/core-2.2.8.tgz#d1edc47584497c58aec741b0a2814cdc1db7b72c"
+  integrity sha512-1Y0XX0Ucyg0LWTfTVLWpmvSRtFRniykUl3dQ0os1sTd03mKDudR6mVyX+2ak1phwPXx2aEWMAAdW52JNi0mc3A==
   dependencies:
-    "@smithy/middleware-endpoint" "^3.0.0"
-    "@smithy/middleware-retry" "^3.0.1"
-    "@smithy/middleware-serde" "^3.0.0"
-    "@smithy/protocol-http" "^4.0.0"
-    "@smithy/smithy-client" "^3.0.1"
-    "@smithy/types" "^3.0.0"
-    "@smithy/util-middleware" "^3.0.0"
+    "@smithy/middleware-endpoint" "^3.0.5"
+    "@smithy/middleware-retry" "^3.0.11"
+    "@smithy/middleware-serde" "^3.0.3"
+    "@smithy/protocol-http" "^4.0.4"
+    "@smithy/smithy-client" "^3.1.9"
+    "@smithy/types" "^3.3.0"
+    "@smithy/util-middleware" "^3.0.3"
     tslib "^2.6.2"
 
-"@smithy/credential-provider-imds@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-3.0.0.tgz#a290eb0224ef045742e5c806685cf63d44a084f3"
-  integrity sha512-lfmBiFQcA3FsDAPxNfY0L7CawcWtbyWsBOHo34nF095728JLkBX4Y9q/VPPE2r7fqMVK+drmDigqE2/SSQeVRA==
+"@smithy/credential-provider-imds@^3.1.4":
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-3.1.4.tgz#797116f68cc3ffa658469558cc014f25d9febe09"
+  integrity sha512-NKyH01m97Xa5xf3pB2QOF3lnuE8RIK0hTVNU5zvZAwZU8uspYO4DHQVlK+Y5gwSrujTfHvbfd1D9UFJAc0iYKQ==
   dependencies:
-    "@smithy/node-config-provider" "^3.0.0"
-    "@smithy/property-provider" "^3.0.0"
-    "@smithy/types" "^3.0.0"
-    "@smithy/url-parser" "^3.0.0"
+    "@smithy/node-config-provider" "^3.1.4"
+    "@smithy/property-provider" "^3.1.3"
+    "@smithy/types" "^3.3.0"
+    "@smithy/url-parser" "^3.0.3"
     tslib "^2.6.2"
 
-"@smithy/fetch-http-handler@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-3.0.1.tgz#dacfdf6e70d639fac4a0f57c42ce13f0ed14ff22"
-  integrity sha512-uaH74i5BDj+rBwoQaXioKpI0SHBJFtOVwzrCpxZxphOW0ki5jhj7dXvDMYM2IJem8TpdFvS2iC08sjOblfFGFg==
+"@smithy/fetch-http-handler@^3.2.2":
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.2.tgz#67e29be8815dcf793d14186cae00bccaeffb963c"
+  integrity sha512-3LaWlBZObyGrOOd7e5MlacnAKEwFBmAeiW/TOj2eR9475Vnq30uS2510+tnKbxrGjROfNdOhQqGo5j3sqLT6bA==
   dependencies:
-    "@smithy/protocol-http" "^4.0.0"
-    "@smithy/querystring-builder" "^3.0.0"
-    "@smithy/types" "^3.0.0"
+    "@smithy/protocol-http" "^4.0.4"
+    "@smithy/querystring-builder" "^3.0.3"
+    "@smithy/types" "^3.3.0"
     "@smithy/util-base64" "^3.0.0"
     tslib "^2.6.2"
 
-"@smithy/hash-node@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-3.0.0.tgz#f44b5fff193e241c1cdcc957b296b60f186f0e59"
-  integrity sha512-84qXstNemP3XS5jcof0el6+bDfjzuvhJPQTEfro3lgtbCtKgzPm3MgiS6ehXVPjeQ5+JS0HqmTz8f/RYfzHVxw==
+"@smithy/hash-node@^3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-3.0.3.tgz#82c5cb7b0f1a29ee7319081853d2d158c07dff24"
+  integrity sha512-2ctBXpPMG+B3BtWSGNnKELJ7SH9e4TNefJS0cd2eSkOOROeBnnVBnAy9LtJ8tY4vUEoe55N4CNPxzbWvR39iBw==
   dependencies:
-    "@smithy/types" "^3.0.0"
+    "@smithy/types" "^3.3.0"
     "@smithy/util-buffer-from" "^3.0.0"
     "@smithy/util-utf8" "^3.0.0"
     tslib "^2.6.2"
 
-"@smithy/invalid-dependency@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-3.0.0.tgz#21cb6b5203ee15321bfcc751f21f7a19536d4ae8"
-  integrity sha512-F6wBBaEFgJzj0s4KUlliIGPmqXemwP6EavgvDqYwCH40O5Xr2iMHvS8todmGVZtuJCorBkXsYLyTu4PuizVq5g==
+"@smithy/invalid-dependency@^3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-3.0.3.tgz#8d9fd70e3a94b565a4eba4ffbdc95238e1930528"
+  integrity sha512-ID1eL/zpDULmHJbflb864k72/SNOZCADRc9i7Exq3RUNJw6raWUSlFEQ+3PX3EYs++bTxZB2dE9mEHTQLv61tw==
+  dependencies:
+    "@smithy/types" "^3.3.0"
+    tslib "^2.6.2"
+
+"@smithy/is-array-buffer@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz#f84f0d9f9a36601a9ca9381688bd1b726fd39111"
+  integrity sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==
   dependencies:
-    "@smithy/types" "^3.0.0"
     tslib "^2.6.2"
 
 "@smithy/is-array-buffer@^3.0.0":
@@ -1105,167 +1101,167 @@
   dependencies:
     tslib "^2.6.2"
 
-"@smithy/middleware-content-length@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-3.0.0.tgz#084b3d22248967885d496eb0b105d9090e8ababd"
-  integrity sha512-3C4s4d/iGobgCtk2tnWW6+zSTOBg1PRAm2vtWZLdriwTroFbbWNSr3lcyzHdrQHnEXYCC5K52EbpfodaIUY8sg==
+"@smithy/middleware-content-length@^3.0.4":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-3.0.4.tgz#7c5804775da0d3d0c045d52293298f608e72311b"
+  integrity sha512-wySGje/KfhsnF8YSh9hP16pZcl3C+X6zRsvSfItQGvCyte92LliilU3SD0nR7kTlxnAJwxY8vE/k4Eoezj847Q==
   dependencies:
-    "@smithy/protocol-http" "^4.0.0"
-    "@smithy/types" "^3.0.0"
+    "@smithy/protocol-http" "^4.0.4"
+    "@smithy/types" "^3.3.0"
     tslib "^2.6.2"
 
-"@smithy/middleware-endpoint@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-3.0.0.tgz#54c9e1bd8f35b7d004c803eaf3702e61e32b8295"
-  integrity sha512-aXOAWztw/5qAfp0NcA2OWpv6ZI/E+Dh9mByif7i91D/0iyYNUcKvskmXiowKESFkuZ7PIMd3VOR4fTibZDs2OQ==
+"@smithy/middleware-endpoint@^3.0.5":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-3.0.5.tgz#76e8a559e891282d3ede9ab8e228e66cbee89b21"
+  integrity sha512-V4acqqrh5tDxUEGVTOgf2lYMZqPQsoGntCrjrJZEeBzEzDry2d2vcI1QCXhGltXPPY+BMc6eksZMguA9fIY8vA==
   dependencies:
-    "@smithy/middleware-serde" "^3.0.0"
-    "@smithy/node-config-provider" "^3.0.0"
-    "@smithy/shared-ini-file-loader" "^3.0.0"
-    "@smithy/types" "^3.0.0"
-    "@smithy/url-parser" "^3.0.0"
-    "@smithy/util-middleware" "^3.0.0"
+    "@smithy/middleware-serde" "^3.0.3"
+    "@smithy/node-config-provider" "^3.1.4"
+    "@smithy/shared-ini-file-loader" "^3.1.4"
+    "@smithy/types" "^3.3.0"
+    "@smithy/url-parser" "^3.0.3"
+    "@smithy/util-middleware" "^3.0.3"
     tslib "^2.6.2"
 
-"@smithy/middleware-retry@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-3.0.1.tgz#167b75e9b79395f11a799f22030eaaf7d40da410"
-  integrity sha512-hBhSEuL841FhJBK/19WpaGk5YWSzFk/P2UaVjANGKRv3eYNO8Y1lANWgqnuPWjOyCEWMPr58vELFDWpxvRKANw==
+"@smithy/middleware-retry@^3.0.10", "@smithy/middleware-retry@^3.0.11":
+  version "3.0.11"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-3.0.11.tgz#4a8137a45247233aa83707ff9da3b8ee3dfefbba"
+  integrity sha512-/TIRWmhwMpv99JCGuMhJPnH7ggk/Lah7s/uNDyr7faF02BxNsyD/fz9Tw7pgCf9tYOKgjimm2Qml1Aq1pbkt6g==
   dependencies:
-    "@smithy/node-config-provider" "^3.0.0"
-    "@smithy/protocol-http" "^4.0.0"
-    "@smithy/service-error-classification" "^3.0.0"
-    "@smithy/smithy-client" "^3.0.1"
-    "@smithy/types" "^3.0.0"
-    "@smithy/util-middleware" "^3.0.0"
-    "@smithy/util-retry" "^3.0.0"
+    "@smithy/node-config-provider" "^3.1.4"
+    "@smithy/protocol-http" "^4.0.4"
+    "@smithy/service-error-classification" "^3.0.3"
+    "@smithy/smithy-client" "^3.1.9"
+    "@smithy/types" "^3.3.0"
+    "@smithy/util-middleware" "^3.0.3"
+    "@smithy/util-retry" "^3.0.3"
     tslib "^2.6.2"
     uuid "^9.0.1"
 
-"@smithy/middleware-serde@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-3.0.0.tgz#786da6a6bc0e5e51d669dac834c19965245dd302"
-  integrity sha512-I1vKG1foI+oPgG9r7IMY1S+xBnmAn1ISqployvqkwHoSb8VPsngHDTOgYGYBonuOKndaWRUGJZrKYYLB+Ane6w==
+"@smithy/middleware-serde@^3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-3.0.3.tgz#74d974460f74d99f38c861e6862984543a880a66"
+  integrity sha512-puUbyJQBcg9eSErFXjKNiGILJGtiqmuuNKEYNYfUD57fUl4i9+mfmThtQhvFXU0hCVG0iEJhvQUipUf+/SsFdA==
   dependencies:
-    "@smithy/types" "^3.0.0"
+    "@smithy/types" "^3.3.0"
     tslib "^2.6.2"
 
-"@smithy/middleware-stack@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-3.0.0.tgz#00f112bae7af5fc3bd37d4fab95ebce0f17a7774"
-  integrity sha512-+H0jmyfAyHRFXm6wunskuNAqtj7yfmwFB6Fp37enytp2q047/Od9xetEaUbluyImOlGnGpaVGaVfjwawSr+i6Q==
+"@smithy/middleware-stack@^3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-3.0.3.tgz#91845c7e61e6f137fa912b623b6def719a4f6ce7"
+  integrity sha512-r4klY9nFudB0r9UdSMaGSyjyQK5adUyPnQN/ZM6M75phTxOdnc/AhpvGD1fQUvgmqjQEBGCwpnPbDm8pH5PapA==
   dependencies:
-    "@smithy/types" "^3.0.0"
+    "@smithy/types" "^3.3.0"
     tslib "^2.6.2"
 
-"@smithy/node-config-provider@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-3.0.0.tgz#4cd5dcf6132c75d6a582fcd6243482dac703865a"
-  integrity sha512-buqfaSdDh0zo62EPLf8rGDvcpKwGpO5ho4bXS2cdFhlOta7tBkWJt+O5uiaAeICfIOfPclNOndshDNSanX2X9g==
+"@smithy/node-config-provider@^3.1.4":
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-3.1.4.tgz#05647bed666aa8036a1ad72323c1942e5d421be1"
+  integrity sha512-YvnElQy8HR4vDcAjoy7Xkx9YT8xZP4cBXcbJSgm/kxmiQu08DwUwj8rkGnyoJTpfl/3xYHH+d8zE+eHqoDCSdQ==
   dependencies:
-    "@smithy/property-provider" "^3.0.0"
-    "@smithy/shared-ini-file-loader" "^3.0.0"
-    "@smithy/types" "^3.0.0"
+    "@smithy/property-provider" "^3.1.3"
+    "@smithy/shared-ini-file-loader" "^3.1.4"
+    "@smithy/types" "^3.3.0"
     tslib "^2.6.2"
 
-"@smithy/node-http-handler@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-3.0.0.tgz#e771ea95d03e259f04b7b37e8aece8a4fffc8cdc"
-  integrity sha512-3trD4r7NOMygwLbUJo4eodyQuypAWr7uvPnebNJ9a70dQhVn+US8j/lCnvoJS6BXfZeF7PkkkI0DemVJw+n+eQ==
+"@smithy/node-http-handler@^3.1.3":
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-3.1.3.tgz#1b729a8a2ca6b84618a1e92c53c49a1fcf3a3e5a"
+  integrity sha512-UiKZm8KHb/JeOPzHZtRUfyaRDO1KPKPpsd7iplhiwVGOeVdkiVJ5bVe7+NhWREMOKomrDIDdSZyglvMothLg0Q==
   dependencies:
-    "@smithy/abort-controller" "^3.0.0"
-    "@smithy/protocol-http" "^4.0.0"
-    "@smithy/querystring-builder" "^3.0.0"
-    "@smithy/types" "^3.0.0"
+    "@smithy/abort-controller" "^3.1.1"
+    "@smithy/protocol-http" "^4.0.4"
+    "@smithy/querystring-builder" "^3.0.3"
+    "@smithy/types" "^3.3.0"
     tslib "^2.6.2"
 
-"@smithy/property-provider@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-3.0.0.tgz#ef7a26557c855cc1471b9aa0e05529183e99b978"
-  integrity sha512-LmbPgHBswdXCrkWWuUwBm9w72S2iLWyC/5jet9/Y9cGHtzqxi+GVjfCfahkvNV4KXEwgnH8EMpcrD9RUYe0eLQ==
+"@smithy/property-provider@^3.1.3":
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-3.1.3.tgz#afd57ea82a3f6c79fbda95e3cb85c0ee0a79f39a"
+  integrity sha512-zahyOVR9Q4PEoguJ/NrFP4O7SMAfYO1HLhB18M+q+Z4KFd4V2obiMnlVoUFzFLSPeVt1POyNWneHHrZaTMoc/g==
   dependencies:
-    "@smithy/types" "^3.0.0"
+    "@smithy/types" "^3.3.0"
     tslib "^2.6.2"
 
-"@smithy/protocol-http@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-4.0.0.tgz#04df3b5674b540323f678e7c4113e8abd8b26432"
-  integrity sha512-qOQZOEI2XLWRWBO9AgIYuHuqjZ2csyr8/IlgFDHDNuIgLAMRx2Bl8ck5U5D6Vh9DPdoaVpuzwWMa0xcdL4O/AQ==
+"@smithy/protocol-http@^4.0.4":
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-4.0.4.tgz#f784a03460b971cf10027d0e7f6673835ed7e637"
+  integrity sha512-fAA2O4EFyNRyYdFLVIv5xMMeRb+3fRKc/Rt2flh5k831vLvUmNFXcydeg7V3UeEhGURJI4c1asmGJBjvmF6j8Q==
   dependencies:
-    "@smithy/types" "^3.0.0"
+    "@smithy/types" "^3.3.0"
     tslib "^2.6.2"
 
-"@smithy/querystring-builder@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-3.0.0.tgz#48a9aa7b700e8409368c21bc0adf7564e001daea"
-  integrity sha512-bW8Fi0NzyfkE0TmQphDXr1AmBDbK01cA4C1Z7ggwMAU5RDz5AAv/KmoRwzQAS0kxXNf/D2ALTEgwK0U2c4LtRg==
+"@smithy/querystring-builder@^3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-3.0.3.tgz#6b0e566f885bb84938d077c69e8f8555f686af13"
+  integrity sha512-vyWckeUeesFKzCDaRwWLUA1Xym9McaA6XpFfAK5qI9DKJ4M33ooQGqvM4J+LalH4u/Dq9nFiC8U6Qn1qi0+9zw==
   dependencies:
-    "@smithy/types" "^3.0.0"
+    "@smithy/types" "^3.3.0"
     "@smithy/util-uri-escape" "^3.0.0"
     tslib "^2.6.2"
 
-"@smithy/querystring-parser@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-3.0.0.tgz#fa1ed0cee408cd4d622070fa874bc50ac1a379b7"
-  integrity sha512-UzHwthk0UEccV4dHzPySnBy34AWw3V9lIqUTxmozQ+wPDAO9csCWMfOLe7V9A2agNYy7xE+Pb0S6K/J23JSzfQ==
+"@smithy/querystring-parser@^3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-3.0.3.tgz#272a6b83f88dfcbbec8283d72a6bde850cc00091"
+  integrity sha512-zahM1lQv2YjmznnfQsWbYojFe55l0SLG/988brlLv1i8z3dubloLF+75ATRsqPBboUXsW6I9CPGE5rQgLfY0vQ==
   dependencies:
-    "@smithy/types" "^3.0.0"
+    "@smithy/types" "^3.3.0"
     tslib "^2.6.2"
 
-"@smithy/service-error-classification@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-3.0.0.tgz#06a45cb91b15b8b0d5f3b1df2b3743d2ca42f5c4"
-  integrity sha512-3BsBtOUt2Gsnc3X23ew+r2M71WwtpHfEDGhHYHSDg6q1t8FrWh15jT25DLajFV1H+PpxAJ6gqe9yYeRUsmSdFA==
+"@smithy/service-error-classification@^3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-3.0.3.tgz#73484255060a094aa9372f6cd972dcaf97e3ce80"
+  integrity sha512-Jn39sSl8cim/VlkLsUhRFq/dKDnRUFlfRkvhOJaUbLBXUsLRLNf9WaxDv/z9BjuQ3A6k/qE8af1lsqcwm7+DaQ==
   dependencies:
-    "@smithy/types" "^3.0.0"
+    "@smithy/types" "^3.3.0"
 
-"@smithy/shared-ini-file-loader@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.0.0.tgz#8739b7cd24f55fb4e276a74f00f0c2bb4e3f25d8"
-  integrity sha512-REVw6XauXk8xE4zo5aGL7Rz4ywA8qNMUn8RtWeTRQsgAlmlvbJ7CEPBcaXU2NDC3AYBgYAXrGyWD8XrN8UGDog==
+"@smithy/shared-ini-file-loader@^3.1.4":
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.4.tgz#7dceaf5a5307a2ee347ace8aba17312a1a3ede15"
+  integrity sha512-qMxS4hBGB8FY2GQqshcRUy1K6k8aBWP5vwm8qKkCT3A9K2dawUwOIJfqh9Yste/Bl0J2lzosVyrXDj68kLcHXQ==
   dependencies:
-    "@smithy/types" "^3.0.0"
+    "@smithy/types" "^3.3.0"
     tslib "^2.6.2"
 
-"@smithy/signature-v4@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-3.0.0.tgz#f536d0abebfeeca8e9aab846a4042658ca07d3b7"
-  integrity sha512-kXFOkNX+BQHe2qnLxpMEaCRGap9J6tUGLzc3A9jdn+nD4JdMwCKTJ+zFwQ20GkY+mAXGatyTw3HcoUlR39HwmA==
+"@smithy/signature-v4@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-4.0.0.tgz#0583baba98819eab49e028166b186ce927c42128"
+  integrity sha512-ervYjQ+ZvmNG51Ui77IOTPri7nOyo8Kembzt9uwwlmtXJPmFXvslOahbA1blvAVs7G0KlYMiOBog1rAt7RVXxg==
   dependencies:
     "@smithy/is-array-buffer" "^3.0.0"
-    "@smithy/types" "^3.0.0"
+    "@smithy/types" "^3.3.0"
     "@smithy/util-hex-encoding" "^3.0.0"
-    "@smithy/util-middleware" "^3.0.0"
+    "@smithy/util-middleware" "^3.0.3"
     "@smithy/util-uri-escape" "^3.0.0"
     "@smithy/util-utf8" "^3.0.0"
     tslib "^2.6.2"
 
-"@smithy/smithy-client@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-3.0.1.tgz#c440473f6fb5dfbe86eaf015565fc56f66533bb4"
-  integrity sha512-KAiFY4Y4jdHxR+4zerH/VBhaFKM8pbaVmJZ/CWJRwtM/CmwzTfXfvYwf6GoUwiHepdv+lwiOXCuOl6UBDUEINw==
+"@smithy/smithy-client@^3.1.8", "@smithy/smithy-client@^3.1.9":
+  version "3.1.9"
+  resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-3.1.9.tgz#a0d8e867165db64c2a66762df0db279d1f8029eb"
+  integrity sha512-My2RaInZ4gSwJUPMaiLR/Nk82+c4LlvqpXA+n7lonGYgCZq23Tg+/xFhgmiejJ6XPElYJysTPyV90vKyp17+1g==
   dependencies:
-    "@smithy/middleware-endpoint" "^3.0.0"
-    "@smithy/middleware-stack" "^3.0.0"
-    "@smithy/protocol-http" "^4.0.0"
-    "@smithy/types" "^3.0.0"
-    "@smithy/util-stream" "^3.0.1"
+    "@smithy/middleware-endpoint" "^3.0.5"
+    "@smithy/middleware-stack" "^3.0.3"
+    "@smithy/protocol-http" "^4.0.4"
+    "@smithy/types" "^3.3.0"
+    "@smithy/util-stream" "^3.1.1"
     tslib "^2.6.2"
 
-"@smithy/types@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/types/-/types-3.0.0.tgz#00231052945159c64ffd8b91e8909d8d3006cb7e"
-  integrity sha512-VvWuQk2RKFuOr98gFhjca7fkBS+xLLURT8bUjk5XQoV0ZLm7WPwWPPY3/AwzTLuUBDeoKDCthfe1AsTUWaSEhw==
+"@smithy/types@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@smithy/types/-/types-3.3.0.tgz#fae037c733d09bc758946a01a3de0ef6e210b16b"
+  integrity sha512-IxvBBCTFDHbVoK7zIxqA1ZOdc4QfM5HM7rGleCuHi7L1wnKv5Pn69xXJQ9hgxH60ZVygH9/JG0jRgtUncE3QUA==
   dependencies:
     tslib "^2.6.2"
 
-"@smithy/url-parser@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-3.0.0.tgz#5fdc77cd22051c1aac6531be0315bfcba0fa705d"
-  integrity sha512-2XLazFgUu+YOGHtWihB3FSLAfCUajVfNBXGGYjOaVKjLAuAxx3pSBY3hBgLzIgB17haf59gOG3imKqTy8mcrjw==
+"@smithy/url-parser@^3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-3.0.3.tgz#e8a060d9810b24b1870385fc2b02485b8a6c5955"
+  integrity sha512-pw3VtZtX2rg+s6HMs6/+u9+hu6oY6U7IohGhVNnjbgKy86wcIsSZwgHrFR+t67Uyxvp4Xz3p3kGXXIpTNisq8A==
   dependencies:
-    "@smithy/querystring-parser" "^3.0.0"
-    "@smithy/types" "^3.0.0"
+    "@smithy/querystring-parser" "^3.0.3"
+    "@smithy/types" "^3.3.0"
     tslib "^2.6.2"
 
 "@smithy/util-base64@^3.0.0":
@@ -1291,6 +1287,14 @@
   dependencies:
     tslib "^2.6.2"
 
+"@smithy/util-buffer-from@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz#6fc88585165ec73f8681d426d96de5d402021e4b"
+  integrity sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==
+  dependencies:
+    "@smithy/is-array-buffer" "^2.2.0"
+    tslib "^2.6.2"
+
 "@smithy/util-buffer-from@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz#559fc1c86138a89b2edaefc1e6677780c24594e3"
@@ -1306,37 +1310,37 @@
   dependencies:
     tslib "^2.6.2"
 
-"@smithy/util-defaults-mode-browser@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.1.tgz#0ba33ec90f6dd311599bed3a3dd604f3adba9acd"
-  integrity sha512-nW5kEzdJn1Bn5TF+gOPHh2rcPli8JU9vSSXLbfg7uPnfR1TMRQqs9zlYRhIb87NeSxIbpdXOI94tvXSy+fvDYg==
+"@smithy/util-defaults-mode-browser@^3.0.10":
+  version "3.0.11"
+  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.11.tgz#c8a74369405f55d39492b9ec15458cc2fe56b783"
+  integrity sha512-O3s9DGb3bmRvEKmT8RwvSWK4A9r6svfd+MnJB+UMi9ZcCkAnoRtliulOnGF0qCMkKF9mwk2tkopBBstalPY/vg==
   dependencies:
-    "@smithy/property-provider" "^3.0.0"
-    "@smithy/smithy-client" "^3.0.1"
-    "@smithy/types" "^3.0.0"
+    "@smithy/property-provider" "^3.1.3"
+    "@smithy/smithy-client" "^3.1.9"
+    "@smithy/types" "^3.3.0"
     bowser "^2.11.0"
     tslib "^2.6.2"
 
-"@smithy/util-defaults-mode-node@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.1.tgz#71242a6978240a6f559445d4cc26f2cce91c90e1"
-  integrity sha512-TFk+Qb+elLc/MOhtSp+50fstyfZ6avQbgH2d96xUBpeScu+Al9elxv+UFAjaTHe0HQe5n+wem8ZLpXvU8lwV6Q==
+"@smithy/util-defaults-mode-node@^3.0.10":
+  version "3.0.11"
+  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.11.tgz#288f443b65554597082858c4b6624cd362a2caaa"
+  integrity sha512-qd4a9qtyOa/WY14aHHOkMafhh9z8D2QTwlcBoXMTPnEwtcY+xpe1JyFm9vya7VsB8hHsfn3XodEtwqREiu4ygQ==
   dependencies:
-    "@smithy/config-resolver" "^3.0.0"
-    "@smithy/credential-provider-imds" "^3.0.0"
-    "@smithy/node-config-provider" "^3.0.0"
-    "@smithy/property-provider" "^3.0.0"
-    "@smithy/smithy-client" "^3.0.1"
-    "@smithy/types" "^3.0.0"
+    "@smithy/config-resolver" "^3.0.5"
+    "@smithy/credential-provider-imds" "^3.1.4"
+    "@smithy/node-config-provider" "^3.1.4"
+    "@smithy/property-provider" "^3.1.3"
+    "@smithy/smithy-client" "^3.1.9"
+    "@smithy/types" "^3.3.0"
     tslib "^2.6.2"
 
-"@smithy/util-endpoints@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-2.0.0.tgz#5a16a723c1220f536a9b1b3e01787e69e77b6f12"
-  integrity sha512-+exaXzEY3DNt2qtA2OtRNSDlVrE4p32j1JSsQkzA5AdP0YtJNjkYbYhJxkFmPYcjI1abuwopOZCwUmv682QkiQ==
+"@smithy/util-endpoints@^2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-2.0.5.tgz#e3a7a4d1c41250bfd2b2d890d591273a7d8934be"
+  integrity sha512-ReQP0BWihIE68OAblC/WQmDD40Gx+QY1Ez8mTdFMXpmjfxSyz2fVQu3A4zXRfQU9sZXtewk3GmhfOHswvX+eNg==
   dependencies:
-    "@smithy/node-config-provider" "^3.0.0"
-    "@smithy/types" "^3.0.0"
+    "@smithy/node-config-provider" "^3.1.4"
+    "@smithy/types" "^3.3.0"
     tslib "^2.6.2"
 
 "@smithy/util-hex-encoding@^3.0.0":
@@ -1346,31 +1350,31 @@
   dependencies:
     tslib "^2.6.2"
 
-"@smithy/util-middleware@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-3.0.0.tgz#64d775628b99a495ca83ce982f5c83aa45f1e894"
-  integrity sha512-q5ITdOnV2pXHSVDnKWrwgSNTDBAMHLptFE07ua/5Ty5WJ11bvr0vk2a7agu7qRhrCFRQlno5u3CneU5EELK+DQ==
+"@smithy/util-middleware@^3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-3.0.3.tgz#07bf9602682f5a6c55bc2f0384303f85fc68c87e"
+  integrity sha512-l+StyYYK/eO3DlVPbU+4Bi06Jjal+PFLSMmlWM1BEwyLxZ3aKkf1ROnoIakfaA7mC6uw3ny7JBkau4Yc+5zfWw==
   dependencies:
-    "@smithy/types" "^3.0.0"
+    "@smithy/types" "^3.3.0"
     tslib "^2.6.2"
 
-"@smithy/util-retry@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-3.0.0.tgz#8a0c47496aab74e1dfde4905d462ad636a8824bb"
-  integrity sha512-nK99bvJiziGv/UOKJlDvFF45F00WgPLKVIGUfAK+mDhzVN2hb/S33uW2Tlhg5PVBoqY7tDVqL0zmu4OxAHgo9g==
+"@smithy/util-retry@^3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-3.0.3.tgz#9b2ac0dbb1c81f69812a8affa4d772bebfc0e049"
+  integrity sha512-AFw+hjpbtVApzpNDhbjNG5NA3kyoMs7vx0gsgmlJF4s+yz1Zlepde7J58zpIRIsdjc+emhpAITxA88qLkPF26w==
   dependencies:
-    "@smithy/service-error-classification" "^3.0.0"
-    "@smithy/types" "^3.0.0"
+    "@smithy/service-error-classification" "^3.0.3"
+    "@smithy/types" "^3.3.0"
     tslib "^2.6.2"
 
-"@smithy/util-stream@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-3.0.1.tgz#3cf527bcd3fec82c231c38d47dd75f3364747edb"
-  integrity sha512-7F7VNNhAsfMRA8I986YdOY5fE0/T1/ZjFF6OLsqkvQVNP3vZ/szYDfGCyphb7ioA09r32K/0qbSFfNFU68aSzA==
+"@smithy/util-stream@^3.1.0", "@smithy/util-stream@^3.1.1":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-3.1.1.tgz#2fffe56d9cdf70e94a7cd690e980454b1b35ad23"
+  integrity sha512-EhRnVvl3AhoHAT2rGQ5o+oSDRM/BUSMPLZZdRJZLcNVUsFAjOs4vHaPdNQivTSzRcFxf5DA4gtO46WWU2zimaw==
   dependencies:
-    "@smithy/fetch-http-handler" "^3.0.1"
-    "@smithy/node-http-handler" "^3.0.0"
-    "@smithy/types" "^3.0.0"
+    "@smithy/fetch-http-handler" "^3.2.2"
+    "@smithy/node-http-handler" "^3.1.3"
+    "@smithy/types" "^3.3.0"
     "@smithy/util-base64" "^3.0.0"
     "@smithy/util-buffer-from" "^3.0.0"
     "@smithy/util-hex-encoding" "^3.0.0"
@@ -1384,6 +1388,14 @@
   dependencies:
     tslib "^2.6.2"
 
+"@smithy/util-utf8@^2.0.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-utf8/-/util-utf8-2.3.0.tgz#dd96d7640363259924a214313c3cf16e7dd329c5"
+  integrity sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==
+  dependencies:
+    "@smithy/util-buffer-from" "^2.2.0"
+    tslib "^2.6.2"
+
 "@smithy/util-utf8@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@smithy/util-utf8/-/util-utf8-3.0.0.tgz#1a6a823d47cbec1fd6933e5fc87df975286d9d6a"
@@ -1420,9 +1432,9 @@
     "@types/node" "*"
 
 "@types/node@*":
-  version "20.12.12"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.12.tgz#7cbecdf902085cec634fdb362172dfe12b8f2050"
-  integrity sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==
+  version "20.14.11"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.11.tgz#09b300423343460455043ddd4d0ded6ac579b74b"
+  integrity sha512-kprQpL8MMeszbz6ojB5/tU8PLN4kesnN8Gjzw349rDlNgsSzg90lAVj3llK99Dh7JON+t9AuscPPFW6mPbTnSA==
   dependencies:
     undici-types "~5.26.4"
 
@@ -1455,9 +1467,9 @@
     "@types/webidl-conversions" "*"
 
 "@types/ws@^8.5.3":
-  version "8.5.10"
-  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.10.tgz#4acfb517970853fa6574a3a6886791d04a396787"
-  integrity sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==
+  version "8.5.11"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.11.tgz#90ad17b3df7719ce3e6bc32f83ff954d38656508"
+  integrity sha512-4+q7P5h3SpJxaBft0Dzpbr6lmMaqh0Jr2tbhJZ/luAwvD7ohSCniYkwz/pLxuT2h0EOa6QADgJj1Ko+TzRfZ+w==
   dependencies:
     "@types/node" "*"
 
@@ -3049,9 +3061,9 @@ balanced-match@^1.0.0:
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
 bare-events@^2.2.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.2.2.tgz#a98a41841f98b2efe7ecc5c5468814469b018078"
-  integrity sha512-h7z00dWdG0PYOQEvChhOSWvOfkIKsdZGkWr083FgN/HyoQuebSew/cgirYqh9SCuy/hRvxc5Vy6Fw8xAmYHLkQ==
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.4.2.tgz#3140cca7a0e11d49b3edc5041ab560659fd8e1f8"
+  integrity sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==
 
 base-64@^0.1.0:
   version "0.1.0"
@@ -3130,11 +3142,6 @@ bindings@^1.1.1, bindings@^1.5.0:
   dependencies:
     file-uri-to-path "1.0.0"
 
-bitwise-xor@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/bitwise-xor/-/bitwise-xor-0.0.0.tgz#040a8172b5bb8cc562b0b7119f230b2a1a780e3d"
-  integrity sha512-3eOkZMBO04dRBn7551o6+IX9Ua7V+B/IubS7sffoa/VC3jdBM4YbuD+LjUNFojY7H+gptMUdTaQgHWTce4L3kw==
-
 bl@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/bl/-/bl-2.2.1.tgz#8c11a7b730655c5d56898cdc871224f40fd901d5"
@@ -3256,15 +3263,15 @@ brotli@^1.3.3:
   dependencies:
     base64-js "^1.1.2"
 
-browserslist@^4.22.2:
-  version "4.23.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.0.tgz#8f3acc2bbe73af7213399430890f86c63a5674ab"
-  integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==
+browserslist@^4.23.1:
+  version "4.23.2"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.2.tgz#244fe803641f1c19c28c48c4b6ec9736eb3d32ed"
+  integrity sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==
   dependencies:
-    caniuse-lite "^1.0.30001587"
-    electron-to-chromium "^1.4.668"
+    caniuse-lite "^1.0.30001640"
+    electron-to-chromium "^1.4.820"
     node-releases "^2.0.14"
-    update-browserslist-db "^1.0.13"
+    update-browserslist-db "^1.1.0"
 
 bson@^1.1.4:
   version "1.1.6"
@@ -3453,10 +3460,10 @@ camelcase@^5.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@^1.0.30001587:
-  version "1.0.30001621"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001621.tgz#4adcb443c8b9c8303e04498318f987616b8fea2e"
-  integrity sha512-+NLXZiviFFKX0fk8Piwv3PfLPGtRqJeq2TiNoUff/qB5KJgwecJTvCXDpmlyP/eCI/GUEmp/h/y5j0yckiiZrA==
+caniuse-lite@^1.0.30001640:
+  version "1.0.30001643"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz#9c004caef315de9452ab970c3da71085f8241dbd"
+  integrity sha512-ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg==
 
 caseless@~0.12.0:
   version "0.12.0"
@@ -4174,9 +4181,9 @@ dateformat@~4.6.2:
   integrity sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==
 
 dayjs@^1.11.9:
-  version "1.11.11"
-  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.11.tgz#dfe0e9d54c5f8b68ccf8ca5f72ac603e7e5ed59e"
-  integrity sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg==
+  version "1.11.12"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.12.tgz#5245226cc7f40a15bf52e0b99fd2a04669ccac1d"
+  integrity sha512-Rt2g+nTbLlDWZTwwrIXjy9MeiZmSDI375FvZs72ngxx8PDC6YXOeR3q5LAuPzjZQxhiWdRKac7RKV+YyQYfYIg==
 
 ddata@~0.1.25:
   version "0.1.28"
@@ -4207,9 +4214,9 @@ debug@3.2.7:
     ms "^2.1.1"
 
 debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.5.tgz#e83444eceb9fedd4a1da56d671ae2446a01a6e1e"
+  integrity sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==
   dependencies:
     ms "2.1.2"
 
@@ -4362,9 +4369,9 @@ discord-api-types@0.37.83:
   integrity sha512-urGGYeWtWNYMKnYlZnOnDHm8fVRffQs3U0SpE8RHeiuLKb/u92APS8HoQnPTFbnXmY1vVnXjXO4dOxcAn3J+DA==
 
 discord-api-types@^0.37.12, discord-api-types@^0.37.41:
-  version "0.37.85"
-  resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.85.tgz#302f7ee8e4880b41eff84ce1dc1c210247434b81"
-  integrity sha512-T75aB9JEw9X0rlMChEMHbr9JlXMqdmdKiZVjBeKs91cJo28IuAIldj+VZoC+I+Q9gCaRjHlwRkcksy2XZY6c3A==
+  version "0.37.93"
+  resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.93.tgz#fd2d34738ec2984cc5f904fe245dccf1cc35ffcd"
+  integrity sha512-M5jn0x3bcXk8EI2c6F6V6LeOWq10B/cJf+YJSyqNmg7z4bdXK+Z7g9zGJwHS0h9Bfgs0nun2LQISFOzwck7G9A==
 
 discord.js@14.6.0:
   version "14.6.0"
@@ -4473,10 +4480,10 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
-electron-to-chromium@^1.4.668:
-  version "1.4.783"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.783.tgz#933887165b8b6025a81663d2d97cf4b85cde27b2"
-  integrity sha512-bT0jEz/Xz1fahQpbZ1D7LgmPYZ3iHVY39NcWWro1+hA2IvjiPeaXtfSqrQ+nXjApMvQRE2ASt1itSLRrebHMRQ==
+electron-to-chromium@^1.4.820:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.0.tgz#0d3123a9f09189b9c7ab4b5d6848d71b3c1fd0e8"
+  integrity sha512-Vb3xHHYnLseK8vlMJQKJYXJ++t4u1/qJ3vykuVrVjvdiOEhYyT1AuP4x03G8EnPmYvYOhe9T+dADTmthjRQMkA==
 
 emoji-regex@^7.0.1:
   version "7.0.3"
@@ -4901,7 +4908,7 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-fifo@^1.1.0, fast-fifo@^1.2.0:
+fast-fifo@^1.2.0, fast-fifo@^1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.3.2.tgz#286e31de96eb96d38a97899815740ba2a4f3640c"
   integrity sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==
@@ -5171,9 +5178,9 @@ foreground-child@^1.5.6:
     signal-exit "^3.0.0"
 
 foreground-child@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d"
-  integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.2.1.tgz#767004ccf3a5b30df39bed90718bab43fe0a59f7"
+  integrity sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==
   dependencies:
     cross-spawn "^7.0.0"
     signal-exit "^4.0.1"
@@ -5332,15 +5339,15 @@ gauge@^4.0.3:
     wide-align "^1.1.5"
 
 gaxios@^6.0.0, gaxios@^6.0.3, gaxios@^6.1.1:
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-6.6.0.tgz#af8242fff0bbb82a682840d5feaa91b6a1c58be4"
-  integrity sha512-bpOZVQV5gthH/jVCSuYuokRo2bTKOcuBiVWpjmTn6C5Agl5zclGfTljuGsQZxwwDBkli+YhZhP4TdlqTnhOezQ==
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-6.7.0.tgz#37b7c5961cb67d8d4b0ae8110dcd83cc6791eb6d"
+  integrity sha512-DSrkyMTfAnAm4ks9Go20QGOcXEyW/NmZhvTYBU2rb4afBB393WIMQPWPEDMl/k8xqiNN9HYq2zao3oWXsdl2Tg==
   dependencies:
     extend "^3.0.2"
     https-proxy-agent "^7.0.1"
     is-stream "^2.0.0"
     node-fetch "^2.6.9"
-    uuid "^9.0.1"
+    uuid "^10.0.0"
 
 gcp-metadata@^6.1.0:
   version "6.1.0"
@@ -5432,14 +5439,15 @@ glob-parent@~5.1.2:
     is-glob "^4.0.1"
 
 glob@^10.0.0:
-  version "10.4.1"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.1.tgz#0cfb01ab6a6b438177bfe6a58e2576f6efe909c2"
-  integrity sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==
+  version "10.4.5"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956"
+  integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==
   dependencies:
     foreground-child "^3.1.0"
     jackspeak "^3.1.2"
     minimatch "^9.0.4"
     minipass "^7.1.2"
+    package-json-from-dist "^1.0.0"
     path-scurry "^1.11.1"
 
 glob@^4:
@@ -5515,9 +5523,9 @@ globalthis@^1.0.3:
     gopd "^1.0.1"
 
 google-auth-library@^9.0.0, google-auth-library@^9.7.0:
-  version "9.10.0"
-  resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-9.10.0.tgz#c9fb940923f7ff2569d61982ee1748578c0bbfd4"
-  integrity sha512-ol+oSa5NbcGdDqA+gZ3G3mev59OHBZksBTxY/tYwjtcp1H/scAFwJfSQU9/1RALoyZ7FslNbke8j4i3ipwlyuQ==
+  version "9.11.0"
+  resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-9.11.0.tgz#bd6da364bcde4e0cc4ed70a0e0df5112b6a671dd"
+  integrity sha512-epX3ww/mNnhl6tL45EQ/oixsY8JLEgUFoT4A5E/5iAR4esld9Kqv6IJGk7EmGuOgDvaarwF95hU2+v7Irql9lw==
   dependencies:
     base64-js "^1.3.0"
     ecdsa-sig-formatter "^1.0.11"
@@ -6014,9 +6022,9 @@ https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1:
     debug "4"
 
 https-proxy-agent@^7.0.0, https-proxy-agent@^7.0.1:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz#8e97b841a029ad8ddc8731f26595bad868cb4168"
-  integrity sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz#9e8b5013873299e11fab6fd548405da2d6c602b2"
+  integrity sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==
   dependencies:
     agent-base "^7.0.2"
     debug "4"
@@ -6246,11 +6254,11 @@ is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
 is-core-module@^2.13.0:
-  version "2.13.1"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
-  integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.0.tgz#71c72ec5442ace7e76b306e9d48db361f22699ea"
+  integrity sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==
   dependencies:
-    hasown "^2.0.0"
+    hasown "^2.0.2"
 
 is-data-descriptor@^1.0.1:
   version "1.0.1"
@@ -6602,18 +6610,18 @@ istanbul-reports@^2.2.4:
     html-escaper "^2.0.0"
 
 jackspeak@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.1.2.tgz#eada67ea949c6b71de50f1b09c92a961897b90ab"
-  integrity sha512-kWmLKn2tRtfYMF/BakihVVRzBKOxz4gJMiL2Rj91WnAB5TPZumSH99R/Yf1qE1u4uRimvCSJfm6hnxohXeEXjQ==
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.3.tgz#8833a9d89ab4acde6188942bd1c53b6390ed5a8a"
+  integrity sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==
   dependencies:
     "@isaacs/cliui" "^8.0.2"
   optionalDependencies:
     "@pkgjs/parseargs" "^0.11.0"
 
 joi@^17.9.2:
-  version "17.13.1"
-  resolved "https://registry.yarnpkg.com/joi/-/joi-17.13.1.tgz#9c7b53dc3b44dd9ae200255cc3b398874918a6ca"
-  integrity sha512-vaBlIKCyo4FCUtCm7Eu4QZd/q02bWcxfUO6YSXAZOWF6gzcLBeba8kwotUdYJjDLW8Cz8RywsSOqiNJZW0mNvg==
+  version "17.13.3"
+  resolved "https://registry.yarnpkg.com/joi/-/joi-17.13.3.tgz#0f5cc1169c999b30d344366d384b12d92558bcec"
+  integrity sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==
   dependencies:
     "@hapi/hoek" "^9.3.0"
     "@hapi/topo" "^5.1.0"
@@ -6622,9 +6630,9 @@ joi@^17.9.2:
     "@sideway/pinpoint" "^2.0.0"
 
 jose@^4.15.5:
-  version "4.15.5"
-  resolved "https://registry.yarnpkg.com/jose/-/jose-4.15.5.tgz#6475d0f467ecd3c630a1b5dadd2735a7288df706"
-  integrity sha512-jc7BFxgKPKi94uOvEmzlSWFFe2+vASyXaKUpdQKatWAESU2MWjDfFf0fdfc83CDKcA5QecabZeNLyfhe3yKNkg==
+  version "4.15.9"
+  resolved "https://registry.yarnpkg.com/jose/-/jose-4.15.9.tgz#9b68eda29e9a0614c042fa29387196c7dd800100"
+  integrity sha512-1vUQX+IdDMVPj4k8kOxgUqlcK518yluMuGZwqlr44FS1ppZB/5GWh4rZG89erpOBOJjU/OBsnCVFfapsRz6nEA==
 
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
@@ -7134,10 +7142,10 @@ lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.3.0
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-logform@^2.3.2, logform@^2.4.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/logform/-/logform-2.6.0.tgz#8c82a983f05d6eaeb2d75e3decae7a768b2bf9b5"
-  integrity sha512-1ulHeNPp6k/LD8H91o7VYFBng5i1BDE7HoKxVbZiGFidS1Rj65qcywLxX+pVfAPoQJEjRdvKcusKwOupHCVOVQ==
+logform@^2.6.0, logform@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/logform/-/logform-2.6.1.tgz#71403a7d8cae04b2b734147963236205db9b3df0"
+  integrity sha512-CdaO738xRapbKIMVn2m4F6KTj4j7ooJ8POVnebSgKo3KBz5axNXRAL7ZdRjIV6NOr2Uf4vjtRkxrFETOioCqSA==
   dependencies:
     "@colors/colors" "1.6.0"
     "@types/triple-beam" "^1.3.2"
@@ -7174,9 +7182,9 @@ lower-case@^1.1.1:
   integrity sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==
 
 lru-cache@^10.0.1, lru-cache@^10.2.0:
-  version "10.2.2"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.2.tgz#48206bc114c1252940c41b25b41af5b545aca878"
-  integrity sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==
+  version "10.4.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119"
+  integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
 
 lru-cache@^4.0.1:
   version "4.1.5"
@@ -7390,11 +7398,16 @@ micromatch@^4.0.2, micromatch@^4.0.4:
     braces "^3.0.3"
     picomatch "^2.3.1"
 
-mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
+mime-db@1.52.0:
   version "1.52.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
+"mime-db@>= 1.43.0 < 2":
+  version "1.53.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.53.0.tgz#3cb63cd820fc29896d9d4e8c32ab4fcd74ccb447"
+  integrity sha512-oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg==
+
 mime-types@^2.1.12, mime-types@^2.1.35, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34:
   version "2.1.35"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
@@ -7466,9 +7479,9 @@ minimatch@^5.1.0:
     brace-expansion "^2.0.1"
 
 minimatch@^9.0.4:
-  version "9.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51"
-  integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==
+  version "9.0.5"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
+  integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
   dependencies:
     brace-expansion "^2.0.1"
 
@@ -7705,9 +7718,9 @@ named-placeholders@^1.1.3:
     lru-cache "^7.14.1"
 
 nan@^2.12.1, nan@^2.13.2, nan@^2.18.0, nan@^2.19.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.19.0.tgz#bb58122ad55a6c5bc973303908d5b16cfdd5a8c0"
-  integrity sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==
+  version "2.20.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.20.0.tgz#08c5ea813dd54ed16e5bd6505bf42af4f7838ca3"
+  integrity sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==
 
 nanoid@^2.1.0:
   version "2.1.11"
@@ -7829,9 +7842,9 @@ node-pushover@1.0.0:
     httpreq "*"
 
 node-releases@^2.0.14:
-  version "2.0.14"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
-  integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
+  version "2.0.18"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f"
+  integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==
 
 node-sspi@0.2.10:
   version "0.2.10"
@@ -7952,9 +7965,9 @@ number-is-nan@^1.0.0:
   integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==
 
 nwsapi@^2.2.4:
-  version "2.2.10"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.10.tgz#0b77a68e21a0b483db70b11fad055906e867cda8"
-  integrity sha512-QK0sRs7MKv0tKe1+5uZIQk/C8XGza4DAnztJG8iD+TpJIORARrCxczA738awHrZoHeTjSSoHqao2teO0dC/gFQ==
+  version "2.2.12"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.12.tgz#fb6af5c0ec35b27b4581eb3bbad34ec9e5c696f8"
+  integrity sha512-qXDmcVlZV4XRtKFzddidpfVP4oMSGhga+xdMc25mv8kaLUHtgzCDhUxkrN8exkGdTlLNaXj7CV3GtON7zuGZ+w==
 
 nyc@^14.1.1:
   version "14.1.1"
@@ -8032,9 +8045,9 @@ object-hash@^2.2.0:
   integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==
 
 object-inspect@^1.13.1:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2"
-  integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.2.tgz#dea0088467fb991e67af4058147a24824a3043ff"
+  integrity sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==
 
 object-keys@^1.1.1:
   version "1.1.1"
@@ -8273,6 +8286,11 @@ package-hash@^3.0.0:
     lodash.flattendeep "^4.4.0"
     release-zalgo "^1.0.0"
 
+package-json-from-dist@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz#e501cd3094b278495eb4258d4c9f6d5ac3019f00"
+  integrity sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==
+
 packet-reader@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-1.0.0.tgz#9238e5480dedabacfe1fe3f2771063f164157d74"
@@ -8523,10 +8541,10 @@ pause@0.0.1:
   resolved "https://registry.yarnpkg.com/pause/-/pause-0.0.1.tgz#1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"
   integrity sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg==
 
-peek-readable@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-5.0.0.tgz#7ead2aff25dc40458c60347ea76cfdfd63efdfec"
-  integrity sha512-YtCKvLUOvwtMGmrniQPdO7MwPjgkFBtFIrmfSbYmYuq3tKDV/mcfAhBth1+C3ru7uXIZasc/pHnb+YDYNkkj4A==
+peek-readable@^5.1.3:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-5.1.3.tgz#08993b35dd87502ae5e6028498663abed2dcc009"
+  integrity sha512-kCsc9HwH5RgVA3H3VqkWFyGQwsxUxLdiSX1d5nqAm7hnMFjNFX1VhBLmJoUY0hZNc8gmDNgBkLjfhiWPsziXWA==
 
 pend@~1.2.0:
   version "1.2.0"
@@ -8588,9 +8606,9 @@ pg@8.7.1:
     pgpass "1.x"
 
 pg@^8.4.0:
-  version "8.11.5"
-  resolved "https://registry.yarnpkg.com/pg/-/pg-8.11.5.tgz#e722b0a5f1ed92931c31758ebec3ddf878dd4128"
-  integrity sha512-jqgNHSKL5cbDjFlHyYsCXmQDrfIX/3RsNwYqpd4N0Kt8niLuNoRNH+aazv6cOd43gPh9Y4DjQCtb+X0MH0Hvnw==
+  version "8.12.0"
+  resolved "https://registry.yarnpkg.com/pg/-/pg-8.12.0.tgz#9341724db571022490b657908f65aee8db91df79"
+  integrity sha512-A+LHUSnwnxrnL/tZ+OLfqR1SxLN3c/pgDztZ47Rpbsd4jUytsTtwQo/TLPRzPJMp/1pbhYVhH9cuSZLAajNfjQ==
   dependencies:
     pg-connection-string "^2.6.4"
     pg-pool "^3.6.2"
@@ -8719,9 +8737,9 @@ postgres-interval@^1.1.0:
     xtend "^4.0.0"
 
 postman-request@^2.88.1-postman.33:
-  version "2.88.1-postman.33"
-  resolved "https://registry.yarnpkg.com/postman-request/-/postman-request-2.88.1-postman.33.tgz#684147d61c9a263a28f148d3207b1593e0f01ec5"
-  integrity sha512-uL9sCML4gPH6Z4hreDWbeinKU0p0Ke261nU7OvII95NU22HN6Dk7T/SaVPaj6T4TsQqGKIFw6/woLZnH7ugFNA==
+  version "2.88.1-postman.34"
+  resolved "https://registry.yarnpkg.com/postman-request/-/postman-request-2.88.1-postman.34.tgz#a5f2c42649935008f87d5aa185c7035d4948cf65"
+  integrity sha512-GkolJ4cIzgamcwHRDkeZc/taFWO1u2HuGNML47K9ZAsFH2LdEkS5Yy8QanpzhjydzV3WWthl9v60J8E7SjKodQ==
   dependencies:
     "@postman/form-data" "~3.1.1"
     "@postman/tough-cookie" "~4.1.3-postman.1"
@@ -8845,9 +8863,9 @@ qs@6.11.0:
     side-channel "^1.0.4"
 
 qs@^6.6.0, qs@^6.7.0, qs@^6.9.4:
-  version "6.12.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.12.1.tgz#39422111ca7cbdb70425541cba20c7d7b216599a"
-  integrity sha512-zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ==
+  version "6.12.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.12.3.tgz#e43ce03c8521b9c7fd7f1f13e514e5ca37727754"
+  integrity sha512-AWJm14H1vVaO/iNZ4/hO+HyaTehuy9nRqVdkTqlJt0HWvBiBIEXFmb4C0DGeYo3Xes9rrEW+TxHsaigCbN5ICQ==
   dependencies:
     side-channel "^1.0.6"
 
@@ -8953,7 +8971,7 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-"readable-stream@2 || 3", readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
+"readable-stream@2 || 3", readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0, readable-stream@^3.6.2:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
   integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
@@ -9422,11 +9440,10 @@ sasl-plain@^0.1.0:
   integrity sha512-X8mCSfR8y0NryTu0tuVyr4IS2jBunBgyG+3a0gEEkd0nlHGiyqJhlc4EIkzmSwaa7F8S4yo+LS6Cu5qxRkJrmg==
 
 sasl-scram-sha-1@^1.2.0, sasl-scram-sha-1@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/sasl-scram-sha-1/-/sasl-scram-sha-1-1.2.1.tgz#d88d51feaa0ff320d8eb1d6fc75657653f9dcd4b"
-  integrity sha512-o63gNo+EGsk1ML0bNeUAjRomIIcG7VaUyA+ffhd9MME5BjqVEpp42YkmBBZqzz1KmJG3YqpRLE4PfUe7FjexaA==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/sasl-scram-sha-1/-/sasl-scram-sha-1-1.3.0.tgz#7d249d6d9da0030f0070746126ad6d96529858ab"
+  integrity sha512-hJE3eUCEx0aK+9jwHu6VVrQwb9qxv8RMc3ZciGF/ZzXgxptCX9QbfJT45nloJGxrR9AfBU6GiVNYKA5mrqu2KQ==
   dependencies:
-    bitwise-xor "0.0.0"
     create-hash "^1.1.0"
     create-hmac "^1.1.3"
     randombytes "^2.0.1"
@@ -9444,9 +9461,9 @@ saslprep@1.0.3, saslprep@^1.0.0, saslprep@^1.0.3:
     sparse-bitfield "^3.0.3"
 
 sax@>=0.6.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.3.0.tgz#a5dbe77db3be05c9d1ee7785dbd3ea9de51593d0"
-  integrity sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.4.1.tgz#44cc8988377f126304d3b3fc1010c733b929ef0f"
+  integrity sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==
 
 saxes@^6.0.0:
   version "6.0.0"
@@ -9478,9 +9495,9 @@ semver@^6.0.0, semver@^6.3.1:
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
 semver@^7.3.5, semver@^7.5.4:
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13"
-  integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
+  integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
 
 send@0.18.0:
   version "0.18.0"
@@ -9932,12 +9949,13 @@ stream-via@~0.1.0:
   integrity sha512-1U7icavM/2dRDSevxnJRZfKBWrnhmtdCh0zQTThwYchL2YWjbwZb2PEngEj9HKjgyJ2oDipz6TLud/AU6BAIzQ==
 
 streamx@^2.15.0:
-  version "2.16.1"
-  resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.16.1.tgz#2b311bd34832f08aa6bb4d6a80297c9caef89614"
-  integrity sha512-m9QYj6WygWyWa3H1YY69amr4nVgy61xfjys7xO7kviL5rfIEc2naf+ewFiOA+aEJD7y0JO3h2GoiUv4TDwEGzQ==
+  version "2.18.0"
+  resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.18.0.tgz#5bc1a51eb412a667ebfdcd4e6cf6a6fc65721ac7"
+  integrity sha512-LLUC1TWdjVdn1weXGcSxyTR3T4+acB6tVGXT95y0nGbca4t4o/ng1wKAGTljm9VicuCVLvRlqFYXYy5GwgM7sQ==
   dependencies:
-    fast-fifo "^1.1.0"
+    fast-fifo "^1.3.2"
     queue-tick "^1.0.1"
+    text-decoder "^1.1.0"
   optionalDependencies:
     bare-events "^2.2.0"
 
@@ -9951,7 +9969,7 @@ string-tools@^1.0.0:
   resolved "https://registry.yarnpkg.com/string-tools/-/string-tools-1.0.0.tgz#c69a9d5788858997da66f1d923ba7113ea466b5a"
   integrity sha512-wN3ILcVQFIf7skV2S9/6tSgK+11RAGDVt8luHaEN/RGOOHQAyBblnfEIVS1qeF+91LlTkp1lqMoglibfWnkIkg==
 
-"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -9969,6 +9987,15 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
 string-width@^3.0.0, string-width@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
@@ -10029,7 +10056,7 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -10050,6 +10077,13 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-ansi@^7.0.1:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -10080,12 +10114,12 @@ strnum@^1.0.5:
   integrity sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==
 
 strtok3@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/strtok3/-/strtok3-7.0.0.tgz#868c428b4ade64a8fd8fee7364256001c1a4cbe5"
-  integrity sha512-pQ+V+nYQdC5H3Q7qBZAz/MO6lwGhoC2gOAjuouGf/VO0m7vQRh8QNMl2Uf6SwAtzZ9bOw3UIeBukEGNJl5dtXQ==
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/strtok3/-/strtok3-7.1.1.tgz#f548fd9dc59d0a76d5567ff8c16be31221f29dfc"
+  integrity sha512-mKX8HA/cdBqMKUr0MMZAFssCkIGoZeSCMXgnt79yKxNFguMLVFgRe6wB+fsL0NmoHDbeyZXczy7vEPSoo3rkzg==
   dependencies:
     "@tokenizer/token" "^0.3.0"
-    peek-readable "^5.0.0"
+    peek-readable "^5.1.3"
 
 supports-color@^2.0.0:
   version "2.0.0"
@@ -10249,6 +10283,13 @@ test-value@^2.0.0, test-value@^2.1.0:
     array-back "^1.0.3"
     typical "^2.6.0"
 
+text-decoder@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/text-decoder/-/text-decoder-1.1.1.tgz#5df9c224cebac4a7977720b9f083f9efa1aefde8"
+  integrity sha512-8zll7REEv4GDD3x4/0pW+ppIxSNs7H1J10IKFZsuOMscumCdM2a+toDGLPA3T+1+fLBql4zbt5z83GEQGGV5VA==
+  dependencies:
+    b4a "^1.6.4"
+
 text-hex@1.0.x:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5"
@@ -10406,15 +10447,10 @@ ts-mixer@^6.0.4:
   resolved "https://registry.yarnpkg.com/ts-mixer/-/ts-mixer-6.0.4.tgz#1da39ceabc09d947a82140d9f09db0f84919ca28"
   integrity sha512-ufKpbmrugz5Aou4wcr5Wc1UUFWOLhq+Fm6qa6P0w0K5Qw2yhaUoiWszhCVuNQyNwrlGiscHOmqYoAox1PtvgjA==
 
-tslib@^1.11.1:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
-  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
-
 tslib@^2.1.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.5.0, tslib@^2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
-  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
+  integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==
 
 tsscmp@1.0.6:
   version "1.0.6"
@@ -10471,9 +10507,9 @@ type-is@~1.6.18:
     mime-types "~2.1.24"
 
 type@^2.7.2:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/type/-/type-2.7.2.tgz#2376a15a3a28b1efa0f5350dcf72d24df6ef98d0"
-  integrity sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/type/-/type-2.7.3.tgz#436981652129285cc3ba94f392886c2637ea0486"
+  integrity sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==
 
 typed-array-buffer@^1.0.2:
   version "1.0.2"
@@ -10547,9 +10583,9 @@ uglify-js@^2.6:
     uglify-to-browserify "~1.0.0"
 
 uglify-js@^3.1.4, uglify-js@^3.5.1:
-  version "3.17.4"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"
-  integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==
+  version "3.19.0"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.19.0.tgz#6d45f1cad2c54117fa2fabd87fc2713a83e3bf7b"
+  integrity sha512-wNKHUY2hYYkf6oSFfhwwiHo4WCHzHmzcXsqXYTN9ja3iApYIFbb2U6ics9hBcYLHcYGQoAlwnZlTrf3oF+BL/Q==
 
 uglify-to-browserify@~1.0.0:
   version "1.0.2"
@@ -10660,10 +10696,10 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
-update-browserslist-db@^1.0.13:
-  version "1.0.16"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.16.tgz#f6d489ed90fb2f07d67784eb3f53d7891f736356"
-  integrity sha512-KVbTxlBYlckhF5wgfyZXTWnMn7MMZjMu9XG8bPlliUOP9ThaF4QnhP8qrjrH7DRzHfSk0oQv1wToW+iA5GajEQ==
+update-browserslist-db@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz#7ca61c0d8650766090728046e416a8cde682859e"
+  integrity sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==
   dependencies:
     escalade "^3.1.2"
     picocolors "^1.0.1"
@@ -10772,6 +10808,11 @@ utils-merge@1.0.1, utils-merge@1.x.x, utils-merge@^1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
 
+uuid@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-10.0.0.tgz#5a95aa454e6e002725c79055fd42aaba30ca6294"
+  integrity sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==
+
 uuid@^3.0.1, uuid@^3.3.2:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
@@ -11020,24 +11061,24 @@ window-size@^0.2.0:
   integrity sha512-UD7d8HFA2+PZsbKyaOCEy8gMh1oDtHgJh1LfgjQ4zVXmYjAT/kvz3PueITKuqDiIXQe7yzpPnxX3lNc+AhQMyw==
 
 winston-transport@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.7.0.tgz#e302e6889e6ccb7f383b926df6936a5b781bd1f0"
-  integrity sha512-ajBj65K5I7denzer2IYW6+2bNIVqLGDHqDw3Ow8Ohh+vdW+rv4MZ6eiDvHoKhfJFZ2auyN8byXieDDJ96ViONg==
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.7.1.tgz#52ff1bcfe452ad89991a0aaff9c3b18e7f392569"
+  integrity sha512-wQCXXVgfv/wUPOfb2x0ruxzwkcZfxcktz6JIMUaPLmcNhO4bZTwA/WtDWK74xV3F2dKu8YadrFv0qhwYjVEwhA==
   dependencies:
-    logform "^2.3.2"
-    readable-stream "^3.6.0"
+    logform "^2.6.1"
+    readable-stream "^3.6.2"
     triple-beam "^1.3.0"
 
 winston@^3.3.3:
-  version "3.13.0"
-  resolved "https://registry.yarnpkg.com/winston/-/winston-3.13.0.tgz#e76c0d722f78e04838158c61adc1287201de7ce3"
-  integrity sha512-rwidmA1w3SE4j0E5MuIufFhyJPBDG7Nu71RkZor1p2+qHvJSZ9GYDA81AyleQcZbh/+V6HjeBdfnTZJm9rSeQQ==
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/winston/-/winston-3.13.1.tgz#53ddadb9c2332eb12cff8306413b3480dc82b6c3"
+  integrity sha512-SvZit7VFNvXRzbqGHsv5KSmgbEYR5EiQfDAL9gxYkRqa934Hnk++zze0wANKtMHcy/gI4W/3xmSDwlhf865WGw==
   dependencies:
     "@colors/colors" "^1.6.0"
     "@dabh/diagnostics" "^2.0.2"
     async "^3.2.3"
     is-stream "^2.0.0"
-    logform "^2.4.0"
+    logform "^2.6.0"
     one-time "^1.0.0"
     readable-stream "^3.4.0"
     safe-stable-stringify "^2.3.1"
@@ -11136,27 +11177,27 @@ write-file-atomic@^2.4.2:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
-ws@8.14.2:
-  version "8.14.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.14.2.tgz#6c249a806eb2db7a20d26d51e7709eab7b2e6c7f"
-  integrity sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==
+ws@8.17.1:
+  version "8.17.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b"
+  integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==
 
 ws@^5.2.0:
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.3.tgz#05541053414921bc29c63bee14b8b0dd50b07b3d"
-  integrity sha512-jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA==
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.4.tgz#c7bea9f1cfb5f410de50e70e82662e562113f9a7"
+  integrity sha512-fFCejsuC8f9kOSu9FYaOw8CdO68O3h5v0lg4p74o8JqWpwTf9tniOD+nOB78aWoVSS6WptVUmDrp/KPsMVBWFQ==
   dependencies:
     async-limiter "~1.0.0"
 
 ws@^7.0.0:
-  version "7.5.9"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
-  integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
+  version "7.5.10"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
+  integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
 
 ws@^8.13.0, ws@^8.4.0, ws@^8.9.0:
-  version "8.17.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.0.tgz#d145d18eca2ed25aaf791a183903f7be5e295fea"
-  integrity sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==
+  version "8.18.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc"
+  integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==
 
 xml-crypto@^2.1.3:
   version "2.1.5"

From 48851c19245b3056dadad26f2302e8e058d19fab Mon Sep 17 00:00:00 2001
From: hlad <hladma@gmail.com>
Date: Tue, 23 Jul 2024 19:47:37 +0200
Subject: [PATCH 152/175] gajim: 1.9.1 - > 1.9.2

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

diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index 7e4b468c301d..cf3815376b76 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -21,11 +21,11 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gajim";
-  version = "1.9.1";
+  version = "1.9.2";
 
   src = fetchurl {
     url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz";
-    hash = "sha256-VvXzGo8GLtkAJ/ZVOpYOboJeRqZkDbZDu9DMjaHqWus=";
+    hash = "sha256-nxSYXVliK+x3RbaXxZ2MA2PZ3bX6UYyctCKNCcdqPDM=";
   };
 
   format = "pyproject";

From f2cbdf625403394f3326db2a2c7aa8a992ae6160 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 18:12:21 +0000
Subject: [PATCH 153/175] eksctl: 0.186.0 -> 0.187.0

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

diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix
index 08b77a72d9af..1a5b96a7d488 100644
--- a/pkgs/by-name/ek/eksctl/package.nix
+++ b/pkgs/by-name/ek/eksctl/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "eksctl";
-  version = "0.186.0";
+  version = "0.187.0";
 
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = pname;
     rev = version;
-    hash = "sha256-awXoD3Yy2nwOF4uhBlgCjLjmPmzU4uRPlWpsTDFu65I=";
+    hash = "sha256-EZYKRkxU2KcjiANUA2tXOk7Kp60O0iOGXRIjmSa61SY=";
   };
 
   vendorHash = "sha256-aOLZQKhBy5uBmOhJPfk3ZDHp/YbZw9oN4DaAu1NFcvA=";

From 1500ccb5fece378ec7aeca95c27f5345a630011b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 18:13:12 +0000
Subject: [PATCH 154/175] python312Packages.awscrt: 0.21.1 -> 0.21.2

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

diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix
index 1ef9d1eeda9a..f7320137d717 100644
--- a/pkgs/development/python-modules/awscrt/default.nix
+++ b/pkgs/development/python-modules/awscrt/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "awscrt";
-  version = "0.21.1";
+  version = "0.21.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-q7nF79TzOItcXQsWQADF9SgLLKz72I5FhSVSjkEoJbw=";
+    hash = "sha256-N6zijQ16kfkIYt0plIcqFZYre08TduC3sBqCGVRhFQc=";
   };
 
   buildInputs = lib.optionals stdenv.isDarwin [

From 17bab7c94eb88ceec00adccbb9e5c730e91fb69d Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Tue, 23 Jul 2024 20:30:11 +0200
Subject: [PATCH 155/175] knot-resolver: 5.7.3 -> 5.7.4

https://gitlab.nic.cz/knot/knot-resolver/-/releases/v5.7.4
---
 pkgs/servers/dns/knot-resolver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 1102024812a8..198c7835fd8b 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -18,11 +18,11 @@ lua = luajitPackages;
 
 unwrapped = stdenv.mkDerivation rec {
   pname = "knot-resolver";
-  version = "5.7.3";
+  version = "5.7.4";
 
   src = fetchurl {
     url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz";
-    hash = "sha256-78bkX/xe/ZiSHqXNP+zhZqGlzp6qEtQbRiaJZDU9vts=";
+    hash = "sha256-a22m7PBoKAQa+tRN+iJ3gfCuNK0YOmZwCFCTVdGL2cg=";
   };
 
   outputs = [ "out" "dev" ];

From 0e8b677bd37f09d4856be46cc95eae39ed9ba61c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 23 Jul 2024 20:57:39 +0200
Subject: [PATCH 156/175] firefox-unwrapped: 128.0 -> 128.0.2

https://www.mozilla.org/en-US/firefox/128.0.2/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 cd8c2b00fda4..c9ab9006ded6 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 = "128.0";
+    version = "128.0.2";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "309c0e2a0bea5699e6daf4fa02300ad7fd118d2c02c35cb5fa97a5fcc6e250cc7aec34e50fe872b8fd516436bfcfe37ddf33c9d0f9291860388cd6f3f08ea9f1";
+      sha512 = "e5c38fa3adf26f5f072b6dfe5955004e67f576dc67ef68348d58fa0ac13bd3c7764e9289dfcadb2bbe034188bf296267d74fde13fb9b53beb5421245fee69da1";
     };
 
     extraPatches = [

From 5a46236992ecbb2805e5f52557cb1f755091026c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 23 Jul 2024 21:00:56 +0200
Subject: [PATCH 157/175] firefox-bin-unwrapped: 128.0 -> 128.0.2

https://www.mozilla.org/en-US/firefox/128.0.2/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 16f28882df5b..f48df8e75fc0 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 = "128.0";
+  version = "128.0.2";
   sources = [
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ach/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ach/firefox-128.0.2.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "fe0fac4d0ff657d57d5c5acce08079f3571a10f7de5a747fbca5ff38a7679317";
+      sha256 = "ccadd301eaac1e5026353a2682f9ce864a936e974d9bc4580ada26d6fd71d5cd";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/af/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/af/firefox-128.0.2.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "2fd8b8fd43239f766ea7c93b8f090c31b1335a0d45d0ab4344baac02836798b7";
+      sha256 = "0351eb9b0c6de5e64f4718f9e19e45738b98d9082d7c7cad9e79c760a76bcce3";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/an/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/an/firefox-128.0.2.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "ddbdc736a1964ac6cc9d4216f8e4d5b72f0bc9cc7d538dd71a9dbeff624d032f";
+      sha256 = "e887feb26b8ed2251d3bb19998ec8a5b00465964a7db85434d8c748584248acc";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ar/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ar/firefox-128.0.2.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "f285788c38d09e26532e12a4821f31cac175b24fdf5d7f48f81ce6cce290538c";
+      sha256 = "15a7c66368a40b79c726229e717d883ed97ecf0edb1f0ee54da7dddcdcaa227f";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ast/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ast/firefox-128.0.2.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "f20aa2eb7b7804c465283ff73bf38e6c6f8a460acc092487131a03b6b44cad3a";
+      sha256 = "744c4282ca08d16701a7c3c526587f80a9448889f2f73b291f7398c5a6a5880d";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/az/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/az/firefox-128.0.2.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "970edaa51af137a81de5fac9b594a4ac7971e2f1db5d8d8113a09b3b682dae80";
+      sha256 = "3ab3c19fe9203b1bdb24ad3e2961c94c6a13261c6d7df1c1fbbe99ed7cb7a6dd";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/be/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/be/firefox-128.0.2.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "b91cbd018f5687ea9e196ae1f23440322b1a2f0bebdb3a57a9e8115c0695569c";
+      sha256 = "2e64c25553d7b8ccd7bd9551adafa01827dc5bbc932e8a804f26e1fff8d348fa";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/bg/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/bg/firefox-128.0.2.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "9c91bb7a0a3663baeeee5e40c3172b858fd5dbf869deb05724ce5c87178f635f";
+      sha256 = "74e679576798c81edf513edc8ab8de2843af6556bcbc64519b98d4255a9228a3";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/bn/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/bn/firefox-128.0.2.tar.bz2";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "7e80370f346568431625ab11438e575ce21a393da13b3d736ed940309cabecaa";
+      sha256 = "c55236652ec23daff081f614ce3d829b029b496c3e5a2cc194e6002a6ccf3d68";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/br/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/br/firefox-128.0.2.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "0ec0c53b87f34ae4f9ee2166a322106b3245df9e35057f2683da30e50c9c1062";
+      sha256 = "7cd92e11d0a0d7f0ca70645b5ad3c26b155e63b181ac2adfe9e7ea7c6fa6d59a";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/bs/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/bs/firefox-128.0.2.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "58cb30dad21f3e0eb69f069a819ffbf4f39e060225dbf4afc0351ec579693e86";
+      sha256 = "9d88ba2d7bac25588084632ddead70388f4a12e5ad90288ff4a7eec057eaa5df";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ca-valencia/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ca-valencia/firefox-128.0.2.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "8729e10a963d47df5ed6f0de7a5c4c94451b32c6dae2be9dced8e00b075e65cf";
+      sha256 = "42002f9a31d05e0c6540ed5ae40d1a88a9fa2067e9911575a539f7f862a608e9";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ca/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ca/firefox-128.0.2.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "95037aec2b9f506d583d62897ad76064a814b028be72dccf34a2a10c51a50507";
+      sha256 = "419cfb6d45da88b2bbb4613fe0e6ac01b24e0f53ff9a8ecc8e0b8fe7eb800d9a";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/cak/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/cak/firefox-128.0.2.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "cdd48e6731404b52a81d2a4dd121313dfac5fcd84d21908617ccfc64ddaa247d";
+      sha256 = "31e26e966281ab7f746ec531d4ef9d58f4a74ffc4b650c627c174b0ef8516708";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/cs/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/cs/firefox-128.0.2.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "ea17169afcf30b7b179032d196f03c6f2cbc3a32c02ac737cbc18d1c1e6e58b8";
+      sha256 = "dc17ba8c98d6d51ceb1c6bf83acc671cf901dbd326942f2ddbf6dc728e88f33d";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/cy/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/cy/firefox-128.0.2.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "ba5a288107d74b021f7ae43564de1cf98f7235f2de7cb23441049ae58d60de2c";
+      sha256 = "4be1336a4690808fbe3050d3be0359b8d1dd529e51d119ac01ddc9a96c672fac";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/da/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/da/firefox-128.0.2.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "a480d6b13ab5c724ca461cc2ca2b2168dfabbf32e3236f136ccc018c994a1b1a";
+      sha256 = "2c96482670295037edaa15179547114cd2aa08687661850030e195b72f889049";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/de/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/de/firefox-128.0.2.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "9eceff958a692aeec627f1d30d6be0aeb993fba259e9c6f7d0fdd3aaf9cfb998";
+      sha256 = "1eeb66fb29a2033fbbaadf803c03d0d263153bfdc6ed80e69af8aaa0a04d780f";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/dsb/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/dsb/firefox-128.0.2.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "f43a2790324711b80fe56ff17525ee3552f3bf2765918eb4087c125c3ff277d3";
+      sha256 = "e96243d9757b947f76531fe0fd3da141ebaf504d1779af98afd507f25c6d12c3";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/el/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/el/firefox-128.0.2.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "2bf7f6aa888eec9737b410e28da2845022e5c68035580de989a6e84648d8e816";
+      sha256 = "1a60bd62fbf14dc7415be4ddc65dc7898917bb98b7ed30c8029c3109fb8d8fbf";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/en-CA/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/en-CA/firefox-128.0.2.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "41f802d9fa41f02d516593324c37691d3fe1fb89c4439992da468c868a03e2c2";
+      sha256 = "4aa6bbf276ae53a7dbc22337609dbe783365e30d26916f98c35eee918e50e010";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/en-GB/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/en-GB/firefox-128.0.2.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "c61adcc64cadaf494f1d8ff4d9e912715b74832fa11409910384a8c532502129";
+      sha256 = "7ccfbff0723c65d20ab65b309554a66b64842f0cc89b820b77d55820ef2c47d5";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/en-US/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/en-US/firefox-128.0.2.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "dce89cff7286c1bd4dd906fb9123e6136f1a1ecb7a6d674c53566c319cc85c4d";
+      sha256 = "e9347f23378469bcb3c3cd9a46c85c1324d1536b3ffdaa6c2730ea07908a6c46";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/eo/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/eo/firefox-128.0.2.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "c8893170b623b075a62773d31f12257c015a827a9eb2ab6bf403f55b162ffc4a";
+      sha256 = "2d06e6c12208d493ecafa6df42b6ab8aa01bf80c663d6cb7d8b1f17ddf7ee218";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/es-AR/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/es-AR/firefox-128.0.2.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "8f2a02d871950415871ed42b624a545d3a407a2e12f764e18958fe86602f7213";
+      sha256 = "6134362778ebd4eeafd5ac4b095896e874516c8411812e0ff707a704a68eba5b";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/es-CL/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/es-CL/firefox-128.0.2.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "a59c7afcdfde5b37a72f88c210fe6dc82e5c93e896d34667f55b3d937a8e2b31";
+      sha256 = "3aec33c45acad7bdfd6198dd6dee4528b86af1f43ea8f0fa143a27c10cec95ff";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/es-ES/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/es-ES/firefox-128.0.2.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "4f29b661826bbdd09cf8c295eec27bdeadc3a6f584cea565088880c522cc0108";
+      sha256 = "e13adfd13f570780f9948fdb341fb3d5071c8892b4a55a667173b68477ab2547";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/es-MX/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/es-MX/firefox-128.0.2.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "c10ca40b9589afb1781597d67cf38e102d8bbc35d82cd5add9899f5412cacdb0";
+      sha256 = "b22d14963b0ce92c95862f6678cb3c3e8d79710b3d1195556540cfc6941968a7";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/et/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/et/firefox-128.0.2.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "bc4bbfb68afd5c028d9796f68a30791d32510151d9063da2d7b2263b07fd2a09";
+      sha256 = "cc21585ff7e2bcb8a1bcedd3356545a997adec9a7a7c81847d8ecd96f2827bfc";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/eu/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/eu/firefox-128.0.2.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "f15a5bc049db89bc8da40a6208a974d3783c676684e04534c5870de795bc73cb";
+      sha256 = "879902a321b11cfb2e3be83b747cda7534ed6244ce235b69123cada173b04b12";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/fa/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/fa/firefox-128.0.2.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "6599bd9a2df5069f0d0b560832d30b6e9960a5ff0beb7e5e7ee30aa18024b525";
+      sha256 = "c762e51b4b98f7add86b3e5a06ccb7e09f3d0c4139ea332e7d3639208f9fdb0b";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ff/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ff/firefox-128.0.2.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "c9505babef7835661a4c7f895dc315c42c066d1e4b30f607a19f742c4b9bc58f";
+      sha256 = "55bde482ee63ebee517b4783f16cf6c53fa5176bdf9e879c80b3a1dcae64108f";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/fi/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/fi/firefox-128.0.2.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "aab2d3b55552515c04451f802635eb621d0b3b283d5e3757677b1a42ec83fe77";
+      sha256 = "822fc01d276a5957835ddf3d8c9d464f951f3804edeac3205a45a6affa0e1aeb";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/fr/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/fr/firefox-128.0.2.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "b86001baff83e05c8254faaf677a3a9e3c2f75d91b93460c0d486dc5c3873d25";
+      sha256 = "01a58d1a2d00b17f6805d8972a2eb177ffac1ac354a37d835048bfeafb94d2e4";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/fur/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/fur/firefox-128.0.2.tar.bz2";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "ef74865b59afda235aa6f62cc4886595bd42c2922493f739e5535b952dcd1bd4";
+      sha256 = "a1b879ce692bfc76318bf46ec52f5436ef7a50e45f94863105ea6db652b441e1";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/fy-NL/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/fy-NL/firefox-128.0.2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "8ae9e65a58b86b8c76829b18ab8a3cd095d9c5adfe97f5dc341086f441dde9bd";
+      sha256 = "abf1aefc73cc40a92e04fae7d1f38264230b5c3529beda0be324189113e64276";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ga-IE/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ga-IE/firefox-128.0.2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "3f9b9be803d23c827b824674933fa19f92dc61479554c5b9dd54e4037fe6309a";
+      sha256 = "c2dec70be2a8613271480eaa0afa571fbdc0b932d54b68fed65bc0919bf96710";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/gd/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/gd/firefox-128.0.2.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "a820a9caeb36045835a48fae768b54c00fd66eb54ab60b80cc39fc9b433bee6b";
+      sha256 = "e67ebebbf511b6fa68a192489ed1f6bca25c57e18491e84f9e2a4c2b06e4cb21";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/gl/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/gl/firefox-128.0.2.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "c82757c3786e8e3ba655ffad34fc5d344646cc3d85b283e52dd9051738061ddd";
+      sha256 = "04a27be0fe2b1f6a35b76aa2db2546ff07e57d4a1198ae6cbd9365aa498200e6";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/gn/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/gn/firefox-128.0.2.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "47dfc4571037ea2ff96a42ef206ba66ae90a4ebb7571b7cde24f6cd9c5b4dcaf";
+      sha256 = "d0006b5480b73e10ba079a331fdf070bed44684a6371a9dcc3271a9907623664";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/gu-IN/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/gu-IN/firefox-128.0.2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "ea4f1837da7babf8d18614b9d937d23774b177ba62cda3b5e02177cbcfe5ed67";
+      sha256 = "94ad3fadc1426f5c160a54a6f64540cf897f21f11ee90ff87fbdb374e2de1729";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/he/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/he/firefox-128.0.2.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "7f118259fef9e2033e8062df7505a39c9d30e5e40d15eefef6f2d8f46699fae5";
+      sha256 = "0f3026494d35e50e7f69d5282487642d778244820b6bfb988cb9475d7419a755";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/hi-IN/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/hi-IN/firefox-128.0.2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "f1ca1598d0702c67eac5d4314394f65ccf0e9b415969ee0fdf38a737e9d572b1";
+      sha256 = "92e5fc31e39d140161743b4bc297b101579e2a0b4588000c9931ea14c03a0e1c";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/hr/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/hr/firefox-128.0.2.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "052335fb532356a7a282a3be0f1ca9dc950e84fdc0bae8807c1dd4b9c1ab3643";
+      sha256 = "4d0c434a691794f34fc30ba13dd8d7f4e228b66a3ffce6e8d7006f380c0e94b0";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/hsb/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/hsb/firefox-128.0.2.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "b79f47ce945b1f5f1e6d5332f79a34a4830f36706c3ac4772ab3ec293405bee0";
+      sha256 = "ba825903c8605fba932a6fc905dffe1adb50e72cbfc79b82542f759ae14f8d1d";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/hu/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/hu/firefox-128.0.2.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "84503c7ef80015d198d08cb8be19ebb1b7fde52006ae415d369c95c68e740779";
+      sha256 = "f210dc9e13c0da1142917187d9b1661f0d7c40dcb8593422e0d7a3b3559c06ef";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/hy-AM/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/hy-AM/firefox-128.0.2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "f598e99bd23eaea269a84272b2894f5d1e9ce51bb99568419882c5f922c54c84";
+      sha256 = "ac3fd522f69eca03d2f0cfe0d05d0542b61ba80e5f7fc8e55fee0a8f060af829";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ia/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ia/firefox-128.0.2.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "648aa52eddaf798c68d240bf889ec6c47e1dda476a597d4012b5f727fa9d670e";
+      sha256 = "509f6aa48a66985f2163356d694d2382f5e802cfe3244a6c070dd21332a231ab";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/id/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/id/firefox-128.0.2.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "f9433c4e8f99b32b3f9d7a98bf7a28712520f5c6b19740a8aac77f6077337746";
+      sha256 = "5116c7cdc73e62b09de5eab4c68e2bb00209c6da55876db2d984a4233a29778f";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/is/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/is/firefox-128.0.2.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "7dcb488fc2a170637f2e44c9edc58a2fe5f330567d130884bbb6695df2c6820f";
+      sha256 = "7df10487f73c792afebeea9eed9b01d482705a240510d6c6d7bd30f5b0b39115";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/it/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/it/firefox-128.0.2.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "dc224da74848080add80ca37bcdd00051c3a1b16b96dbf6c2d9f99823a013371";
+      sha256 = "0203ee0a2d778491eb98e9ccfa986ad5d2a43fc21335584da5bc4bfdd57c403f";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ja/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ja/firefox-128.0.2.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "0f73fe2afe181ce98ec8bea9e9434c1ec2f518ddd4d3aeb5cf85f1132e2b3067";
+      sha256 = "0044fde7e92e12f72feebccb84ef5cb2926f2d9227e64807bb48d2c78fa0dd88";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ka/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ka/firefox-128.0.2.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "f1fd00b547ddfec6b1e21701294b2e9e645e7370b2ac8c27cfb91a0e271e01ed";
+      sha256 = "6b2c6225a2b44a6677578b923334ec1b6fb07f781de585d07d081e71701491fc";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/kab/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/kab/firefox-128.0.2.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "30e78c78a1b6a06ae1ebadb3a0ad34f6f7b6203f091a6f36c5d67ecf4a1d157c";
+      sha256 = "d2ebf010be4de66cc8e46db39333766c7e3ee4d4f4699d553a16f957278e2945";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/kk/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/kk/firefox-128.0.2.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "cf2f0bda716ccaffe0f778878856f9f15fed47822c7b8cc01f34624b27926df4";
+      sha256 = "2fba1aadf1c914b0bab40a1b48d077b68313e0496d5bbfbeffa60d5b354a3fa5";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/km/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/km/firefox-128.0.2.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "266d46816ca36eaf5ffe8dc2837079c58903b8608d1a03fb5466b945439c131f";
+      sha256 = "2e8e7da4b87623ff4d715c9cdf2c5afa9c689960eb0d9c781808e25768644e33";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/kn/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/kn/firefox-128.0.2.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "6ef139036f2674101bfdd761586d79c9b61687b4eb8c9bdceeeb169ed9edb2ef";
+      sha256 = "79053848bf90159b9ee57a4294c1c72d696b99cb0b3c557c87fdea5e1293aa4d";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ko/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ko/firefox-128.0.2.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "0d259fbd42d4f800e63316b119a0c34d565f4cb5b297b6f2b598cd919c395bc8";
+      sha256 = "09f52594961e09ff3d7f20c4717da90d41cf83c3cee9119d8c6307bfc41018d3";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/lij/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/lij/firefox-128.0.2.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "b7d67080efb049da964a817005b19e11b799581aa70876ecfb1233b5b0400497";
+      sha256 = "2a4699fe17940cc46b2f22b474741d0fee109b765b4d8d2d19cb1a74c52cd06b";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/lt/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/lt/firefox-128.0.2.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "aa30e9c30a31acd549bd5481e2d7e22065319da9cf1bdf746d3039aeabbfb349";
+      sha256 = "78a6aca7850d3a91559921fb2b03dbbd7898c164489d4b87f195e8ec7447f969";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/lv/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/lv/firefox-128.0.2.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "fa05a0fb7080ac8254d23597e108a5bb8a793eed4f1109ee30ca287ae5271d06";
+      sha256 = "4868d15ca605a079a4c29a38520c5935005ea38427919d9d27c9c3e33d644844";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/mk/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/mk/firefox-128.0.2.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "3b506f3130dc54e8d7f8d95f62b1bc03ba578706638c99e3470e0916d931a410";
+      sha256 = "3f667382a6b4644d4456f4eae4844e61b733acbb22c12bb609fe9e87cb1302f9";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/mr/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/mr/firefox-128.0.2.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "597a970ed1b7770e49229e9efeaac7a7a58cef1e8240a1faea25f7c4efa71cc1";
+      sha256 = "05dfd8dd6fb856b93f67b3c9d2b33073fc2be201cc7f28c1477d590f1ea536ba";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ms/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ms/firefox-128.0.2.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "4b39e60cb04a3345ee71b38a83e0b0af77b3a18f826cd7c4478922aa49069383";
+      sha256 = "b23b3187617ca6810a0b4acd07a4a78f8cff834b501aff8c9427b3f34ae50260";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/my/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/my/firefox-128.0.2.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "9ff911791105e834673cd3b6e5f30ca60e91c04669f24a5e4328250dbcb274e3";
+      sha256 = "a0714272ffe640f2c29d429b18c65d828da0e9112c999ba06057798224753ce4";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/nb-NO/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/nb-NO/firefox-128.0.2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "3c1e8b23dbae15d3818ac3a218f2bcfa7d78c9c5815b10b491f582d7d6093c9f";
+      sha256 = "a39c59829192e98b9b40c25b6aee5d73e1640422e846b65522694c9e6ecf35c0";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ne-NP/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ne-NP/firefox-128.0.2.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "255ed595f432c97710a415112bac099262b3756033cd349859dc07bccfedd3e2";
+      sha256 = "16c0b0f19d025ea97178c4d3791e82a22b0d76251b2612dc5820608610538d93";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/nl/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/nl/firefox-128.0.2.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "fd91041ce8d9d21f435aecae3a5f7f338f2ecc77b942eca3b7da76e74b1e6551";
+      sha256 = "f29014bc9de0bde36c1b814e00ef8ed52189b49e242a12b09c706b44965631cf";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/nn-NO/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/nn-NO/firefox-128.0.2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "c6c738ca66b37715e4cc1039c21613559e899fbcaf56388ab157ef19132734e7";
+      sha256 = "07329fd32e0853ebb9b8b3663704f3e3b48b4f6127b73ca0cc5e3f702648ee54";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/oc/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/oc/firefox-128.0.2.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "0fea52b897520fec00aa98b6192bacb0109638973c2372d601da9161a6a868a6";
+      sha256 = "e690295a31516c4d3522edf3b6ec6763912887bb3a5c38e13fc92ebc4eb0aeab";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/pa-IN/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/pa-IN/firefox-128.0.2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "3121e2e5a0e2657677902a120486ef7b3bdc8c1e5b56a6efd22e2cf21d3ec1b9";
+      sha256 = "ba53f5d4bcc8e53da145c9874231f43f5882801844aec432692a4add4cfa10a7";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/pl/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/pl/firefox-128.0.2.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "00c219e73a879b9f59ffebc57b880a1455cb608335c455efa5231f39a7f35bab";
+      sha256 = "4195e14dc1d8d4ef4206e84e717d3320edbd95d5b544768921e6b00ec158ad60";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/pt-BR/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/pt-BR/firefox-128.0.2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "acc4b5e0c285382b9946b1625068db4932fc3398f1e9ee5c5b75a9f323f6f826";
+      sha256 = "6c6d3f359c265db7e0435a6cbea65182e37bf5e92227e6dbc2c225acf2955347";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/pt-PT/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/pt-PT/firefox-128.0.2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "6d42294e217c65767762833567077c713d86df88fbde2e370e9a2d4e7078db54";
+      sha256 = "5dd0d9e02e3446f14ecdf401e6a3bee50aef7b03562d6110aa130dcf60682989";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/rm/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/rm/firefox-128.0.2.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "901d4560e67a4248548b3f852bd28afda1935cb62c7829fd533ebb39a5192f1d";
+      sha256 = "0b562c56e888ffcb510e78ecebceaf17f90ed6b125a01b988c0a83740c99ac5d";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ro/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ro/firefox-128.0.2.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "9ce10c9e66f88a6087db2e5123b83955417c81ed40a4c70235ee1bdcc0869a63";
+      sha256 = "c624988518a561dbb3719b84526ffb1707b9d6a5acd2a1d8e837e387256298e2";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ru/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ru/firefox-128.0.2.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "96c11c2e8fd57e222a4437b451a374bd7d25c7b23697104c10caa7f3b3832528";
+      sha256 = "7afe5712edbab6d970a305d4cc4c66f062dfbe6b1df196d0c313321a22c4720a";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/sat/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/sat/firefox-128.0.2.tar.bz2";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "a85406dd18f171b09f14a7756955aa3cd877eb94eae70cc3b484d0b385cce557";
+      sha256 = "fba1a5cae9758f8941fd6396f9b9ca3a9724b4a5d049836147ec85b35e52a729";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/sc/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/sc/firefox-128.0.2.tar.bz2";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "7f23eb5fbe67431ebb33c93758fbb7895700cc23b83aaa682ccc06af722a2261";
+      sha256 = "9116613e362299bd45119a5e89324b84be5fee0accdb39a04f842adaac694631";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/sco/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/sco/firefox-128.0.2.tar.bz2";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "3a163bff765de291c400de9e58731128db90f072e74b095dccacf97ec495aef2";
+      sha256 = "0267001f96f27290ee896c17d2832c9cbe0a2fc0ae0b195b72cf6bc4a6b2ff4b";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/si/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/si/firefox-128.0.2.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "17aa5525a46339ceaf58e33fd15f030b7883cedeffa1c5108abc5ef174a60853";
+      sha256 = "8e48d7e01edf0f9c1fb10cf93e7c1512c041c2cee8245536e84db5560375c200";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/sk/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/sk/firefox-128.0.2.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "0bd8adc58399f59a6b4b0c0ec3f42fbc85b28bb5b06a090eabedab53a71ef846";
+      sha256 = "961e8b48b80ff52e4d2b26b968f03b26e89217a400b16f56213f07a172655159";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/skr/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/skr/firefox-128.0.2.tar.bz2";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "5ada1070ca4d134c8fe268eed1c347b5f2eec8b9e2879b147e77fee7a0f17c2d";
+      sha256 = "b66953f1a040c55976f49fa062af2e8e2cca55a60ad8111ac45f3fd6e1c29cd0";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/sl/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/sl/firefox-128.0.2.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "fd36fcfc3208b37385f574baecc996e453d0d42e558bce8a3091961f3bb5dda2";
+      sha256 = "abc8c8a4df2a7fee90605df27d8768b745e359803b10a4c4b293bcb3e1e92be4";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/son/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/son/firefox-128.0.2.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "5b928bf3aa8fce5107fe0201eb81c3e7c445ece9b97b38ec856abf2f721f1d50";
+      sha256 = "656583346841431bffb978c77fc4280e7f7f14a36221d644bd1f3476866aaa2b";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/sq/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/sq/firefox-128.0.2.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "d4dacbcb9a2c30e614435d7f40f94339b3bdfccebbfcecf968ab28bc30bb7d76";
+      sha256 = "54eb29e48a7ff3a52ac8b094a2443d2b5bfc352e379b1563995997e9da8e975a";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/sr/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/sr/firefox-128.0.2.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "fe2641e4807c9550883987e01c4336972a37a4b6964de934cd4cfd95fad25475";
+      sha256 = "c90459fa1034fa39173f2abc17332189b41a7cf3784b1e0e668eb452e0d6b86a";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/sv-SE/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/sv-SE/firefox-128.0.2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "22482927401c7cfa1a1d99149f3a5fdb0e3abc8411bdf44949948be10f699366";
+      sha256 = "2b6d618d0a3285b7e4f9ee8f75bd31507762b06e78515a9aef7e942b10bc2a65";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/szl/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/szl/firefox-128.0.2.tar.bz2";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "a45e6cbda15c263be7b5ed476c4a3056f3a40677531c4aac94ffe1761f358218";
+      sha256 = "ae0d5184dcac959a893d204e302599c92892fbe5f04f418de4f246609d40a013";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ta/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ta/firefox-128.0.2.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "01f38f4cbdadea42b27c77f5fff321351491357d3f754e03d10febe77b2a6086";
+      sha256 = "ab3b8cae5d5280d9f39e4971c61e785e7d6197f05653f6d3e4c164bc0b5150f1";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/te/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/te/firefox-128.0.2.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "a61af32a2ac80b91ee63065471271a651c7dbfd3db58b8fb149e2db778416e8c";
+      sha256 = "ea2b173f49ac950827bca5376a84dca203a3669967970932ce5cac6692bb09c2";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/tg/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/tg/firefox-128.0.2.tar.bz2";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "49fc5ef871a81f54b6e287f2663b23a4668ebdc75940de6599ca8a3ac90f6a90";
+      sha256 = "b4754870b994bc07c1af204e62ab068ba02950338613f3bf8755d71de5b2344f";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/th/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/th/firefox-128.0.2.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "d056df36c22e3c3d766dc32366ff711cf2ba039afddae4c0cc0dcabe8ef40beb";
+      sha256 = "144c4f69446caf8b62df692f595cd12e20cd64c655ccb19d32ab95e42626c639";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/tl/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/tl/firefox-128.0.2.tar.bz2";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "6b6daed40ec7433ad91b570bc4f1cacc79b63c9a063dd165dff78db9a9d8ae56";
+      sha256 = "cb1695abd8b8ee098a03f4d998c984bc876613bc65de775c30e555bb6f5fb831";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/tr/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/tr/firefox-128.0.2.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "b361477aecb8a24a755cd1d977f4a78c52f87baeb2a5bd5c2261427a8c74fa07";
+      sha256 = "25cd844b4b321f5e1ddae46fbc7e75bdbef8713572145a126768b405793087d1";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/trs/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/trs/firefox-128.0.2.tar.bz2";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "9a72632d56d9ef6add3653404e62b3dd7f51e1bf88cf6910712f9aeedefb261c";
+      sha256 = "d917906e4eee010b667a7b2bd3f580194c16313f0c6305ee041d89b8043b43a5";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/uk/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/uk/firefox-128.0.2.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "35865189d3d15c39deeeefb6c7361cad6d9a771e0a1176155f4142f9f4ca254b";
+      sha256 = "597bca22ce03df2497c062b2fceafc172d3ab6f3d0f3ce14e7ac818075588489";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/ur/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/ur/firefox-128.0.2.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "dc74ea8a0dd1617f298a7d438c71e1d22c081a7ffaeabbcee176dc9c6576db5d";
+      sha256 = "eebb053bf4955731aed344681e79a4b96ad3cde1410b4b6dd73d328273f3b358";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/uz/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/uz/firefox-128.0.2.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "d34e921bb16cac806c29c268d8f09b6869d914f12677c295ed14e760da344a84";
+      sha256 = "dda3fafc2801b3c60cb3793f243cd635186b30758fa7e5713e237bd9109f1961";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/vi/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/vi/firefox-128.0.2.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "f0de9044eee46454ced3e6be5c1c0af5252f11d43f740bb1611f2800c814b2df";
+      sha256 = "9d4761835e54f862f11c89877834f7468b3c8efba5bfd9085f8a9a470317f13f";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/xh/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/xh/firefox-128.0.2.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "ee401bfcb28279a3b49611ea87fae67970f472a68e893a2cde55b95a8ba949a0";
+      sha256 = "599fbd74956a9f8537710ed25a7602a7a3fddd3ad378cdf0a8097dc501b49565";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/zh-CN/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/zh-CN/firefox-128.0.2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "daf6944d438b9b51762eacf439bc2996c01250ddd0aae7fe2f73f771571662d5";
+      sha256 = "633874453d1f10dbdfe348c0b25271ad8a0cb0145de9c77d5aa2e01448c2277c";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-x86_64/zh-TW/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-x86_64/zh-TW/firefox-128.0.2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "8e018072ff38386675d826b4be84b88aa05ebbe457022d06e135a87db56ba520";
+      sha256 = "c368c0581987a3cfc017268068aade0c5a1c91639fc2171ba8cf5ceb6fa1f85d";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ach/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ach/firefox-128.0.2.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "c970c2b9810f2a2cc646714d99a59623c04daea87bb6a32b5c434e6a2a4b3bf9";
+      sha256 = "264d80795048cfbb47f29de500f52a10a45cb8745137d080b119d79c01e8287d";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/af/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/af/firefox-128.0.2.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "1508093fcff587ead35cc726f57e3d399ef96c028da8220c1ff3dad7ab279746";
+      sha256 = "6eee58e8e644d673107ed5f131a10bb1b90179a53ca6c80941676c3a83ab60b9";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/an/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/an/firefox-128.0.2.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "23faeb79323393802ecf3768a3369f9670f8400292a03f37455ff419cd647537";
+      sha256 = "530e0d0b13476b3b61f326b10ef27f9b4360681bba967cddfff962dfae4c5da3";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ar/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ar/firefox-128.0.2.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "0d815d6550f11cba2466487cfae3dc5001705133a3842d7c608c0c94eed400b9";
+      sha256 = "ccf7db0e4c4dd3e47b10466a94afbf98b21f49399a0cb019e4be799a520cce35";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ast/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ast/firefox-128.0.2.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "ac1296582914c67751c6bceb606081f0559f9d8d099ac15951acb0a4123e22d7";
+      sha256 = "b4c5ef614ed3c7ac7aafadceff0dca0b0196767bd1a87231fc608f2acd7d02d7";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/az/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/az/firefox-128.0.2.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "bd7c16747987a51f71c52c9ede2902dbdff450b5480d4fc72cf9b7fedda34789";
+      sha256 = "dbca6179a577b29c96cc24977de67921d0a5974a9bc940a957536ce0997776f3";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/be/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/be/firefox-128.0.2.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "23a8e9cf0cc7e4ff397dbb1fdd12e7317efc616ed2ac88d3cfdbf063b426e78e";
+      sha256 = "66ae7cc89ea47629d3c16958067009387fea33303196e8d3f820259e0f13642a";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/bg/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/bg/firefox-128.0.2.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "16008e2c03e35429a248f9986e868b53993504dd5216ae4d6a5bd1df540ecf89";
+      sha256 = "0dc8fe00ad9e3a6307743d49374bd8c3d22aff8bf8a7b83a6ccb5d5e3b5c5fba";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/bn/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/bn/firefox-128.0.2.tar.bz2";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "5106acec718bcdd33197ebf0780326019050b6fde84255cf08bc86923c4071bf";
+      sha256 = "0f2679377c6f6f034409f6383c56d74ef941f4346bb5450001890825a1839576";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/br/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/br/firefox-128.0.2.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "c0eb06ac18ca6828b88eb614c861f01e564f8ae7280bc4a040208bb033d8d328";
+      sha256 = "395860392c302b7d8d335f1c0739a335b790c1446d90ba40504d3bd4d463fa0b";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/bs/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/bs/firefox-128.0.2.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "b46df9eb8011a55dace77a1607a55341453cbe6ef5939b16409263dcb2f0f7b5";
+      sha256 = "6b5ada9156639396a2bafd20ca390ffd6df3e90f4ac12f02ae510a750145d72e";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ca-valencia/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ca-valencia/firefox-128.0.2.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "d57ebaae949d5ed196dbf9278c3fa4d630c5367b0ee51b56ccc7e3a6fd16e146";
+      sha256 = "644a305b1f3cd374bcda0ddcd8e00edc161f92784b88a0bc9223b53c61b28c6a";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ca/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ca/firefox-128.0.2.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "32d79c89caedebb8f33f5d4ed11eb01c10a6cf3a3c326f92bfa5b41cb059e93d";
+      sha256 = "794e712daed332d34c51a7f1ed549a922da4990f242d17a05379b32b84442e36";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/cak/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/cak/firefox-128.0.2.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "3df47932602f02d44829ac053f616f951a14b24752347dcf2a5d069b5934192d";
+      sha256 = "625651b2387e4b93ed0b5a659f4e446a1b7c5e2af75431996aef8f2c177c89ce";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/cs/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/cs/firefox-128.0.2.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "db45b6649ef91a6cbf7ec3eca1d606ac24192f78d5eede545f14a8e446ef2e5e";
+      sha256 = "c1fe01a24745c60687f72c203432f8c6fa9b0e9264e0968722e7acf060f65ea1";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/cy/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/cy/firefox-128.0.2.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "89b3fecab3f8bfb3e1db24d4ce15d2979f96899567f7e242831809066e6eaf77";
+      sha256 = "d0a41b5cd551aa460af262044334068735a40b35cbb34f674c660ee234a75099";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/da/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/da/firefox-128.0.2.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "6232de82522ad288e13feb10c9618c01a1c9d7de7b1ef3033c6d54666b341a47";
+      sha256 = "19c78eae9f38c11b31f9ab03a0819f1c44866bf82032f42694f6b5bc4c719ace";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/de/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/de/firefox-128.0.2.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "ab54c709fb5e9cf469fec9a5dd8deec428cd103cf895440cf35fc9fbb7647a74";
+      sha256 = "44df80e29a8995715bddecf6a32798571fb3578b07ae7fe3e3b66dd3fcdc9356";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/dsb/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/dsb/firefox-128.0.2.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "ebb03a2761e3a89a61f632bd0905a9ba81bd154140a854b0ae210a791a0cbdf0";
+      sha256 = "c921f35f4e9a6466729c2a44acf0419f66f519cc44995931399343929fbf97db";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/el/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/el/firefox-128.0.2.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "ca7839bf59ebc527bffb93c177fd219532d6230f57843403b97361324d65fd0e";
+      sha256 = "a8a275774061013f8b865e661ba40f2a111e45d3d1c07ebc028997944c2a6d1b";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/en-CA/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/en-CA/firefox-128.0.2.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "d1f933e9822665be2eadb979e4c4a416501cc848e87717fee08822695394f004";
+      sha256 = "8d4e8d22bc017fbf40777740ebac48f3d20cc1484b2b4bc1fc3afb8bbe51d11e";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/en-GB/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/en-GB/firefox-128.0.2.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "fb25e28aef29d9287e896233f45dcd833cd148cd75f786ae5c28442ea4168b42";
+      sha256 = "ba0fcc1d6b56a80b4e554fca9d92210f2249763c5de947d6f8c8587445e6fdaa";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/en-US/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/en-US/firefox-128.0.2.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "58a080e199dfda2a4ac182f964acba1431f76a02587679e2fee6de45d3cbc12b";
+      sha256 = "60dc739b70c21d389d9b9b1dc4ee97f210223ffec0777f93ed74c5e606676502";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/eo/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/eo/firefox-128.0.2.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "ac5a1350e5db0d847b702fd655cbbfe057ae79e10faf40bd8d3040a164497662";
+      sha256 = "cf0f42b3573a59e09f3bd8c509aa99c8fad07b13925d05a85ed739aef5d46115";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/es-AR/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/es-AR/firefox-128.0.2.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "4a8ae870c71f751a5ad1e3b5a3b24c75209874cf86bf36c0b52bb31e423e2c79";
+      sha256 = "ec6beb078fa8770707532fc7e5bc4187274eeb4c912fc15178a3acc06bd3ee91";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/es-CL/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/es-CL/firefox-128.0.2.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "ee35dae9628ff82b77bc84a2da49d710aebc8857f8a47cb9ee41d689080a5ea9";
+      sha256 = "7cb8dae495765e2878cc6b5b0e4b62a8be0d0b5addd22cf7703c1cd66dffbd31";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/es-ES/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/es-ES/firefox-128.0.2.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "d582ebcb09ea0fa3daca4a20263a5165068f83f1da54d7cc079496a917ecd887";
+      sha256 = "cbe1fb89275a71b7b636e8fdbc3786b7f126d88aaedff49ab80384466d705732";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/es-MX/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/es-MX/firefox-128.0.2.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "5804478fead1d2540076b9701953de077f000de411f4adc003a1bf4f8c73b10a";
+      sha256 = "fc06a00a11142c284dab406b29a52226310aa6c7efdc8d28c5e9cf83638c0e4c";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/et/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/et/firefox-128.0.2.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "1d73da6ce23ce2fe6cd1f5ccd707be1bc0a1b7aae788ac41ed93158286b0c26d";
+      sha256 = "9a04c89f61bdbc37fa19f2fc5a4ebed9051a24c6b614a0c3c59c359773b99677";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/eu/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/eu/firefox-128.0.2.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "01898cc5ede5d5865cf73defd8124d773379066568943040aeef75621989b839";
+      sha256 = "b305f77f335cf3673270d5194bcab29064fa44b9cbf4add32ea63ae141a4f55e";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/fa/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/fa/firefox-128.0.2.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "cbb8ff6da1fe06fdf16a47771153ca91f532cef0c1d749126cb19f6c9a7743f7";
+      sha256 = "fdfbe0c56fb66c315a1252552ed771147a911e3c923b92a70f5344e90d2602a4";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ff/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ff/firefox-128.0.2.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "423fb86583962168cba54bfc27808e8c829daecd0eaca14fc72a87deb349abd6";
+      sha256 = "4cba5f6d9c259e971d5a65d9d2df0aa502863395ee32f68882ddf0687a675ccf";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/fi/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/fi/firefox-128.0.2.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "93820f6716eb72e082267db5157adc79ba537a24f3683d4bf3ea3c0a29ffcacb";
+      sha256 = "6f09d6f4793ab820732233a6e82e8be90b89466581ae9b31433c3492edef1620";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/fr/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/fr/firefox-128.0.2.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "e143066e9906ae6d84e101d1d67889f02c61a8160403c31c47980c58ed337d2b";
+      sha256 = "7b6e643185824b5d850d8070df6df1d5a7a3bb8fca0fc937457377ee622d270c";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/fur/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/fur/firefox-128.0.2.tar.bz2";
       locale = "fur";
       arch = "linux-i686";
-      sha256 = "5c1d8c5f0ef84dd0ba0d2c4410ee3be326f25f439ca50ac90317d72d4d1fe174";
+      sha256 = "2ac0983d6001c7fb2268578df75aed94f5ec409480b46cf3a6d34ac1e66e7044";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/fy-NL/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/fy-NL/firefox-128.0.2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "3ea1c108ddd9fc945e754e0a62ac2a65ed4a2bf32fd69eb71da377c5087997e3";
+      sha256 = "15500ca3d0f08a9c7a03bfdfab96043a03185c3e3f401edbf82fe63b50b4aadd";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ga-IE/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ga-IE/firefox-128.0.2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "ab9751bd8305cc2a9cfa4ca6c4c64311268476c6e23d089f1979101b40b31407";
+      sha256 = "573ad14016d744dc7fe04d4ed09631cf32ba7ef2be925906fc2b86086b9c923f";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/gd/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/gd/firefox-128.0.2.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "064008aafb9c7ccd0852c2ca225690eed3aea9b3e66adc4d2415923b67b3fd25";
+      sha256 = "2b2c42ee6e84868c30542fba2cbc7b747177a80efe8183e6ed755dc6e397bf7e";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/gl/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/gl/firefox-128.0.2.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "937fd58fc7bd3bdda7033dec98819050e1f70ca8ad54b354397daf280c0747e7";
+      sha256 = "21bb8ab1605c83800529e051a17bac5a269ff44b48908b9dfbc9432ee485947d";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/gn/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/gn/firefox-128.0.2.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "d7344bac79016767f48ec27c479010208def970ba7be1996a647d0dc3871002c";
+      sha256 = "cc0474836293a66894245ca752da8a1e4a52f563600b771e183404396c56a3d3";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/gu-IN/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/gu-IN/firefox-128.0.2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "0d2b4f98180f539979367a47b61226816294657b61dfdd5b6917699a1b87a2d5";
+      sha256 = "d18b96452cafd50b947f2b05397039b6f58ff73ad60f4185a74e39c446e4c464";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/he/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/he/firefox-128.0.2.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "fbe8fde45625054eb5950440f45582aafe254238477426413f4daed6c09092d9";
+      sha256 = "b3c173ec6004b1f98cc5af44fa29e49078cb77d14d9496e895cef52a17a52fe8";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/hi-IN/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/hi-IN/firefox-128.0.2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "bcf46a993fcb057556fedfdf738b54f88308edffc8801132ec7f947bdb88d871";
+      sha256 = "adf452e113cd55d9e1343aefdb311dbf2c32242ca7190c3db55861491d476b84";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/hr/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/hr/firefox-128.0.2.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "c4ad905887f1ecf94045bcfcc3d746df923e36f3cd87ed5a3e34d78ff0002aa7";
+      sha256 = "93868a7949c1c2a89c335adfbc9fc266efd77135faec6f0d0c8a1996d791527c";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/hsb/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/hsb/firefox-128.0.2.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "064132f106c01a82a43129071d782a5afbcefe5dfc83b784436753eeb6976277";
+      sha256 = "fdb1897604b8f9cea245757de1dcfbdc7e721203b6d042289cd7ae9b858eeca7";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/hu/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/hu/firefox-128.0.2.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "b9ccbb891e5b277e854f54aa8e62ab2458cec0d5044357d6549a93ee4b333201";
+      sha256 = "9f59966a30da65005d706bc9bf173bb35ab7c8a9cf88b10398ab9ceb9bde87ca";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/hy-AM/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/hy-AM/firefox-128.0.2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "75ec62c04890541a71371cbbc0a3a7719625ace685dcb8e35ee649bf324e4afb";
+      sha256 = "70e878f79905b6b9bc2b133f9bb4efc3e2358ecedca7b5317132b12760c2b6ad";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ia/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ia/firefox-128.0.2.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "d9d64c4d4b2f796d002747f73bc2b3d6a52dddfd2bcf05dcbaaf866ee0b8e65f";
+      sha256 = "23238b5e9e342ef2e17f046d5aaa1cc176d37e4ace9436d9c4708c3839cccc19";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/id/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/id/firefox-128.0.2.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "2ac87a78ef5ced3cd7581bdfa4c32ac43c15fc06d49504d529170860fe3a5a57";
+      sha256 = "2288b8f24f527b119a1189a08a36d87a287eb1751fce16c22e6e82ce641ef7a6";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/is/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/is/firefox-128.0.2.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "54e563ade2c758ada7a0efde0056bb8ad246877c0ef50c7c7f503719d670fdb4";
+      sha256 = "168427f4574aa71d83617c06e657b1dfc56af407b8f17e16a1cba8063f47b049";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/it/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/it/firefox-128.0.2.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "27c8d5dff9a1fed680e3dda6d765d40af9f3c43ff25a4464b646e36681b29225";
+      sha256 = "fed9870891898644b60662b63bc848fb0cade6018fbefb91874ed8f85848e7fb";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ja/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ja/firefox-128.0.2.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "90b00f0a6cd7d4357c226b53a84d15ffa3aaf9e5f788df27bbe78b93d10f1dbc";
+      sha256 = "7dee7449abba3f9794d1ce79cc9ba898dfde738f6c03ee0d15eae1cef29b8065";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ka/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ka/firefox-128.0.2.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "9e4725f1aea9c231324fefcf4da0133c64188e70f125d144da602f13404788dc";
+      sha256 = "794ba99b33f48ead7c1e82feac6a78a2c7a6fc0a3683a2a8debed76278d667d0";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/kab/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/kab/firefox-128.0.2.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "3abe9d19eefce955de0eedf8252bf3e9d53700164f9c682e30d2d2644496b4ce";
+      sha256 = "1978a5277987f5c46b6afb1efd50a7658a8f3c4d949d1bbdb882d91e47399ac5";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/kk/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/kk/firefox-128.0.2.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "292182a11c2177bfa96ba4430ec9afbcd98ccf85d975c8bce86d8b1f8a27b6e4";
+      sha256 = "272e3cbc5f3f0e4f84f5ebbc1d99906d689f2c733629ec319b0b366977a02ca8";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/km/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/km/firefox-128.0.2.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "1d892df863231a20c47f2113be5db27db05f7ca50da2462b4b54e03ef74e1e84";
+      sha256 = "41243c3d00d35147c248af1ff7202382781fb5bf04e0b4fbfb78bf3c5d86ddf6";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/kn/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/kn/firefox-128.0.2.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "fb8f5e48c2c154c0fcb2f52edbc32efeb88ad9eddb4396fcae8ec1ee187e3378";
+      sha256 = "d0de2c673c13e87bd9a086ff2baa6eddecf16ec8662bb20f6789ac8c128484bf";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ko/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ko/firefox-128.0.2.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "2e78eabde3b965d341936afa0ba65350d27b988cbb99527ab251a0a0d475a062";
+      sha256 = "6474c23951361afe745684c9222d8f5fb5a7227a33ce7678a5136887113a1d7a";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/lij/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/lij/firefox-128.0.2.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "b48b63d20e4f4b5481f9c9496963f53adbb68f2921213f3641c863b7f43b19e1";
+      sha256 = "9fb973dabb658f383774b47b77a49ef50e51c6cb803a893d9d289b83b638c947";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/lt/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/lt/firefox-128.0.2.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "2974ec879878d9a0e6e732b48e006499061cf2c8bafa3da5d12553d9a2613a5b";
+      sha256 = "ea4d6a8fbce960a683526c49caab3ab4f63e2cb481b37394b1868f0bdd9a472f";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/lv/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/lv/firefox-128.0.2.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "2d537cb4853a794487da83d9b407df869f28e082580d2291da5ddeae69c828b3";
+      sha256 = "3ad05b32176b8d6a387de36c63744121f6760ccb7549b27434c0a691143a5773";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/mk/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/mk/firefox-128.0.2.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "62b47d144947ee08d1d2164a1d80929272dccecafcc241ef5875cd4d845a41d1";
+      sha256 = "d43a2aec6870dc26173ac6c93ee8bd030107af10029723918913d674eb136ffc";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/mr/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/mr/firefox-128.0.2.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "a302bd88a32536db9810b927c318ff052ab5fc3590c114733eac14989f98ecdd";
+      sha256 = "350d378304bd5f3fdef2c5731bf050a4ac160d8d12a0a241f617cf8e4d1fbbc0";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ms/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ms/firefox-128.0.2.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "1270fdeaac163be327c6378183a597070c78a3366de62d219f272dca85c0db73";
+      sha256 = "a458cfb76c94b1d64f9dc2539cae1ef8976671900e7b8099b7c30312a36fe6a4";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/my/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/my/firefox-128.0.2.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "e192eb3e08ad4a6d07f8cbf0fef7ca6bf0f0e0dcab2088811fa110ea48bd96ac";
+      sha256 = "2b3f4efd413cf55ab734179b043929e1d9d9e8ae261609cb8104d93a730fbd09";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/nb-NO/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/nb-NO/firefox-128.0.2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "4648bdc7b9f96d1bfea2c00543fe87965b7d9c764215c4cef7f551760aad5d36";
+      sha256 = "90636874bbbb89973026f68018aa97c5280b47706303be75d7ef15d1190ed383";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ne-NP/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ne-NP/firefox-128.0.2.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "4948ab9b122ee48912e051e8257888a56a7aa669e98deb176228932f9870a3cd";
+      sha256 = "03c56bdde8f117ad664663d0483e78db411df2ee1c72b6d3ab9e40ba1d19009e";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/nl/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/nl/firefox-128.0.2.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "ab37173f006c344412b49ef07ca273b73300c17b967d7f35966f29cfa2c1d20f";
+      sha256 = "a25d8b88c140a771ded2fe557bc021cb05a6af7f3579b453c614cd5c8f4564d7";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/nn-NO/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/nn-NO/firefox-128.0.2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "4a9b9c7dfa6d8fd4a8bd96c6ceffdfd6f0246cff498cce134b53bfaa253fc64b";
+      sha256 = "6388d1cccac3f53228864aca0ea26bf05061bde97a226c3c63fe5d69d13cc35e";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/oc/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/oc/firefox-128.0.2.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "607f3af7cc6c0e6807ef47fb3ef3857a2e70013281efe92416119a51b8c457c8";
+      sha256 = "eca6eb70a59f092f61ee2db66933da1ec25bd8a3404285ea5feb7b3f82ab1947";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/pa-IN/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/pa-IN/firefox-128.0.2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "2e1e28747507b654419159f6b72a4db0b5a3fd30d2b4ed58ec92bf0a17e78ccd";
+      sha256 = "c29d74bbd97ef0b5bceae83b6520436a57dcbc9370b5f86ba4e51e9cf110a971";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/pl/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/pl/firefox-128.0.2.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "f87f984b29f2fd5a483b46211f2b2667d1be30b63620b0276cd93f950d638a5c";
+      sha256 = "a15a99418fc06f678efa35aafc0bd8a2a9acc592ca18abbc852b2166dc31e30f";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/pt-BR/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/pt-BR/firefox-128.0.2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "2feeaf18469fea0ac8e99cbadd1733966c6b5eff19dbd60db85ba59472ee10ad";
+      sha256 = "37523ad0c2ee181e01c11bac4adc82695c86cf17b0688e6f78cd79ec19c3fb0b";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/pt-PT/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/pt-PT/firefox-128.0.2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "efbc81fb9b1be7c4aee863a9ca9afdc7c7b5d16ec582f1dddf5d4b7e136132c1";
+      sha256 = "4c2cdf0c375597e04d5812325d80c1ed598b1918ed14914e7117098f11ee427c";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/rm/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/rm/firefox-128.0.2.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "889e29ce5ceb98bc4a2bb90ac6da4fc49be1b6db8360517bafbce60d49fb6d05";
+      sha256 = "91ac993e6d97ed1469b36321a0627ccf5afb98478e78afd7154069066a85f53b";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ro/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ro/firefox-128.0.2.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "63f0de6f571c83a061860067418d2c69334dbb93893c21323756ce919352d286";
+      sha256 = "cb619b50c4763b106938d4cc8e92afefd95e2bd5e800bfc3784a3d93ecb8185b";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ru/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ru/firefox-128.0.2.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "de242c5a63ccccf379030bf3b97b76ba1f36d84d2cec461d60ae56879b309895";
+      sha256 = "e249db0972f40de6c58e706478e5f89f9c9a28aa13f9c8ff17e72a753ceaaa11";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/sat/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/sat/firefox-128.0.2.tar.bz2";
       locale = "sat";
       arch = "linux-i686";
-      sha256 = "af9fcb6a3a8994c9364e9b2ec0b86405e84732a33dd101c6f53a481fce8ec659";
+      sha256 = "f160e2d68d4d3dbdfc9308edbfcd60722d872fbfc9dd60b8f9b01426bd8d867f";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/sc/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/sc/firefox-128.0.2.tar.bz2";
       locale = "sc";
       arch = "linux-i686";
-      sha256 = "6f800d9a6e80260e902ace24f0265aa0654dd54ea6447739ce8f84514b1c9c06";
+      sha256 = "030a5b731e78896b99169d287c27d982d96c9a2b9ca5e2b7f78a3d4076ed19bd";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/sco/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/sco/firefox-128.0.2.tar.bz2";
       locale = "sco";
       arch = "linux-i686";
-      sha256 = "0424affaed867fb548bce355216389d10225ea803adbafb9fb7314db6d90b451";
+      sha256 = "bcb2264e71974efeabd6d369a3bd389eaceff27d1edcc5ec9a115dd9b68a223f";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/si/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/si/firefox-128.0.2.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "a77b2aaf13848d1c3798f0e1e2902b8482adcc7b4a1b492102aefd3f44749464";
+      sha256 = "303046ad1118c044f05366bbbef2e87dcd19291c8894d352eef8a739c82b2a29";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/sk/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/sk/firefox-128.0.2.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "1c9fc78313c51e257dfc30ec419d250b95de41b00c22969d626216ff50517779";
+      sha256 = "651b9f9f57d687df7b9c317f3c8a3df6ca66f9e52c9d674c54fae0bab77f6959";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/skr/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/skr/firefox-128.0.2.tar.bz2";
       locale = "skr";
       arch = "linux-i686";
-      sha256 = "0be62f8a7fd67345af52ad39bdf44484417cb4d600dd9d8fe382cc1c4306c055";
+      sha256 = "a3c714b3e27bb103fbf11ab6c10e2511dab53dc6ade45a1dced2f423d32f32a4";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/sl/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/sl/firefox-128.0.2.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "ffdb96120be177f8947fba89fafb3cea15087b8c49284f7df8cf5edacaecbe8d";
+      sha256 = "117749fd27c7f5b0eeeb73511afda5037aa25124279585c5bd72f298213bc5db";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/son/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/son/firefox-128.0.2.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "2306bbb23289390ec7a272325807ffed8ff73f964c9fb1006318c06873e7fdcd";
+      sha256 = "a0d952ffd5419206b507651534746a736286e92c3fd72a9db4b12b52d5a75db6";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/sq/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/sq/firefox-128.0.2.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "6ae796cd4c14f95ef7d89459c4ff09da4c243a4bd65660284465222c9cfb2db0";
+      sha256 = "4785f49a0de4e9dd5f8ee030fe7e2f8eee5763a241bb2307a7eff9f87c5f6503";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/sr/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/sr/firefox-128.0.2.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "5af85de91871f48270e22a69205ff131ca8ea2bc7eeac787bb2a79d9ff484485";
+      sha256 = "87d69852745cb7620cf76b4405b7b5980b212e5f7b878bc2170d01ed3c245214";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/sv-SE/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/sv-SE/firefox-128.0.2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "49c7f58166c021b9e77c0b952e8431b31ed9b192846597bf6b365e95044aed5d";
+      sha256 = "44539421aa13257e85c511beadb2434567d1c230a05a25f16d830516c8184831";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/szl/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/szl/firefox-128.0.2.tar.bz2";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "0a9ae0cf543c4a0e48f6aea0569c26de804da3792ac53358f7eb9081d2a466a8";
+      sha256 = "79b6dafa82f92ab1ea9063885c17a4f09ea17b7210e14cce3764d1457ed213bb";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ta/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ta/firefox-128.0.2.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "3141a79e5029308cbb960607a374219d82cfae68719907695fe92ebecc4b5d6f";
+      sha256 = "1000fa0b83ab184bc43db2db701b70eb0565bb9f72e6c2702e61725cb9091cad";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/te/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/te/firefox-128.0.2.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "49a94d81b44b808bd60501dfdd35143d1cea4a89d07eaaad7e3c3b86822578e6";
+      sha256 = "75520f08386ccee407a18c1547a07aff3e59e8c267aa3e581215c8d44c80b1d7";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/tg/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/tg/firefox-128.0.2.tar.bz2";
       locale = "tg";
       arch = "linux-i686";
-      sha256 = "0c333ab93311327d1ae4dacd769fd67862eb7e44571be0c271dcd2a6e159b20b";
+      sha256 = "a198cfa165ca260fab3d8341676e7f9129f6f7ba458a250292115635cbba4c23";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/th/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/th/firefox-128.0.2.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "172a836ee9b84fecf2c9687e6cf8d6e68acfe5aba517ace8fed2abe3332044ee";
+      sha256 = "8009dd6877cbfc1b89eb6ab612f3b0e113d678894ebca994f86fed10751e2aab";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/tl/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/tl/firefox-128.0.2.tar.bz2";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "8c7d6ae9604f3cefa6ce23202e9022bf5de596a7527c9b0fcafaaf6d1d911c99";
+      sha256 = "e3c651e61179ca944a735700591742b9ffb30e5ddce88b6978ac3e33a981db3e";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/tr/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/tr/firefox-128.0.2.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "9be9d78f004a27e1dd3e7872433f5e720182acd1f173de95863fa21e170cc9b2";
+      sha256 = "87ebe236358bc3c422ec4828922b53b35f4f0ecc39314efcaad9451e3d260c58";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/trs/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/trs/firefox-128.0.2.tar.bz2";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "d0eb20bfbe50c5dc4afb999189decee91405461da6564cff2cac725d895584b6";
+      sha256 = "c9af2091e0ee5d21a053ada831f6788d5ee4d7e0dfcfedb2090671482a8932c5";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/uk/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/uk/firefox-128.0.2.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "e947918e9cc708ae3569546552479b2fcbf5e95f9d06739753cdbe9360e7bd32";
+      sha256 = "c09015f88a27b6d2c1c77648c4de13ff06fdc0317364b4e88b36b8616f0965a2";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/ur/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/ur/firefox-128.0.2.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "95c6a3abb0227707fed30457b58ae18c979e6f203e772a69ce58b5582925c556";
+      sha256 = "f26d7a5c31443e0eb65bc607e93785c448bd7b7a821f3524fd90f9d41242a0d6";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/uz/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/uz/firefox-128.0.2.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "f9c1931bd98885bb33dfd8b40de211a2d639ecc1259f1e41cd1fdc13c2ea8104";
+      sha256 = "29ab0233a1255d7ac2f1b5b4b380df0dbd2df3a1c70dc575b925e46f73d6fc76";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/vi/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/vi/firefox-128.0.2.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "41c2dffc8985b067c534014fb32322e26cfd0d45ceaa27bea49dbe6ca5093d5c";
+      sha256 = "f38ab642035a7a8be22b08210340966d88e85d6452c9fa578ed09d657173646b";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/xh/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/xh/firefox-128.0.2.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "9366b220973f588bcd5534999ae2b1ccbf4283d9cd0612a2e6b5cac105e11958";
+      sha256 = "933d26028865175f8481f344a27aa32d1470e0f89077444ab80b850b1fb3042d";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/zh-CN/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/zh-CN/firefox-128.0.2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "126cb0a2582a4b77d63276222a92df3e4fe11df4d95b4d213bbac97a098f4bdd";
+      sha256 = "047ad2f2092b36f6628711987d1334fc7fd3d56a45b3a95dddd38e88f4f67985";
     }
-    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0/linux-i686/zh-TW/firefox-128.0.tar.bz2";
+    { url = "https://archive.mozilla.org/pub/firefox/releases/128.0.2/linux-i686/zh-TW/firefox-128.0.2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "f66c84d07fc17fc403adcc864f546d0ac5c8aa3b87149d5df3af9e1c0ae8694a";
+      sha256 = "341858e2457282cc2376c5d52ad7e6cf11a0d02ae79591b28f8bb5d00079a7cc";
     }
     ];
 }

From 1f0b359712de68b11022a5ed0832b3727d088b89 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Tue, 23 Jul 2024 21:03:15 +0200
Subject: [PATCH 158/175] Enforce nixfmt on new files and changed files that
 were already formatted (#326407)

* workflows/check-nix-format: Enforce nixfmt on new/changed files

This makes the Nix format workflow check new/changed files instead of
just an allowlist.

This enforces that all PRs updated after this is merged are required to
have fully standard formatted Nix files!

* workflows/check-nix-format: determine changed files via base commit

The next commit will use this to have a simpler change

* workflows/check-nix-format: Only ensure for already formatted files

This prevents situations where contributors need to suddenly format a
huge file even if they only changed a small part of it (e.g.
all-packages.nix)
---
 .github/workflows/check-nix-format.yml | 84 +++++++++++++++-----------
 1 file changed, 48 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/check-nix-format.yml b/.github/workflows/check-nix-format.yml
index 8bef5f6d676a..a3ffc40cc37b 100644
--- a/.github/workflows/check-nix-format.yml
+++ b/.github/workflows/check-nix-format.yml
@@ -7,18 +7,29 @@ name: Check that Nix files are formatted
 
 on:
   pull_request_target:
+    # See the comment at the same location in ./check-by-name.yml
+    types: [opened, synchronize, reopened, edited]
 permissions:
   contents: read
 
 jobs:
   nixos:
     runs-on: ubuntu-latest
-    if: github.repository_owner == 'NixOS'
+    if: "github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip treewide]')"
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           # pull_request_target checks out the base branch by default
           ref: refs/pull/${{ github.event.pull_request.number }}/merge
+          # Fetches the merge commit and its parents
+          fetch-depth: 2
+      - name: Checking out base branch
+        run: |
+          base=$(mktemp -d)
+          baseRev=$(git rev-parse HEAD^1)
+          git worktree add "$base" "$baseRev"
+          echo "baseRev=$baseRev" >> "$GITHUB_ENV"
+          echo "base=$base" >> "$GITHUB_ENV"
       - name: Get Nixpkgs revision for nixfmt
         run: |
           # pin to a commit from nixpkgs-unstable to avoid e.g. building nixfmt
@@ -34,43 +45,44 @@ jobs:
       - name: Install nixfmt
         run: "nix-env -f '<nixpkgs>' -iAP nixfmt-rfc-style"
       - name: Check that Nix files are formatted according to the RFC style
-        # Each environment variable beginning with NIX_FMT_PATHS_ is a list of
-        # paths to check with nixfmt.
-        env:
-          NIX_FMT_PATHS_BSD: pkgs/os-specific/bsd
-          NIX_FMT_PATHS_MPVSCRIPTS: pkgs/applications/video/mpv/scripts
-          # Format paths related to the Nixpkgs CUDA ecosystem.
-          NIX_FMT_PATHS_CUDA: |-
-            pkgs/development/cuda-modules
-            pkgs/test/cuda
-            pkgs/top-level/cuda-packages.nix
-          NIX_FMT_PATHS_MAINTAINERS: |-
-            maintainers/maintainer-list.nix
-            maintainers/team-list.nix
-          NIX_FMT_PATHS_K3S: |-
-            nixos/modules/services/cluster/k3s
-            nixos/tests/k3s
-            pkgs/applications/networking/cluster/k3s
-          NIX_FMT_PATHS_VSCODE_EXTS: pkgs/applications/editors/vscode/extensions
-          NIX_FMT_PATHS_PHP_PACKAGES: pkgs/development/php-packages
-          NIX_FMT_PATHS_BUILD_SUPPORT_PHP: pkgs/build-support/php
-        # Iterate over all environment variables beginning with NIX_FMT_PATHS_.
         run: |
-          unformattedPaths=()
-          for env_var in "${!NIX_FMT_PATHS_@}"; do
-            readarray -t paths <<< "${!env_var}"
-            if [[ "${paths[*]}" == "" ]]; then
-              echo "Error: $env_var is empty."
-              exit 1
+          unformattedFiles=()
+
+          # TODO: Make this more parallel
+
+          # Loop through all Nix files touched by the PR
+          while readarray -d '' -n 2 entry && (( ${#entry[@]} != 0 )); do
+            type=${entry[0]}
+            file=${entry[1]}
+            case $type in
+              A*)
+                source=""
+                dest=$file
+                ;;
+              M*)
+                source=$file
+                dest=$file
+                ;;
+              C*|R*)
+                source=$file
+                read -r -d '' dest
+                ;;
+              *)
+                echo "Ignoring file $file with type $type"
+                continue
+            esac
+
+            # Ignore files that weren't already formatted
+            if [[ -n "$source" ]] && ! nixfmt --check ${{ env.base }}/"$source" 2>/dev/null; then
+              echo "Ignoring file $file because it's not formatted in the base commit"
+            elif ! nixfmt --check "$dest"; then
+              unformattedFiles+=("$file")
             fi
-            echo "Checking paths: ${paths[@]}"
-            if ! nixfmt --check "${paths[@]}"; then
-              unformattedPaths+=("${paths[@]}")
-            fi
-          done
-          if (( "${#unformattedPaths[@]}" > 0 )); then
-            echo "Some required Nix files are not properly formatted"
+          done < <(git diff -z --name-status ${{ env.baseRev }} -- '*.nix')
+
+          if (( "${#unformattedFiles[@]}" > 0 )); then
+            echo "Some new/changed Nix files are not properly formatted"
             echo "Please run the following in \`nix-shell\`:"
-            echo "nixfmt ${unformattedPaths[*]@Q}"
+            echo "nixfmt ${unformattedFiles[*]@Q}"
             exit 1
           fi

From 12490b4e7b44439ddcd4e444f38532b7dda01ef4 Mon Sep 17 00:00:00 2001
From: Joshua Manchester <JManch@protonmail.com>
Date: Tue, 23 Jul 2024 20:12:30 +0100
Subject: [PATCH 159/175] 
 home-assistant-custom-components.waste_collection_schedule: 1.48.0 -> 2.0.1

https://github.com/mampfes/hacs_waste_collection_schedule/releases/tag/1.49.0
https://github.com/mampfes/hacs_waste_collection_schedule/releases/tag/2.0.0
https://github.com/mampfes/hacs_waste_collection_schedule/releases/tag/2.0.1
---
 .../custom-components/waste_collection_schedule/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/default.nix b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/default.nix
index cdbd2c2067bf..88a131ff3ff9 100644
--- a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/default.nix
+++ b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/default.nix
@@ -11,13 +11,13 @@
 buildHomeAssistantComponent rec {
   owner = "mampfes";
   domain = "waste_collection_schedule";
-  version = "1.48.0";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "hacs_${domain}";
     rev = "refs/tags/${version}";
-    hash = "sha256-4JtPhErAqHO06c8tEmwmWsot1Kz1wz2QuiUGdrgU8II=";
+    hash = "sha256-nStfENwlPXPEvK13e8kUpPav6ul6XQO/rViHRHlZpKI=";
   };
 
   propagatedBuildInputs = [

From ab5a40ef7fc6a2328fb232c2cfd08bb4d286ee23 Mon Sep 17 00:00:00 2001
From: Jan van Esdonk <jan+dev@vanesdonk.de>
Date: Sun, 21 Jul 2024 17:43:33 +0200
Subject: [PATCH 160/175] python312Packages.pypdf: 4.2.0 -> 4.3.1

https://github.com/py-pdf/pypdf/releases/tag/4.3.0
https://github.com/py-pdf/pypdf/releases/tag/4.3.1

Co-Authored-By: Martin Weinelt <hexa@darmstadt.ccc.de>
---
 pkgs/development/python-modules/pypdf/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix
index 3ecbde22d690..23c90f841ac5 100644
--- a/pkgs/development/python-modules/pypdf/default.nix
+++ b/pkgs/development/python-modules/pypdf/default.nix
@@ -27,8 +27,8 @@
 
 buildPythonPackage rec {
   pname = "pypdf";
-  version = "4.2.0";
-  format = "pyproject";
+  version = "4.3.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "py-pdf";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     rev = "refs/tags/${version}";
     # fetch sample files used in tests
     fetchSubmodules = true;
-    hash = "sha256-ksLpxfRxrNVXezF0VjbAqadpF6bv/SAOOnCKabhugo0=";
+    hash = "sha256-wSF20I5WaxRoN0n0jxB5O3mAAIOxP/TclYBTRAUwYHo=";
   };
 
   outputs = [
@@ -55,12 +55,12 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace "--disable-socket" ""
+      --replace-fail "--disable-socket" ""
   '';
 
-  propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ typing-extensions ];
+  propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ typing-extensions ];
 
-  passthru.optional-dependencies = rec {
+  optional-dependencies = rec {
     full = crypto ++ image;
     crypto = [ cryptography ];
     image = [ pillow ];
@@ -72,7 +72,7 @@ buildPythonPackage rec {
     (fpdf2.overridePythonAttrs { doCheck = false; }) # avoid reference loop
     pytestCheckHook
     pytest-timeout
-  ] ++ passthru.optional-dependencies.full;
+  ] ++ optional-dependencies.full;
 
   pytestFlagsArray = [
     # don't access the network

From 0dc6b40136fbbb310fa130780fd7f97b7612340c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 23 Jul 2024 15:39:02 +0200
Subject: [PATCH 161/175] python312Packages.comicon: 1.1.0 -> 1.2.0

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

diff --git a/pkgs/development/python-modules/comicon/default.nix b/pkgs/development/python-modules/comicon/default.nix
index d42304712ef3..da91b3947731 100644
--- a/pkgs/development/python-modules/comicon/default.nix
+++ b/pkgs/development/python-modules/comicon/default.nix
@@ -13,15 +13,15 @@
 
 buildPythonPackage rec {
   pname = "comicon";
-  version = "1.1.0";
+  version = "1.2.0";
   pyproject = true;
   disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "potatoeggy";
     repo = "comicon";
-    rev = "v${version}";
-    hash = "sha256-VP4n2pWXHge2gJ67O2nErJ30gI0vaAMn0VOpX8sLkfs=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-oiEzZRgyG/RQCo2zSTqwlOhkwz76lSImR0ZtSlIUp4Y=";
   };
 
   nativeBuildInputs = [
@@ -38,6 +38,8 @@ buildPythonPackage rec {
     python-slugify
   ];
 
+  doCheck = false; # test artifacts are not public
+
   pythonImportsCheck = [ "comicon" ];
 
   meta = with lib; {

From 142ac6a97b6ab4d39e8afe5c56112e97b4056567 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 23 Jul 2024 16:48:20 +0200
Subject: [PATCH 162/175] pretix: relax pypdf constraint

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

diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix
index fa30d5c1a17d..1a8731768616 100644
--- a/pkgs/by-name/pr/pretix/package.nix
+++ b/pkgs/by-name/pr/pretix/package.nix
@@ -98,6 +98,7 @@ python.pkgs.buildPythonApplication rec {
       --replace-fail "markdown==3.6" markdown \
       --replace-fail "protobuf==5.27.*" protobuf \
       --replace-fail "pycryptodome==3.20.*" pycryptodome \
+      --replace-fail "pypdf==4.2.*" pypdf \
       --replace-fail "python-dateutil==2.9.*" python-dateutil \
       --replace-fail "requests==2.31.*" "requests" \
       --replace-fail "sentry-sdk==2.5.*" "sentry-sdk>=2" \

From 25ecaa1c99465582d2e08b1ed929fa22d927c310 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 23 Jul 2024 20:52:31 +0100
Subject: [PATCH 163/175] pypy27Packages.corner.nativeBuildInputs: fix the eval

Without the change the eval fails as:

    $ nix build --no-link -f. pypy27Packages.corner.nativeBuildInputs
    error:
       error: attribute 'optional-dependencies' missing
---
 pkgs/development/python-modules/corner/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/corner/default.nix b/pkgs/development/python-modules/corner/default.nix
index c69bf902d556..68446453e200 100644
--- a/pkgs/development/python-modules/corner/default.nix
+++ b/pkgs/development/python-modules/corner/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage rec {
 
   dependencies = [ matplotlib ];
 
-  optional-dependencies = {
+  passthru.optional-dependencies = {
     arviz = [ arviz ];
     docs = [
       arviz

From 4e7ebba346c62de9b693e2a83121d0233585e08a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 21 Jul 2024 11:19:15 +0200
Subject: [PATCH 164/175] static-web-server: 2.24.2 -> 2.32.1

---
 pkgs/servers/static-web-server/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/static-web-server/default.nix b/pkgs/servers/static-web-server/default.nix
index a38c1bcc3636..a9ffbf9fdf4c 100644
--- a/pkgs/servers/static-web-server/default.nix
+++ b/pkgs/servers/static-web-server/default.nix
@@ -2,21 +2,25 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "static-web-server";
-  version = "2.24.2";
+  version = "2.32.1";
 
   src = fetchFromGitHub {
     owner = "static-web-server";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-5Axqn3sYLM4yjGkN8d0ZUe8KrjYszaZmTg5GqmamNtc=";
+    hash = "sha256-PkDT6FU6JSIeeKCJeeIjjqZfoo+tGzqyPyWuIiwusQY=";
   };
 
-  cargoHash = "sha256-xS2XARqXXcQ2J1k3jC5St19RdcK2korbEia4koUxG5s=";
+  cargoHash = "sha256-ymI5O6j6NEcgIbMLEYgyUZBBkwxDWDWaVn4hqJScGxA=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.Security
   ];
 
+  # Lots of tests fail due to unexpected argument '--test-threads' because CLI options of
+  # test runner is being parsed
+  doCheck = false;
+
   checkFlags = [
     # TODO: investigate why these tests fail
     "--skip=tests::handle_byte_ranges_if_range_too_old"

From f7d4253bc2866cce30b9e3d32752c69435e6cd01 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 21 Jul 2024 11:19:59 +0200
Subject: [PATCH 165/175] static-web-server: reformat

---
 pkgs/servers/static-web-server/default.nix | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/static-web-server/default.nix b/pkgs/servers/static-web-server/default.nix
index a9ffbf9fdf4c..db91eda363a2 100644
--- a/pkgs/servers/static-web-server/default.nix
+++ b/pkgs/servers/static-web-server/default.nix
@@ -1,4 +1,11 @@
-{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin, nixosTests }:
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  stdenv,
+  darwin,
+  nixosTests,
+}:
 
 rustPlatform.buildRustPackage rec {
   pname = "static-web-server";
@@ -13,9 +20,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-ymI5O6j6NEcgIbMLEYgyUZBBkwxDWDWaVn4hqJScGxA=";
 
-  buildInputs = lib.optionals stdenv.isDarwin [
-    darwin.apple_sdk.frameworks.Security
-  ];
+  buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 
   # Lots of tests fail due to unexpected argument '--test-threads' because CLI options of
   # test runner is being parsed
@@ -33,13 +38,18 @@ rustPlatform.buildRustPackage rec {
     install -Dm444 -t $out/lib/systemd/system/ systemd/static-web-server.{service,socket}
   '';
 
-  passthru.tests = { inherit (nixosTests) static-web-server; };
+  passthru.tests = {
+    inherit (nixosTests) static-web-server;
+  };
 
   meta = with lib; {
     description = "Asynchronous web server for static files-serving";
     homepage = "https://static-web-server.net/";
     changelog = "https://github.com/static-web-server/static-web-server/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [ mit /* or */ asl20 ];
+    license = with licenses; [
+      mit # or
+      asl20
+    ];
     maintainers = with maintainers; [ figsoda ];
     mainProgram = "static-web-server";
   };

From 3187be929cb1c425fbdf7fd5a6eac9882bb9caf7 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 22 Jul 2024 00:37:15 +0200
Subject: [PATCH 166/175] static-web-server: fix tests

---
 pkgs/servers/static-web-server/default.nix | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/static-web-server/default.nix b/pkgs/servers/static-web-server/default.nix
index db91eda363a2..3e29f5aa42d7 100644
--- a/pkgs/servers/static-web-server/default.nix
+++ b/pkgs/servers/static-web-server/default.nix
@@ -2,6 +2,7 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  fetchpatch,
   stdenv,
   darwin,
   nixosTests,
@@ -20,18 +21,19 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-ymI5O6j6NEcgIbMLEYgyUZBBkwxDWDWaVn4hqJScGxA=";
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/static-web-server/static-web-server/pull/466.patch";
+      hash = "sha256-VYSoi6swG4nEFmGKvdEaJ05mJlxaXYsjs8cQai40P4g=";
+    })
+  ];
+
   buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 
-  # Lots of tests fail due to unexpected argument '--test-threads' because CLI options of
-  # test runner is being parsed
-  doCheck = false;
-
-  checkFlags = [
-    # TODO: investigate why these tests fail
-    "--skip=tests::handle_byte_ranges_if_range_too_old"
-    "--skip=tests::handle_not_modified"
-    "--skip=handle_precondition"
-  ];
+  # Some tests rely on timestamps newer than 18 Nov 1974 00:00:00
+  preCheck = ''
+    find docker/public -exec touch -m {} \;
+  '';
 
   # Need to copy in the systemd units for systemd.packages to discover them
   postInstall = ''

From 1ba8bcf8aee8be8aea26b2e6728e68a274790548 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 23 Jul 2024 21:20:36 +0100
Subject: [PATCH 167/175] pypy27Packages.ray.optional-dependencies: fix the
 eval
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without the change the eval fails as:

    $ nix build --no-link -f. pypy27Packages.kserve.dependencies
    error:
       … while evaluating the attribute 'passthru.optional-dependencies.serve-deps'
         at pkgs/stdenv/generic/make-derivation.nix:633:14:
          632|
          633|      inherit passthru overrideAttrs;
             |              ^
          634|      inherit meta;

       error: attribute 'optional-dependencies' missing
       at pkgs/development/python-modules/kserve/default.nix:77:8:
           76|     uvicorn
           77|   ] ++ ray.passthru.optional-dependencies.serve-deps;
             |        ^
           78|
---
 pkgs/development/python-modules/ray/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix
index 3b6976d02f72..69fbb8cae968 100644
--- a/pkgs/development/python-modules/ray/default.nix
+++ b/pkgs/development/python-modules/ray/default.nix
@@ -76,7 +76,7 @@ buildPythonPackage rec {
       // binary-hash
     );
 
-  optional-dependencies = rec {
+  passthru.optional-dependencies = rec {
     data-deps = [
       pandas
       pyarrow

From f84f1c2744a004fa1c3c7f6ea98327495cd52a18 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 23 Jul 2024 22:10:35 +0100
Subject: [PATCH 168/175] python3Packages.pytorch-bin.tests: fix the eval
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without the change the eval fails as:

    $ nix-instantiate -A python3Packages.pytorch-bin.tests
    error:
       … while calling a functor (an attribute set with a '__functor' attribute)
         at lib/customisation.nix:264:13:
          263|     in if missingArgs == {}
          264|        then makeOverridable f allArgs
             |             ^
          265|        # This needs to be an abort so it can't be caught with `builtins.tryEval`,

       … while evaluating a branch condition
         at lib/customisation.nix:148:7:
          147|     in
          148|       if isAttrs result then
             |       ^
          149|         result // {

       (stack trace truncated; use '--show-trace' to show the full, detailed trace)

       error: function 'anonymous lambda' called with unexpected argument 'torchWithCuda'
       at pkgs/development/python-modules/torch/tests.nix:1:1:
            1| { callPackage }:
             | ^
            2|
---
 pkgs/development/python-modules/torch/bin.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix
index ec6843deac98..b2d627381c8b 100644
--- a/pkgs/development/python-modules/torch/bin.nix
+++ b/pkgs/development/python-modules/torch/bin.nix
@@ -121,10 +121,7 @@ buildPythonPackage {
 
   pythonImportsCheck = [ "torch" ];
 
-  passthru.tests = callPackage ./tests.nix {
-    torchWithCuda = torch-bin;
-    torchWithRocm = torch-bin;
-  };
+  passthru.tests = callPackage ./tests.nix {};
 
   meta = {
     description = "PyTorch: Tensors and Dynamic neural networks in Python with strong GPU acceleration";

From d8b2244fdbde06cae253e6d086e947a91b73312f Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 23 Jul 2024 22:15:47 +0100
Subject: [PATCH 169/175] pypy27Packages.pyreqwest-impersonate: fix the eval
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without the change the eval fails as:

    $ nix build --no-link -f. pypy27Packages.pyreqwest-impersonate
    error:
       error: cannot coerce a set to a string: { dev = «thunk»; }
---
 .../python-modules/pyreqwest-impersonate/default.nix            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pyreqwest-impersonate/default.nix b/pkgs/development/python-modules/pyreqwest-impersonate/default.nix
index 465615b99ed8..1dc215bf0ee8 100644
--- a/pkgs/development/python-modules/pyreqwest-impersonate/default.nix
+++ b/pkgs/development/python-modules/pyreqwest-impersonate/default.nix
@@ -51,7 +51,7 @@ buildPythonPackage rec {
 
   env.BORING_BSSL_PATH = boringssl-wrapper;
 
-  optional-dependencies = {
+  passthru.optional-dependencies = {
     dev = [ pytest ];
   };
 

From b420f2341f82704663e351886898092ca4f6f855 Mon Sep 17 00:00:00 2001
From: tahanonu <tochipreciousahan@gmail.com>
Date: Tue, 23 Jul 2024 21:36:25 +0100
Subject: [PATCH 170/175] pg-gvm: init at 22.6.5

Release: https://github.com/greenbone/pg-gvm/releases/tag/v22.6.5
---
 pkgs/by-name/pg/pg-gvm/package.nix | 60 ++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 pkgs/by-name/pg/pg-gvm/package.nix

diff --git a/pkgs/by-name/pg/pg-gvm/package.nix b/pkgs/by-name/pg/pg-gvm/package.nix
new file mode 100644
index 000000000000..96aa7a2f68b9
--- /dev/null
+++ b/pkgs/by-name/pg/pg-gvm/package.nix
@@ -0,0 +1,60 @@
+{
+  cmake,
+  fetchFromGitHub,
+  glib,
+  gvm-libs,
+  icu,
+  lib,
+  libical,
+  pcre2,
+  pkg-config,
+  postgresql,
+  stdenv,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "pg-gvm";
+  version = "22.6.5";
+
+  src = fetchFromGitHub {
+    owner = "greenbone";
+    repo = "pg-gvm";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-19ZmQdLjfwJwOMoO16rKJYKOnRyt7SQOdkYTxt8WQ2A=";
+  };
+
+  strictDeps = true;
+
+  configurePhase = ''
+    runHook preConfigure
+
+    cmake \
+      -DCMAKE_INSTALL_DEV_PREFIX=$out .
+
+    runHook postConfigure
+  '';
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    glib
+    gvm-libs
+    icu
+    libical
+    pcre2
+    postgresql
+  ];
+
+  meta = {
+    description = "Greenbone Library for helper functions in PostgreSQL";
+    homepage = "https://github.com/greenbone/pg-gvm";
+    changelog = "https://github.com/greenbone/pg-gvm/releases/tag/v${version}";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ tochiaha ];
+    mainProgram = "pg-gvm";
+    platforms = lib.platforms.all;
+  };
+}

From a7251acc6450b9d5a9f98a9d3bb44b0719411ab8 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 23 Jul 2024 22:48:10 +0100
Subject: [PATCH 171/175] varnish60Packages.modules: fix hash prefix

Without the change the eval fails as:

    $ nix build --no-link -f. varnish60Packages.modules
    error:
       error: hash '1lwgjhgr5yw0d17kbqwlaj5pkn70wvaqqjpa1i0n459nx5cf5pqj' does not include a type, nor is the type otherwise known from context
---
 pkgs/servers/varnish/modules.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix
index a16d0b68f2e6..039ead256e56 100644
--- a/pkgs/servers/varnish/modules.nix
+++ b/pkgs/servers/varnish/modules.nix
@@ -39,7 +39,7 @@ in
 {
   modules15 = common {
     version = "0.15.1";
-    hash = "1lwgjhgr5yw0d17kbqwlaj5pkn70wvaqqjpa1i0n459nx5cf5pqj";
+    hash = "sha256-Et/iWOk2FWJBDOpKjNXm4Nh5i1SU4zVPaID7kh+Uj9M=";
   };
   modules23 = common {
     version = "0.23.0";

From f29bf79f81a0976fbc8bc6d157b2423abbe589bd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 21:55:24 +0000
Subject: [PATCH 172/175] termshot: 0.2.7 -> 0.2.8

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

diff --git a/pkgs/by-name/te/termshot/package.nix b/pkgs/by-name/te/termshot/package.nix
index b44f6ec906f3..17f83504ef46 100644
--- a/pkgs/by-name/te/termshot/package.nix
+++ b/pkgs/by-name/te/termshot/package.nix
@@ -5,16 +5,16 @@
 }:
 buildGoModule rec {
   pname = "termshot";
-  version = "0.2.7";
+  version = "0.2.8";
 
   src = fetchFromGitHub {
     owner = "homeport";
     repo = "termshot";
     rev = "v${version}";
-    hash = "sha256-Sxp6abYq0MrqtqDdpffSBdZB3/EyIMF9Ixsc7IgW5hI=";
+    hash = "sha256-cCtae2O9P9czivNVcytJKz3tQ41TaqokZcTOwt2v6jk=";
   };
 
-  vendorHash = "sha256-jzDbA1iN+1dbTVgKw228TuCV3eeAVmHFDiHd2qF/80E=";
+  vendorHash = "sha256-ji2B9Gr1oQGouGH2hBpTyfjbht6bRfIeLcdTBhmmIwk=";
 
   ldflags = [
     "-s"

From dfc6da9fee33904edb37d79655e13fb62871fa0b Mon Sep 17 00:00:00 2001
From: Alexey Orlenko <alex@aqrln.net>
Date: Sun, 14 Apr 2024 00:38:06 +0200
Subject: [PATCH 173/175] xpra: 4.4.6 -> 5.0.9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Daniel Höxtermann <daniel@hxtm.dev>
---
 pkgs/tools/X11/xpra/default.nix      | 15 ++++++++-------
 pkgs/tools/X11/xpra/fix-122159.patch |  8 ++++----
 pkgs/tools/X11/xpra/fix-41106.patch  | 10 +++++-----
 pkgs/tools/X11/xpra/fix-paths.patch  |  6 +++---
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 90fd42f9f3be..625dde8f825c 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -1,5 +1,5 @@
 { lib
-, fetchurl
+, fetchFromGitHub
 , substituteAll
 , pkg-config
 , runCommand
@@ -70,11 +70,13 @@ let
   '';
 in buildPythonApplication rec {
   pname = "xpra";
-  version = "4.4.6";
+  version = "5.0.9";
 
-  src = fetchurl {
-    url = "https://xpra.org/src/${pname}-${version}.tar.xz";
-    hash = "sha256-BWf3nypfSrYCzpJ0OfBkecoHGbG1lEgu5jLZhfkIejQ=";
+  src = fetchFromGitHub {
+    owner = "Xpra-org";
+    repo = "xpra";
+    rev = "v${version}";
+    hash = "sha256-gwo5plCAryGC8/BKVEqyMkgB+3FM8HXG6sESomDOtNM=";
   };
 
   patches = [
@@ -86,9 +88,8 @@ in buildPythonApplication rec {
     ./fix-122159.patch # https://github.com/NixOS/nixpkgs/issues/122159
   ];
 
-  # Note: xposix is renamed to posix in v5.
   postPatch = lib.optionalString stdenv.isLinux ''
-    substituteInPlace xpra/platform/xposix/features.py \
+    substituteInPlace xpra/platform/posix/features.py \
       --replace-fail "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open"
   '';
 
diff --git a/pkgs/tools/X11/xpra/fix-122159.patch b/pkgs/tools/X11/xpra/fix-122159.patch
index 510b40422a2a..5fe2ce3892fd 100644
--- a/pkgs/tools/X11/xpra/fix-122159.patch
+++ b/pkgs/tools/X11/xpra/fix-122159.patch
@@ -1,9 +1,9 @@
 diff --git a/xpra/scripts/main.py b/xpra/scripts/main.py
-index 031a41f9e..6232ba830 100755
+index 58c8bf6464..36f4b3cd3d 100755
 --- a/xpra/scripts/main.py
 +++ b/xpra/scripts/main.py
-@@ -377,11 +377,7 @@ def run_mode(script_file, cmdline, error_cb, options, args, mode, defaults):
-         "seamless", "desktop", "shadow", "expand",
+@@ -389,11 +389,7 @@ def run_mode(script_file:str, cmdline, error_cb, options, args, mode:str, defaul
+         "seamless", "desktop", "shadow", "shadow-screen", "expand",
          "upgrade", "upgrade-seamless", "upgrade-desktop",
          ) and not display_is_remote and use_systemd_run(options.systemd_run):
 -        #make sure we run via the same interpreter,
@@ -11,6 +11,6 @@ index 031a41f9e..6232ba830 100755
          argv = list(cmdline)
 -        if argv[0].find("python")<0:
 -            argv.insert(0, "python%i.%i" % (sys.version_info.major, sys.version_info.minor))
-         return systemd_run_wrap(mode, argv, options.systemd_run_args)
+         return systemd_run_wrap(mode, argv, options.systemd_run_args, user=getuid()!=0)
      configure_env(options.env)
      configure_logging(options, mode)
diff --git a/pkgs/tools/X11/xpra/fix-41106.patch b/pkgs/tools/X11/xpra/fix-41106.patch
index 81870fc1a2a1..a1a74a01c3fe 100644
--- a/pkgs/tools/X11/xpra/fix-41106.patch
+++ b/pkgs/tools/X11/xpra/fix-41106.patch
@@ -1,15 +1,15 @@
 diff --git a/xpra/server/server_util.py b/xpra/server/server_util.py
-index f46998ee9f..60068f21b6 100644
+index 2e83712bb8..2dd0bf73d2 100644
 --- a/xpra/server/server_util.py
 +++ b/xpra/server/server_util.py
-@@ -157,6 +157,10 @@ def xpra_env_shell_script(socket_dir, env):
-     return b"\n".join(script)
+@@ -166,6 +166,10 @@ def xpra_env_shell_script(socket_dir, env : Dict[str,str]) -> str:
+     return "\n".join(script)
  
- def xpra_runner_shell_script(xpra_file, starting_dir):
+ def xpra_runner_shell_script(xpra_file:str, starting_dir:str) -> str:
 +    # Nixpkgs contortion:
 +    # xpra_file points to a shell wrapper, not to the python script.
 +    dirname, basename = os.path.split(xpra_file)
 +    xpra_file = os.path.join(dirname, "."+basename+"-wrapped")
-     script = []
      # We ignore failures in cd'ing, b/c it's entirely possible that we were
      # started from some temporary directory and all paths are absolute.
+     qdir = sh_quotemeta(starting_dir)
diff --git a/pkgs/tools/X11/xpra/fix-paths.patch b/pkgs/tools/X11/xpra/fix-paths.patch
index 9df7d835d031..43210f4f15d6 100644
--- a/pkgs/tools/X11/xpra/fix-paths.patch
+++ b/pkgs/tools/X11/xpra/fix-paths.patch
@@ -1,8 +1,8 @@
 diff --git a/xpra/x11/fakeXinerama.py b/xpra/x11/fakeXinerama.py
-index d5c1c8bb10..88c77e8142 100755
+index a5289e0e43..527cdf90c9 100755
 --- a/xpra/x11/fakeXinerama.py
 +++ b/xpra/x11/fakeXinerama.py
-@@ -22,31 +22,7 @@ fakeXinerama_config_files = [
+@@ -23,31 +23,7 @@ fakeXinerama_config_files = [
             ]
  
  def find_libfakeXinerama():
@@ -29,7 +29,7 @@ index d5c1c8bb10..88c77e8142 100755
 -        except Exception as e:
 -            log("find_libfakeXinerama()", exc_info=True)
 -            log.error("Error: cannot launch ldconfig -p to locate libfakeXinerama:")
--            log.error(" %s", e)
+-            log.estr(e)
 -    return find_lib("libfakeXinerama.so.1")
 +    return "@libfakeXinerama@/lib/libfakeXinerama.so.1.0"
  

From af558f9bc9b7b7143626ec0ca96059daaeef9ebd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Jul 2024 01:57:05 +0000
Subject: [PATCH 174/175] rspamd: 3.9.0 -> 3.9.1

---
 pkgs/servers/mail/rspamd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index 41074da03471..aff57ef0e137 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -33,13 +33,13 @@ assert withHyperscan -> stdenv.isx86_64;
 
 stdenv.mkDerivation rec {
   pname = "rspamd";
-  version = "3.9.0";
+  version = "3.9.1";
 
   src = fetchFromGitHub {
     owner = "rspamd";
     repo = "rspamd";
     rev = version;
-    hash = "sha256-PCogHnes3/8qqdcqsiUzuVVEUf8+ze3xiYUmfe6L3IU=";
+    hash = "sha256-qT94DqX5Dt9pLgqed/j+dtiykwRFY3Fsbvcub7IzAZE=";
   };
 
   hardeningEnable = [ "pie" ];

From 3b64853264fcfa2f2857f85f5d6f8300000f2a41 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Tue, 23 Jul 2024 21:23:23 -0700
Subject: [PATCH 175/175] tests: enable llvmPackages_git (#329570)

---
 pkgs/test/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index 1b7882bcbed3..3612bbfd1ef8 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -12,7 +12,6 @@ with pkgs;
         # Are throw aliases.
         (filter (n: n != "llvmPackages_rocm"))
         (filter (n: n != "llvmPackages_latest"))
-        (filter (n: n != "llvmPackages_git"))
         (filter (n: n != "llvmPackages_6"))
         (filter (n: n != "llvmPackages_7"))
         (filter (n: n != "llvmPackages_8"))