From 2b5f33497035cb7f33fa0f2b32e821d6666fba0c Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Thu, 14 Nov 2024 19:36:04 +0800
Subject: [PATCH 01/76] python3Packages.swspotify: fix build

(cherry picked from commit 315faf185e952a0e528d211dc1c5dce03d32588e)
---
 .../python-modules/swspotify/default.nix          | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/swspotify/default.nix b/pkgs/development/python-modules/swspotify/default.nix
index 21bd1348525c..7ed844e91d6a 100644
--- a/pkgs/development/python-modules/swspotify/default.nix
+++ b/pkgs/development/python-modules/swspotify/default.nix
@@ -24,24 +24,29 @@ buildPythonPackage rec {
     hash = "sha256-xGLvc154xnje45Akf7H1qqQRUc03gGVt8AhGlkcP3kY=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     dbus-python
     flask
     flask-cors
     requests
   ];
 
+  pythonRelaxDeps = [
+    "flask-cors"
+    "flask"
+  ];
+
   # Tests want to use Dbus
   doCheck = false;
 
   pythonImportsCheck = [ "SwSpotify" ];
 
-  meta = with lib; {
+  meta = {
     description = "Library to get the currently playing song and artist from Spotify";
     homepage = "https://github.com/SwagLyrics/SwSpotify";
-    license = licenses.mit;
-    maintainers = with maintainers; [ siraben ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ siraben ];
   };
 }

From 6589e4bc3a8116e70925c7ad031853921ad83f85 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Thu, 14 Nov 2024 11:57:38 +0800
Subject: [PATCH 02/76] python3Packages.cocotb: fix build

(cherry picked from commit 8c863fce740f8570aec84348176e99495180dc72)
---
 ...SHARED-for-macOS-along-with-LDSHARED.patch | 26 ----------
 ...de_handle_assignment_deprecated-test.patch | 25 ----------
 .../python-modules/cocotb/default.nix         | 50 +++++++++----------
 3 files changed, 25 insertions(+), 76 deletions(-)
 delete mode 100644 pkgs/development/python-modules/cocotb/0001-Patch-LDCXXSHARED-for-macOS-along-with-LDSHARED.patch
 delete mode 100644 pkgs/development/python-modules/cocotb/0002-Patch-remove-test_unicode_handle_assignment_deprecated-test.patch

diff --git a/pkgs/development/python-modules/cocotb/0001-Patch-LDCXXSHARED-for-macOS-along-with-LDSHARED.patch b/pkgs/development/python-modules/cocotb/0001-Patch-LDCXXSHARED-for-macOS-along-with-LDSHARED.patch
deleted file mode 100644
index 38ca864add3b..000000000000
--- a/pkgs/development/python-modules/cocotb/0001-Patch-LDCXXSHARED-for-macOS-along-with-LDSHARED.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 94c4768cd69b026e498d92133dd6c7d8589cf911 Mon Sep 17 00:00:00 2001
-From: Jiajie Chen <c@jia.je>
-Date: Sat, 25 Jun 2022 10:19:44 +0800
-Subject: [PATCH] Patch LDCXXSHARED for macOS along with LDSHARED
-
-In Nixpkgs, we patched distutils to respect LDCXXSHARED environment, so
-the replacement should be taken on LDCXXSHARED as well.
----
- cocotb_build_libs.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cocotb_build_libs.py b/cocotb_build_libs.py
-index 66097ec2..d5555b36 100755
---- a/cocotb_build_libs.py
-+++ b/cocotb_build_libs.py
-@@ -583,6 +583,7 @@ def get_ext():
- 
-     if sys.platform == "darwin":
-         cfg_vars["LDSHARED"] = cfg_vars["LDSHARED"].replace("-bundle", "-dynamiclib")
-+        cfg_vars["LDCXXSHARED"] = cfg_vars["LDCXXSHARED"].replace("-bundle", "-dynamiclib")
- 
-     share_lib_dir = os.path.relpath(os.path.join(cocotb_share_dir, "lib"))
-     include_dir = os.path.relpath(os.path.join(cocotb_share_dir, "include"))
--- 
-2.36.1
-
diff --git a/pkgs/development/python-modules/cocotb/0002-Patch-remove-test_unicode_handle_assignment_deprecated-test.patch b/pkgs/development/python-modules/cocotb/0002-Patch-remove-test_unicode_handle_assignment_deprecated-test.patch
deleted file mode 100644
index f1a6c7f975fa..000000000000
--- a/pkgs/development/python-modules/cocotb/0002-Patch-remove-test_unicode_handle_assignment_deprecated-test.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/tests/test_cases/test_cocotb/test_deprecated.py b/tests/test_cases/test_cocotb/test_deprecated.py
-index 523b93ba..b4f1701e 100644
---- a/tests/test_cases/test_cocotb/test_deprecated.py
-+++ b/tests/test_cases/test_cocotb/test_deprecated.py
-@@ -26,20 +26,6 @@ async def test_returnvalue_deprecated(dut):
-     assert val == 42
- 
- 
--# strings are not supported on Icarus (gh-2585) or GHDL (gh-2584)
--@cocotb.test(
--    expect_error=AttributeError
--    if cocotb.SIM_NAME.lower().startswith("icarus")
--    else TypeError
--    if cocotb.SIM_NAME.lower().startswith("ghdl")
--    else ()
--)
--async def test_unicode_handle_assignment_deprecated(dut):
--    with pytest.warns(DeprecationWarning, match=".*bytes.*"):
--        dut.stream_in_string.value = "Bad idea"
--        await cocotb.triggers.ReadWrite()
--
--
- @cocotb.test()
- async def test_convert_handle_to_string_deprecated(dut):
-     dut.stream_in_data.value = 0
diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix
index b1dec7aab5de..028cf7238e6f 100644
--- a/pkgs/development/python-modules/cocotb/default.nix
+++ b/pkgs/development/python-modules/cocotb/default.nix
@@ -10,11 +10,13 @@
   swig,
   iverilog,
   ghdl,
+  stdenv,
+  fetchpatch,
 }:
 
 buildPythonPackage rec {
   pname = "cocotb";
-  version = "1.9.1";
+  version = "1.9.2";
   format = "setuptools";
 
   # pypi source doesn't include tests
@@ -22,7 +24,7 @@ buildPythonPackage rec {
     owner = "cocotb";
     repo = "cocotb";
     rev = "refs/tags/v${version}";
-    hash = "sha256-+pS+y9rmyJ4laDK5evAtoqr5D0GuHGaX6DpK1qtumnA=";
+    hash = "sha256-7KCo7g2I1rfm8QDHRm3ZKloHwjDIICnJCF8KhaFdvqY=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];
@@ -30,29 +32,25 @@ buildPythonPackage rec {
   buildInputs = [ setuptools ];
   propagatedBuildInputs = [ find-libpython ];
 
-  postPatch =
-    ''
-      patchShebangs bin/*.py
+  postPatch = ''
+    patchShebangs bin/*.py
 
-      # POSIX portability (TODO: upstream this)
-      for f in \
-        cocotb/share/makefiles/Makefile.* \
-        cocotb/share/makefiles/simulators/Makefile.*
-      do
-        substituteInPlace $f --replace 'shell which' 'shell command -v'
-      done
+    # POSIX portability (TODO: upstream this)
+    for f in \
+      cocotb/share/makefiles/Makefile.* \
+      cocotb/share/makefiles/simulators/Makefile.*
+    do
+      substituteInPlace $f --replace 'shell which' 'shell command -v'
+    done
 
-      # remove circular dependency cocotb-bus from setup.py
-      substituteInPlace setup.py --replace "'cocotb-bus<1.0'" ""
-    '';
+    # remove circular dependency cocotb-bus from setup.py
+    substituteInPlace setup.py --replace "'cocotb-bus<1.0'" ""
+  '';
 
-  patches = [
-    # Fix "can't link with bundle (MH_BUNDLE) only dylibs (MH_DYLIB) file" error
-    ./0001-Patch-LDCXXSHARED-for-macOS-along-with-LDSHARED.patch
-
-    # For the 1.8.1 release only: remove the test_unicode_handle_assignment_deprecated test
-    # It's more thoroughly removed upstream master with 425e1edb8e7133f4a891f2f87552aa2748cd8d2c
-    ./0002-Patch-remove-test_unicode_handle_assignment_deprecated-test.patch
+  disabledTests = [
+    # https://github.com/cocotb/cocotb/commit/425e1edb8e7133f4a891f2f87552aa2748cd8d2c#diff-4df986cbc2b1a3f22172caea94f959d8fcb4a128105979e6e99c68139469960cL33
+    "test_cocotb"
+    "test_cocotb_parallel"
   ];
 
   nativeCheckInputs = [
@@ -62,6 +60,7 @@ buildPythonPackage rec {
     iverilog
     ghdl
   ];
+
   preCheck = ''
     export PATH=$out/bin:$PATH
     mv cocotb cocotb.hidden
@@ -69,13 +68,14 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "cocotb" ];
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/cocotb/cocotb/releases/tag/v${version}";
     description = "Coroutine based cosimulation library for writing VHDL and Verilog testbenches in Python";
     mainProgram = "cocotb-config";
     homepage = "https://github.com/cocotb/cocotb";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [
+    license = lib.licenses.bsd3;
+    broken = stdenv.hostPlatform.isDarwin;
+    maintainers = with lib.maintainers; [
       matthuszagh
       jleightcap
     ];

From 0431a90dd6b25f2088758ba94a34f86d1c506dfd Mon Sep 17 00:00:00 2001
From: Noa Aarts <noa@voorwaarts.nl>
Date: Sat, 16 Nov 2024 19:34:57 +0100
Subject: [PATCH 03/76] phlare: format using nixfmt

(cherry picked from commit 7e91f3884709d42cf385ca851afa4cf178240fc3)
---
 pkgs/by-name/ph/phlare/package.nix | 31 ++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ph/phlare/package.nix b/pkgs/by-name/ph/phlare/package.nix
index b1290953a852..57145610ffdb 100644
--- a/pkgs/by-name/ph/phlare/package.nix
+++ b/pkgs/by-name/ph/phlare/package.nix
@@ -1,4 +1,8 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
 
 buildGoModule rec {
   pname = "phlare";
@@ -14,17 +18,20 @@ buildGoModule rec {
   proxyVendor = true;
   vendorHash = "sha256-l7+iDT9GAP9BX+xKvnx57iVF8wCM1YyHwq6dD9PbTDI=";
 
-  ldflags = let
-    prefix = "github.com/grafana/phlare/pkg/util/build";
-  in [
-    "-s" "-w"
-    # https://github.com/grafana/phlare/blob/v0.6.1/Makefile#L32
-    "-X ${prefix}.Version=${version}"
-    "-X ${prefix}.Branch=v${version}"
-    "-X ${prefix}.Revision=v${version}"
-    "-X ${prefix}.BuildUser=nix"
-    "-X ${prefix}.BuildDate=1980-01-01T00:00:00Z"
-  ];
+  ldflags =
+    let
+      prefix = "github.com/grafana/phlare/pkg/util/build";
+    in
+    [
+      "-s"
+      "-w"
+      # https://github.com/grafana/phlare/blob/v0.6.1/Makefile#L32
+      "-X ${prefix}.Version=${version}"
+      "-X ${prefix}.Branch=v${version}"
+      "-X ${prefix}.Revision=v${version}"
+      "-X ${prefix}.BuildUser=nix"
+      "-X ${prefix}.BuildDate=1980-01-01T00:00:00Z"
+    ];
 
   subPackages = [
     "cmd/phlare"

From 9697838ddcb3a7b64e16fd5ef25fc1aa5007ed5e Mon Sep 17 00:00:00 2001
From: Noa Aarts <noa@voorwaarts.nl>
Date: Sat, 16 Nov 2024 19:41:25 +0100
Subject: [PATCH 04/76] phlare: fix build

(cherry picked from commit 7cc6a148e8c59c199497425ced46501053ce8082)
---
 pkgs/by-name/ph/phlare/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ph/phlare/package.nix b/pkgs/by-name/ph/phlare/package.nix
index 57145610ffdb..96c1a33fa74b 100644
--- a/pkgs/by-name/ph/phlare/package.nix
+++ b/pkgs/by-name/ph/phlare/package.nix
@@ -1,10 +1,11 @@
 {
   lib,
-  buildGoModule,
+  buildGo122Module,
   fetchFromGitHub,
 }:
-
-buildGoModule rec {
+# breaks in go 1.23 with `invalid reference to runtime.aeskeysched`
+# won't be fixed upstream since the repository is archived.
+buildGo122Module rec {
   pname = "phlare";
   version = "0.6.1";
 

From ce0938d62bc81d5e0141927603740a735b74a933 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Sat, 16 Nov 2024 15:55:45 +0000
Subject: [PATCH 05/76] koboldcpp: 1.77 -> 1.78

Changelog: https://github.com/LostRuins/koboldcpp/releases/tag/v1.78
Diff: https://github.com/LostRuins/koboldcpp/compare/v1.77...v1.78
(cherry picked from commit 683a41fcb27886dfc78259c068521e64d5fd6002)
---
 pkgs/by-name/ko/koboldcpp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix
index 40cc23278ea7..7a99f2e62392 100644
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@@ -53,13 +53,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "koboldcpp";
-  version = "1.77";
+  version = "1.78";
 
   src = fetchFromGitHub {
     owner = "LostRuins";
     repo = "koboldcpp";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-dyu//4LRjpdxkyA9M5yNDO0DA7inZZjH4pSkj6l2afk=";
+    hash = "sha256-6RvodNWO/IVGlKxC/zt0itYDzymhk+hEBpbmQ1jHigU=";
   };
 
   enableParallelBuilding = true;

From a75e8c45996826d8bc40bb9bd11c9aeb6c8ae1a0 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sun, 17 Nov 2024 08:30:41 -0500
Subject: [PATCH 06/76] nihstro: init at 0-unstable-2024-05-05 (#356377)

(cherry picked from commit 5290f1e9c8a1d2e55ce764899d086b3eb3c07657)
---
 pkgs/by-name/ni/nihstro/package.nix | 47 +++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 pkgs/by-name/ni/nihstro/package.nix

diff --git a/pkgs/by-name/ni/nihstro/package.nix b/pkgs/by-name/ni/nihstro/package.nix
new file mode 100644
index 000000000000..d6e962f799e8
--- /dev/null
+++ b/pkgs/by-name/ni/nihstro/package.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  stdenv,
+  boost,
+  cmake,
+  fetchFromGitHub,
+  ninja,
+  unstableGitUpdater,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "nihstro";
+  version = "0-unstable-2024-05-05";
+
+  src = fetchFromGitHub {
+    owner = "neobrain";
+    repo = "nihstro";
+    rev = "f4d8659decbfe5d234f04134b5002b82dc515a44";
+    hash = "sha256-ZHgWyZFW7t2VTibH7WeuU8+I12bb95I9NcHI5s4U3VU=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+  ];
+
+  buildInputs = [ boost ];
+
+  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+
+  passthru = {
+    updateScript = unstableGitUpdater {
+      hardcodeZeroVersion = true;
+    };
+  };
+
+  meta = {
+    description = "3DS shader assembler and disassembler";
+    homepage = "https://github.com/neobrain/nihstro";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ getchoo ];
+    mainProgram = "nihstro-assemble";
+    platforms = lib.platforms.unix ++ lib.platforms.windows;
+  };
+})

From fcf21f7ac94f7134c636f6095b90df853a8d729f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 Nov 2024 09:29:29 +0000
Subject: [PATCH 07/76] vengi-tools: 0.0.33 -> 0.0.34

(cherry picked from commit f477b3752d320789ee094225b053943ba30edb5a)
---
 pkgs/applications/graphics/vengi-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix
index be14ad6c63e9..1487e2d65324 100644
--- a/pkgs/applications/graphics/vengi-tools/default.nix
+++ b/pkgs/applications/graphics/vengi-tools/default.nix
@@ -35,13 +35,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vengi-tools";
-  version = "0.0.33";
+  version = "0.0.34";
 
   src = fetchFromGitHub {
     owner = "mgerhardy";
     repo = "vengi";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ljB36A5b8K1KBBuQVISb1fkWxb/tTTwojE31KPMg1xQ=";
+    hash = "sha256-a78Oiwln3vyzCyjNewbK1/05bnGcSixxzKIgz4oiDmA=";
   };
 
   nativeBuildInputs = [

From 82801809d954771aee8e3a136ca8610bb28c12e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com>
Date: Fri, 15 Nov 2024 19:55:49 +0100
Subject: [PATCH 08/76] rnote: unbreak darwin

(cherry picked from commit a76c14685b3273eb78ee1c466e00123513100b2c)
---
 pkgs/by-name/rn/rnote/package.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/rn/rnote/package.nix b/pkgs/by-name/rn/rnote/package.nix
index e2c569131ee2..531ff2066156 100644
--- a/pkgs/by-name/rn/rnote/package.nix
+++ b/pkgs/by-name/rn/rnote/package.nix
@@ -22,7 +22,6 @@
 , rustc
 , shared-mime-info
 , wrapGAppsHook4
-, darwin
 }:
 
 stdenv.mkDerivation rec {
@@ -77,8 +76,6 @@ stdenv.mkDerivation rec {
     poppler
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.apple_sdk.frameworks.AudioUnit
   ];
 
   postPatch = ''
@@ -86,6 +83,10 @@ stdenv.mkDerivation rec {
     patchShebangs build-aux
   '';
 
+  env = lib.optionalAttrs stdenv.cc.isClang {
+    NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types";
+  };
+
   meta = with lib; {
     homepage = "https://github.com/flxzt/rnote";
     changelog = "https://github.com/flxzt/rnote/releases/tag/${src.rev}";
@@ -93,7 +94,5 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ dotlambda gepbird yrd ];
     platforms = platforms.unix;
-    # compiler error since 2023-11-17
-    broken = stdenv.hostPlatform.isDarwin;
   };
 }

From d0810c6a686761cf062efa85314c8a3fc00aba4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com>
Date: Fri, 15 Nov 2024 19:56:18 +0100
Subject: [PATCH 09/76] rnote: format with nixfmt-rfc-style

(cherry picked from commit 01d50342b81aaf44e69edc6ec8913a1b13348d9a)
---
 pkgs/by-name/rn/rnote/package.nix | 79 +++++++++++++++++--------------
 1 file changed, 43 insertions(+), 36 deletions(-)

diff --git a/pkgs/by-name/rn/rnote/package.nix b/pkgs/by-name/rn/rnote/package.nix
index 531ff2066156..e4ce87daf0e0 100644
--- a/pkgs/by-name/rn/rnote/package.nix
+++ b/pkgs/by-name/rn/rnote/package.nix
@@ -1,27 +1,28 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, alsa-lib
-, appstream
-, appstream-glib
-, cargo
-, cmake
-, desktop-file-utils
-, dos2unix
-, glib
-, gst_all_1
-, gtk4
-, libadwaita
-, libxml2
-, meson
-, ninja
-, pkg-config
-, poppler
-, python3
-, rustPlatform
-, rustc
-, shared-mime-info
-, wrapGAppsHook4
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  alsa-lib,
+  appstream,
+  appstream-glib,
+  cargo,
+  cmake,
+  desktop-file-utils,
+  dos2unix,
+  glib,
+  gst_all_1,
+  gtk4,
+  libadwaita,
+  libxml2,
+  meson,
+  ninja,
+  pkg-config,
+  poppler,
+  python3,
+  rustPlatform,
+  rustc,
+  shared-mime-info,
+  wrapGAppsHook4,
 }:
 
 stdenv.mkDerivation rec {
@@ -66,17 +67,19 @@ stdenv.mkDerivation rec {
     (lib.mesonBool "cli" true)
   ];
 
-  buildInputs = [
-    appstream
-    glib
-    gst_all_1.gstreamer
-    gtk4
-    libadwaita
-    libxml2
-    poppler
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
-    alsa-lib
-  ];
+  buildInputs =
+    [
+      appstream
+      glib
+      gst_all_1.gstreamer
+      gtk4
+      libadwaita
+      libxml2
+      poppler
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      alsa-lib
+    ];
 
   postPatch = ''
     chmod +x build-aux/*.py
@@ -92,7 +95,11 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/flxzt/rnote/releases/tag/${src.rev}";
     description = "Simple drawing application to create handwritten notes";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dotlambda gepbird yrd ];
+    maintainers = with maintainers; [
+      dotlambda
+      gepbird
+      yrd
+    ];
     platforms = platforms.unix;
   };
 }

From cfd190dd4328aa2656c36fc45932184f08cbb795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com>
Date: Thu, 14 Nov 2024 08:17:32 +0100
Subject: [PATCH 10/76] spotify-player: format with nixfmt-rfc-style

(cherry picked from commit 4de26d0760681fd44f7a76797a5bbcbe225638c6)
---
 pkgs/by-name/sp/spotify-player/package.nix | 143 +++++++++++++--------
 1 file changed, 88 insertions(+), 55 deletions(-)

diff --git a/pkgs/by-name/sp/spotify-player/package.nix b/pkgs/by-name/sp/spotify-player/package.nix
index 7adc58d48e99..09de8d6e02a9 100644
--- a/pkgs/by-name/sp/spotify-player/package.nix
+++ b/pkgs/by-name/sp/spotify-player/package.nix
@@ -1,39 +1,50 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, pkg-config
-, openssl
-, cmake
-# deps for audio backends
-, alsa-lib
-, libpulseaudio
-, portaudio
-, libjack2
-, SDL2
-, gst_all_1
-, dbus
-, fontconfig
-, libsixel
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  openssl,
+  cmake,
+  # deps for audio backends
+  alsa-lib,
+  libpulseaudio,
+  portaudio,
+  libjack2,
+  SDL2,
+  gst_all_1,
+  dbus,
+  fontconfig,
+  libsixel,
 
-# build options
-, withStreaming ? true
-, withDaemon ? true
-, withAudioBackend ? "rodio" # alsa, pulseaudio, rodio, portaudio, jackaudio, rodiojack, sdl
-, withMediaControl ? true
-, withLyrics ? true
-, withImage ? true
-, withNotify ? true
-, withSixel ? true
-, withFuzzy ? true
-, stdenv
-, darwin
-, makeBinaryWrapper
+  # build options
+  withStreaming ? true,
+  withDaemon ? true,
+  withAudioBackend ? "rodio", # alsa, pulseaudio, rodio, portaudio, jackaudio, rodiojack, sdl
+  withMediaControl ? true,
+  withLyrics ? true,
+  withImage ? true,
+  withNotify ? true,
+  withSixel ? true,
+  withFuzzy ? true,
+  stdenv,
+  darwin,
+  makeBinaryWrapper,
 
-# passthru
-, nix-update-script
+  # passthru
+  nix-update-script,
 }:
 
-assert lib.assertOneOf "withAudioBackend" withAudioBackend [ "" "alsa" "pulseaudio" "rodio" "portaudio" "jackaudio" "rodiojack" "sdl" "gstreamer" ];
+assert lib.assertOneOf "withAudioBackend" withAudioBackend [
+  ""
+  "alsa"
+  "pulseaudio"
+  "rodio"
+  "portaudio"
+  "jackaudio"
+  "rodiojack"
+  "sdl"
+  "gstreamer"
+];
 
 rustPlatform.buildRustPackage rec {
   pname = "spotify-player";
@@ -48,38 +59,55 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-VlJ8Bz4EY2rERyOn6ifC7JAL5Mvjt0ZOzlPBOwiH6WA=";
 
-  nativeBuildInputs = [
-    pkg-config
-    cmake
-    rustPlatform.bindgenHook
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    makeBinaryWrapper
-  ];
+  nativeBuildInputs =
+    [
+      pkg-config
+      cmake
+      rustPlatform.bindgenHook
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      makeBinaryWrapper
+    ];
 
-  buildInputs = [
-    openssl
-    dbus
-    fontconfig
-  ]
+  buildInputs =
+    [
+      openssl
+      dbus
+      fontconfig
+    ]
     ++ lib.optionals withSixel [ libsixel ]
     ++ lib.optionals (withAudioBackend == "alsa") [ alsa-lib ]
     ++ lib.optionals (withAudioBackend == "pulseaudio") [ libpulseaudio ]
     ++ lib.optionals (withAudioBackend == "rodio" && stdenv.hostPlatform.isLinux) [ alsa-lib ]
     ++ lib.optionals (withAudioBackend == "portaudio") [ portaudio ]
     ++ lib.optionals (withAudioBackend == "jackaudio") [ libjack2 ]
-    ++ lib.optionals (withAudioBackend == "rodiojack") [ alsa-lib libjack2 ]
+    ++ lib.optionals (withAudioBackend == "rodiojack") [
+      alsa-lib
+      libjack2
+    ]
     ++ lib.optionals (withAudioBackend == "sdl") [ SDL2 ]
-    ++ lib.optionals (withAudioBackend == "gstreamer") [ gst_all_1.gstreamer gst_all_1.gst-devtools gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && withMediaControl) [ darwin.apple_sdk.frameworks.MediaPlayer ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
-      AppKit
-      AudioUnit
-      Cocoa
-    ]);
+    ++ lib.optionals (withAudioBackend == "gstreamer") [
+      gst_all_1.gstreamer
+      gst_all_1.gst-devtools
+      gst_all_1.gst-plugins-base
+      gst_all_1.gst-plugins-good
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin && withMediaControl) [
+      darwin.apple_sdk.frameworks.MediaPlayer
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin (
+      with darwin.apple_sdk.frameworks;
+      [
+        AppKit
+        AudioUnit
+        Cocoa
+      ]
+    );
 
   buildNoDefaultFeatures = true;
 
-  buildFeatures = [ ]
+  buildFeatures =
+    [ ]
     ++ lib.optionals (withAudioBackend != "") [ "${withAudioBackend}-backend" ]
     ++ lib.optionals withMediaControl [ "media-control" ]
     ++ lib.optionals withImage [ "image" ]
@@ -93,7 +121,7 @@ rustPlatform.buildRustPackage rec {
   # sixel-sys is dynamically linked to libsixel
   postInstall = lib.optionals (stdenv.hostPlatform.isDarwin && withSixel) ''
     wrapProgram $out/bin/spotify_player \
-      --prefix DYLD_LIBRARY_PATH : "${lib.makeLibraryPath [libsixel]}"
+      --prefix DYLD_LIBRARY_PATH : "${lib.makeLibraryPath [ libsixel ]}"
   '';
 
   passthru = {
@@ -106,6 +134,11 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/aome510/spotify-player/releases/tag/v${version}";
     mainProgram = "spotify_player";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ dit7ya xyven1 _71zenith caperren ];
+    maintainers = with lib.maintainers; [
+      dit7ya
+      xyven1
+      _71zenith
+      caperren
+    ];
   };
 }

From ed9b773ef3d413ce47c3aabe7a4096da006fdcce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com>
Date: Thu, 14 Nov 2024 08:37:24 +0100
Subject: [PATCH 11/76] spotify-player: clean up old darwin SDK pattern

(cherry picked from commit c5472cf2b6190d8a51bc8ead527eb4a808b15079)
---
 pkgs/by-name/sp/spotify-player/package.nix | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/pkgs/by-name/sp/spotify-player/package.nix b/pkgs/by-name/sp/spotify-player/package.nix
index 09de8d6e02a9..782a69865408 100644
--- a/pkgs/by-name/sp/spotify-player/package.nix
+++ b/pkgs/by-name/sp/spotify-player/package.nix
@@ -27,7 +27,6 @@
   withSixel ? true,
   withFuzzy ? true,
   stdenv,
-  darwin,
   makeBinaryWrapper,
 
   # passthru
@@ -91,18 +90,7 @@ rustPlatform.buildRustPackage rec {
       gst_all_1.gst-devtools
       gst_all_1.gst-plugins-base
       gst_all_1.gst-plugins-good
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isDarwin && withMediaControl) [
-      darwin.apple_sdk.frameworks.MediaPlayer
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin (
-      with darwin.apple_sdk.frameworks;
-      [
-        AppKit
-        AudioUnit
-        Cocoa
-      ]
-    );
+    ];
 
   buildNoDefaultFeatures = true;
 

From 46e0741208d3322505f54d70ae2d720494804833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com>
Date: Sat, 16 Nov 2024 08:43:12 +0100
Subject: [PATCH 12/76] spotify-player: fix x86_64-darwin

(cherry picked from commit 6fe1904e43a0bd3fbb5c5e4b7c231dc8654b37b5)
---
 pkgs/by-name/sp/spotify-player/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/sp/spotify-player/package.nix b/pkgs/by-name/sp/spotify-player/package.nix
index 782a69865408..55776515e809 100644
--- a/pkgs/by-name/sp/spotify-player/package.nix
+++ b/pkgs/by-name/sp/spotify-player/package.nix
@@ -15,6 +15,7 @@
   dbus,
   fontconfig,
   libsixel,
+  apple-sdk_11,
 
   # build options
   withStreaming ? true,
@@ -74,6 +75,9 @@ rustPlatform.buildRustPackage rec {
       dbus
       fontconfig
     ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      apple-sdk_11 # can be removed once x86_64-darwin defaults to a newer SDK
+    ]
     ++ lib.optionals withSixel [ libsixel ]
     ++ lib.optionals (withAudioBackend == "alsa") [ alsa-lib ]
     ++ lib.optionals (withAudioBackend == "pulseaudio") [ libpulseaudio ]

From 6cdb69a16dea235b7a13eacc257ed9ffdea3a754 Mon Sep 17 00:00:00 2001
From: Noa Aarts <noa@voorwaarts.nl>
Date: Sat, 16 Nov 2024 14:55:59 +0100
Subject: [PATCH 13/76] replibyte: fix build by updating lockfile

(cherry picked from commit 6a13b245ec29477861b5a3941878e49380fb25b8)
---
 .../tools/database/replibyte/Cargo.lock       | 1139 +++++++++++------
 1 file changed, 729 insertions(+), 410 deletions(-)

diff --git a/pkgs/development/tools/database/replibyte/Cargo.lock b/pkgs/development/tools/database/replibyte/Cargo.lock
index f6811141c49d..7c19e7976c6d 100644
--- a/pkgs/development/tools/database/replibyte/Cargo.lock
+++ b/pkgs/development/tools/database/replibyte/Cargo.lock
@@ -4,18 +4,18 @@ version = 3
 
 [[package]]
 name = "addr2line"
-version = "0.21.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
- "gimli 0.28.1",
+ "gimli 0.31.1",
 ]
 
 [[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "aead"
@@ -58,7 +58,7 @@ version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
 dependencies = [
- "getrandom 0.2.12",
+ "getrandom 0.2.15",
  "once_cell",
  "version_check",
 ]
@@ -70,7 +70,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if 1.0.0",
- "getrandom 0.2.12",
+ "getrandom 0.2.15",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -78,9 +78,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
@@ -102,15 +102,15 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.80"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1"
+checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
 
 [[package]]
 name = "arrayref"
-version = "0.3.7"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
 
 [[package]]
 name = "arrayvec"
@@ -135,14 +135,14 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg 1.4.0",
 ]
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "aws-config"
@@ -299,7 +299,7 @@ dependencies = [
  "percent-encoding",
  "regex",
  "ring 0.16.20",
- "time 0.3.34",
+ "time 0.3.36",
  "tracing",
 ]
 
@@ -415,7 +415,7 @@ dependencies = [
  "itoa",
  "num-integer",
  "ryu",
- "time 0.3.34",
+ "time 0.3.36",
 ]
 
 [[package]]
@@ -437,24 +437,24 @@ dependencies = [
  "aws-smithy-async",
  "aws-smithy-client",
  "aws-smithy-types",
- "rustc_version 0.4.0",
+ "rustc_version 0.4.1",
  "tracing",
  "zeroize",
 ]
 
 [[package]]
 name = "backtrace"
-version = "0.3.69"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
  "addr2line",
- "cc",
  "cfg-if 1.0.0",
  "libc",
  "miniz_oxide",
- "object 0.32.2",
+ "object 0.36.5",
  "rustc-demangle",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -483,9 +483,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "bitvec"
@@ -512,22 +512,22 @@ dependencies = [
 
 [[package]]
 name = "bson"
-version = "2.9.0"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce21468c1c9c154a85696bb25c20582511438edb6ad67f846ba1378ffdd80222"
+checksum = "068208f2b6fcfa27a7f1ee37488d2bb8ba2640f68f5475d08e1d9130696aba59"
 dependencies = [
  "ahash 0.8.11",
  "base64 0.13.1",
  "bitvec",
  "hex",
- "indexmap 2.2.5",
+ "indexmap 2.6.0",
  "js-sys",
  "once_cell",
  "rand 0.8.5",
  "serde",
  "serde_bytes",
  "serde_json",
- "time 0.3.34",
+ "time 0.3.36",
  "uuid",
 ]
 
@@ -539,9 +539,9 @@ checksum = "b4ae4235e6dac0694637c763029ecea1a2ec9e4e06ec2729bd21ba4d9c863eb7"
 
 [[package]]
 name = "bumpalo"
-version = "3.15.4"
+version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "bytecheck"
@@ -573,9 +573,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.5.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
 
 [[package]]
 name = "bytes-utils"
@@ -589,9 +589,12 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.90"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
+checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47"
+dependencies = [
+ "shlex",
+]
 
 [[package]]
 name = "cfg-if"
@@ -607,15 +610,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "cfg_aliases"
-version = "0.1.1"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "chrono"
-version = "0.4.35"
+version = "0.4.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -623,7 +626,7 @@ dependencies = [
  "num-traits",
  "serde",
  "wasm-bindgen",
- "windows-targets 0.52.4",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -707,9 +710,9 @@ dependencies = [
 
 [[package]]
 name = "const_fn"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935"
+checksum = "373e9fafaa20882876db20562275ff58d50e0caa2590077fe7ce7bef90211d0d"
 
 [[package]]
 name = "constant_time_eq"
@@ -729,9 +732,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "corosensei"
@@ -739,7 +742,7 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "80128832c58ea9cbd041d2a759ec449224487b2c1e400453d99d244eead87a8e"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg 1.4.0",
  "cfg-if 1.0.0",
  "libc",
  "scopeguard",
@@ -748,9 +751,9 @@ dependencies = [
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.12"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+checksum = "0ca741a962e1b0bff6d724a1a0958b686406e853bb14061f218562e1896f95e6"
 dependencies = [
  "libc",
 ]
@@ -825,9 +828,9 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.4.0"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -853,15 +856,15 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.19"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
 [[package]]
 name = "csv"
-version = "1.3.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe"
+checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf"
 dependencies = [
  "csv-core",
  "itoa",
@@ -898,19 +901,19 @@ dependencies = [
 
 [[package]]
 name = "ctrlc"
-version = "3.4.4"
+version = "3.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345"
+checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3"
 dependencies = [
  "nix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "darling"
-version = "0.20.8"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391"
+checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -918,26 +921,26 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.8"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f"
+checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.87",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.20.8"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
+checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -951,9 +954,9 @@ dependencies = [
 
 [[package]]
 name = "deunicode"
-version = "1.4.3"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6e854126756c496b8c81dec88f9a706b15b875c5849d4097a3854476b9fdf94"
+checksum = "339544cc9e2c4dc3fc7149fd630c5f22263a4fdf18a98afd0075784968b5cf00"
 
 [[package]]
 name = "dirs"
@@ -972,6 +975,17 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
 
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "dump-parser"
 version = "0.10.0"
@@ -983,9 +997,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.10.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "encode_unicode"
@@ -995,9 +1009,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.33"
+version = "0.8.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -1024,23 +1038,23 @@ dependencies = [
 
 [[package]]
 name = "enumset"
-version = "1.1.3"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "226c0da7462c13fb57e5cc9e0dc8f0635e7d27f276a3a7fd30054647f669007d"
+checksum = "d07a4b049558765cef5f0c1a273c3fc57084d768b44d2f98127aef4cceb17293"
 dependencies = [
  "enumset_derive",
 ]
 
 [[package]]
 name = "enumset_derive"
-version = "0.8.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af"
+checksum = "59c3b24c345d8c314966bdc1832f6c2635bfcce8e7cf363bd115987bba2ee242"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1064,9 +1078,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -1091,14 +1105,14 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn 1.0.109",
- "synstructure",
+ "synstructure 0.12.6",
 ]
 
 [[package]]
 name = "fake"
-version = "2.9.2"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c25829bde82205da46e1823b2259db6273379f626fc211f126f65654a2669be"
+checksum = "2d391ba4af7f1d93f01fcf7b2f29e2bc9348e109dfdbf4dcbdc51dfa38dab0b6"
 dependencies = [
  "deunicode",
  "rand 0.8.5",
@@ -1121,15 +1135,15 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.0.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4"
 
 [[package]]
 name = "flate2"
-version = "1.0.28"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
+checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -1179,53 +1193,53 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
 ]
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.87",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-core",
  "futures-io",
@@ -1269,9 +1283,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.12"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
@@ -1301,15 +1315,15 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.28.1"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "h2"
-version = "0.3.24"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9"
+checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
 dependencies = [
  "bytes",
  "fnv",
@@ -1317,10 +1331,10 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http",
- "indexmap 2.2.5",
+ "indexmap 2.6.0",
  "slab",
  "tokio",
- "tokio-util 0.7.10",
+ "tokio-util 0.7.12",
  "tracing",
 ]
 
@@ -1344,9 +1358,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.3"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3"
 
 [[package]]
 name = "heck"
@@ -1408,9 +1422,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.8.0"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
 
 [[package]]
 name = "httpdate"
@@ -1426,9 +1440,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.28"
+version = "0.14.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
+checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1480,9 +1494,9 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -1501,6 +1515,124 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -1509,12 +1641,23 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
@@ -1523,19 +1666,19 @@ version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg 1.4.0",
  "hashbrown 0.12.3",
  "serde",
 ]
 
 [[package]]
 name = "indexmap"
-version = "2.2.5"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.3",
+ "hashbrown 0.15.1",
 ]
 
 [[package]]
@@ -1552,18 +1695,18 @@ dependencies = [
 
 [[package]]
 name = "instant"
-version = "0.1.12"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
 dependencies = [
  "cfg-if 1.0.0",
 ]
 
 [[package]]
 name = "ipnet"
-version = "2.9.0"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
 
 [[package]]
 name = "isolang"
@@ -1577,24 +1720,24 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "js-sys"
-version = "0.3.69"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
 dependencies = [
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "leb128"
@@ -1604,9 +1747,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
 
 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.164"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f"
 
 [[package]]
 name = "libloading"
@@ -1626,25 +1769,31 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "litemap"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
 
 [[package]]
 name = "lock_api"
-version = "0.4.11"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg 1.4.0",
  "scopeguard",
 ]
 
 [[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 = "loupe"
@@ -1676,6 +1825,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "mach2"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "machine-uid"
 version = "0.2.0"
@@ -1693,9 +1851,9 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
 
 [[package]]
 name = "memchr"
-version = "2.7.1"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memmap2"
@@ -1712,7 +1870,7 @@ version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg 1.4.0",
 ]
 
 [[package]]
@@ -1728,23 +1886,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
-name = "miniz_oxide"
-version = "0.7.2"
+name = "minicov"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+checksum = "f27fe9f1cc3c22e1687f9446c2083c4c5fc7f0bcf1c7a86bdbded14985895b4b"
 dependencies = [
- "adler",
+ "cc",
+ "walkdir",
+]
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+dependencies = [
+ "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "0.8.11"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
 dependencies = [
+ "hermit-abi 0.3.9",
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1773,11 +1942,10 @@ checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389"
 
 [[package]]
 name = "native-tls"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
 dependencies = [
- "lazy_static",
  "libc",
  "log",
  "openssl",
@@ -1791,11 +1959,11 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.28.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "cfg-if 1.0.0",
  "cfg_aliases",
  "libc",
@@ -1818,21 +1986,11 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
- "autocfg 1.1.0",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi 0.3.9",
- "libc",
+ "autocfg 1.4.0",
 ]
 
 [[package]]
@@ -1855,18 +2013,18 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.32.2"
+version = "0.36.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "opaque-debug"
@@ -1876,11 +2034,11 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "openssl"
-version = "0.10.64"
+version = "0.10.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
+checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "cfg-if 1.0.0",
  "foreign-types",
  "libc",
@@ -1897,7 +2055,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1908,9 +2066,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.101"
+version = "0.9.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff"
+checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
 dependencies = [
  "cc",
  "libc",
@@ -1926,9 +2084,9 @@ checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -1936,15 +2094,15 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.9"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
- "redox_syscall 0.4.1",
+ "redox_syscall 0.5.7",
  "smallvec",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -1993,29 +2151,29 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "1.1.5"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
+checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.5"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
+checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.87",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.13"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
 [[package]]
 name = "pin-utils"
@@ -2025,9 +2183,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
 [[package]]
 name = "polyval"
@@ -2049,9 +2207,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
 
 [[package]]
 name = "prettytable-rs"
@@ -2064,7 +2225,7 @@ dependencies = [
  "encode_unicode",
  "lazy_static",
  "term",
- "unicode-width",
+ "unicode-width 0.1.14",
 ]
 
 [[package]]
@@ -2099,9 +2260,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
 dependencies = [
  "unicode-ident",
 ]
@@ -2128,9 +2289,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -2212,7 +2373,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.12",
+ "getrandom 0.2.15",
 ]
 
 [[package]]
@@ -2279,9 +2440,9 @@ dependencies = [
 
 [[package]]
 name = "rayon"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
 dependencies = [
  "either",
  "rayon-core",
@@ -2314,11 +2475,11 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
 
 [[package]]
 name = "redox_syscall"
-version = "0.4.1"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
@@ -2345,9 +2506,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.3"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2357,9 +2518,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.6"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2368,20 +2529,20 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.2"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "region"
-version = "3.0.0"
+version = "3.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76e189c2369884dce920945e2ddf79b3dff49e071a167dd1817fa9c4c00d512e"
+checksum = "e6b6ebd13bc009aef9cd476c1310d49ac354d36e240cf1bd753290f3dc7199a7"
 dependencies = [
  "bitflags 1.3.2",
  "libc",
- "mach",
- "winapi",
+ "mach2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2438,9 +2599,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.11.25"
+version = "0.11.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eea5a9eb898d3783f17c6407670e3592fd174cb81a10e51d4c37f49450b9946"
+checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
 dependencies = [
  "base64 0.21.7",
  "bytes",
@@ -2499,7 +2660,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
  "cfg-if 1.0.0",
- "getrandom 0.2.12",
+ "getrandom 0.2.15",
  "libc",
  "spin 0.9.8",
  "untrusted 0.9.0",
@@ -2508,9 +2669,9 @@ dependencies = [
 
 [[package]]
 name = "rkyv"
-version = "0.7.44"
+version = "0.7.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0"
+checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b"
 dependencies = [
  "bitvec",
  "bytecheck",
@@ -2526,9 +2687,9 @@ dependencies = [
 
 [[package]]
 name = "rkyv_derive"
-version = "0.7.44"
+version = "0.7.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65"
+checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2549,9 +2710,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
@@ -2570,20 +2731,20 @@ dependencies = [
 
 [[package]]
 name = "rustc_version"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
 dependencies = [
- "semver 1.0.22",
+ "semver 1.0.23",
 ]
 
 [[package]]
 name = "rustix"
-version = "0.38.31"
+version = "0.38.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
+checksum = "99e4ea3e1cdc4b559b8e5650f9c8e5998e3e5c1343b4eaf034565f32318d63c0"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -2638,23 +2799,32 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.14"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
+checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
 
 [[package]]
 name = "ryu"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
 
 [[package]]
 name = "schannel"
-version = "0.1.23"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2697,11 +2867,11 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
 
 [[package]]
 name = "security-framework"
-version = "2.9.2"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -2710,9 +2880,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.9.1"
+version = "2.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
+checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -2729,9 +2899,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "semver-parser"
@@ -2741,41 +2911,42 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.197"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
+checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_bytes"
-version = "0.11.14"
+version = "0.11.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734"
+checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.197"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
+checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.87",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.114"
+version = "1.0.132"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
 dependencies = [
- "indexmap 2.2.5",
+ "indexmap 2.6.0",
  "itoa",
+ "memchr",
  "ryu",
  "serde",
 ]
@@ -2815,24 +2986,30 @@ dependencies = [
 
 [[package]]
 name = "sha1_smol"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
+checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d"
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.1"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "simdutf8"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
+checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
 
 [[package]]
 name = "siphasher"
@@ -2846,20 +3023,20 @@ version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg 1.4.0",
 ]
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "socket2"
-version = "0.5.6"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -2975,9 +3152,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.52"
+version = "2.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07"
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3003,21 +3180,32 @@ dependencies = [
 ]
 
 [[package]]
-name = "system-configuration"
-version = "0.6.0"
+name = "synstructure"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "658bc6ee10a9b4fcf576e9b0819d95ec16f4d2c02d39fd83ac1c8789785c4a42"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
- "bitflags 2.4.2",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "system-configuration"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
+dependencies = [
+ "bitflags 1.3.2",
  "core-foundation",
  "system-configuration-sys",
 ]
 
 [[package]]
 name = "system-configuration-sys"
-version = "0.6.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
+checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -3031,20 +3219,21 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.14"
+version = "0.12.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "tempfile"
-version = "3.10.1"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
 dependencies = [
  "cfg-if 1.0.0",
- "fastrand 2.0.1",
+ "fastrand 2.2.0",
+ "once_cell",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3075,22 +3264,22 @@ checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
 
 [[package]]
 name = "thiserror"
-version = "1.0.57"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.57"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3110,9 +3299,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.34"
+version = "0.3.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
 dependencies = [
  "deranged",
  "itoa",
@@ -3120,7 +3309,7 @@ dependencies = [
  "powerfmt",
  "serde",
  "time-core",
- "time-macros 0.2.17",
+ "time-macros 0.2.18",
 ]
 
 [[package]]
@@ -3141,9 +3330,9 @@ dependencies = [
 
 [[package]]
 name = "time-macros"
-version = "0.2.17"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
 dependencies = [
  "num-conv",
  "time-core",
@@ -3173,10 +3362,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "tinyvec"
-version = "1.6.0"
+name = "tinystr"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -3189,32 +3388,31 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.36.0"
+version = "1.41.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
+checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33"
 dependencies = [
  "backtrace",
  "bytes",
  "libc",
  "mio",
- "num_cpus",
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2",
  "tokio-macros",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.2.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3240,9 +3438,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.14"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
+checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -3265,16 +3463,15 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.10"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
+checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
 dependencies = [
  "bytes",
  "futures-core",
  "futures-sink",
  "pin-project-lite",
  "tokio",
- "tracing",
 ]
 
 [[package]]
@@ -3295,15 +3492,15 @@ dependencies = [
 
 [[package]]
 name = "tower-layer"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
 
 [[package]]
 name = "tower-service"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
@@ -3325,7 +3522,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3349,38 +3546,29 @@ version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
-[[package]]
-name = "unicode-bidi"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
-
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.11"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+
+[[package]]
+name = "unicode-width"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.4"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "universal-hash"
@@ -3406,9 +3594,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.0"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -3422,12 +3610,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a1f0175e03a0973cf4afd476bef05c26e228520400eb1fd473ad417b1c00ffb"
 
 [[package]]
-name = "uuid"
-version = "1.7.0"
+name = "utf16_iter"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "uuid"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
 dependencies = [
- "getrandom 0.2.12",
+ "getrandom 0.2.15",
  "serde",
 ]
 
@@ -3439,9 +3639,19 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
 
 [[package]]
 name = "want"
@@ -3466,11 +3676,12 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.92"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
 dependencies = [
  "cfg-if 1.0.0",
+ "once_cell",
  "serde",
  "serde_json",
  "wasm-bindgen-macro",
@@ -3478,24 +3689,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.87",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.42"
+version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
+checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -3505,9 +3716,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3515,31 +3726,32 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.87",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.42"
+version = "0.3.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9bf62a58e0780af3e852044583deee40983e5886da43a271dd772379987667b"
+checksum = "d381749acb0943d357dcbd8f0b100640679883fcdeeef04def49daf8d33a5426"
 dependencies = [
  "console_error_panic_hook",
  "js-sys",
+ "minicov",
  "scoped-tls",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -3548,22 +3760,23 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.42"
+version = "0.3.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0"
+checksum = "c97b2ef2c8d627381e51c071c2ab328eac606d3f69dd82bcbca20a9e389d95f0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.87",
 ]
 
 [[package]]
 name = "wasm-encoder"
-version = "0.201.0"
+version = "0.220.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9c7d2731df60006819b013f64ccc2019691deccf6e11a1804bc850cd6748f1a"
+checksum = "ebf48234b389415b226a4daef6562933d38c7b28a8b8f64c5c4130dad1561ab7"
 dependencies = [
  "leb128",
+ "wasmparser 0.220.0",
 ]
 
 [[package]]
@@ -3621,7 +3834,7 @@ dependencies = [
  "target-lexicon",
  "thiserror",
  "wasmer-types",
- "wasmparser",
+ "wasmparser 0.83.0",
 ]
 
 [[package]]
@@ -3816,7 +4029,7 @@ checksum = "fadbe31e3c1b6f3e398ad172b169152ae1a743ae6efd5f9ffb34019983319d99"
 dependencies = [
  "cfg-if 1.0.0",
  "generational-arena",
- "getrandom 0.2.12",
+ "getrandom 0.2.15",
  "libc",
  "thiserror",
  "tracing",
@@ -3845,32 +4058,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a"
 
 [[package]]
-name = "wast"
-version = "201.0.0"
+name = "wasmparser"
+version = "0.220.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ef6e1ef34d7da3e2b374fd2b1a9c0227aff6cad596e1b24df9b58d0f6222faa"
+checksum = "e246c2772ce3ebc83f89a2d4487ac5794cad6c309b2071818a88c7db7c36d87b"
+dependencies = [
+ "bitflags 2.6.0",
+ "indexmap 2.6.0",
+]
+
+[[package]]
+name = "wast"
+version = "220.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e708c8de08751fd66e70961a32bae9d71901f14a70871e181cb8461a3bb3165"
 dependencies = [
  "bumpalo",
  "leb128",
  "memchr",
- "unicode-width",
+ "unicode-width 0.2.0",
  "wasm-encoder",
 ]
 
 [[package]]
 name = "wat"
-version = "1.201.0"
+version = "1.220.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453d5b37a45b98dee4f4cb68015fc73634d7883bbef1c65e6e9c78d454cf3f32"
+checksum = "de4f1d7d59614ba690541360102b995c4eb1b9ed373701d5102cc1a968b1c5a3"
 dependencies = [
  "wast",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.69"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -3938,11 +4161,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.6"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "winapi",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3957,7 +4180,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.52.4",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -3988,7 +4211,16 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.4",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -4008,17 +4240,18 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.4"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.4",
- "windows_aarch64_msvc 0.52.4",
- "windows_i686_gnu 0.52.4",
- "windows_i686_msvc 0.52.4",
- "windows_x86_64_gnu 0.52.4",
- "windows_x86_64_gnullvm 0.52.4",
- "windows_x86_64_msvc 0.52.4",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
 ]
 
 [[package]]
@@ -4029,9 +4262,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.4"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -4047,9 +4280,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.4"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -4065,9 +4298,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.4"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -4083,9 +4322,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.4"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -4101,9 +4340,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.4"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -4113,9 +4352,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.4"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -4131,9 +4370,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.4"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winreg"
@@ -4154,6 +4393,18 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
 [[package]]
 name = "wyz"
 version = "0.5.1"
@@ -4179,27 +4430,95 @@ dependencies = [
 ]
 
 [[package]]
-name = "zerocopy"
-version = "0.7.32"
+name = "yoke"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
 dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "synstructure 0.13.1",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "byteorder",
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.32"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.52",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "synstructure 0.13.1",
 ]
 
 [[package]]
 name = "zeroize"
-version = "1.7.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]

From 53b6f312dcdf1ff122288439498c9a920a33a260 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 11 Nov 2024 22:29:25 +0100
Subject: [PATCH 14/76] lomiri.history-service: 0.5 -> 0.6

(cherry picked from commit 48b99d0225bfaa968234b65b96058acdfed1a966)
---
 .../services/history-service/default.nix      | 37 ++-----------------
 .../services/telephony-service/default.nix    |  7 ++++
 2 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/pkgs/desktops/lomiri/services/history-service/default.nix b/pkgs/desktops/lomiri/services/history-service/default.nix
index 8e386ac5c1a2..0fbd53550ba7 100644
--- a/pkgs/desktops/lomiri/services/history-service/default.nix
+++ b/pkgs/desktops/lomiri/services/history-service/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , lib
 , fetchFromGitLab
-, fetchpatch
 , gitUpdater
 , testers
 , cmake
@@ -29,13 +28,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "history-service";
-  version = "0.5";
+  version = "0.6";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/history-service";
     rev = finalAttrs.version;
-    hash = "sha256-m/ytJoHxW0q1vlVKK6Z9ovHzjoiS1AodCSGHTeKygfQ=";
+    hash = "sha256-pcTYuumywTarW+ZciwwvmmBQQH6aq4+FdVjV62VzSZU=";
   };
 
   outputs = [
@@ -43,36 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
     "dev"
   ];
 
-  patches = [
-    # Drop deprecated qt5_use_modules usage
-    # Remove when https://gitlab.com/ubports/development/core/history-service/-/merge_requests/36 merged & in release
-    (fetchpatch {
-      url = "https://gitlab.com/ubports/development/core/history-service/-/commit/b36ab377aca93555b29d1471d6eaa706b5c843ca.patch";
-      hash = "sha256-mOpXqqd4JI7lHtcWDm9LGCrtB8ERge04jMpHIagDM2k=";
-    })
-
-    # Add more / correct existing GNUInstallDirs usage
-    # Remove when https://gitlab.com/ubports/development/core/history-service/-/merge_requests/37 merged & in release
-    (fetchpatch {
-      url = "https://gitlab.com/ubports/development/core/history-service/-/commit/bb4dbdd16e80dcd286d8edfb86b08f0b61bc7fec.patch";
-      hash = "sha256-C/XaygI663yaU06klQD9g0NnbqYxHSmzdbrRxcfiJkk=";
-    })
-
-    # Correct version information
-    # Remove when https://gitlab.com/ubports/development/core/history-service/-/merge_requests/38 merged & in release
-    (fetchpatch {
-      url = "https://gitlab.com/ubports/development/core/history-service/-/commit/98458126f9f494b124134fb35c198af0545f6a98.patch";
-      hash = "sha256-4EfLsaueKTCovl8EilN30cmfNfg19wvyCsbKqOrXtuw=";
-    })
-
-    # Make tests optional
-    # Remove when https://gitlab.com/ubports/development/core/history-service/-/merge_requests/39 merged & in release
-    (fetchpatch {
-      url = "https://gitlab.com/ubports/development/core/history-service/-/commit/cb5c80cffc35611657244e15a7eb10edcd598ccd.patch";
-      hash = "sha256-MFHGu4OMScdThq9htUgFMpezP7Ym6YTIZUHWol20wqw=";
-    })
-  ];
-
   postPatch = ''
     # Upstream's way of generating their schema doesn't work for us, don't quite understand why.
     # (gdb) bt
@@ -193,7 +162,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = teams.lomiri.members;
     platforms = platforms.linux;
     pkgConfigModules = [
-      "history-service"
+      "lomiri-history-service"
     ];
   };
 })
diff --git a/pkgs/desktops/lomiri/services/telephony-service/default.nix b/pkgs/desktops/lomiri/services/telephony-service/default.nix
index 0735f56ce794..fc8e29dbfc8b 100644
--- a/pkgs/desktops/lomiri/services/telephony-service/default.nix
+++ b/pkgs/desktops/lomiri/services/telephony-service/default.nix
@@ -66,6 +66,13 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/18e0ba8e025b097eef1217d97d98ef4a4940fe84.patch";
       hash = "sha256-vOIy+B/OQeccsVn4pXsnr8LYyEapqbebW1I6dBg5u2c=";
     })
+
+    # Remove when version > 0.5.3
+    (fetchpatch {
+      name = "0003-lomiri-telephony-service-Handle-renamed-history-service.patch";
+      url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/3a387670ed13041db069068292b1f41229e79583.patch";
+      hash = "sha256-b7gxzr6Mmtogclq3hR7a/zl+816H2wmJqv3oHjUJggw=";
+    })
   ];
 
   postPatch =

From c8140c5fa6da980697c4105262cf8661f4972b6e Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 11 Nov 2024 22:34:47 +0100
Subject: [PATCH 15/76] lomiri.history-service: Modernise

(cherry picked from commit 2fdce28dabec3d656a2bb050c412cd389230bcfa)
---
 .../services/history-service/default.nix      | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/pkgs/desktops/lomiri/services/history-service/default.nix b/pkgs/desktops/lomiri/services/history-service/default.nix
index 0fbd53550ba7..d5d4df4046d8 100644
--- a/pkgs/desktops/lomiri/services/history-service/default.nix
+++ b/pkgs/desktops/lomiri/services/history-service/default.nix
@@ -24,7 +24,7 @@
 }:
 
 let
-  replaceDbusService = pkg: name: "--replace \"\\\${DBUS_SERVICES_DIR}/${name}\" \"${pkg}/share/dbus-1/services/${name}\"";
+  replaceDbusService = pkg: name: "--replace-fail \"\\\${DBUS_SERVICES_DIR}/${name}\" \"${pkg}/share/dbus-1/services/${name}\"";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "history-service";
@@ -64,18 +64,13 @@ stdenv.mkDerivation (finalAttrs: {
     # This replacement script should hopefully achieve the same / a similar-enough result with just sqlite
     cp ${./update_schema.sh.in} plugins/sqlite/schema/update_schema.sh.in
 
-    # libphonenumber -> protobuf -> abseil-cpp demands C++14
-    # But uses std::string_view which is C++17?
-    substituteInPlace CMakeLists.txt \
-      --replace '-std=c++11' '-std=c++17'
-
     # Uses pkg_get_variable, cannot substitute prefix with that
     substituteInPlace daemon/CMakeLists.txt \
-      --replace 'pkg_get_variable(SYSTEMD_USER_UNIT_DIR systemd systemduserunitdir)' 'set(SYSTEMD_USER_UNIT_DIR "''${CMAKE_INSTALL_PREFIX}/lib/systemd/user")'
+      --replace-fail 'pkg_get_variable(SYSTEMD_USER_UNIT_DIR systemd systemduserunitdir)' 'set(SYSTEMD_USER_UNIT_DIR "''${CMAKE_INSTALL_PREFIX}/lib/systemd/user")'
 
     # Queries qmake for the QML installation path, which returns a reference to Qt5's build directory
     substituteInPlace CMakeLists.txt \
-      --replace "\''${QMAKE_EXECUTABLE} -query QT_INSTALL_QML" "echo $out/${qtbase.qtQmlPrefix}"
+      --replace-fail "\''${QMAKE_EXECUTABLE} -query QT_INSTALL_QML" "echo $out/${qtbase.qtQmlPrefix}"
   '' + lib.optionalString finalAttrs.finalPackage.doCheck ''
     # Tests launch these DBus services, fix paths related to them
     substituteInPlace tests/common/dbus-services/CMakeLists.txt \
@@ -84,8 +79,8 @@ stdenv.mkDerivation (finalAttrs: {
       ${replaceDbusService dconf "ca.desrt.dconf.service"}
 
     substituteInPlace cmake/modules/GenerateTest.cmake \
-      --replace '/usr/lib/dconf' '${lib.getLib dconf}/libexec' \
-      --replace '/usr/lib/telepathy' '${lib.getLib telepathy-mission-control}/libexec'
+      --replace-fail '/usr/lib/dconf' '${lib.getLib dconf}/libexec' \
+      --replace-fail '/usr/lib/telepathy' '${lib.getLib telepathy-mission-control}/libexec'
   '';
 
   strictDeps = true;
@@ -147,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: {
     updateScript = gitUpdater { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Service that provides call log and conversation history";
     longDescription = ''
       History service provides the database and an API to store/retrieve the call log (used by dialer-app) and the sms/mms history (used by messaging-app).
@@ -158,9 +153,9 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://gitlab.com/ubports/development/core/history-service";
     changelog = "https://gitlab.com/ubports/development/core/history-service/-/blob/${finalAttrs.version}/ChangeLog";
-    license = licenses.gpl3Only;
-    maintainers = teams.lomiri.members;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Only;
+    maintainers = lib.teams.lomiri.members;
+    platforms = lib.platforms.linux;
     pkgConfigModules = [
       "lomiri-history-service"
     ];

From 78aa75520f3dd1e6e9c3460caa6c9b853845e74f Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 11 Nov 2024 22:36:30 +0100
Subject: [PATCH 16/76] lomiri.history-service: nixfmt

(cherry picked from commit 4fd4d62c11c449a7425e65577942b87c407a7fe4)
---
 .../services/history-service/default.nix      | 144 +++++++++---------
 1 file changed, 75 insertions(+), 69 deletions(-)

diff --git a/pkgs/desktops/lomiri/services/history-service/default.nix b/pkgs/desktops/lomiri/services/history-service/default.nix
index d5d4df4046d8..fe55f8d65532 100644
--- a/pkgs/desktops/lomiri/services/history-service/default.nix
+++ b/pkgs/desktops/lomiri/services/history-service/default.nix
@@ -1,30 +1,33 @@
-{ stdenv
-, lib
-, fetchFromGitLab
-, gitUpdater
-, testers
-, cmake
-, dbus
-, dbus-test-runner
-, dconf
-, gnome-keyring
-, libphonenumber
-, libqtdbustest
-, pkg-config
-, protobuf
-, qtbase
-, qtdeclarative
-, qtpim
-, sqlite
-, telepathy
-, telepathy-mission-control
-, validatePkgConfig
-, wrapQtAppsHook
-, xvfb-run
+{
+  stdenv,
+  lib,
+  fetchFromGitLab,
+  gitUpdater,
+  testers,
+  cmake,
+  dbus,
+  dbus-test-runner,
+  dconf,
+  gnome-keyring,
+  libphonenumber,
+  libqtdbustest,
+  pkg-config,
+  protobuf,
+  qtbase,
+  qtdeclarative,
+  qtpim,
+  sqlite,
+  telepathy,
+  telepathy-mission-control,
+  validatePkgConfig,
+  wrapQtAppsHook,
+  xvfb-run,
 }:
 
 let
-  replaceDbusService = pkg: name: "--replace-fail \"\\\${DBUS_SERVICES_DIR}/${name}\" \"${pkg}/share/dbus-1/services/${name}\"";
+  replaceDbusService =
+    pkg: name:
+    "--replace-fail \"\\\${DBUS_SERVICES_DIR}/${name}\" \"${pkg}/share/dbus-1/services/${name}\"";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "history-service";
@@ -42,46 +45,48 @@ stdenv.mkDerivation (finalAttrs: {
     "dev"
   ];
 
-  postPatch = ''
-    # Upstream's way of generating their schema doesn't work for us, don't quite understand why.
-    # (gdb) bt
-    # #0  QSQLiteResult::prepare (this=0x4a4650, query=...) at qsql_sqlite.cpp:406
-    # #1  0x00007ffff344bcf4 in QSQLiteResult::reset (this=0x4a4650, query=...) at qsql_sqlite.cpp:378
-    # #2  0x00007ffff7f95f39 in QSqlQuery::exec (this=this@entry=0x7fffffffaad8, query=...) at kernel/qsqlquery.cpp:406
-    # #3  0x00000000004084cb in SQLiteDatabase::dumpSchema (this=<optimized out>) at /build/source/plugins/sqlite/sqlitedatabase.cpp:148
-    # #4  0x0000000000406d70 in main (argc=<optimized out>, argv=<optimized out>)
-    #     at /build/source/plugins/sqlite/schema/generate_schema.cpp:56
-    # (gdb) p lastError().driverText().toStdString()
-    # $17 = {_M_dataplus = {<std::allocator<char>> = {<std::__new_allocator<char>> = {<No data fields>}, <No data fields>},
-    #     _M_p = 0x4880d0 "Unable to execute statement"}, _M_string_length = 27, {
-    #     _M_local_buf = "\033\000\000\000\000\000\000\000+\344\371\367\377\177\000", _M_allocated_capacity = 27}}
-    # (gdb) p lastError().databaseText().toStdString()
-    # $18 = {_M_dataplus = {<std::allocator<char>> = {<std::__new_allocator<char>> = {<No data fields>}, <No data fields>},
-    #     _M_p = 0x48c480 "no such column: rowid"}, _M_string_length = 21, {
-    #     _M_local_buf = "\025\000\000\000\000\000\000\000A\344\371\367\377\177\000", _M_allocated_capacity = 21}}
-    #
-    # This makes the tests stall indefinitely and breaks history-service usage.
-    # This replacement script should hopefully achieve the same / a similar-enough result with just sqlite
-    cp ${./update_schema.sh.in} plugins/sqlite/schema/update_schema.sh.in
+  postPatch =
+    ''
+      # Upstream's way of generating their schema doesn't work for us, don't quite understand why.
+      # (gdb) bt
+      # #0  QSQLiteResult::prepare (this=0x4a4650, query=...) at qsql_sqlite.cpp:406
+      # #1  0x00007ffff344bcf4 in QSQLiteResult::reset (this=0x4a4650, query=...) at qsql_sqlite.cpp:378
+      # #2  0x00007ffff7f95f39 in QSqlQuery::exec (this=this@entry=0x7fffffffaad8, query=...) at kernel/qsqlquery.cpp:406
+      # #3  0x00000000004084cb in SQLiteDatabase::dumpSchema (this=<optimized out>) at /build/source/plugins/sqlite/sqlitedatabase.cpp:148
+      # #4  0x0000000000406d70 in main (argc=<optimized out>, argv=<optimized out>)
+      #     at /build/source/plugins/sqlite/schema/generate_schema.cpp:56
+      # (gdb) p lastError().driverText().toStdString()
+      # $17 = {_M_dataplus = {<std::allocator<char>> = {<std::__new_allocator<char>> = {<No data fields>}, <No data fields>},
+      #     _M_p = 0x4880d0 "Unable to execute statement"}, _M_string_length = 27, {
+      #     _M_local_buf = "\033\000\000\000\000\000\000\000+\344\371\367\377\177\000", _M_allocated_capacity = 27}}
+      # (gdb) p lastError().databaseText().toStdString()
+      # $18 = {_M_dataplus = {<std::allocator<char>> = {<std::__new_allocator<char>> = {<No data fields>}, <No data fields>},
+      #     _M_p = 0x48c480 "no such column: rowid"}, _M_string_length = 21, {
+      #     _M_local_buf = "\025\000\000\000\000\000\000\000A\344\371\367\377\177\000", _M_allocated_capacity = 21}}
+      #
+      # This makes the tests stall indefinitely and breaks history-service usage.
+      # This replacement script should hopefully achieve the same / a similar-enough result with just sqlite
+      cp ${./update_schema.sh.in} plugins/sqlite/schema/update_schema.sh.in
 
-    # Uses pkg_get_variable, cannot substitute prefix with that
-    substituteInPlace daemon/CMakeLists.txt \
-      --replace-fail 'pkg_get_variable(SYSTEMD_USER_UNIT_DIR systemd systemduserunitdir)' 'set(SYSTEMD_USER_UNIT_DIR "''${CMAKE_INSTALL_PREFIX}/lib/systemd/user")'
+      # Uses pkg_get_variable, cannot substitute prefix with that
+      substituteInPlace daemon/CMakeLists.txt \
+        --replace-fail 'pkg_get_variable(SYSTEMD_USER_UNIT_DIR systemd systemduserunitdir)' 'set(SYSTEMD_USER_UNIT_DIR "''${CMAKE_INSTALL_PREFIX}/lib/systemd/user")'
 
-    # Queries qmake for the QML installation path, which returns a reference to Qt5's build directory
-    substituteInPlace CMakeLists.txt \
-      --replace-fail "\''${QMAKE_EXECUTABLE} -query QT_INSTALL_QML" "echo $out/${qtbase.qtQmlPrefix}"
-  '' + lib.optionalString finalAttrs.finalPackage.doCheck ''
-    # Tests launch these DBus services, fix paths related to them
-    substituteInPlace tests/common/dbus-services/CMakeLists.txt \
-      ${replaceDbusService telepathy-mission-control "org.freedesktop.Telepathy.MissionControl5.service"} \
-      ${replaceDbusService telepathy-mission-control "org.freedesktop.Telepathy.AccountManager.service"} \
-      ${replaceDbusService dconf "ca.desrt.dconf.service"}
+      # Queries qmake for the QML installation path, which returns a reference to Qt5's build directory
+      substituteInPlace CMakeLists.txt \
+        --replace-fail "\''${QMAKE_EXECUTABLE} -query QT_INSTALL_QML" "echo $out/${qtbase.qtQmlPrefix}"
+    ''
+    + lib.optionalString finalAttrs.finalPackage.doCheck ''
+      # Tests launch these DBus services, fix paths related to them
+      substituteInPlace tests/common/dbus-services/CMakeLists.txt \
+        ${replaceDbusService telepathy-mission-control "org.freedesktop.Telepathy.MissionControl5.service"} \
+        ${replaceDbusService telepathy-mission-control "org.freedesktop.Telepathy.AccountManager.service"} \
+        ${replaceDbusService dconf "ca.desrt.dconf.service"}
 
-    substituteInPlace cmake/modules/GenerateTest.cmake \
-      --replace-fail '/usr/lib/dconf' '${lib.getLib dconf}/libexec' \
-      --replace-fail '/usr/lib/telepathy' '${lib.getLib telepathy-mission-control}/libexec'
-  '';
+      substituteInPlace cmake/modules/GenerateTest.cmake \
+        --replace-fail '/usr/lib/dconf' '${lib.getLib dconf}/libexec' \
+        --replace-fail '/usr/lib/telepathy' '${lib.getLib telepathy-mission-control}/libexec'
+    '';
 
   strictDeps = true;
 
@@ -114,11 +119,14 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [
     # Many deprecation warnings with Qt 5.15
     (lib.cmakeBool "ENABLE_WERROR" false)
-    (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" (lib.concatStringsSep ";" [
-      # DaemonTest is flaky
-      # https://gitlab.com/ubports/development/core/history-service/-/issues/13
-      "-E" "^DaemonTest"
-    ]))
+    (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" (
+      lib.concatStringsSep ";" [
+        # DaemonTest is flaky
+        # https://gitlab.com/ubports/development/core/history-service/-/issues/13
+        "-E"
+        "^DaemonTest"
+      ]
+    ))
   ];
 
   preBuild = ''
@@ -156,8 +164,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl3Only;
     maintainers = lib.teams.lomiri.members;
     platforms = lib.platforms.linux;
-    pkgConfigModules = [
-      "lomiri-history-service"
-    ];
+    pkgConfigModules = [ "lomiri-history-service" ];
   };
 })

From 8cb1c3fcdcbf25eb9a937fdf4d701ff8659e7c0d Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 11 Nov 2024 22:47:21 +0100
Subject: [PATCH 17/76] lomiri.lomiri-history-service: Rename from
 lomiri.history-service

(cherry picked from commit 87d70198eae37c3eb2c2666b79c9833eb7c1f07c)
---
 nixos/modules/services/desktop-managers/lomiri.nix          | 2 +-
 pkgs/desktops/lomiri/default.nix                            | 3 ++-
 .../{history-service => lomiri-history-service}/default.nix | 6 +++---
 .../update_schema.sh.in                                     | 2 +-
 pkgs/desktops/lomiri/services/telephony-service/default.nix | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)
 rename pkgs/desktops/lomiri/services/{history-service => lomiri-history-service}/default.nix (95%)
 rename pkgs/desktops/lomiri/services/{history-service => lomiri-history-service}/update_schema.sh.in (85%)

diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix
index c8faa352a644..8d245ce0050c 100644
--- a/nixos/modules/services/desktop-managers/lomiri.nix
+++ b/nixos/modules/services/desktop-managers/lomiri.nix
@@ -79,7 +79,6 @@ in
           ])
           ++ (with pkgs.lomiri; [
             hfd-service
-            history-service
             libusermetrics
             lomiri
             lomiri-calculator-app
@@ -90,6 +89,7 @@ in
             lomiri-download-manager
             lomiri-filemanager-app
             lomiri-gallery-app
+            lomiri-history-service
             lomiri-polkit-agent
             lomiri-schemas # exposes some required dbus interfaces
             lomiri-session # wrappers to properly launch the session
diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix
index c4794109b862..a8577bbf4123 100644
--- a/pkgs/desktops/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/default.nix
@@ -58,8 +58,8 @@ let
       biometryd = callPackage ./services/biometryd { };
       lomiri-content-hub = callPackage ./services/lomiri-content-hub { };
       hfd-service = callPackage ./services/hfd-service { };
-      history-service = callPackage ./services/history-service { };
       lomiri-download-manager = callPackage ./services/lomiri-download-manager { };
+      lomiri-history-service = callPackage ./services/lomiri-history-service { };
       lomiri-indicator-network = callPackage ./services/lomiri-indicator-network { };
       lomiri-polkit-agent = callPackage ./services/lomiri-polkit-agent { };
       lomiri-thumbnailer = callPackage ./services/lomiri-thumbnailer { };
@@ -71,5 +71,6 @@ in
 lib.makeScope libsForQt5.newScope packages
 // lib.optionalAttrs config.allowAliases {
   content-hub = lib.warn "`content-hub` was renamed to `lomiri-content-hub`." pkgs.lomiri.lomiri-content-hub; # Added on 2024-09-11
+  history-service = lib.warn "`history-service` was renamed to `lomiri-history-service`." pkgs.lomiri.lomiri-history-service; # Added on 2024-11-11
   lomiri-system-settings-security-privacy = lib.warn "`lomiri-system-settings-security-privacy` upstream was merged into `lomiri-system-settings`. Please use `pkgs.lomiri.lomiri-system-settings-unwrapped` if you need to directly access the plugins that belonged to this project." pkgs.lomiri.lomiri-system-settings-unwrapped; # Added on 2024-08-08
 }
diff --git a/pkgs/desktops/lomiri/services/history-service/default.nix b/pkgs/desktops/lomiri/services/lomiri-history-service/default.nix
similarity index 95%
rename from pkgs/desktops/lomiri/services/history-service/default.nix
rename to pkgs/desktops/lomiri/services/lomiri-history-service/default.nix
index fe55f8d65532..f4f793cf577e 100644
--- a/pkgs/desktops/lomiri/services/history-service/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-history-service/default.nix
@@ -30,7 +30,7 @@ let
     "--replace-fail \"\\\${DBUS_SERVICES_DIR}/${name}\" \"${pkg}/share/dbus-1/services/${name}\"";
 in
 stdenv.mkDerivation (finalAttrs: {
-  pname = "history-service";
+  pname = "lomiri-history-service";
   version = "0.6";
 
   src = fetchFromGitLab {
@@ -159,8 +159,8 @@ stdenv.mkDerivation (finalAttrs: {
 
       Database location: ~/.local/share/history-service/history.sqlite
     '';
-    homepage = "https://gitlab.com/ubports/development/core/history-service";
-    changelog = "https://gitlab.com/ubports/development/core/history-service/-/blob/${finalAttrs.version}/ChangeLog";
+    homepage = "https://gitlab.com/ubports/development/core/lomiri-history-service";
+    changelog = "https://gitlab.com/ubports/development/core/lomiri-history-service/-/blob/${finalAttrs.version}/ChangeLog";
     license = lib.licenses.gpl3Only;
     maintainers = lib.teams.lomiri.members;
     platforms = lib.platforms.linux;
diff --git a/pkgs/desktops/lomiri/services/history-service/update_schema.sh.in b/pkgs/desktops/lomiri/services/lomiri-history-service/update_schema.sh.in
similarity index 85%
rename from pkgs/desktops/lomiri/services/history-service/update_schema.sh.in
rename to pkgs/desktops/lomiri/services/lomiri-history-service/update_schema.sh.in
index 3911c59ebe3a..358990b32410 100644
--- a/pkgs/desktops/lomiri/services/history-service/update_schema.sh.in
+++ b/pkgs/desktops/lomiri/services/lomiri-history-service/update_schema.sh.in
@@ -25,7 +25,7 @@ done
 # To output the schema
 echo ".fullschema" >> $MERGED_COMMANDS
 
-# The schemas may use functions that history-service defines in C which don't affect the generated schema in a meaningful way.
+# The schemas may use functions that lomiri-history-service defines in C which don't affect the generated schema in a meaningful way.
 # sqlite will return an error after processing queries with such function calls, so remove them.
 sed -i -e '/normalizeId(/d' $MERGED_COMMANDS
 
diff --git a/pkgs/desktops/lomiri/services/telephony-service/default.nix b/pkgs/desktops/lomiri/services/telephony-service/default.nix
index fc8e29dbfc8b..c7b3dbf27aeb 100644
--- a/pkgs/desktops/lomiri/services/telephony-service/default.nix
+++ b/pkgs/desktops/lomiri/services/telephony-service/default.nix
@@ -15,11 +15,11 @@
   gettext,
   glib,
   gnome-keyring,
-  history-service,
   libnotify,
   libphonenumber,
   libpulseaudio,
   libusermetrics,
+  lomiri-history-service,
   lomiri-url-dispatcher,
   makeWrapper,
   pkg-config,
@@ -111,11 +111,11 @@ stdenv.mkDerivation (finalAttrs: {
     dconf
     gettext
     glib
-    history-service
     libnotify
     libphonenumber
     libpulseaudio
     libusermetrics
+    lomiri-history-service
     lomiri-url-dispatcher
     protobuf
     (python3.withPackages (

From e85ae96d3983f46c78cffac3aa371c1352d2762b Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 11 Nov 2024 22:55:06 +0100
Subject: [PATCH 18/76] lomiri.suru-icon-theme: 2024.02.1 -> 2024.10.13

(cherry picked from commit dfcc70216ef4f6ac7a6eebd92365b52434749369)
---
 pkgs/desktops/lomiri/data/suru-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix b/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix
index 32b2cef1f021..7d589419f3d8 100644
--- a/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix
+++ b/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "suru-icon-theme";
-  version = "2024.02.1";
+  version = "2024.10.13";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/suru-icon-theme";
     rev = finalAttrs.version;
-    hash = "sha256-7T9FILhZrs5bbdBEV/FszCOwUd/C1Rl9tbDt77SIzRk=";
+    hash = "sha256-rbhfcjca0vMBa0tJWGpXMRGGygZH1hmdQv/nLJWPS7s=";
   };
 
   strictDeps = true;

From 3574f94a9dfedced779dea1af7df31fcdec8c88b Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 11 Nov 2024 22:56:08 +0100
Subject: [PATCH 19/76] lomiri.suru-icon-theme: Modernise

(cherry picked from commit 4e91715e6491eba057c5644e7efcd9dc0983f295)
---
 pkgs/desktops/lomiri/data/suru-icon-theme/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix b/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix
index 7d589419f3d8..0c26aa44dc36 100644
--- a/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix
+++ b/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix
@@ -47,12 +47,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     description = "Suru Icon Theme for Lomiri Operating Environment";
     homepage = "https://gitlab.com/ubports/development/core/suru-icon-theme";
     changelog = "https://gitlab.com/ubports/development/core/suru-icon-theme/-/blob/${finalAttrs.version}/ChangeLog";
-    license = licenses.cc-by-sa-30;
-    maintainers = teams.lomiri.members;
-    platforms = platforms.all;
+    license = lib.licenses.cc-by-sa-30;
+    maintainers = lib.teams.lomiri.members;
+    platforms = lib.platforms.all;
   };
 })

From 6da2870d5cb997dd4b360cba433c22f5c9dc1808 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 11 Nov 2024 22:56:22 +0100
Subject: [PATCH 20/76] lomiri.suru-icon-theme: nixfmt

(cherry picked from commit 72dd60d9cf0b92b33d4899adc0979594dcaf6345)
---
 .../lomiri/data/suru-icon-theme/default.nix   | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix b/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix
index 0c26aa44dc36..91be03cd1df8 100644
--- a/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix
+++ b/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix
@@ -1,10 +1,11 @@
-{ stdenvNoCC
-, lib
-, fetchFromGitLab
-, gitUpdater
-, gtk3
-, hicolor-icon-theme
-, ubuntu-themes
+{
+  stdenvNoCC,
+  lib,
+  fetchFromGitLab,
+  gitUpdater,
+  gtk3,
+  hicolor-icon-theme,
+  ubuntu-themes,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
@@ -25,9 +26,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     hicolor-icon-theme # theme setup hook
   ];
 
-  propagatedBuildInputs = [
-    ubuntu-themes
-  ];
+  propagatedBuildInputs = [ ubuntu-themes ];
 
   dontConfigure = true;
   dontBuild = true;

From 5abbce1f454fff4001e059a1d5418b5d4e2dc0a5 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 11 Nov 2024 23:15:54 +0100
Subject: [PATCH 21/76] lomiri.lomiri-clock-app: 4.0.4 -> 4.1.0

(cherry picked from commit 3e59945443b983a4ec39d2c95d52fdc19c7de4ee)
---
 .../applications/lomiri-clock-app/default.nix | 62 +------------------
 1 file changed, 2 insertions(+), 60 deletions(-)

diff --git a/pkgs/desktops/lomiri/applications/lomiri-clock-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-clock-app/default.nix
index b750184e7300..e219b16428bf 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-clock-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-clock-app/default.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  fetchpatch,
   gitUpdater,
   nixosTests,
   cmake,
@@ -27,72 +26,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-clock-app";
-  version = "4.0.4";
+  version = "4.1.0";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/apps/lomiri-clock-app";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-IWNLMYrebYQe5otNwZtRUs4YGPo/5OFic3Nh2pWxROs=";
+    hash = "sha256-bYnAdlpY2Ka08hrJOyqW8+VbCTOi0NNrW+8MHLF7+2E=";
   };
 
-  patches = [
-    # Fix GNUInstallDirs variables usage
-    # Remove when version > 4.0.4
-    (fetchpatch {
-      name = "0002-lomiri-clock-app-Fix-GNUInstallDirs-variable-concatenations-in-CMake.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-clock-app/-/commit/33c62d0382f69462de0567628d7a6ef162944e12.patch";
-      hash = "sha256-JEoRjc6RugtznNtgJsXz9wnAL/7fkoog40EVl7uu2pc=";
-    })
-
-    # Fix installation of splash icon
-    # Remove when version > 4.0.4
-    (fetchpatch {
-      name = "0003-lomiri-clock-app-Fix-splash-file-installation-in-non-clock-mode.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-clock-app/-/commit/97fd6fd91ee787dfe107bd36bc895f2ff234b5e3.patch";
-      hash = "sha256-g9eR6yYgKFDohuZMs1Ub0TwPM2AWbwWLDvZMrT4gMls=";
-    })
-
-    # Port from qmlscene to dedicated C++ entry, and apply abunch of fixes that this move enables
-    # Remove when https://gitlab.com/ubports/development/apps/lomiri-clock-app/-/merge_requests/217 merged & in release
-    (fetchpatch {
-      name = "0004-lomiri-clock-app-Migrate-to-C++-app.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-clock-app/-/commit/c690d65baf2d28f99364dec2244f8d4ebdb09178.patch";
-      hash = "sha256-JCQFlHFAXbgiSGNtEsq/khblhAD/3BdE68Qctn7j5T0=";
-    })
-    (fetchpatch {
-      name = "0005-lomiri-clock-app-Call-i18n.bindtextdomain-and-fix-app-icon-load.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-clock-app/-/commit/0619730ca639228b1c0a3403082a6a13e2fe3ff3.patch";
-      hash = "sha256-NQQYvJ141fU2iQ+xzYoNkuuzvqQg1BGZNGq24u8i1is=";
-    })
-    (fetchpatch {
-      name = "0006-lomiri-clock-app-Pass-through-project-version.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-clock-app/-/commit/ae1467fe44813eef2fc6cc4b9d6ddc02edee7640.patch";
-      hash = "sha256-E6yk5H+YVH4oSg6AIAJ+Rynu0HFkNomX7sTjM/x37PU=";
-    })
-    (fetchpatch {
-      name = "0007-lomiri-clock-app-Fix-tests-after-module-changes.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-clock-app/-/commit/40cbd7847c4a850184e553ac5b8981672b7deed0.patch";
-      hash = "sha256-AA4KRYZNBQ0/Nk65kyzzDFhs/zWO7fb5f2Toy1diPBg=";
-    })
-
-    # Don't ignore PATH when looking for qmltestrunner, saves us a patch for hardcoded fallback
-    # Remove when version > 4.0.4
-    (fetchpatch {
-      name = "0008-lomiri-clock-app-tests-Drop-NO_DEFAULT_PATH.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-clock-app/-/commit/190ef47e2efaaf139920d0556e0522f95479ea95.patch";
-      hash = "sha256-jy4E+VfVyRu99eGqbhlYi/xjDgPajozHPSlqEcGVOA4=";
-    })
-
-    # Make tests honour BUILD_TESTING
-    # Remove when https://gitlab.com/ubports/development/apps/lomiri-clock-app/-/merge_requests/219 merged & in release
-    (fetchpatch {
-      name = "0009-lomiri-clock-app-tests-Honour-BUILD_TESTING.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-clock-app/-/commit/b0ca583238f011e23a99286a1d2b61f2dcd85303.patch";
-      hash = "sha256-TyM5Y8BRAqinvZiZ5TEXd5caVesFluPi6iGmTS1wRlI=";
-    })
-  ];
-
   postPatch = ''
     # QT_IMPORTS_DIR returned by qmake -query is broken
     substituteInPlace CMakeLists.txt \

From e8ceba04c52133cac58986f35408d377be2bb7cb Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 17 Nov 2024 11:32:03 +0100
Subject: [PATCH 22/76] docs/dotnet.section.md: fix accidentally localized
 example output

(cherry picked from commit 54aee078915c9cd00c9b0b3db9c06563cafc6dfd)
---
 doc/languages-frameworks/dotnet.section.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/languages-frameworks/dotnet.section.md b/doc/languages-frameworks/dotnet.section.md
index d9e0cbe16351..3de2bafb5cf3 100644
--- a/doc/languages-frameworks/dotnet.section.md
+++ b/doc/languages-frameworks/dotnet.section.md
@@ -42,7 +42,7 @@ $ dotnet --info
  Version:   7.0.202
  Commit:    6c74320bc3
 
-Środowisko uruchomieniowe:
+Runtime Environment:
  OS Name:     nixos
  OS Version:  23.05
  OS Platform: Linux

From bf67c23dcc2b647b0bd836199671bc596ed943bd Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 17 Nov 2024 11:33:33 +0100
Subject: [PATCH 23/76] docs: remove references before 22.11

Stuff that has been in for many years doesn't need to be mentioned
explicitly anymore.

(cherry picked from commit 1dd9c32b18e884b087488076983237c07372b9f8)
---
 doc/languages-frameworks/texlive.section.md                    | 2 +-
 doc/packages/nginx.section.md                                  | 2 +-
 doc/packages/steam.section.md                                  | 1 -
 nixos/doc/manual/configuration/kubernetes.chapter.md           | 2 +-
 .../installation/installing-from-other-distro.section.md       | 3 +--
 nixos/modules/services/x11/desktop-managers/pantheon.md        | 2 +-
 6 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/doc/languages-frameworks/texlive.section.md b/doc/languages-frameworks/texlive.section.md
index 35fb0db9a444..a31a4357a22f 100644
--- a/doc/languages-frameworks/texlive.section.md
+++ b/doc/languages-frameworks/texlive.section.md
@@ -1,6 +1,6 @@
 # TeX Live {#sec-language-texlive}
 
-Since release 15.09 there is a new TeX Live packaging that lives entirely under attribute `texlive`.
+There is a TeX Live packaging that lives entirely under attribute `texlive`.
 
 ## User's guide (experimental new interface) {#sec-language-texlive-user-guide-experimental}
 
diff --git a/doc/packages/nginx.section.md b/doc/packages/nginx.section.md
index 41241304ceff..3c04c052cb6b 100644
--- a/doc/packages/nginx.section.md
+++ b/doc/packages/nginx.section.md
@@ -8,4 +8,4 @@ HTTP has a couple of different mechanisms for caching to prevent clients from ha
 
 Fortunately, HTTP supports an alternative (and more effective) caching mechanism: the [`ETag`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag) response header. The value of the `ETag` header specifies some identifier for the particular content that the server is sending (e.g., a hash). When a client makes a second request for the same resource, it sends that value back in an `If-None-Match` header. If the ETag value is unchanged, then the server does not need to resend the content.
 
-As of NixOS 19.09, the nginx package in Nixpkgs is patched such that when nginx serves a file out of `/nix/store`, the hash in the store path is used as the `ETag` header in the HTTP response, thus providing proper caching functionality. With NixOS 24.05 and later, the `ETag` additionally includes the response content length, to ensure files served with static compression do not share `ETag`s with their uncompressed version. This `ETag` functionality is enabled automatically; you do not need to do modify any configuration to get this behavior.
+The nginx package in Nixpkgs is patched such that when nginx serves a file out of `/nix/store`, the hash in the store path is used as the `ETag` header in the HTTP response, thus providing proper caching functionality. With NixOS 24.05 and later, the `ETag` additionally includes the response content length, to ensure files served with static compression do not share `ETag`s with their uncompressed version. This `ETag` functionality is enabled automatically; you do not need to do modify any configuration to get this behavior.
diff --git a/doc/packages/steam.section.md b/doc/packages/steam.section.md
index 4c87eeb81836..0762b90c896a 100644
--- a/doc/packages/steam.section.md
+++ b/doc/packages/steam.section.md
@@ -31,7 +31,6 @@ Use `programs.steam.enable = true;` if you want to add steam to `systemPackages`
 
 - **Using the FOSS Radeon or nouveau (nvidia) drivers**
 
-  - The `newStdcpp` parameter was removed since NixOS 17.09 and should not be needed anymore.
   - Steam ships statically linked with a version of `libcrypto` that conflicts with the one dynamically loaded by radeonsi_dri.so. If you get the error:
 
     ```
diff --git a/nixos/doc/manual/configuration/kubernetes.chapter.md b/nixos/doc/manual/configuration/kubernetes.chapter.md
index fba40b648752..e9855af19add 100644
--- a/nixos/doc/manual/configuration/kubernetes.chapter.md
+++ b/nixos/doc/manual/configuration/kubernetes.chapter.md
@@ -52,7 +52,7 @@ and [](#opt-services.kubernetes.easyCerts)
 to true. This sets up flannel as CNI and activates automatic PKI bootstrapping.
 
 ::: {.note}
-As of NixOS 19.03, it is mandatory to configure:
+It is mandatory to configure:
 [](#opt-services.kubernetes.masterAddress).
 The masterAddress must be resolveable and routeable by all cluster nodes.
 In single node clusters, this can be set to `localhost`.
diff --git a/nixos/doc/manual/installation/installing-from-other-distro.section.md b/nixos/doc/manual/installation/installing-from-other-distro.section.md
index 2d9818e6805c..3608cd7716fc 100644
--- a/nixos/doc/manual/installation/installing-from-other-distro.section.md
+++ b/nixos/doc/manual/installation/installing-from-other-distro.section.md
@@ -206,8 +206,7 @@ The first steps to all these are the same:
         line)
 
     ::: {.note}
-    Support for `NIXOS_LUSTRATE` was added in NixOS 16.09. The act of
-    "lustrating" refers to the wiping of the existing distribution.
+    The act of "lustrating" refers to the wiping of the existing distribution.
     Creating `/etc/NIXOS_LUSTRATE` can also be used on NixOS to remove
     all mutable files from your root partition (anything that's not in
     `/nix` or `/boot` gets "lustrated" on the next boot.
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.md b/nixos/modules/services/x11/desktop-managers/pantheon.md
index ce251ec2d394..c964321d4814 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.md
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.md
@@ -74,7 +74,7 @@ this could be most useful for testing a particular plug-in in isolation.
   : This is a known [issue](https://github.com/NixOS/nixpkgs/issues/64611) and there is no known workaround.
 
 [Does AppCenter work, or is it available?]{#sec-pantheon-faq-appcenter}
-  : AppCenter has been available since 20.03. Starting from 21.11, the Flatpak backend should work so you can install some Flatpak applications using it. However, due to missing appstream metadata, the Packagekit backend does not function currently. See this [issue](https://github.com/NixOS/nixpkgs/issues/15932).
+  : AppCenter is available and the Flatpak backend should work so you can install some Flatpak applications using it. However, due to missing appstream metadata, the Packagekit backend does not function currently. See this [issue](https://github.com/NixOS/nixpkgs/issues/15932).
 
     If you are using Pantheon, AppCenter should be installed by default if you have [Flatpak support](#module-services-flatpak) enabled. If you also wish to add the `appcenter` Flatpak remote:
 

From 569c78e8e0b7c20a64f71db6458846e0fa1b3ec9 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 17 Nov 2024 13:06:11 +0100
Subject: [PATCH 24/76] nixos/yabar: remove reference to nixos 18.03

No need to mention that anymore - it's just a fact by now.

(cherry picked from commit 7076d32d233e3d05195509f9ec61abed422f637b)
---
 nixos/modules/programs/yabar.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/yabar.nix b/nixos/modules/programs/yabar.nix
index ee8370b56914..e7168f85f41e 100644
--- a/nixos/modules/programs/yabar.nix
+++ b/nixos/modules/programs/yabar.nix
@@ -64,8 +64,8 @@ in
         description = ''
           The package which contains the `yabar` binary.
 
-          Nixpkgs provides the `yabar` and `yabar-unstable`
-          derivations since 18.03, so it's possible to choose.
+          Nixpkgs provides the `yabar` and `yabar-unstable`,
+          so it's possible to choose.
         '';
       };
 

From 23669eccf2d553d985b206ffb195ab6bff321d77 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Mon, 21 Oct 2024 10:25:50 +0800
Subject: [PATCH 25/76] rl-2411.section.md: update to inform the removal of
 (buildPythonPackage { ... }).overrideDerivation

Clean up the leftover of commit 58bfe7412308 ("buildPython*:
Deprecate and remove (buildPython* { ... }).override")

(cherry picked from commit b4e9f423f494dce9f506916cea13c885ae92e595)
---
 nixos/doc/manual/release-notes/rl-2411.section.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 6fce4f2a04dc..0256e07ca436 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -213,8 +213,9 @@
 
 - The NVIDIA driver no longer defaults to the proprietary kernel module with versions >= 560. You will need to manually set `hardware.nvidia.open` to select the proprietary or open modules.
 
-- The `(buildPythonPackage { ... }).override` attribute is now deprecated and removed in favour of `overridePythonAttrs`.
+- The `(buildPythonPackage { ... }).override` and `(buildPythonPackage { ... }).overrideDerivation` attributes is now deprecated and removed in favour of `overridePythonAttrs` and `lib.overrideDerivation`.
   This change does not affect the override interface of most Python packages, as [`<pkg>.override`](https://nixos.org/manual/nixpkgs/unstable/#sec-pkg-override) provided by `callPackage` shadows such a locally-defined `override` attribute.
+  The `<pkg>.overrideDerivation` attribute of Python packages called with `callPackage` will also remain available after this change.
 
 - All Cinnamon and XApp packages have been moved to top-level (i.e., `cinnamon.nemo` is now `nemo`).
 

From 5e26356aa33af2ae726bdc9ebd4a60c5119943ff Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Mon, 21 Oct 2024 10:15:20 +0800
Subject: [PATCH 26/76] python3Packages.pythonCatchConflictsHook: fix tests
 with lib.overrideDerivation

Use lib.overrideDerivation instead of <pkg>.overrideDerivation
to fix the evaluation of
python3Packages.pythonCatchConflictsHook.tests.catches-conflict-multiple-chains,
as buildPythonPackage and buildPythonApplication no longer provide
<pkg>.overrideDerivation

Clean up the leftover of commit 58bfe7412308 ("buildPython*:
Deprecate and remove (buildPython* { ... }).override")

(cherry picked from commit 3e8d53b9e8eebdbe1a33e9e8e76522ca3e2aa07e)
---
 pkgs/development/interpreters/python/hooks/default.nix        | 1 +
 .../python/hooks/python-catch-conflicts-hook-tests.nix        | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix
index ca70d452c808..b4f7ca9cd837 100644
--- a/pkgs/development/interpreters/python/hooks/default.nix
+++ b/pkgs/development/interpreters/python/hooks/default.nix
@@ -122,6 +122,7 @@ in {
       };
       passthru.tests = import ./python-catch-conflicts-hook-tests.nix {
         inherit pythonOnBuildForHost runCommand;
+        inherit lib;
         inherit (pkgs) coreutils gnugrep writeShellScript;
       };
     } ./python-catch-conflicts-hook.sh) {};
diff --git a/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook-tests.nix b/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook-tests.nix
index 3890df40cb74..2a77ef015015 100644
--- a/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook-tests.nix
+++ b/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook-tests.nix
@@ -1,4 +1,4 @@
-{ pythonOnBuildForHost, runCommand, writeShellScript, coreutils, gnugrep }: let
+{ lib, pythonOnBuildForHost, runCommand, writeShellScript, coreutils, gnugrep }: let
 
   pythonPkgs = pythonOnBuildForHost.pkgs;
 
@@ -38,7 +38,7 @@
   );
 
   # in order to test for a failing build, wrap it in a shell script
-  expectFailure = build: errorMsg: build.overrideDerivation (old: {
+  expectFailure = build: errorMsg: lib.overrideDerivation build (old: {
     builder = writeShellScript "test-for-failure" ''
       export PATH=${coreutils}/bin:${gnugrep}/bin:$PATH
       ${old.builder} "$@" > ./log 2>&1

From ba7101ffe856f58b79d1bc2c45f68d28e2f51b68 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Tue, 22 Oct 2024 14:25:51 +0800
Subject: [PATCH 27/76] python3Packages.scikit-image: fix tests with
 overridePythonAttrs

buildPythonPackage no longer provide local .override attribute. Use
overridePythonAttrs instead.

(cherry picked from commit 38e77220352ec445632cc862fd8987cbefa75225)
---
 pkgs/development/python-modules/scikit-image/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix
index b04e02faa6e3..93738259f2f8 100644
--- a/pkgs/development/python-modules/scikit-image/default.nix
+++ b/pkgs/development/python-modules/scikit-image/default.nix
@@ -157,7 +157,7 @@ let
     ];
 
     passthru.tests = {
-      all-tests = self.override { doCheck = true; };
+      all-tests = self.overridePythonAttrs { doCheck = true; };
     };
 
     meta = {

From e6a93104a2f39c14d55d45cf165a4c55f5d889d1 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Fri, 8 Nov 2024 00:59:50 +0900
Subject: [PATCH 28/76] ansible_2_15: drop

Ansible 2.15 goes end of life in 2024/11 and can't be supported
throughout the 24.11 release cycle

(cherry picked from commit 132b5f592df2a16609270eb53153f86de630641e)
---
 pkgs/top-level/aliases.nix      | 1 +
 pkgs/top-level/all-packages.nix | 8 --------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8aa39ce54983..11657e558110 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -104,6 +104,7 @@ mapAliases {
   alsaUtils = throw "'alsaUtils' has been renamed to/replaced by 'alsa-utils'"; # Converted to throw 2024-10-17
   angelfish = throw "'angelfish' has been renamed to/replaced by 'libsForQt5.kdeGear.angelfish'"; # Converted to throw 2024-10-17
   ansible_2_14 = throw "Ansible 2.14 goes end of life in 2024/05 and can't be supported throughout the 24.05 release cycle"; # Added 2024-04-11
+  ansible_2_15 = throw "Ansible 2.15 goes end of life in 2024/11 and can't be supported throughout the 24.11 release cycle"; # Added 2024-11-08
   antennas = throw "antennas has been removed as it only works with tvheadend, which nobody was willing to maintain and was stuck on an unmaintained version that required FFmpeg 4; please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version"; # Added 2024-08-21
   androidndkPkgs_23b = lib.warn "The package set `androidndkPkgs_23b` has been renamed to `androidndkPkgs_23`." androidndkPkgs_23; # Added 2024-07-21
   ankisyncd = throw "ankisyncd is dead, use anki-sync-server instead"; # Added 2024-08-10
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7eec404e3f39..9d5a72dc241c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7855,14 +7855,6 @@ with pkgs;
       hash = "sha256-WeSqQO1azbTvm789BYkY//k/ZqFJNz2BWciilgRBC9o=";
     };
   }));
-  ansible_2_15 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
-    version = "2.15.9";
-    src = oldAttrs.src.override {
-      inherit version;
-      pname = "ansible-core";
-      hash = "sha256-JfmxtaWvPAmGvTko7QhurduGdSf7XIOv7xoDz60080U=";
-    };
-  }));
 
   ansible-builder = with python3Packages; toPythonApplication ansible-builder;
 

From 661acb8d3427a7a2cc8067baa527aaec691f9ae3 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Fri, 8 Nov 2024 01:04:06 +0900
Subject: [PATCH 29/76] python312Packages.ansible-core: 2.17.5 -> 2.17.6

Diff: https://github.com/ansible/ansible/compare/v2.17.5...v2.17.6
Changelog: https://github.com/ansible/ansible/releases/tag/v2.17.6
(cherry picked from commit 70266f1d0be27ee4f2feeb63b041aaf3d42b7147)
---
 pkgs/development/python-modules/ansible/core.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix
index 42b60a1b59f3..0061a8e4144f 100644
--- a/pkgs/development/python-modules/ansible/core.nix
+++ b/pkgs/development/python-modules/ansible/core.nix
@@ -5,6 +5,7 @@
   pythonOlder,
   installShellFiles,
   docutils,
+  setuptools,
   ansible,
   cryptography,
   importlib-resources,
@@ -30,12 +31,13 @@
 
 buildPythonPackage rec {
   pname = "ansible-core";
-  version = "2.17.5";
+  version = "2.17.6";
+  pyproject = true;
 
   src = fetchPypi {
     pname = "ansible_core";
     inherit version;
-    hash = "sha256-rn9R/RPcnVfJvNQ+8j+cJVyo8Y9LXAARpPm3JNksWo4=";
+    hash = "sha256-PlOXC3zr/irbObcRweL4u/y+2sgo2lHcA1ehkHBjjpU=";
   };
 
   # ansible_connection is already wrapped, so don't pass it through
@@ -53,7 +55,9 @@ buildPythonPackage rec {
     docutils
   ];
 
-  propagatedBuildInputs =
+  build-system = [ setuptools ];
+
+  dependencies =
     [
       # depend on ansible instead of the other way around
       ansible

From f46acb4670bbdddd8cb7418a189b4ac940139a33 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Mon, 18 Nov 2024 07:37:49 +0000
Subject: [PATCH 30/76] python312Packages.magic-wormhole-mailbox-server: 0.4.1
 -> 0.5.1

https://github.com/magic-wormhole/magic-wormhole-mailbox-server/compare/refs/tags/0.4.1...refs/tags/0.5.1
https://github.com/magic-wormhole/magic-wormhole-mailbox-server/blob/0.5.1/NEWS.md

Python 3.12 is now supported

(cherry picked from commit 0afba0d517208e36cdef92eddbd4f24056bd72ea)
---
 .../magic-wormhole-mailbox-server.nix         |  2 +-
 .../magic-wormhole-mailbox-server/default.nix | 22 ++-------------
 .../python-modules/magic-wormhole/default.nix | 28 ++-----------------
 3 files changed, 6 insertions(+), 46 deletions(-)

diff --git a/nixos/modules/services/networking/magic-wormhole-mailbox-server.nix b/nixos/modules/services/networking/magic-wormhole-mailbox-server.nix
index 5b700269037c..f2bb40bae31e 100644
--- a/nixos/modules/services/networking/magic-wormhole-mailbox-server.nix
+++ b/nixos/modules/services/networking/magic-wormhole-mailbox-server.nix
@@ -9,7 +9,7 @@ let
   cfg = config.services.magic-wormhole-mailbox-server;
   # keep semicolon in dataDir for backward compatibility
   dataDir = "/var/lib/magic-wormhole-mailbox-server;";
-  python = pkgs.python311.withPackages (
+  python = pkgs.python3.withPackages (
     py: with py; [
       magic-wormhole-mailbox-server
       twisted
diff --git a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix
index d98cfa259579..8ee9ab16ef3d 100644
--- a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix
+++ b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix
@@ -3,46 +3,31 @@
   stdenv,
   buildPythonPackage,
   fetchPypi,
-  fetchpatch,
   setuptools,
-  six,
   attrs,
   twisted,
   autobahn,
   treq,
-  mock,
   nixosTests,
-  pythonOlder,
-  pythonAtLeast,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "magic-wormhole-mailbox-server";
-  version = "0.4.1";
+  version = "0.5.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-GvEFkpCcqvUZwA5wbqyELF53+NQ1YhX+nGHHsiWKiPs=";
+    hash = "sha256-oAegNnIpMgRldoHb9QIEXW1YF8V/mq4vIibm6hoAjKE=";
   };
 
-  patches = [
-    (fetchpatch {
-      # Remove the 'U' open mode removed, https://github.com/magic-wormhole/magic-wormhole-mailbox-server/pull/34
-      name = "fix-for-python-3.11.patch";
-      url = "https://github.com/magic-wormhole/magic-wormhole-mailbox-server/commit/4b358859ba80de37c3dc0a5f67ec36909fd48234.patch";
-      hash = "sha256-RzZ5kD+xhmFYusVzAbGE+CODXtJVR1zN2rZ+VGApXiQ=";
-    })
-  ];
-
   build-system = [ setuptools ];
 
   dependencies = [
     attrs
     autobahn
     setuptools # pkg_resources is referenced at runtime
-    six
     twisted
   ] ++ autobahn.optional-dependencies.twisted ++ twisted.optional-dependencies.tls;
 
@@ -51,7 +36,6 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     treq
-    mock
   ];
 
   disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
@@ -69,7 +53,5 @@ buildPythonPackage rec {
     changelog = "https://github.com/magic-wormhole/magic-wormhole-mailbox-server/blob/${version}/NEWS.md";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.mjoerg ];
-    # Python 3.12 support: https://github.com/magic-wormhole/magic-wormhole-mailbox-server/issues/41
-    broken = pythonOlder "3.7" || pythonAtLeast "3.12";
   };
 }
diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix
index 87404ab5b21e..f85cfd295954 100644
--- a/pkgs/development/python-modules/magic-wormhole/default.nix
+++ b/pkgs/development/python-modules/magic-wormhole/default.nix
@@ -28,7 +28,6 @@
   # tests
   nettools,
   unixtools,
-  mock,
   magic-wormhole-transit-relay,
   magic-wormhole-mailbox-server,
   pytestCheckHook,
@@ -81,16 +80,9 @@ buildPythonPackage rec {
   };
 
   nativeCheckInputs =
-    # For Python 3.12, remove magic-wormhole-mailbox-server and magic-wormhole-transit-relay from test dependencies,
-    # which are not yet supported with this version.
-    lib.optionals
-      (!magic-wormhole-mailbox-server.meta.broken && !magic-wormhole-transit-relay.meta.broken)
-      [
-        magic-wormhole-mailbox-server
-        magic-wormhole-transit-relay
-      ]
-    ++ [
-      mock
+    [
+      magic-wormhole-mailbox-server
+      magic-wormhole-transit-relay
       pytestCheckHook
     ]
     ++ optional-dependencies.dilation
@@ -98,20 +90,6 @@ buildPythonPackage rec {
 
   __darwinAllowLocalNetworking = true;
 
-  disabledTestPaths =
-    # For Python 3.12, remove the tests depending on magic-wormhole-mailbox-server and magic-wormhole-transit-relay,
-    # which are not yet supported with this version.
-    lib.optionals
-      (magic-wormhole-mailbox-server.meta.broken || magic-wormhole-transit-relay.meta.broken)
-      [
-        "src/wormhole/test/dilate/test_full.py"
-        "src/wormhole/test/test_args.py"
-        "src/wormhole/test/test_cli.py"
-        "src/wormhole/test/test_transit.py"
-        "src/wormhole/test/test_wormhole.py"
-        "src/wormhole/test/test_xfer_util.py"
-      ];
-
   postInstall = ''
     install -Dm644 docs/wormhole.1 $out/share/man/man1/wormhole.1
   '';

From e840d574ea4e25c5bc827a22d83d1d7b9b84e5c7 Mon Sep 17 00:00:00 2001
From: Marcus Ramberg <marcus@means.no>
Date: Tue, 19 Nov 2024 08:40:46 +0100
Subject: [PATCH 31/76] gh-dash: 4.7.1 -> 4.7.3

Signed-off-by: Marcus Ramberg <marcus@means.no>
(cherry picked from commit 91012254f9fc5dd23353f759def3559bf23055eb)
---
 pkgs/by-name/gh/gh-dash/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gh/gh-dash/package.nix b/pkgs/by-name/gh/gh-dash/package.nix
index 281cbe0c2c36..c02f3b127414 100644
--- a/pkgs/by-name/gh/gh-dash/package.nix
+++ b/pkgs/by-name/gh/gh-dash/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "gh-dash";
-  version = "4.7.1";
+  version = "4.7.3";
 
   src = fetchFromGitHub {
     owner = "dlvhdr";
     repo = "gh-dash";
     rev = "v${version}";
-    hash = "sha256-q/p7WDbJU27+m/4HVQJ7zRo0r1A0FkV21gJqHJYHHBE=";
+    hash = "sha256-QDqGsVgY3Je1VgQVobDhNkVjrCyvMNEdghXc0ny+yyo=";
   };
 
   vendorHash = "sha256-lqmz+6Cr9U5IBoJ5OeSN6HKY/nKSAmszfvifzbxG7NE=";

From 9308c5efcfeee9c589e1a15b496136468bbf540b Mon Sep 17 00:00:00 2001
From: Jordan Williams <jordan@jwillikers.com>
Date: Fri, 8 Nov 2024 08:07:35 -0600
Subject: [PATCH 32/76] cbconvert: 1.0.4 -> 1.1.0

(cherry picked from commit 45599a3be468204c76bd10751abd067bce4dbd0e)
---
 pkgs/by-name/cb/cbconvert/gui.nix     | 27 ++++++++++++++----------
 pkgs/by-name/cb/cbconvert/package.nix | 30 +++------------------------
 2 files changed, 19 insertions(+), 38 deletions(-)

diff --git a/pkgs/by-name/cb/cbconvert/gui.nix b/pkgs/by-name/cb/cbconvert/gui.nix
index a5721401d31e..8c0c0fba4039 100644
--- a/pkgs/by-name/cb/cbconvert/gui.nix
+++ b/pkgs/by-name/cb/cbconvert/gui.nix
@@ -1,7 +1,10 @@
 {
   buildGoModule,
   cbconvert,
+  cbconvert-gui,
   gtk3,
+  pkg-config,
+  testers,
   wrapGAppsHook3,
 }:
 
@@ -10,18 +13,18 @@ buildGoModule rec {
 
   inherit (cbconvert)
     patches
-    proxyVendor
     src
     tags
     version
     ;
 
-  nativeBuildInputs = cbconvert.nativeBuildInputs ++ [
+  nativeBuildInputs = [
+    pkg-config
     wrapGAppsHook3
   ];
   buildInputs = cbconvert.buildInputs ++ [ gtk3 ];
 
-  vendorHash = "sha256-vvCvKecPszhNCQdgm3mQMb5+486BGZ9sz3R0b70eLeQ=";
+  vendorHash = "sha256-oMW5zfAw2VQSVaB+Z1pE51OtNIFr+PnRMM+oBYNLWxk=";
   modRoot = "cmd/cbconvert-gui";
 
   ldflags = [
@@ -31,16 +34,18 @@ buildGoModule rec {
   ];
 
   postInstall = ''
-    install -D --mode=0644 --target-directory=$out/share/applications/ dist/linux/cbconvert.desktop
-    install -D --mode=0644 --target-directory=$out/icons/hicolor/256x256/apps dist/linux/cbconvert.png
-    install -D --mode=0644 --target-directory=$out/share/thumbnailers dist/linux/cbconvert.thumbnailer
-    install -D --mode=0644 dist/linux/flatpak/io.github.gen2brain.cbconvert.metainfo.xml $out/share/metainfo/cbconvert.metainfo.xml
+    install -D --mode=0644 --target-directory=$out/icons/hicolor/256x256/apps dist/linux/io.github.gen2brain.cbconvert.png
+    install -D --mode=0644 --target-directory=$out/share/applications/ dist/linux/io.github.gen2brain.cbconvert.desktop
+    install -D --mode=0644 --target-directory=$out/share/metainfo dist/linux/io.github.gen2brain.cbconvert.metainfo.xml
+    install -D --mode=0644 --target-directory=$out/share/thumbnailers dist/linux/io.github.gen2brain.cbconvert.thumbnailer
   '';
 
-  postFixup = ''
-    substituteInPlace $out/share/metainfo/cbconvert.metainfo.xml \
-      --replace-fail "io.github.gen2brain.cbconvert" "cbconvert"
-  '';
+  passthru = {
+    tests.version = testers.testVersion {
+      package = cbconvert-gui;
+      command = "cbconvert-gui version";
+    };
+  };
 
   meta = cbconvert.meta // {
     mainProgram = "cbconvert-gui";
diff --git a/pkgs/by-name/cb/cbconvert/package.nix b/pkgs/by-name/cb/cbconvert/package.nix
index 9ab25d493c07..43af077e79c2 100644
--- a/pkgs/by-name/cb/cbconvert/package.nix
+++ b/pkgs/by-name/cb/cbconvert/package.nix
@@ -4,47 +4,28 @@
   callPackage,
   cbconvert,
   fetchFromGitHub,
-  fetchpatch2,
-  imagemagick,
   lib,
   libunarr,
   mupdf-headless,
   nix-update-script,
-  pkg-config,
   testers,
   zlib,
 }:
 
 buildGoModule rec {
   pname = "cbconvert";
-  version = "1.0.4";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "gen2brain";
     repo = "cbconvert";
     rev = "v${version}";
-    hash = "sha256-9x7RXyiQoV2nIVFnG1XHcYfTQiMZ88Ck7uuY7NLK8CA=";
+    hash = "sha256-C2Eox6fpKS0fPB7KFgBn62HKbWYacSVMJK0CkT6+FBU=";
   };
 
-  # Update dependencies in order to use the extlib tag.
-  patches = [
-    (fetchpatch2 {
-      name = "update-dependencies-1.patch";
-      url = "https://github.com/gen2brain/cbconvert/commit/1a36ec17b2c012f278492d60d469b8e8457a6110.patch";
-      hash = "sha256-E+HWYPz9FtU3JAktzIRflF/pHdLfoaciBmjb7UOQYLo=";
-    })
-    (fetchpatch2 {
-      name = "update-dependencies-2.patch";
-      url = "https://github.com/gen2brain/cbconvert/commit/74c5de699413e95133f97666b64a1866f88fedd5.patch";
-      hash = "sha256-rrJsYJHcfNWF90vwUAT3J/gqg22e1gk6I48LsTrYbmU=";
-    })
-  ];
-
-  vendorHash = "sha256-aVInsWvygNH+/h7uQs4hAPOO2gsSkBx+tI+TK77M/hg=";
+  vendorHash = "sha256-uV8aIUKy9HQdZvR3k8CTTrHsh9TyBw21gFTdjR1XJlg=";
   modRoot = "cmd/cbconvert";
 
-  proxyVendor = true;
-
   # The extlib tag forces the github.com/gen2brain/go-unarr module to use external libraries instead of bundled ones.
   tags = [ "extlib" ];
 
@@ -54,13 +35,8 @@ buildGoModule rec {
     "-X main.appVersion=${version}"
   ];
 
-  nativeBuildInputs = [
-    pkg-config
-  ];
-
   buildInputs = [
     bzip2
-    imagemagick
     libunarr
     mupdf-headless
     zlib

From 4b8ad4e2d95e2d3424f4ab4f05e7de44fe0de595 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 Nov 2024 06:59:38 +0000
Subject: [PATCH 33/76] trivy: 0.57.0 -> 0.57.1

(cherry picked from commit b2d20baecb525a423db7ecefb287b9f515a9a68e)
---
 pkgs/by-name/tr/trivy/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tr/trivy/package.nix b/pkgs/by-name/tr/trivy/package.nix
index ac34affce1c8..e4aa3377dcdf 100644
--- a/pkgs/by-name/tr/trivy/package.nix
+++ b/pkgs/by-name/tr/trivy/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "trivy";
-  version = "0.57.0";
+  version = "0.57.1";
 
   src = fetchFromGitHub {
     owner = "aquasecurity";
     repo = "trivy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-al8hxVNyDoGQaoqa0fmA7Bn7M1twwlS4I5+XZnETXyc=";
+    hash = "sha256-ivxMH/oyLBGIDNraSAPFcD78S1AJ5O8OvLb2UYwZnAc=";
   };
 
   # Hash mismatch on across Linux and Darwin

From 9ae06ce8df8dbc630e848b44bddf90e209229c68 Mon Sep 17 00:00:00 2001
From: Sofi <sofi+git@mailbox.org>
Date: Sat, 28 Sep 2024 01:23:02 +0200
Subject: [PATCH 34/76] easyeffects: fix bug 'missing spectrum analyzer'

Due to old version of lsp-plugins in nixpkgs, the delay plugin is
incorrectly inserting silence in the plugin output instead of the
processed audio. This has been fixed in lsp-plugins 1.2.17 but is not
in nixpkgs yet.

(cherry picked from commit c2df671cfc78d21b7c8d3212a6c14ea4dda755ea)
---
 ...l-request-3340-from-violetmage-viole.patch | 229 ++++++++++++++++++
 pkgs/by-name/ea/easyeffects/package.nix       |   5 +
 2 files changed, 234 insertions(+)
 create mode 100644 pkgs/by-name/ea/easyeffects/0001-Revert-Merge-pull-request-3340-from-violetmage-viole.patch

diff --git a/pkgs/by-name/ea/easyeffects/0001-Revert-Merge-pull-request-3340-from-violetmage-viole.patch b/pkgs/by-name/ea/easyeffects/0001-Revert-Merge-pull-request-3340-from-violetmage-viole.patch
new file mode 100644
index 000000000000..e67e1bcf2c19
--- /dev/null
+++ b/pkgs/by-name/ea/easyeffects/0001-Revert-Merge-pull-request-3340-from-violetmage-viole.patch
@@ -0,0 +1,229 @@
+From a2f524ffe163e1a15dc8a4b6f21964092ec8e0a7 Mon Sep 17 00:00:00 2001
+From: Sofi <sofi+git@mailbox.org>
+Date: Sat, 28 Sep 2024 00:31:11 +0200
+Subject: [PATCH] Revert "Merge pull request #3340 from
+ violetmage/violetmage-spectrum-avsync"
+
+This reverts commit d40ff638e2f0db00579e1f30a9880b7d35f137fd, reversing
+changes made to ee0fe4a8da57ef84a39600ad02280ddc98d9de31.
+---
+ ...thub.wwmm.easyeffects.spectrum.gschema.xml |  5 --
+ data/ui/preferences_spectrum.ui               | 21 -----
+ include/spectrum.hpp                          |  5 --
+ src/preferences_spectrum.cpp                  |  7 +-
+ src/spectrum.cpp                              | 86 +++----------------
+ 5 files changed, 14 insertions(+), 110 deletions(-)
+
+diff --git a/data/schemas/com.github.wwmm.easyeffects.spectrum.gschema.xml b/data/schemas/com.github.wwmm.easyeffects.spectrum.gschema.xml
+index 340da382e..1260810f3 100644
+--- a/data/schemas/com.github.wwmm.easyeffects.spectrum.gschema.xml
++++ b/data/schemas/com.github.wwmm.easyeffects.spectrum.gschema.xml
+@@ -49,10 +49,5 @@
+             <range min="120" max="22000" />
+             <default>20000</default>
+         </key>
+-
+-        <key name="avsync-delay" type="i">
+-            <range min="0" max="1000" />
+-            <default>0</default>
+-        </key>
+     </schema>
+ </schemalist>
+\ No newline at end of file
+diff --git a/data/ui/preferences_spectrum.ui b/data/ui/preferences_spectrum.ui
+index 2eae7b8ab..97535d518 100644
+--- a/data/ui/preferences_spectrum.ui
++++ b/data/ui/preferences_spectrum.ui
+@@ -18,27 +18,6 @@
+                         </child>
+                     </object>
+                 </child>
+-
+-                <child>
+-                    <object class="AdwActionRow">
+-                        <property name="title" translatable="yes">Compensating Delay (ms)</property>
+-
+-                        <child>
+-                            <object class="GtkSpinButton" id="avsync_delay">
+-                                <property name="valign">center</property>
+-                                <property name="digits">0</property>
+-                                <property name="adjustment">
+-                                    <object class="GtkAdjustment">
+-                                        <property name="lower">0</property>
+-                                        <property name="upper">1000</property>
+-                                        <property name="step-increment">1</property>
+-                                        <property name="page-increment">10</property>
+-                                    </object>
+-                                </property>
+-                            </object>
+-                        </child>
+-                    </object>
+-                </child>
+             </object>
+         </child>
+ 
+diff --git a/include/spectrum.hpp b/include/spectrum.hpp
+index 546ceec59..af49dd9e5 100644
+--- a/include/spectrum.hpp
++++ b/include/spectrum.hpp
+@@ -65,11 +65,6 @@ class Spectrum : public PluginBase {
+ 
+   std::array<float, n_bands> real_input;
+   std::array<double, n_bands / 2U + 1U> output;
+-  
+-  std::vector<float> left_delayed_vector;
+-  std::vector<float> right_delayed_vector;
+-  std::span<float> left_delayed;
+-  std::span<float> right_delayed;
+ 
+   std::array<float, n_bands> latest_samples_mono;
+ 
+diff --git a/src/preferences_spectrum.cpp b/src/preferences_spectrum.cpp
+index 2902a8ee4..151960bef 100644
+--- a/src/preferences_spectrum.cpp
++++ b/src/preferences_spectrum.cpp
+@@ -49,7 +49,7 @@ struct _PreferencesSpectrum {
+ 
+   GtkDropDown* type;
+ 
+-  GtkSpinButton *n_points, *height, *line_width, *minimum_frequency, *maximum_frequency, *avsync_delay;
++  GtkSpinButton *n_points, *height, *line_width, *minimum_frequency, *maximum_frequency;
+ 
+   GSettings* settings;
+ 
+@@ -119,7 +119,6 @@ void preferences_spectrum_class_init(PreferencesSpectrumClass* klass) {
+   gtk_widget_class_bind_template_child(widget_class, PreferencesSpectrum, axis_color_button);
+   gtk_widget_class_bind_template_child(widget_class, PreferencesSpectrum, minimum_frequency);
+   gtk_widget_class_bind_template_child(widget_class, PreferencesSpectrum, maximum_frequency);
+-  gtk_widget_class_bind_template_child(widget_class, PreferencesSpectrum, avsync_delay);
+ 
+   gtk_widget_class_bind_template_callback(widget_class, on_spectrum_color_set);
+   gtk_widget_class_bind_template_callback(widget_class, on_spectrum_axis_color_set);
+@@ -193,9 +192,9 @@ void preferences_spectrum_init(PreferencesSpectrum* self) {
+   // spectrum section gsettings bindings
+ 
+   gsettings_bind_widgets<"show", "fill", "rounded-corners", "show-bar-border", "dynamic-y-scale", "n-points", "height",
+-                         "line-width", "minimum-frequency", "maximum-frequency", "avsync-delay">(
++                         "line-width", "minimum-frequency", "maximum-frequency">(
+       self->settings, self->show, self->fill, self->rounded_corners, self->show_bar_border, self->dynamic_y_scale,
+-      self->n_points, self->height, self->line_width, self->minimum_frequency, self->maximum_frequency, self->avsync_delay);
++      self->n_points, self->height, self->line_width, self->minimum_frequency, self->maximum_frequency);
+ 
+   ui::gsettings_bind_enum_to_combo_widget(self->settings, "type", self->type);
+ 
+diff --git a/src/spectrum.cpp b/src/spectrum.cpp
+index 28f7ff4da..1075a358f 100644
+--- a/src/spectrum.cpp
++++ b/src/spectrum.cpp
+@@ -55,30 +55,6 @@ Spectrum::Spectrum(const std::string& tag,
+ 
+   plan = fftwf_plan_dft_r2c_1d(static_cast<int>(n_bands), real_input.data(), complex_output, FFTW_ESTIMATE);
+ 
+-
+-
+-  lv2_wrapper = std::make_unique<lv2::Lv2Wrapper>("http://lsp-plug.in/plugins/lv2/comp_delay_x2_stereo");
+-
+-  package_installed = lv2_wrapper->found_plugin;
+-
+-  if (!package_installed) {
+-    util::debug(log_tag + "http://lsp-plug.in/plugins/lv2/comp_delay_x2_stereo is not installed, spectrum will not have A/V sync compensation");
+-  }
+-
+-  lv2_wrapper->set_control_port_value("mode_l", 2);
+-  lv2_wrapper->set_control_port_value("mode_r", 2);
+-
+-  lv2_wrapper->set_control_port_value("dry_l", 0.0F);
+-  lv2_wrapper->set_control_port_value("dry_r", 0.0F);
+-
+-  lv2_wrapper->set_control_port_value("wet_l", static_cast<float>(util::db_to_linear(0.0F)));
+-  lv2_wrapper->set_control_port_value("wet_r", static_cast<float>(util::db_to_linear(0.0F)));
+-
+-  lv2_wrapper->bind_key_int<"time_l", "avsync-delay">(settings);
+-  lv2_wrapper->bind_key_int<"time_r", "avsync-delay">(settings);
+-
+-
+-
+   g_signal_connect(settings, "changed::show", G_CALLBACK(+[](GSettings* settings, char* key, gpointer user_data) {
+                      auto* self = static_cast<Spectrum*>(user_data);
+ 
+@@ -106,19 +82,6 @@ Spectrum::~Spectrum() {
+ void Spectrum::setup() {
+   std::ranges::fill(real_input, 0.0F);
+   std::ranges::fill(latest_samples_mono, 0.0F);
+-
+-  left_delayed_vector.resize(n_samples, 0.0F);
+-  right_delayed_vector.resize(n_samples, 0.0F);
+-
+-  left_delayed = std::span<float>(left_delayed_vector);
+-  right_delayed = std::span<float>(right_delayed_vector);
+-
+-  lv2_wrapper->set_n_samples(n_samples);
+-
+-  if (lv2_wrapper->get_rate() != rate) {
+-    util::debug(log_tag + " creating instance of comp delay x2 stereo for spectrum A/V sync");
+-    lv2_wrapper->create_instance(rate);
+-  }
+ }
+ 
+ void Spectrum::process(std::span<float>& left_in,
+@@ -132,46 +95,19 @@ void Spectrum::process(std::span<float>& left_in,
+     return;
+   }
+ 
+-  // delay the visualization of the spectrum by the reported latency
+-  // of the output device, so that the spectrum is visually in sync
+-  // with the audio as experienced by the user. (A/V sync)
+-  if ( lv2_wrapper->found_plugin && lv2_wrapper->has_instance() ) {
+-    lv2_wrapper->connect_data_ports(left_in, right_in, left_delayed, right_delayed);
+-    lv2_wrapper->run();
++  if (n_samples < n_bands) {
++    // Drop the oldest quantum.
++    std::memmove(&latest_samples_mono[0], &latest_samples_mono[n_samples],
++        (n_bands - n_samples) * sizeof(float));
+ 
+-    // Downmix the latest n_bands samples from the delayed signal.
+-    if (n_samples < n_bands) {
+-      // Drop the oldest quantum.
+-      std::memmove(&latest_samples_mono[0], &latest_samples_mono[n_samples],
+-          (n_bands - n_samples) * sizeof(float));
+-
+-      // Copy the new quantum.
+-      for (size_t n = 0; n < n_samples; n++) {
+-        latest_samples_mono[n_bands - n_samples + n] = 0.5F * (left_delayed[n] + right_delayed[n]);
+-      }
+-    } else {
+-      // Copy the latest n_bands samples.
+-      for (size_t n = 0; n < n_bands; n++)
+-        latest_samples_mono[n] = 0.5F * (left_delayed[n_samples - n_bands + n] +
+-                                        right_delayed[n_samples - n_bands + n]);
+-    }
++    // Copy the new quantum.
++    for (size_t n = 0; n < n_samples; n++)
++      latest_samples_mono[n_bands - n_samples + n] = 0.5F * (left_in[n] + right_in[n]);
+   } else {
+-    // Downmix the latest n_bands samples from the non-delayed signal.
+-    if (n_samples < n_bands) {
+-      // Drop the oldest quantum.
+-      std::memmove(&latest_samples_mono[0], &latest_samples_mono[n_samples],
+-          (n_bands - n_samples) * sizeof(float));
+-
+-      // Copy the new quantum.
+-      for (size_t n = 0; n < n_samples; n++) {
+-        latest_samples_mono[n_bands - n_samples + n] = 0.5F * (left_in[n] + right_in[n]);
+-      }
+-    } else {
+-      // Copy the latest n_bands samples.
+-      for (size_t n = 0; n < n_bands; n++)
+-        latest_samples_mono[n] = 0.5F * (left_in[n_samples - n_bands + n] +
+-                                        right_in[n_samples - n_bands + n]);
+-    }
++    // Copy the latest n_bands samples.
++    for (size_t n = 0; n < n_bands; n++)
++      latest_samples_mono[n] = 0.5F * (left_in[n_samples - n_bands + n] +
++                                       right_in[n_samples - n_bands + n]);
+   }
+ 
+   /*
+-- 
+2.46.0
+
diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix
index 5c371efca5d3..bffd21b7f0c3 100644
--- a/pkgs/by-name/ea/easyeffects/package.nix
+++ b/pkgs/by-name/ea/easyeffects/package.nix
@@ -114,6 +114,11 @@ stdenv.mkDerivation rec {
       )
     '';
 
+  patches = [
+    # Remove when lsp-plugins is >= 1.2.17. (https://github.com/wwmm/easyeffects/issues/3394)
+    ./0001-Revert-Merge-pull-request-3340-from-violetmage-viole.patch
+  ];
+
   separateDebugInfo = true;
 
   passthru = {

From 25e7a07dee9e2c389f6a03483acc8f5d5d05bfc0 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Thu, 7 Nov 2024 19:10:05 +0000
Subject: [PATCH 35/76] spotifyd: 0.3.5-unstable-2024-09-05 ->
 0.3.5-unstable-2024-10-21

(cherry picked from commit 426246f849d8fa9468bf386d17e8280bbc7e7122)
---
 pkgs/by-name/sp/spotifyd/package.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/sp/spotifyd/package.nix b/pkgs/by-name/sp/spotifyd/package.nix
index 45cce2754754..45e43876ae0c 100644
--- a/pkgs/by-name/sp/spotifyd/package.nix
+++ b/pkgs/by-name/sp/spotifyd/package.nix
@@ -17,6 +17,7 @@
   withMpris ? stdenv.hostPlatform.isLinux,
   withKeyring ? true,
   dbus,
+  withPipe ? true,
   nix-update-script,
   testers,
   spotifyd,
@@ -24,16 +25,16 @@
 
 rustPackages.rustPlatform.buildRustPackage rec {
   pname = "spotifyd";
-  version = "0.3.5-unstable-2024-09-05";
+  version = "0.3.5-unstable-2024-10-21";
 
   src = fetchFromGitHub {
     owner = "Spotifyd";
     repo = "spotifyd";
-    rev = "e280d84124d854af3c2f9509ba496b1c2ba6a1ae";
-    hash = "sha256-RFfM/5DY7IG0E79zc8IuXpSNAIjloMWI3ZVbyLxh4O8=";
+    rev = "b25538f5c4dfc5b376927e7edf71c7c988492ace";
+    hash = "sha256-50eUVax3yqwncQUWgCPc0PHVUuUERQ9iORSSajPHB9c=";
   };
 
-  cargoHash = "sha256-z3zcQD2v71FZg6nEvKfaMiQU/aRAPFNt69b9Rm+jpuY=";
+  cargoHash = "sha256-3aEBLPyf72o9gF58j9OANpcqD/IClb2alfAEKRFzatU=";
 
   nativeBuildInputs = [ pkg-config ];
 
@@ -54,6 +55,7 @@ rustPackages.rustPlatform.buildRustPackage rec {
     ++ lib.optional withPulseAudio "pulseaudio_backend"
     ++ lib.optional withPortAudio "portaudio_backend"
     ++ lib.optional withMpris "dbus_mpris"
+    ++ lib.optional withPipe "pipe_backend"
     ++ lib.optional withKeyring "dbus_keyring";
 
   doCheck = false;

From d6b302ecce44ef99af5621882db9270dd4045e9d Mon Sep 17 00:00:00 2001
From: Sander <hey@sandydoo.me>
Date: Tue, 19 Nov 2024 17:10:17 +0400
Subject: [PATCH 36/76] meilisearch: migrate to the new macOS SDK

(cherry picked from commit 15e49d961bce69e98dbede5d264726708dd2c0fc)
---
 pkgs/servers/search/meilisearch/default.nix | 8 ++------
 pkgs/top-level/all-packages.nix             | 4 +---
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix
index 59ce07445c98..75b9b4a4df98 100644
--- a/pkgs/servers/search/meilisearch/default.nix
+++ b/pkgs/servers/search/meilisearch/default.nix
@@ -3,8 +3,7 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
-  Security,
-  SystemConfiguration,
+  apple-sdk_11,
   nixosTests,
   nix-update-script,
 }:
@@ -39,10 +38,7 @@ rustPlatform.buildRustPackage {
 
   nativeBuildInputs = [ rustPlatform.bindgenHook ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    Security
-    SystemConfiguration
-  ];
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7eec404e3f39..0d1719857b11 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4250,9 +4250,7 @@ with pkgs;
     hdf5 = hdf5.override { usev110Api = true; };
   };
 
-  meilisearch = callPackage ../servers/search/meilisearch {
-    inherit (darwin.apple_sdk_11_0.frameworks) Security SystemConfiguration;
-  };
+  meilisearch = callPackage ../servers/search/meilisearch { };
 
   mhonarc = perlPackages.MHonArc;
 

From 5677d2d52ad7367c0bde3f5e7b97be97546ce3f7 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Mon, 18 Nov 2024 22:02:08 +0100
Subject: [PATCH 37/76] vvenc: 1.12.0 -> 1.12.1

(cherry picked from commit 1c82a1d6bf23f67e5af25278b7fa7281bfa69a4b)
---
 pkgs/by-name/vv/vvenc/package.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vv/vvenc/package.nix b/pkgs/by-name/vv/vvenc/package.nix
index 774645e29ff9..8419b215b832 100644
--- a/pkgs/by-name/vv/vvenc/package.nix
+++ b/pkgs/by-name/vv/vvenc/package.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vvenc";
-  version = "1.12.0";
+  version = "1.12.1";
 
   outputs = [
     "out"
@@ -21,9 +21,16 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "fraunhoferhhi";
     repo = "vvenc";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-C7ApayhubunkXBqJ/EqntaFPn6zk8rZ9fUqg7kbhvAk=";
+    hash = "sha256-Et/JmF/2hh6A1EsOzvgzruMN47rd5cPgRke3uPvz298=";
   };
 
+  env.NIX_CFLAGS_COMPILE = toString (
+    lib.optionals stdenv.cc.isGNU [
+      "-Wno-maybe-uninitialized"
+      "-Wno-uninitialized"
+    ]
+  );
+
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [

From bc84a4af0bedda61049ed2a8e9cf1076c4939039 Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Fri, 15 Nov 2024 17:31:17 +0000
Subject: [PATCH 38/76] nixos/pay-respects: actually import the module

I am unbelievably stupid sometimes.

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
(cherry picked from commit 3cd382262c19cab764c8d31b70227fb742d63cdf)
---
 nixos/modules/module-list.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 4977b6a73ec6..630fb176c253 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -263,6 +263,7 @@
   ./programs/openvpn3.nix
   ./programs/obs-studio.nix
   ./programs/partition-manager.nix
+  ./programs/pay-respects.nix
   ./programs/plotinus.nix
   ./programs/pqos-wrapper.nix
   ./programs/projecteur.nix

From b89e0bf06f6f9bc6952e2c9940f6b6824a477e7d Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Fri, 15 Nov 2024 17:56:54 +0000
Subject: [PATCH 39/76] nixos/pay-respects: fix interactiveShellInit for fish
 and zsh

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
(cherry picked from commit c346fd5125298ddad629f1e38f86894a5c1a50e6)
---
 nixos/modules/programs/pay-respects.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/pay-respects.nix b/nixos/modules/programs/pay-respects.nix
index a3fdcf5b8848..83822cdc2c7f 100644
--- a/nixos/modules/programs/pay-respects.nix
+++ b/nixos/modules/programs/pay-respects.nix
@@ -11,6 +11,7 @@ let
     mkEnableOption
     mkIf
     mkOption
+    optionalString
     types
     ;
   inherit (types) str;
@@ -48,8 +49,8 @@ in
 
     programs = {
       bash.interactiveShellInit = initScript "bash";
-      fish.interactiveShellInit = mkIf config.programs.fish.enable initScript "fish";
-      zsh.interactiveShellInit = mkIf config.programs.zsh.enable initScript "zsh";
+      fish.interactiveShellInit = optionalString config.programs.fish.enable (initScript "fish");
+      zsh.interactiveShellInit = optionalString config.programs.zsh.enable (initScript "zsh");
     };
   };
   meta.maintainers = with maintainers; [ sigmasquadron ];

From bf053f5e8cb3c032951e8ad0b73dccde0283c550 Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Wed, 13 Nov 2024 15:45:31 -0500
Subject: [PATCH 40/76] brave: 1.71.123 -> 1.73.89

https://community.brave.com/t/release-channel-1-73-89/580675
(cherry picked from commit e9f6aeb2fd67bfe2dee9f0469b43072c3b5f7385)
---
 pkgs/by-name/br/brave/package.nix | 10 +++++-----
 pkgs/by-name/br/brave/update.sh   |  1 -
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix
index 758a5578af8b..b2cedc7788bb 100644
--- a/pkgs/by-name/br/brave/package.nix
+++ b/pkgs/by-name/br/brave/package.nix
@@ -3,24 +3,24 @@
 
 let
   pname = "brave";
-  version = "1.71.123";
+  version = "1.73.89";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-u3fme771Q5F00fYiLez9mhGQR2mORYdSabXovr0+OYE=";
+      hash = "sha256-qpWKu0hmFs8LXkSrrcSOpS9BsgkO1WPOItpPc/InBLY=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-fJczTAra+j8+veicz4lIyKSNJyxJK4q9gpZoAyQwkxQ=";
+      hash = "sha256-9e0zMS5kcTMdxkvvq248kZDQpBz/Hf4OMUdZ4lgmDV8=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-kDiZ6NKQ+v1jBEUexItKTCKFsbnOtSzPmGEVWI5JoXI=";
+      hash = "sha256-LOSm4IbdmrpxzDf9yzbKhkBlp8452R9tInYOP4dMfzo=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-/yl4k/XvmL7oBW1XU4wVNHfa07Z+XMHYTkkufhDCXUc=";
+      hash = "sha256-VWobettpSvMCCENg/b9VkH+cwNOrYF/n6d3Ebdq00Lc=";
     };
   };
 
diff --git a/pkgs/by-name/br/brave/update.sh b/pkgs/by-name/br/brave/update.sh
index b6443b64eae5..f806154aa9dc 100755
--- a/pkgs/by-name/br/brave/update.sh
+++ b/pkgs/by-name/br/brave/update.sh
@@ -48,7 +48,6 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) (
   archive
   // {
     inherit pname version;
-    platform = stdenv.system;
   }
 )
 EOF

From a7ab390051499e904165a6bb1eac81a33abd0d36 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 15 Nov 2024 21:44:56 +0100
Subject: [PATCH 41/76] postgresqlPackages: enable update scripts by default

This enables update scripts via buildPostgresqlExtension. Extensions
must actively opt-out, if they don't support either the default
configuration or the unstable configuration.

To make the update script work, some extensions had to be changed to
pull their code from GitHub instead. Those with PostgreSQL-style version
tags (REL_X_Y) had to be changed to make src.rev the source of truth.

(cherry picked from commit 68254e438c9ae6eb29b32ee96809e0beef97a014)
---
 .../postgresql/buildPostgresqlExtension.nix   | 122 ++++++++++--------
 pkgs/servers/sql/postgresql/ext/age.nix       |   1 +
 .../postgresql/ext/apache_datasketches.nix    |   1 +
 .../servers/sql/postgresql/ext/cstore_fdw.nix |   2 +-
 .../sql/postgresql/ext/jsonb_deep_sum.nix     |   2 +-
 .../sql/postgresql/ext/pg_hint_plan.nix       |   2 +
 .../sql/postgresql/ext/pg_similarity.nix      |   6 +-
 .../servers/sql/postgresql/ext/pg_squeeze.nix |   7 +-
 pkgs/servers/sql/postgresql/ext/pgaudit.nix   |   2 +
 pkgs/servers/sql/postgresql/ext/pgroonga.nix  |  13 +-
 pkgs/servers/sql/postgresql/ext/plr.nix       |   4 +-
 pkgs/servers/sql/postgresql/ext/postgis.nix   |  20 ++-
 pkgs/servers/sql/postgresql/ext/wal2json.nix  |   8 +-
 13 files changed, 114 insertions(+), 76 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/buildPostgresqlExtension.nix b/pkgs/servers/sql/postgresql/buildPostgresqlExtension.nix
index 87847c368eba..03797b610827 100644
--- a/pkgs/servers/sql/postgresql/buildPostgresqlExtension.nix
+++ b/pkgs/servers/sql/postgresql/buildPostgresqlExtension.nix
@@ -60,70 +60,88 @@
   lib,
   stdenv,
   postgresql,
+  nix-update-script,
 }:
 
 args:
 
 let
-  buildPostgresqlExtension = finalAttrs: prevAttrs: {
-    buildInputs = [ postgresql ] ++ prevAttrs.buildInputs or [ ];
+  buildPostgresqlExtension =
+    finalAttrs:
+    {
+      enableUpdateScript ? true,
+      ...
+    }@prevAttrs:
+    {
+      passthru =
+        prevAttrs.passthru or { }
+        // lib.optionalAttrs enableUpdateScript {
+          updateScript =
+            prevAttrs.passthru.updateScript or (nix-update-script (
+              lib.optionalAttrs (lib.hasInfix "unstable" prevAttrs.version) {
+                extraArgs = [ "--version=branch" ];
+              }
+            ));
+        };
 
-    installFlags = [
-      "DESTDIR=${placeholder "out"}"
-    ] ++ prevAttrs.installFlags or [ ];
+      buildInputs = [ postgresql ] ++ prevAttrs.buildInputs or [ ];
 
-    postInstall =
-      ''
-        # DESTDIR + pg_config install the files into
-        # /nix/store/<extension>/nix/store/<postgresql>/...
-        # We'll now remove the /nix/store/<postgresql> part:
-        if [[ -d "$out${postgresql}" ]]; then
-            cp -alt "$out" "$out${postgresql}"/*
-            rm -r "$out${postgresql}"
-        fi
+      installFlags = [
+        "DESTDIR=${placeholder "out"}"
+      ] ++ prevAttrs.installFlags or [ ];
 
-        if [[ -d "$out${postgresql.dev}" ]]; then
-            mkdir -p "''${dev:-$out}"
-            cp -alt "''${dev:-$out}" "$out${postgresql.dev}"/*
-            rm -r "$out${postgresql.dev}"
-        fi
+      postInstall =
+        ''
+          # DESTDIR + pg_config install the files into
+          # /nix/store/<extension>/nix/store/<postgresql>/...
+          # We'll now remove the /nix/store/<postgresql> part:
+          if [[ -d "$out${postgresql}" ]]; then
+              cp -alt "$out" "$out${postgresql}"/*
+              rm -r "$out${postgresql}"
+          fi
 
-        if [[ -d "$out${postgresql.lib}" ]]; then
-            mkdir -p "''${lib:-$out}"
-            cp -alt "''${lib:-$out}" "$out${postgresql.lib}"/*
-            rm -r "$out${postgresql.lib}"
-        fi
+          if [[ -d "$out${postgresql.dev}" ]]; then
+              mkdir -p "''${dev:-$out}"
+              cp -alt "''${dev:-$out}" "$out${postgresql.dev}"/*
+              rm -r "$out${postgresql.dev}"
+          fi
 
-        if [[ -d "$out${postgresql.doc}" ]]; then
-            mkdir -p "''${doc:-$out}"
-            cp -alt "''${doc:-$out}" "$out${postgresql.doc}"/*
-            rm -r "$out${postgresql.doc}"
-        fi
+          if [[ -d "$out${postgresql.lib}" ]]; then
+              mkdir -p "''${lib:-$out}"
+              cp -alt "''${lib:-$out}" "$out${postgresql.lib}"/*
+              rm -r "$out${postgresql.lib}"
+          fi
 
-        if [[ -d "$out${postgresql.man}" ]]; then
-            mkdir -p "''${man:-$out}"
-            cp -alt "''${man:-$out}" "$out${postgresql.man}"/*
-            rm -r "$out${postgresql.man}"
-        fi
+          if [[ -d "$out${postgresql.doc}" ]]; then
+              mkdir -p "''${doc:-$out}"
+              cp -alt "''${doc:-$out}" "$out${postgresql.doc}"/*
+              rm -r "$out${postgresql.doc}"
+          fi
 
-        # In some cases (postgis) parts of the install script
-        # actually work "OK", before we add DESTDIR, so some
-        # files end up in
-        # /nix/store/<extension>/nix/store/<extension>/...
-        if [[ -d "$out$out" ]]; then
-            cp -alt "$out" "$out$out"/*
-            rm -r "$out$out"
-        fi
+          if [[ -d "$out${postgresql.man}" ]]; then
+              mkdir -p "''${man:-$out}"
+              cp -alt "''${man:-$out}" "$out${postgresql.man}"/*
+              rm -r "$out${postgresql.man}"
+          fi
 
-        if [[ -d "$out/nix/store" ]]; then
-            if ! rmdir "$out/nix/store" "$out/nix"; then
-              find "$out/nix"
-              nixErrorLog 'Found left-overs in $out/nix/store, make sure to move them into $out properly.'
-              exit 1
-            fi
-        fi
-      ''
-      + prevAttrs.postInstall or "";
-  };
+          # In some cases (postgis) parts of the install script
+          # actually work "OK", before we add DESTDIR, so some
+          # files end up in
+          # /nix/store/<extension>/nix/store/<extension>/...
+          if [[ -d "$out$out" ]]; then
+              cp -alt "$out" "$out$out"/*
+              rm -r "$out$out"
+          fi
+
+          if [[ -d "$out/nix/store" ]]; then
+              if ! rmdir "$out/nix/store" "$out/nix"; then
+                find "$out/nix"
+                nixErrorLog 'Found left-overs in $out/nix/store, make sure to move them into $out properly.'
+                exit 1
+              fi
+          fi
+        ''
+        + prevAttrs.postInstall or "";
+    };
 in
 stdenv.mkDerivation (lib.extends buildPostgresqlExtension (lib.toFunction args))
diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix
index a9f74bc76ec1..4811ec01ccb5 100644
--- a/pkgs/servers/sql/postgresql/ext/age.nix
+++ b/pkgs/servers/sql/postgresql/ext/age.nix
@@ -28,6 +28,7 @@ buildPostgresqlExtension rec {
     "PERL=${perl}/bin/perl"
   ];
 
+  enableUpdateScript = false;
   passthru.tests = stdenv.mkDerivation {
     inherit version src;
 
diff --git a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix
index 4c8d723354d2..46b5fac3852b 100644
--- a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix
+++ b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix
@@ -36,6 +36,7 @@ buildPostgresqlExtension (finalAttrs: {
     runHook postPatch
   '';
 
+  enableUpdateScript = false;
   passthru.tests.extension = postgresqlTestExtension {
     inherit (finalAttrs) finalPackage;
     sql = ''
diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
index 2236f815a823..4b5499bfe9fa 100644
--- a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
+++ b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
@@ -2,7 +2,7 @@
 
 buildPostgresqlExtension rec {
   pname = "cstore_fdw";
-  version = "unstable-2022-03-08";
+  version = "1.7.0-unstable-2021-03-08";
 
   nativeBuildInputs = [ protobufc ];
 
diff --git a/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix b/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix
index eb84ec54c028..7fe4f22254f3 100644
--- a/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix
+++ b/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix
@@ -2,7 +2,7 @@
 
 buildPostgresqlExtension rec {
   pname = "jsonb_deep_sum";
-  version = "unstable-2021-12-24";
+  version = "0-unstable-2021-12-24";
 
   src = fetchFromGitHub {
     owner = "furstenheim";
diff --git a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix
index db5c360196e2..5adf5486113f 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix
@@ -44,6 +44,8 @@ buildPostgresqlExtension {
     substituteInPlace Makefile --replace "LDFLAGS+=-Wl,--build-id" ""
   '';
 
+  enableUpdateScript = false;
+
   meta = with lib; {
     description = "Extension to tweak PostgreSQL execution plans using so-called 'hints' in SQL comments";
     homepage = "https://github.com/ossc-db/pg_hint_plan";
diff --git a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix
index 4ec5bd83fc47..19441807b515 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix
@@ -1,8 +1,8 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, postgresql, unstableGitUpdater, buildPostgresqlExtension }:
+{ stdenv, lib, fetchFromGitHub, fetchpatch, postgresql, buildPostgresqlExtension }:
 
 buildPostgresqlExtension {
   pname = "pg_similarity";
-  version = "1.0-unstable-2021-01-12";
+  version = "pg_similarity_1_0-unstable-2021-01-12";
 
   src = fetchFromGitHub {
     owner = "eulerto";
@@ -23,8 +23,6 @@ buildPostgresqlExtension {
 
   makeFlags = [ "USE_PGXS=1" ];
 
-  passthru.updateScript = unstableGitUpdater {};
-
   meta = {
     description = "Extension to support similarity queries on PostgreSQL";
     longDescription = ''
diff --git a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix
index ba2f4443c557..fa4225f3389d 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix
@@ -1,16 +1,17 @@
-{ lib, stdenv, fetchFromGitHub, postgresql, postgresqlTestExtension, buildPostgresqlExtension }:
+{ lib, stdenv, fetchFromGitHub, postgresql, postgresqlTestExtension, buildPostgresqlExtension, nix-update-script }:
 
 buildPostgresqlExtension (finalAttrs: {
   pname = "pg_squeeze";
-  version = "1.7.0";
+  version = "${builtins.replaceStrings ["_"] ["."] (lib.strings.removePrefix "REL" finalAttrs.src.rev)}";
 
   src = fetchFromGitHub {
     owner = "cybertec-postgresql";
     repo = "pg_squeeze";
-    rev = "REL${builtins.replaceStrings ["."] ["_"] finalAttrs.version}";
+    rev = "REL1_7_0";
     hash = "sha256-Kh1wSOvV5Rd1CG/na3yzbWzvaR8SJ6wmTZOnM+lbgik=";
   };
 
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=REL(.*)" ]; };
   passthru.tests.extension = postgresqlTestExtension {
     inherit (finalAttrs) finalPackage;
     postgresqlExtraSettings = ''
diff --git a/pkgs/servers/sql/postgresql/ext/pgaudit.nix b/pkgs/servers/sql/postgresql/ext/pgaudit.nix
index d50da6c7e282..91c081eaf955 100644
--- a/pkgs/servers/sql/postgresql/ext/pgaudit.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgaudit.nix
@@ -43,6 +43,8 @@ buildPostgresqlExtension {
 
   makeFlags = [ "USE_PGXS=1" ];
 
+  enableUpdateScript = false;
+
   meta = with lib; {
     description = "Open Source PostgreSQL Audit Logging";
     homepage = "https://github.com/pgaudit/pgaudit";
diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix
index 3d855f5e1977..6cd900be5f16 100644
--- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix
@@ -1,18 +1,21 @@
-{ lib, stdenv, fetchurl, pkg-config, postgresql, msgpack-c, groonga, buildPostgresqlExtension }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, postgresql, msgpack-c, groonga, buildPostgresqlExtension, xxHash }:
 
 buildPostgresqlExtension rec {
   pname = "pgroonga";
   version = "3.2.3";
 
-  src = fetchurl {
-    url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz";
-    hash = "sha256-k9+DgiLzU2cA3jvw3pMF7/FmDGxsCYtAOaUtf2LMTnw=";
+  src = fetchFromGitHub {
+    owner = "pgroonga";
+    repo = "pgroonga";
+    rev = "${version}";
+    hash = "sha256-bDCDfb78r/HUa7LuZZrwrSZEFcevA1pwSy8/tcCh/oE=";
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ msgpack-c groonga ];
+  buildInputs = [ msgpack-c groonga xxHash ];
 
   makeFlags = [
+    "HAVE_XXHASH=1"
     "HAVE_MSGPACK=1"
     "MSGPACK_PACKAGE_NAME=msgpack-c"
   ];
diff --git a/pkgs/servers/sql/postgresql/ext/plr.nix b/pkgs/servers/sql/postgresql/ext/plr.nix
index 1c2266e7cfb6..2aece8cee9d1 100644
--- a/pkgs/servers/sql/postgresql/ext/plr.nix
+++ b/pkgs/servers/sql/postgresql/ext/plr.nix
@@ -2,12 +2,12 @@
 
 buildPostgresqlExtension rec {
   pname = "plr";
-  version = "8.4.7";
+  version = "${builtins.replaceStrings ["_"] ["."] (lib.strings.removePrefix "REL" src.rev)}";
 
   src = fetchFromGitHub {
     owner = "postgres-plr";
     repo = "plr";
-    rev = "REL${builtins.replaceStrings ["."] ["_"] version}";
+    rev = "REL8_4_7";
     sha256 = "sha256-PdvFEmtKfLT/xfaf6obomPR5hKC9F+wqpfi1heBphRk=";
   };
 
diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix
index 68aefc1e605d..cca196dab006 100644
--- a/pkgs/servers/sql/postgresql/ext/postgis.nix
+++ b/pkgs/servers/sql/postgresql/ext/postgis.nix
@@ -1,5 +1,5 @@
 {
-  fetchurl,
+  fetchFromGitHub,
   lib,
   stdenv,
   perl,
@@ -22,6 +22,10 @@
   jitSupport,
   llvm,
   buildPostgresqlExtension,
+  autoconf,
+  automake,
+  libtool,
+  which,
 }:
 
 let
@@ -36,9 +40,11 @@ buildPostgresqlExtension (finalAttrs: {
     "doc"
   ];
 
-  src = fetchurl {
-    url = "https://download.osgeo.org/postgis/source/postgis-${finalAttrs.version}.tar.gz";
-    hash = "sha256-ymmKIswrKzRnrE4GO0OihBPzAE3dUFvczddMVqZH9RA=";
+  src = fetchFromGitHub {
+    owner = "postgis";
+    repo = "postgis";
+    rev = "${finalAttrs.version}";
+    hash = "sha256-wh7Lav2vnKzGWuSvvMFvAaGV7ynD+KgPsFUgujdtzlA=";
   };
 
   buildInputs = [
@@ -51,8 +57,12 @@ buildPostgresqlExtension (finalAttrs: {
     pcre2.dev
   ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
   nativeBuildInputs = [
+    autoconf
+    automake
+    libtool
     perl
     pkg-config
+    which
   ] ++ lib.optional jitSupport llvm;
   dontDisableStatic = true;
 
@@ -70,7 +80,7 @@ buildPostgresqlExtension (finalAttrs: {
 
   setOutputFlags = false;
   preConfigure = ''
-    sed -i 's@/usr/bin/file@${file}/bin/file@' configure
+    ./autogen.sh
   '';
 
   configureFlags = [
diff --git a/pkgs/servers/sql/postgresql/ext/wal2json.nix b/pkgs/servers/sql/postgresql/ext/wal2json.nix
index adc57f333fcf..9562c738eb1f 100644
--- a/pkgs/servers/sql/postgresql/ext/wal2json.nix
+++ b/pkgs/servers/sql/postgresql/ext/wal2json.nix
@@ -8,12 +8,14 @@
 
 buildPostgresqlExtension rec {
   pname = "wal2json";
-  version = "2.6";
+  version = "${builtins.replaceStrings [ "_" ] [ "." ] (
+    lib.strings.removePrefix "wal2json_" src.rev
+  )}";
 
   src = fetchFromGitHub {
     owner = "eulerto";
     repo = "wal2json";
-    rev = "wal2json_${builtins.replaceStrings [ "." ] [ "_" ] version}";
+    rev = "wal2json_2_6";
     sha256 = "sha256-+QoACPCKiFfuT2lJfSUmgfzC5MXf75KpSoc2PzPxKyM=";
   };
 
@@ -24,7 +26,7 @@ buildPostgresqlExtension rec {
   meta = with lib; {
     description = "PostgreSQL JSON output plugin for changeset extraction";
     homepage = "https://github.com/eulerto/wal2json";
-    changelog = "https://github.com/eulerto/wal2json/releases/tag/wal2json_${version}";
+    changelog = "https://github.com/eulerto/wal2json/releases/tag/${src.rev}";
     maintainers = with maintainers; [ euank ];
     platforms = postgresql.meta.platforms;
     license = licenses.bsd3;

From db0269e5c288736e7fc991a29510fed6afd3473c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 15 Nov 2024 20:50:55 +0000
Subject: [PATCH 42/76] postgresqlPackages.citus: 12.1.2 -> 12.1.6

(cherry picked from commit 0dbbc3c5f933d439079fc802bb050abb1d4c2b62)
---
 pkgs/servers/sql/postgresql/ext/citus.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/citus.nix b/pkgs/servers/sql/postgresql/ext/citus.nix
index 98d79051ddf7..8e46d4addfb4 100644
--- a/pkgs/servers/sql/postgresql/ext/citus.nix
+++ b/pkgs/servers/sql/postgresql/ext/citus.nix
@@ -9,13 +9,13 @@
 
 buildPostgresqlExtension rec {
   pname = "citus";
-  version = "12.1.2";
+  version = "12.1.6";
 
   src = fetchFromGitHub {
     owner = "citusdata";
     repo = "citus";
     rev = "v${version}";
-    hash = "sha256-0uYNMLAYigtGlDRvOEkQeC5i58QfXcdSVjTQwWVFX+8=";
+    hash = "sha256-PYABH4e5Wp5hMvEQMRHjPL7gDVu8Wud6d+BzrBBMjIQ=";
   };
 
   buildInputs = [
@@ -30,7 +30,7 @@ buildPostgresqlExtension rec {
     broken = versionOlder postgresql.version "14" ||
       # PostgreSQL 17 support issue upstream: https://github.com/citusdata/citus/issues/7708
       # Check after next package update.
-      (versionAtLeast postgresql.version "17" && version == "12.1.2");
+      (versionAtLeast postgresql.version "17" && version == "12.1.6");
     description = "Distributed PostgreSQL as an extension";
     homepage = "https://www.citusdata.com/";
     changelog = "https://github.com/citusdata/citus/blob/${src.rev}/CHANGELOG.md";

From 54339a832f615d203cddacd0f7800f2b0c0c2f6e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 15 Nov 2024 20:51:22 +0000
Subject: [PATCH 43/76] postgresqlPackages.h3-pg: 4.1.3 -> 4.1.4

(cherry picked from commit 53b1df6254fcef640a3e1ad572fa64f6447c18a7)
---
 pkgs/servers/sql/postgresql/ext/h3-pg.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/h3-pg.nix b/pkgs/servers/sql/postgresql/ext/h3-pg.nix
index ec73b97999c5..3893ea310d8e 100644
--- a/pkgs/servers/sql/postgresql/ext/h3-pg.nix
+++ b/pkgs/servers/sql/postgresql/ext/h3-pg.nix
@@ -10,21 +10,24 @@
 
 buildPostgresqlExtension (finalAttrs: {
   pname = "h3-pg";
-  version = "4.1.3";
+  version = "4.1.4";
 
   src = fetchFromGitHub {
     owner = "zachasme";
     repo = "h3-pg";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-nkaDZ+JuMtsGUJVx70DD2coLrmc/T8/cNov7pfNF1Eg=";
+    hash = "sha256-uZ4XI/VXRr636CI1r24D6ykPQqO5qZNxNQLUQKmoPtg=";
   };
 
   postPatch = ''
     substituteInPlace CMakeLists.txt \
-      --replace "add_subdirectory(cmake/h3)" "include_directories(${lib.getDev h3_4}/include/h3)"
+      --replace-fail "add_subdirectory(cmake/h3)" "include_directories(${lib.getDev h3_4}/include/h3)"
   '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
     substituteInPlace cmake/AddPostgreSQLExtension.cmake \
-      --replace "INTERPROCEDURAL_OPTIMIZATION TRUE" ""
+      --replace-fail "INTERPROCEDURAL_OPTIMIZATION TRUE" ""
+    # Commented upstream: https://github.com/zachasme/h3-pg/pull/141/files#r1844970927
+    substituteInPlace cmake/FindPostgreSQL.cmake \
+      --replace-fail 'list(APPEND PostgreSQL_INCLUDE_DIRS "/usr/local/include")' ""
   '';
 
   nativeBuildInputs = [

From c8498f0eea711e03b58f9742196b3fe59dc3551a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 15 Nov 2024 20:51:50 +0000
Subject: [PATCH 44/76] postgresqlPackages.lantern: 0.4.1 -> 0.5.0

(cherry picked from commit e87aa28b9c3a6680cdb2756e8d352d5e2d4313bd)
---
 pkgs/servers/sql/postgresql/ext/lantern.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/lantern.nix b/pkgs/servers/sql/postgresql/ext/lantern.nix
index d5fce34f1ff2..23c7415f3f15 100644
--- a/pkgs/servers/sql/postgresql/ext/lantern.nix
+++ b/pkgs/servers/sql/postgresql/ext/lantern.nix
@@ -10,13 +10,13 @@
 
 buildPostgresqlExtension (finalAttrs: {
   pname = "postgresql-lantern";
-  version = "0.4.1";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "lanterndata";
     repo = "lantern";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-V8W61hELXeaVvNZgRUcckFlCMWis7NENlRKySxsK/L8=";
+    hash = "sha256-IsDD/um5pVvbzin8onf45DQVszl+Id/pJSQ2iijgHmg=";
     fetchSubmodules = true;
   };
 

From 850bcea10c1117c62b987d98ad1b3dd3f853ae9e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 15 Nov 2024 20:52:09 +0000
Subject: [PATCH 45/76] postgresqlPackages.periods: 1.2.2 -> 1.2.3

(cherry picked from commit 7c19e850655c1bf03ef0a31c4ab13b95ce9bbed3)
---
 pkgs/servers/sql/postgresql/ext/periods.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/periods.nix b/pkgs/servers/sql/postgresql/ext/periods.nix
index c5c0d4a8dc42..cc751a49d3c0 100644
--- a/pkgs/servers/sql/postgresql/ext/periods.nix
+++ b/pkgs/servers/sql/postgresql/ext/periods.nix
@@ -2,13 +2,13 @@
 
 buildPostgresqlExtension rec {
   pname = "periods";
-  version = "1.2.2";
+  version = "1.2.3";
 
   src = fetchFromGitHub {
     owner = "xocolatl";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-ezt+MtDqPM8OmJCD6oQTS644l+XHZoxuivq0PUIXOY8=";
+    sha256 = "sha256-97v6+WNDcYb/KivlE/JBlRIZ3gYHj68AlK0fylp1cPo=";
   };
 
   meta = with lib; {

From 6ebb3fd7849c40632bdad76e221e4e0f26c42762 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 15 Nov 2024 20:52:23 +0000
Subject: [PATCH 46/76] postgresqlPackages.pg_bigm: 1.2-20200228 ->
 1.2-20240606

(cherry picked from commit 448763cd4be54d2441f094af9ac28ce071c5bfef)
---
 pkgs/servers/sql/postgresql/ext/pg_bigm.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix
index e7980e305bf3..58dba27e9601 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix
@@ -2,23 +2,15 @@
 
 buildPostgresqlExtension rec {
   pname = "pg_bigm";
-  version = "1.2-20200228";
+  version = "1.2-20240606";
 
   src = fetchFromGitHub {
     owner = "pgbigm";
     repo = "pg_bigm";
     rev = "v${version}";
-    hash = "sha256-3lspEglVWzEUTiRIWqW0DpQe8gDn9R/RxsWuI9znYc8=";
+    hash = "sha256-5Uy1DmGZR4WdtRUvNdZ5b9zBHJUb9idcEzW20rkreBs=";
   };
 
-  patches = [
-    # Fix compatibility with PostgreSQL 16. Remove with the next release.
-    (fetchpatch {
-      url = "https://github.com/pgbigm/pg_bigm/commit/2a9d783c52a1d7a2eb414da6f091f6035da76edf.patch";
-      hash = "sha256-LuMpSUPnT8cPChQfA9sJEKP4aGpsbN5crfTKLnDzMN8=";
-    })
-  ];
-
   makeFlags = [ "USE_PGXS=1" ];
 
   meta = with lib; {

From 09b40f80d4a8cbe1cc875ee189cd86d2b185315d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 15 Nov 2024 20:52:36 +0000
Subject: [PATCH 47/76] postgresqlPackages.pg_net: 0.8.0 -> 0.13.0

(cherry picked from commit a65bd1adefe29f46a689d746ccb1257dcd61ec9f)
---
 pkgs/servers/sql/postgresql/ext/pg_net.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/pg_net.nix
index a4e0cb2f06c2..be7a6da5d633 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_net.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_net.nix
@@ -2,7 +2,7 @@
 
 buildPostgresqlExtension rec {
   pname = "pg_net";
-  version = "0.8.0";
+  version = "0.13.0";
 
   buildInputs = [ curl ];
 
@@ -10,7 +10,7 @@ buildPostgresqlExtension rec {
     owner  = "supabase";
     repo   = pname;
     rev    = "refs/tags/v${version}";
-    hash   = "sha256-ZPsRPWV1G3lMM2mT+H139Wvgoy8QnmeUbzEnGeDJmZA=";
+    hash   = "sha256-FRaTZPCJQPYAFmsJg22hYJJ0+gH1tMdDQoCQgiqEnaA=";
   };
 
   env.NIX_CFLAGS_COMPILE = "-Wno-error";

From 128e34ede19b7d27751294d69239d307e626d2f1 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 15 Nov 2024 20:52:50 +0000
Subject: [PATCH 48/76] postgresqlPackages.pg_repack: 1.5.0 -> 1.5.1

(cherry picked from commit e7b11ef572b4f0c03e28dd93ac64e4e4432a72da)
---
 pkgs/servers/sql/postgresql/ext/pg_repack.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix
index ffad30742d23..7c70294de130 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix
@@ -9,7 +9,7 @@
 
 buildPostgresqlExtension (finalAttrs: {
   pname = "pg_repack";
-  version = "1.5.0";
+  version = "1.5.1";
 
   buildInputs = postgresql.buildInputs;
 
@@ -17,7 +17,7 @@ buildPostgresqlExtension (finalAttrs: {
     owner = "reorg";
     repo = "pg_repack";
     rev = "ver_${finalAttrs.version}";
-    sha256 = "sha256-do80phyMxwcRIkYyUt9z02z7byNQhK+pbSaCUmzG+4c=";
+    sha256 = "sha256-wJwy4qIt6/kgWqT6HbckUVqDayDkixqHpYiC1liLERw=";
   };
 
   passthru.tests = {

From 8cb8a741f3a53e0499f0862ef2fe5a73a94a15dc Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 15 Nov 2024 20:53:07 +0000
Subject: [PATCH 49/76] postgresqlPackages.pg_uuidv7: 1.5.0 -> 1.6.0

(cherry picked from commit 796e44d16836501ef62eb3633b57f0d149e02087)
---
 pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix
index 81a4e69015e2..7418b833716d 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix
@@ -7,13 +7,13 @@
 
 buildPostgresqlExtension rec {
   pname = "pg_uuidv7";
-  version = "1.5.0";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "fboulnois";
     repo = "pg_uuidv7";
     rev = "v${version}";
-    hash = "sha256-oVyRtjl3KsD3j96qvQb8bFLMhoWO81OudOL4wVXrjzI=";
+    hash = "sha256-lG6dCnbLALnfQc4uclqXXXfYjK/WXLV0lo5I8l1E5p4=";
   };
 
   meta = with lib; {

From cc000088e630ce9f28773d893804aaa79c7f5fd8 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 15 Nov 2024 20:53:22 +0000
Subject: [PATCH 50/76] postgresqlPackages.pgmq: 1.4.4 -> 1.4.5

(cherry picked from commit b0187db3697bf74f00b2dc52af07236b6350abdb)
---
 pkgs/servers/sql/postgresql/ext/pgmq.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pgmq.nix b/pkgs/servers/sql/postgresql/ext/pgmq.nix
index 8a5319efb66b..c3511e3dfbd5 100644
--- a/pkgs/servers/sql/postgresql/ext/pgmq.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgmq.nix
@@ -8,13 +8,13 @@
 
 buildPostgresqlExtension rec {
   pname = "pgmq";
-  version = "1.4.4";
+  version = "1.4.5";
 
   src = fetchFromGitHub {
     owner = "tembo-io";
     repo = "pgmq";
     rev = "v${version}";
-    hash = "sha256-z+8/BqIlHwlMnuIzMz6eylmYbSmhtsNt7TJf/CxbdVw=";
+    hash = "sha256-ynco5t/z7+IPEynuY1wtSaoVloMr6z7UYn4byZecOhg=";
   };
 
   sourceRoot = "${src.name}/pgmq-extension";

From 42108ff589ee681de1522f0122b4a17b1c896356 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 15 Nov 2024 20:53:46 +0000
Subject: [PATCH 51/76] postgresqlPackages.pgroonga: 3.2.3 -> 3.2.4

(cherry picked from commit 1f44f94ad3864b9e4fc99e3574daa0904e4a3c42)
---
 pkgs/servers/sql/postgresql/ext/pgroonga.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix
index 6cd900be5f16..ac778ec5d980 100644
--- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix
@@ -2,13 +2,13 @@
 
 buildPostgresqlExtension rec {
   pname = "pgroonga";
-  version = "3.2.3";
+  version = "3.2.4";
 
   src = fetchFromGitHub {
     owner = "pgroonga";
     repo = "pgroonga";
     rev = "${version}";
-    hash = "sha256-bDCDfb78r/HUa7LuZZrwrSZEFcevA1pwSy8/tcCh/oE=";
+    hash = "sha256-ZHACMsQ+hneU68Y2jOpz16Mo0jzgXKaVSCZ/qAqCDdI=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From a15548f815d9831d54870db3dda10327ff4a4144 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 15 Nov 2024 20:54:48 +0000
Subject: [PATCH 52/76] postgresqlPackages.pgrouting: 3.6.3 -> 3.7.0

(cherry picked from commit 34bcb530b12ce4131dc73f2a9682fe7477b5f8cb)
---
 pkgs/servers/sql/postgresql/ext/pgrouting.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix
index 65bc5ee7c8c5..9a1c940b2888 100644
--- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix
@@ -2,7 +2,7 @@
 
 buildPostgresqlExtension rec {
   pname = "pgrouting";
-  version = "3.6.3";
+  version = "3.7.0";
 
   nativeBuildInputs = [ cmake perl ];
   buildInputs = [ boost ];
@@ -11,7 +11,7 @@ buildPostgresqlExtension rec {
     owner  = "pgRouting";
     repo   = "pgrouting";
     rev    = "v${version}";
-    hash   = "sha256-VCoapUM7Vh4W1DUE/gWQ9YIRLbw63XlOWsgajJW+XNU=";
+    hash   = "sha256-IwH8bEdyJyPMFYtCfWLRr+jVmS5sOr5QFOhGykGPYh4=";
   };
 
   meta = with lib; {

From 05e219b55a9b598478e91a3556fcdeee06eee7c6 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 15 Nov 2024 20:55:08 +0000
Subject: [PATCH 53/76] postgresqlPackages.pgsql-http: 1.6.0 -> 1.6.1

(cherry picked from commit 2b9fc77f89f0c49280c203dd122b3d6d737e96b9)
---
 pkgs/servers/sql/postgresql/ext/pgsql-http.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix
index c71e255cdb51..11aa6dfec748 100644
--- a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix
@@ -2,13 +2,13 @@
 
 buildPostgresqlExtension rec {
   pname = "pgsql-http";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "pramsey";
     repo = "pgsql-http";
     rev = "v${version}";
-    hash = "sha256-CPHfx7vhWfxkXsoKTzyFuTt47BPMvzi/pi1leGcuD60=";
+    hash = "sha256-C8eqi0q1dnshUAZjIsZFwa5FTYc7vmATF3vv2CReWPM=";
   };
 
   buildInputs = [ curl ];

From d2a46a16936e184425e76a371c2d98a1b31e1b2c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 15 Nov 2024 20:55:32 +0000
Subject: [PATCH 54/76] postgresqlPackages.pgvector: 0.6.2 -> 0.8.0

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

diff --git a/pkgs/servers/sql/postgresql/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/pgvector.nix
index 08db0762eddf..eed91a3a8c45 100644
--- a/pkgs/servers/sql/postgresql/ext/pgvector.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgvector.nix
@@ -2,13 +2,13 @@
 
 buildPostgresqlExtension rec {
   pname = "pgvector";
-  version = "0.6.2";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "pgvector";
     repo = "pgvector";
     rev = "v${version}";
-    hash = "sha256-r+TpFJg6WrMn0L2B7RpmSRvw3XxpHzMRtpFWDCzLvgs=";
+    hash = "sha256-JsZV+I4eRMypXTjGmjCtMBXDVpqTIPHQa28ogXncE/Q=";
   };
 
   meta = with lib; {

From 92710380e7eb8bb59c809f2eb003ca19bc98c9aa Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 15 Nov 2024 20:55:49 +0000
Subject: [PATCH 55/76] postgresqlPackages.plpgsql_check: 2.7.5 -> 2.7.12

(cherry picked from commit 12d32a594696556927b30485fcde006902fe6216)
---
 pkgs/servers/sql/postgresql/ext/plpgsql_check.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
index b5924fed6ec2..8d10de848f1b 100644
--- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
+++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
@@ -2,13 +2,13 @@
 
 buildPostgresqlExtension (finalAttrs: {
   pname = "plpgsql-check";
-  version = "2.7.5";
+  version = "2.7.12";
 
   src = fetchFromGitHub {
     owner = "okbob";
     repo = "plpgsql_check";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-CD/G/wX6o+mC6gowlpFe1DdJWyh3cB9wxSsW2GXrENE=";
+    hash = "sha256-sLakN4595z+Smt7oaK7IPIJZp/JIGwL5UB4OXQek7JU=";
   };
 
   passthru.tests.extension = postgresqlTestExtension {

From 0bab9fc24a04048953a8b52bb5a44f92455b4fec Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 15 Nov 2024 20:56:11 +0000
Subject: [PATCH 56/76] postgresqlPackages.repmgr: 5.4.1 -> 5.5.0

(cherry picked from commit a7daa5426bef77245984ee24fd554d03c118ba16)
---
 pkgs/servers/sql/postgresql/ext/repmgr.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/repmgr.nix b/pkgs/servers/sql/postgresql/ext/repmgr.nix
index c4203b42f362..5cdeaaebc2d2 100644
--- a/pkgs/servers/sql/postgresql/ext/repmgr.nix
+++ b/pkgs/servers/sql/postgresql/ext/repmgr.nix
@@ -10,13 +10,13 @@
 
 buildPostgresqlExtension rec {
   pname = "repmgr";
-  version = "5.4.1";
+  version = "5.5.0";
 
   src = fetchFromGitHub {
     owner = "EnterpriseDB";
     repo = "repmgr";
     rev = "v${version}";
-    sha256 = "sha256-OaEoP1BajVW9dt8On9Ppf8IXmAk47HHv8zKw3WlsLHw=";
+    sha256 = "sha256-8G2CzzkWTKEglpUt1Gr7d/DuHJvCIEjsbYDMl3Zt3cs=";
   };
 
   nativeBuildInputs = [ flex ];
@@ -29,9 +29,6 @@ buildPostgresqlExtension rec {
     license = licenses.postgresql;
     platforms = postgresql.meta.platforms;
     maintainers = with maintainers; [ zimbatm ];
-    # PostgreSQL 17 support issue upstream: https://github.com/EnterpriseDB/repmgr/issues/856
-    # Check after next package update.
-    broken = versionAtLeast postgresql.version "17" && version == "5.4.1";
   };
 }
 

From 753ebc23ad95e5d92969cea1d33d7bd124f67470 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 1 Nov 2024 13:01:45 -0500
Subject: [PATCH 57/76] febio: darwin sdk refactor

(cherry picked from commit 08bed55e78daec2fb4cbdc78779cfcbd900c92ad)
---
 pkgs/by-name/fe/febio/package.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/fe/febio/package.nix b/pkgs/by-name/fe/febio/package.nix
index 3f70ad711d76..5ba5c377f0ad 100644
--- a/pkgs/by-name/fe/febio/package.nix
+++ b/pkgs/by-name/fe/febio/package.nix
@@ -1,23 +1,19 @@
 {
   lib,
   stdenv,
-  overrideSDK,
   fetchFromGitHub,
   fetchpatch2,
   substituteAll,
+  apple-sdk_11,
   cmake,
+  darwinMinVersionHook,
   ninja,
   zlib,
-  darwin,
   mklSupport ? true,
   mkl,
 }:
 
-let
-  stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
-in
-
-stdenv'.mkDerivation (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "FEBio";
   version = "4.7";
 
@@ -57,9 +53,8 @@ stdenv'.mkDerivation (finalAttrs: {
     [ zlib ]
     ++ lib.optionals mklSupport [ mkl ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      darwin.apple_sdk.frameworks.CoreGraphics
-      darwin.apple_sdk.frameworks.CoreVideo
-      darwin.apple_sdk.frameworks.Accelerate
+      apple-sdk_11
+      (darwinMinVersionHook "10.15")
     ];
 
   meta = {

From 38f1f2d1044713a935dd826cc4a6cbbf50595983 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sun, 3 Nov 2024 17:40:07 -0600
Subject: [PATCH 58/76] febio-studio: darwin sdk refactor

(cherry picked from commit c970f0f7cd60d9d98b11729e5a213711bdabff28)
---
 pkgs/by-name/fe/febio-studio/package.nix | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/fe/febio-studio/package.nix b/pkgs/by-name/fe/febio-studio/package.nix
index b9605413575d..e7f6f35f01b7 100644
--- a/pkgs/by-name/fe/febio-studio/package.nix
+++ b/pkgs/by-name/fe/febio-studio/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  overrideSDK,
   fetchFromGitHub,
   cmake,
   ninja,
@@ -10,6 +9,8 @@
   qt6Packages,
   febio,
   glew,
+  apple-sdk_11,
+  darwinMinVersionHook,
   sshSupport ? true,
   openssl,
   libssh,
@@ -23,18 +24,7 @@
   withCadFeatures ? false,
 }:
 
-let
-  stdenv' =
-    if stdenv.hostPlatform.isDarwin then
-      overrideSDK stdenv {
-        darwinSdkVersion = "11.0";
-        darwinMinVersion = "10.15";
-      }
-    else
-      stdenv;
-in
-
-stdenv'.mkDerivation (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "febio-studio";
   version = "2.7";
 
@@ -76,7 +66,11 @@ stdenv'.mkDerivation (finalAttrs: {
     ]
     ++ lib.optional tetgenSupport tetgen
     ++ lib.optional ffmpegSupport ffmpeg
-    ++ lib.optional dicomSupport dcmtk;
+    ++ lib.optional dicomSupport dcmtk
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      apple-sdk_11
+      (darwinMinVersionHook "10.15")
+    ];
 
   meta = {
     description = "FEBio Suite Solver";

From 4a3b98d09fbebd9ac150ff27a04f46c89e0ae8a7 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 18 Nov 2024 10:38:48 -0600
Subject: [PATCH 59/76] febio-studio: fix qt 6.8 build

Use a commit from upstream that hasn't been released to support qt 6.8

(cherry picked from commit 2e61f3236def89fc736995fd52555fe952cf5ac5)
---
 pkgs/by-name/fe/febio-studio/package.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/fe/febio-studio/package.nix b/pkgs/by-name/fe/febio-studio/package.nix
index e7f6f35f01b7..a875cfb0e635 100644
--- a/pkgs/by-name/fe/febio-studio/package.nix
+++ b/pkgs/by-name/fe/febio-studio/package.nix
@@ -11,6 +11,7 @@
   glew,
   apple-sdk_11,
   darwinMinVersionHook,
+  fetchpatch,
   sshSupport ? true,
   openssl,
   libssh,
@@ -35,7 +36,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-ggIzz6bvNjqlI8s31EVnbM0TOspBSc9/myKpWukS3MU=";
   };
 
-  patches = [ ./cmake-install.patch ];
+  patches = [
+    ./cmake-install.patch
+    # Fix qt 6.8 compile, can be removed after next release
+    (fetchpatch {
+      url = "https://github.com/febiosoftware/FEBioStudio/commit/15524d958a6f5ef81ccee58b4efa1ea25de91543.patch";
+      hash = "sha256-LRToK1/RQC+bLXgroDTQOV6H8pI+IZ38Y0nsl/Fz1WE=";
+    })
+  ];
 
   cmakeFlags =
     [ (lib.cmakeFeature "Qt_Root" "${qt6Packages.qtbase}") ]

From e03aa5c659f5d8cb797887c636a3f131ac3e5bf1 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 15 Nov 2024 22:37:58 +0100
Subject: [PATCH 60/76] coqPackages_8_20.dpdgraph: init at 1.0+8.20

(cherry picked from commit 171e081b7288fce14fdea43ee0ce25c88738ab4d)
---
 pkgs/development/coq-modules/dpdgraph/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix
index 905dbf1377b6..0ceb84095b70 100644
--- a/pkgs/development/coq-modules/dpdgraph/default.nix
+++ b/pkgs/development/coq-modules/dpdgraph/default.nix
@@ -8,6 +8,7 @@ mkCoqDerivation {
   repo = "coq-dpdgraph";
   inherit version;
   defaultVersion = lib.switch coq.coq-version [
+    { case = "8.20"; out = "1.0+8.20"; }
     { case = "8.19"; out = "1.0+8.19"; }
     { case = "8.18"; out = "1.0+8.18"; }
     { case = "8.17"; out = "1.0+8.17"; }
@@ -23,6 +24,7 @@ mkCoqDerivation {
     { case = "8.7";  out = "0.6.2"; }
   ] null;
 
+  release."1.0+8.20".sha256 = "sha256-szfH/OksCH3SCbcFjwEvLwHE5avmHp1vYiJM6KAXFqs=";
   release."1.0+8.19".sha256 = "sha256-L1vjEydYiwDFTXES3sgfdaO/D50AbTJKBXUKUCgbpto=";
   release."1.0+8.18".sha256 = "sha256-z14MI1VSYzPqmF1PqDXzymXWRMYoTlQAfR/P3Pdf7fI=";
   release."1.0+8.17".sha256 = "sha256-gcvL3vseLKEF9xinT0579jXBBaA5E3rJ5KaU8RfKtm4=";

From 5556c77ca8236b804385970310510f7a5d8faf38 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 18 Nov 2024 18:00:49 +0100
Subject: [PATCH 61/76] prrte: 3.0.5 -> 3.0.6

(cherry picked from commit a16a1449a0e833bb153f82f366d00b4ddf68ade9)
---
 pkgs/by-name/pr/prrte/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/prrte/package.nix b/pkgs/by-name/pr/prrte/package.nix
index 922f5e5aa94f..44f8fba390ae 100644
--- a/pkgs/by-name/pr/prrte/package.nix
+++ b/pkgs/by-name/pr/prrte/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "prrte";
-  version = "3.0.6";
+  version = "3.0.7";
 
   src = fetchFromGitHub {
     owner = "openpmix";
     repo = "prrte";
     rev = "v${version}";
-    hash = "sha256-0JHtUpGFdPKmgUk0+MNxTfZIUDz/vY/CV+Mqbmv0JFw=";
+    hash = "sha256-Jw9/M2rpGTA19qssDaZV+9FYlIvz8wgL5oUDdWwidHI=";
     fetchSubmodules = true;
   };
 

From 9444b574fcb82bd4dbdfa51c7bfdf35d19ac1fae Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 18 Nov 2024 18:01:06 +0100
Subject: [PATCH 62/76] openmpi: 5.0.5 -> 5.0.6

(cherry picked from commit ee22085aeb514e6f095861d50f5edfcbcb72263c)
---
 pkgs/by-name/op/openmpi/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/openmpi/package.nix b/pkgs/by-name/op/openmpi/package.nix
index a1fb9454561b..7fcca51c739e 100644
--- a/pkgs/by-name/op/openmpi/package.nix
+++ b/pkgs/by-name/op/openmpi/package.nix
@@ -40,11 +40,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "openmpi";
-  version = "5.0.5";
+  version = "5.0.6";
 
   src = fetchurl {
     url = "https://www.open-mpi.org/software/ompi/v${lib.versions.majorMinor finalAttrs.version}/downloads/openmpi-${finalAttrs.version}.tar.bz2";
-    sha256 = "sha256-ZYjVfApL0pmiQQP04ZYFGynotV+9pJ4R1bPTIDCjJ3Y=";
+    sha256 = "sha256-vUGD/LxDR3wlR5m0Kd8abldsBC50otL4s31Tey/5gVc=";
   };
 
   postPatch = ''

From dcea4c5a240648636bdcfd6a288fa6084b20028e Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Sun, 10 Nov 2024 17:29:39 +0100
Subject: [PATCH 63/76] prowlarr: 1.24.3.4754 -> 1.25.4.4818

(cherry picked from commit 79fccb5048611847344cdc8d15f99d3b36a89cc7)
---
 pkgs/servers/prowlarr/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix
index 4d50e2f7e382..f261568bbfaf 100644
--- a/pkgs/servers/prowlarr/default.nix
+++ b/pkgs/servers/prowlarr/default.nix
@@ -21,15 +21,15 @@ let
   }.${stdenv.hostPlatform.system} or unsupported;
 
   hash = {
-    aarch64-darwin = "sha256-n9WGbxxackZ2FRexvy7lFVUTjcydhSzSkXO78wsywi8=";
-    aarch64-linux = "sha256-CS3T9beQZo/WllZo2mRMUMYvgM0x6H//tTqByx3ikQw=";
-    x86_64-darwin = "sha256-p3sPwSKE0761R7DlmO55FhmjGDWbGl8X9UcQBjaUXQs=";
-    x86_64-linux = "sha256-wfucjWxTpYsrRRLoQDgy66HZHdRILCKrFEnZyaoQ560=";
+    aarch64-darwin = "sha256-Okp/+glgeIKzHIcW/9AJAmBEcXPm7ANM23iU/Q4jhf8=";
+    aarch64-linux = "sha256-x0hQ/EZGM8XjIqpPGMzxTsL7oUg4YMvc/xNfvmU/sJE=";
+    x86_64-darwin = "sha256-Y7N8flvk3HpaSYjg6RJlCfN6eMsM8AuqIJ+oef85+8s=";
+    x86_64-linux = "sha256-Egp+U/I9i1PQc/MruGRaOpJtDQUQAyRmu4nC71e8fWM=";
   }.${stdenv.hostPlatform.system} or unsupported;
 
 in stdenv.mkDerivation rec {
   inherit pname;
-  version = "1.24.3.4754";
+  version = "1.25.4.4818";
 
   src = fetchurl {
     url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz";

From cf5a1c32934569601207395e03b3fa7ad66dd625 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Tue, 19 Nov 2024 05:00:20 -0500
Subject: [PATCH 64/76] mission-center: use RUSTFLAGS to link libGL and
 libvulkan

A less crude method than patching `$cargoDepsCopy`

(cherry picked from commit dd78a15b79aa3f741d16deadf209f6074938af82)
---
 pkgs/by-name/mi/mission-center/package.nix | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/mi/mission-center/package.nix b/pkgs/by-name/mi/mission-center/package.nix
index b21baead3379..4067bee90eda 100644
--- a/pkgs/by-name/mi/mission-center/package.nix
+++ b/pkgs/by-name/mi/mission-center/package.nix
@@ -35,9 +35,8 @@
   pango,
   sqlite,
   udev,
-  wayland,
-
   vulkan-loader,
+  wayland,
 
   versionCheckHook,
 }:
@@ -111,6 +110,7 @@ stdenv.mkDerivation rec {
     pango
     sqlite
     udev
+    vulkan-loader
     wayland
   ];
 
@@ -118,12 +118,6 @@ stdenv.mkDerivation rec {
     substituteInPlace src/sys_info_v2/gatherer.rs \
       --replace-fail '"missioncenter-gatherer"' '"${placeholder "out"}/bin/missioncenter-gatherer"'
 
-    substituteInPlace $cargoDepsCopy/gl_loader-*/src/glad.c \
-      --replace-fail "libGL.so.1" "${libGL}/lib/libGL.so.1"
-
-    substituteInPlace $cargoDepsCopy/ash-*/src/entry.rs \
-      --replace-fail '"libvulkan.so.1"' '"${vulkan-loader}/lib/libvulkan.so.1"'
-
     SRC_GATHERER=$NIX_BUILD_TOP/source/src/sys_info_v2/gatherer
     SRC_GATHERER_NVTOP=$SRC_GATHERER/3rdparty/nvtop
 
@@ -151,6 +145,18 @@ stdenv.mkDerivation rec {
   versionCheckProgram = "${builtins.placeholder "out"}/bin/${meta.mainProgram}";
   doInstallCheck = true;
 
+  env = {
+    # Make sure libGL and libvulkan can be found by dlopen()
+    RUSTFLAGS = toString (
+      map (flag: "-C link-arg=" + flag) [
+        "-Wl,--push-state,--no-as-needed"
+        "-lGL"
+        "-lvulkan"
+        "-Wl,--pop-state"
+      ]
+    );
+  };
+
   meta = {
     description = "Monitor your CPU, Memory, Disk, Network and GPU usage";
     homepage = "https://gitlab.com/mission-center-devs/mission-center";

From d86a6878f54221ff5d1d4ddce0eb27864f1a472e Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Tue, 19 Nov 2024 05:42:39 -0500
Subject: [PATCH 65/76] mission-center: add getchoo to maintainers

(cherry picked from commit 56e2eb4d1ae50f30acad6fa1fe0738b3d62adcde)
---
 pkgs/by-name/mi/mission-center/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/mi/mission-center/package.nix b/pkgs/by-name/mi/mission-center/package.nix
index 4067bee90eda..3b2972df4d24 100644
--- a/pkgs/by-name/mi/mission-center/package.nix
+++ b/pkgs/by-name/mi/mission-center/package.nix
@@ -162,7 +162,10 @@ stdenv.mkDerivation rec {
     homepage = "https://gitlab.com/mission-center-devs/mission-center";
     changelog = "https://gitlab.com/mission-center-devs/mission-center/-/releases/v${version}";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ GaetanLepage ];
+    maintainers = with lib.maintainers; [
+      GaetanLepage
+      getchoo
+    ];
     platforms = lib.platforms.linux;
     mainProgram = "missioncenter";
   };

From 4edfea170d2f5c856e782c887e82488aae917700 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 Nov 2024 19:54:58 +0000
Subject: [PATCH 66/76] openasar: 0-unstable-2024-09-06 ->
 0-unstable-2024-11-13

(cherry picked from commit a9fe8ba0e4ef81eb128353813f91a655d9a73596)
---
 pkgs/by-name/op/openasar/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/openasar/package.nix b/pkgs/by-name/op/openasar/package.nix
index 1f3a1f15ebee..d48baf764f83 100644
--- a/pkgs/by-name/op/openasar/package.nix
+++ b/pkgs/by-name/op/openasar/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "openasar";
-  version = "0-unstable-2024-09-06";
+  version = "0-unstable-2024-11-13";
 
   src = fetchFromGitHub {
     owner = "GooseMod";
     repo = "OpenAsar";
-    rev = "f92ee8c3dc6b6ff9829f69a1339e0f82a877929c";
-    hash = "sha256-V2oZ0mQbX+DHDZfTj8sV4XS6r9NOmJYHvYOGK6X/+HU=";
+    rev = "ef4470849624032a8eb7265eabd23158aa5a2356";
+    hash = "sha256-U9wYKen5MfE/WTKL0SICN0v3DPMLqblMYQVAbkZnfjY=";
   };
 
   postPatch = ''

From cb0c4e81487c527d503690aad7f17faa9ffaff06 Mon Sep 17 00:00:00 2001
From: Aadniz <8147434+Aadniz@users.noreply.github.com>
Date: Tue, 19 Nov 2024 21:14:29 +0100
Subject: [PATCH 67/76] prowlarr: 1.25.4.4818 -> 1.26.1.4844

(cherry picked from commit e65ba64c2920d4cc69b5af1cbfa211149948e711)
---
 pkgs/servers/prowlarr/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix
index f261568bbfaf..60e9a0d3b11b 100644
--- a/pkgs/servers/prowlarr/default.nix
+++ b/pkgs/servers/prowlarr/default.nix
@@ -21,15 +21,15 @@ let
   }.${stdenv.hostPlatform.system} or unsupported;
 
   hash = {
-    aarch64-darwin = "sha256-Okp/+glgeIKzHIcW/9AJAmBEcXPm7ANM23iU/Q4jhf8=";
-    aarch64-linux = "sha256-x0hQ/EZGM8XjIqpPGMzxTsL7oUg4YMvc/xNfvmU/sJE=";
-    x86_64-darwin = "sha256-Y7N8flvk3HpaSYjg6RJlCfN6eMsM8AuqIJ+oef85+8s=";
-    x86_64-linux = "sha256-Egp+U/I9i1PQc/MruGRaOpJtDQUQAyRmu4nC71e8fWM=";
+    aarch64-darwin = "sha256-Ht8M0gHO6a+JVUGEZXdU2LFiNCx2jrGmErXT6kVTje0=";
+    aarch64-linux = "sha256-d3/6NxctWbMBSR7CPF2N46g1TJc63KnKKqZcu2p0A80=";
+    x86_64-darwin = "sha256-diShDytcYY+9/gNDAQM+xZ/79o40Qs+62dtxpW0EfaQ=";
+    x86_64-linux = "sha256-bb3UzRr0Df4QejSsFzL7x9PnyULL3ML8CL6EGmsqelM=";
   }.${stdenv.hostPlatform.system} or unsupported;
 
 in stdenv.mkDerivation rec {
   inherit pname;
-  version = "1.25.4.4818";
+  version = "1.26.1.4844";
 
   src = fetchurl {
     url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz";

From b96540931b88142b1523e16d8aba40fd340ef196 Mon Sep 17 00:00:00 2001
From: Mauricio Collares <mauricio@collares.org>
Date: Tue, 19 Nov 2024 18:14:12 +0100
Subject: [PATCH 68/76] sage: 10.4 -> 10.5.rc0

(cherry picked from commit c0f0acb787450a71b01d629f8429715041144af1)
---
 .../sphinx-docbuild-subprocesses.patch        | 12 +++---
 pkgs/by-name/sa/sage/sage-src.nix             | 42 ++-----------------
 2 files changed, 10 insertions(+), 44 deletions(-)

diff --git a/pkgs/by-name/sa/sage/patches/sphinx-docbuild-subprocesses.patch b/pkgs/by-name/sa/sage/patches/sphinx-docbuild-subprocesses.patch
index fecf2088e504..77c49e2eb011 100644
--- a/pkgs/by-name/sa/sage/patches/sphinx-docbuild-subprocesses.patch
+++ b/pkgs/by-name/sa/sage/patches/sphinx-docbuild-subprocesses.patch
@@ -1,5 +1,5 @@
 diff --git a/src/sage_docbuild/builders.py b/src/sage_docbuild/builders.py
-index 871cc4705a2..4b718136b91 100644
+index ab39d93c280..e6501c083d5 100644
 --- a/src/sage_docbuild/builders.py
 +++ b/src/sage_docbuild/builders.py
 @@ -106,31 +106,6 @@ def builder_helper(type):
@@ -48,13 +48,13 @@ index 871cc4705a2..4b718136b91 100644
              if build_options.ABORT_ON_ERROR:
                  raise
 diff --git a/src/sage_docbuild/sphinxbuild.py b/src/sage_docbuild/sphinxbuild.py
-index 5621fe9e456..b1b91ce7b2c 100644
+index 62b2d3cb112..aa7dc07741b 100644
 --- a/src/sage_docbuild/sphinxbuild.py
 +++ b/src/sage_docbuild/sphinxbuild.py
-@@ -323,3 +323,8 @@ def runsphinx():
-         sys.stderr = saved_stderr
-         sys.stdout.flush()
-         sys.stderr.flush()
+@@ -331,3 +331,8 @@ def runsphinx():
+ 
+     if not sys.warnoptions:
+         warnings.filters = original_filters[:]
 +
 +if __name__ == '__main__':
 +    import sys
diff --git a/pkgs/by-name/sa/sage/sage-src.nix b/pkgs/by-name/sa/sage/sage-src.nix
index 16a551a56cb5..7b06e7f850c7 100644
--- a/pkgs/by-name/sa/sage/sage-src.nix
+++ b/pkgs/by-name/sa/sage/sage-src.nix
@@ -11,14 +11,14 @@
 # all get the same sources with the same patches applied.
 
 stdenv.mkDerivation rec {
-  version = "10.4";
+  version = "10.5.rc0";
   pname = "sage-src";
 
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "sage";
     rev = version;
-    hash = "sha256-BDO00ZSm5lnjEuA56VsY/FZyAhoG1hkFxdIlTtBZVBA=";
+    hash = "sha256-qjgEgyPOpT/g7D8YNhkqO1EHGNftZnuR5ucLNZBa9Sg=";
   };
 
   # contains essential files (e.g., setup.cfg) generated by the bootstrap script.
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
   configure-src = fetchurl {
     # the hash below is the tagged commit's _parent_. it can also be found by looking for
     # the "configure" asset at https://github.com/sagemath/sage/releases/tag/${version}
-    url = "mirror://sageupstream/configure/configure-3c279ec5712e0fa35c5733e03e010970727d7189.tar.gz";
-    hash = "sha256-3bRlgIUSIq9tDzvI+ZfEd5LMy1qHXdItEwu1say4cx4=";
+    url = "mirror://sageupstream/configure/configure-d9c38a7c581e6ed54fbe420122b8bba488b16074.tar.gz";
+    hash = "sha256-y1EpsuYK9wloptjeiTew+TZaIUZ2K/NKCbSteojFa4s=";
   };
 
   # Patches needed because of particularities of nix or the way this is packaged.
@@ -54,20 +54,6 @@ stdenv.mkDerivation rec {
   # fix those bugs themselves. This is for critical bugfixes, where "critical"
   # == "causes (transient) doctest failures / somebody complained".
   bugfixPatches = [
-    # https://github.com/sagemath/sage/pull/38628, landed in 10.5.beta4
-    (fetchpatch {
-      name = "pari-stack-cysignals-exception.patch";
-      url = "https://github.com/sagemath/sage/commit/4a9c985b769b1209902c970ade1892f18ab48c10.diff";
-      hash = "sha256-S6NdonB7needJlQdx52Huk34Q8/vG3nyGicA5JpsdWc=";
-    })
-
-    # https://github.com/sagemath/sage/pull/38851, landed in 10.5.beta8
-    (fetchpatch {
-      name = "glpk-aarch64-hang-workaround.patch";
-      url = "https://github.com/sagemath/sage/commit/ce4a78dcb4178f85273619cea076c97345977ee1.diff";
-      hash = "sha256-TibTx5llkXjkEZB/MDy4hfGwKBmwtitEpWP6K/ykke0=";
-    })
-
     # compile libs/gap/element.pyx with -O1
     # a more conservative version of https://github.com/sagemath/sage/pull/37951
     ./patches/gap-element-crash.patch
@@ -80,26 +66,6 @@ stdenv.mkDerivation rec {
   # should come from or be proposed to upstream. This list will probably never
   # be empty since dependencies update all the time.
   packageUpgradePatches = [
-    # https://github.com/sagemath/sage/pull/38500, landed in 10.5.beta3
-    (fetchpatch {
-      name = "cython-3.0.11-upgrade.patch";
-      url = "https://patch-diff.githubusercontent.com/raw/sagemath/sage/pull/38500.diff";
-      hash = "sha256-ePfH3Gy1T0UfpoVd3EZowCfy88CbE+yE2MV2itWthsA=";
-    })
-
-    # https://github.com/sagemath/sage/pull/36641, landed in 10.5.beta3
-    (fetchpatch {
-      name = "sympy-1.13.2-update.patch";
-      url = "https://github.com/sagemath/sage/commit/100189fa62f9a40e7aa0d856615366ea99b87aff.diff";
-      sha256 = "sha256-uWr3I15WByQYGVxbJFqG4zUJ7c7+4rjkcgwkAT85O7w=";
-    })
-
-    # https://github.com/sagemath/sage/pull/38250, landed in 10.5.beta0
-    (fetchpatch {
-      name = "numpy-2.0-compat.patch";
-      url = "https://github.com/sagemath/sage/commit/0962e0bcb159d342e7c7d83557a71e7b670fff47.diff";
-      sha256 = "sha256-4SBhgPgT9VsBxcBH8+T5uYtWzYP5tZi9+iKOG55hWgI=";
-    })
   ];
 
   patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;

From 982b6849ca7a3bb5fb5ce5b165a88073e6bc1962 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 14 Jun 2024 23:51:01 +0000
Subject: [PATCH 69/76] gap: 4.12.2 -> 4.13.1

(cherry picked from commit c11dc6f65c5330f0ee5bbc0e961bcfb4a577ada5)
---
 pkgs/by-name/ga/gap/package.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ga/gap/package.nix b/pkgs/by-name/ga/gap/package.nix
index 697a19d6afa1..7fe330e24d71 100644
--- a/pkgs/by-name/ga/gap/package.nix
+++ b/pkgs/by-name/ga/gap/package.nix
@@ -1,6 +1,5 @@
 { stdenv
 , lib
-, fetchpatch
 , fetchurl
 , makeWrapper
 , readline
@@ -67,20 +66,13 @@ in
 stdenv.mkDerivation rec {
   pname = "gap";
   # https://www.gap-system.org/Releases/
-  version = "4.12.2";
+  version = "4.13.1";
 
   src = fetchurl {
     url = "https://github.com/gap-system/gap/releases/download/v${version}/gap-${version}.tar.gz";
-    sha256 = "sha256-ZyMIdF63iiIklO6N1nhu3VvDMUVvzGRWrAZL2yjVh6g=";
+    sha256 = "sha256-l5Tb26b7mY4KLQqoziH8iEitPT+cyZk7C44gvn4dvro=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/gap-system/gap/commit/c786e229413a44b7462196716b99ae9bb0071f4c.patch";
-      hash = "sha256-g3jrEMSavHAUKlHoPqWmOw49hWHU+29SA788Klnr0Uw=";
-    })
-  ];
-
   # remove all non-essential packages (which take up a lot of space)
   preConfigure = lib.optionalString (!keepAll) (removeNonWhitelistedPkgs packagesToKeep) + ''
     patchShebangs .

From 852f4f517559e6146e5a665c8502bf5184f4902d Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Tue, 19 Nov 2024 18:30:54 -0800
Subject: [PATCH 70/76] llvmPackages_19: 19.1.3 -> 19.1.4

(cherry picked from commit 54300c25d87c529d1a0b12fdbc6192acd4e287b3)
---
 pkgs/development/compilers/llvm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 24a028e77974..37e88287f5c8 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -28,7 +28,7 @@ let
     "16.0.6".officialRelease.sha256 = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs=";
     "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag=";
     "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";
-    "19.1.3".officialRelease.sha256 = "sha256-NUx01eJNsYMlk+8mtlf10isIqhK8zBmqaOTjuFqMNRQ=";
+    "19.1.4".officialRelease.sha256 = "sha256-qi1a/AWxF5j+4O38VQ2R/tvnToVAlMjgv9SP0PNWs3g=";
     "20.0.0-git".gitRelease = {
       rev = "0e8555d4dbfdfeddc01dc2ecf9a9b6e804f7b645";
       rev-version = "20.0.0-unstable-2024-10-07";

From 6b7f035b93731f0cda82901018a0b1d05d00ab80 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 20 Nov 2024 15:20:34 +0100
Subject: [PATCH 71/76] signal-desktop(aarch64-linux): 7.23.0 -> 7.33.0

https://github.com/0mniteck/Signal-Desktop-Mobian/compare/7.23.0...7.33.1
(cherry picked from commit c48022dee9719505df436c6048d4ff7b959a89a3)
---
 .../signal-desktop/signal-desktop-aarch64.nix                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix
index 8f3eabb7bc27..7a047df74241 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix
@@ -2,7 +2,7 @@
 callPackage ./generic.nix { } rec {
   pname = "signal-desktop";
   dir = "Signal";
-  version = "7.23.0";
+  version = "7.33.0";
   url = "https://github.com/0mniteck/Signal-Desktop-Mobian/raw/${version}/builds/release/signal-desktop_${version}_arm64.deb";
-  hash = "sha256-fQb2nYE1+q6DNcMF0z5NadGlffYaCFNgcu8IIGVUtf8=";
+  hash = "sha256-2PwEPwQkoNrnSI00CVeTjF7QvxQb9NxQqrcOVisWwFU=";
 }

From 6219a5a59cd037b8249705dd6a1b6c05277f9666 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 20 Nov 2024 15:28:00 +0100
Subject: [PATCH 72/76] signal-desktop(darwin): 7.29.0 -> 7.33.0

(cherry picked from commit 0bcdcae905f1ba86fc79729336f8d9c3286a0336)
---
 .../signal-desktop/signal-desktop-darwin.nix                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-darwin.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-darwin.nix
index ff5137debe39..2f7258717b57 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-darwin.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-darwin.nix
@@ -6,11 +6,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "signal-desktop";
-  version = "7.29.0";
+  version = "7.33.0";
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg";
-    hash = "sha256-R/NYPb7bvLbyDYntw2K75SC1/sqNO7HAJ3QUwGThvUg=";
+    hash = "sha256-kq4HkLlTWTE8CLPnZ0o4XYDUC0n5LmgJiGdiIDTtdTI=";
   };
   sourceRoot = ".";
 

From ed9f1d9c581d960101f474c041b66001293e9b1f Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 19 Nov 2024 21:42:43 +0800
Subject: [PATCH 73/76] pantheon.switchboard-plug-sound: 8.0.0 -> 8.0.1

https://github.com/elementary/switchboard-plug-sound/compare/8.0.0...8.0.1
(cherry picked from commit b05dbffa60839cca8f859123f6e495dd4a59551a)
---
 .../pantheon/apps/switchboard-plugs/sound/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
index f6bd304bbfc0..9a20aa7a9906 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-sound";
-  version = "8.0.0";
+  version = "8.0.1";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "sha256-e7XjiqOxa0UtqUOfbsUiF497sOPgQd+lc93ARearXTw=";
+    sha256 = "sha256-GLeQxdrrjz4MurN8Ia5Q68y6gHuyxiMVNneft1AXKvs=";
   };
 
   nativeBuildInputs = [

From 458cfc165b5f6f0516086856fb9b82779a05bed5 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 20 Nov 2024 14:03:12 -0500
Subject: [PATCH 74/76] alembic: fix hash

(cherry picked from commit 408404d8fec02b0d2bdbe6f4d5142f9bbed258c6)
---
 pkgs/development/libraries/alembic/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix
index efe5a38c6263..103b480b5899 100644
--- a/pkgs/development/libraries/alembic/default.nix
+++ b/pkgs/development/libraries/alembic/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec
     owner = "alembic";
     repo = "alembic";
     rev = version;
-    sha256 = "sha256-PuVN5Ytls58G2BmwCHUHiMQ0rolH98Hlw/pp7cvpiAg=";
+    hash = "sha256-EJZvbaGP9aea/UvcXmFbI3Y2/xTkdqORdzyz5ch931A=";
   };
 
   # note: out is unused (but required for outputDoc anyway)

From 43aa85573a0084b3409a583f3d289e477e939c77 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Fri, 15 Nov 2024 11:00:06 +0530
Subject: [PATCH 75/76] nodejs_23: add patches to fix parallel-os test

FIXME: remove after a point release containing the patches
(cherry picked from commit 28bcb4477dfeddda89e0c61e6d1e78379a66d29f)
---
 pkgs/development/web/nodejs/v23.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/web/nodejs/v23.nix b/pkgs/development/web/nodejs/v23.nix
index a34e53375e69..7e5a915ed357 100644
--- a/pkgs/development/web/nodejs/v23.nix
+++ b/pkgs/development/web/nodejs/v23.nix
@@ -53,5 +53,15 @@ buildNodejs {
       hash = "sha256-gmIyiSyNzC3pClL1SM2YicckWM+/2tsbV1xv2S3d5G0=";
       revert = true;
     })
+    # Fix for https://github.com/NixOS/nixpkgs/issues/355919
+    # FIXME: remove after a minor point release
+    (fetchpatch2 {
+      url = "https://github.com/nodejs/node/commit/a094a8166cd772f89e92b5deef168e5e599fa815.patch?full_index=1";
+      hash = "sha256-5FZfozYWRa1ZI/f+e+xpdn974Jg2DbiHbua13XUQP5E=";
+    })
+    (fetchpatch2 {
+      url = "https://github.com/nodejs/node/commit/f270462c09ddfd770291a7c8a2cd204b2c63d730.patch?full_index=1";
+      hash = "sha256-Err0i5g7WtXcnhykKgrS3ocX7/3oV9UrT0SNeRtMZNU=";
+    })
   ];
 }

From f449f2784a1561e2428d35cb3730de73087893a6 Mon Sep 17 00:00:00 2001
From: Oriano de Stefani <oriano.destefani@gmail.com>
Date: Thu, 26 Sep 2024 19:48:02 +0200
Subject: [PATCH 76/76] evdi: 1.14.6 -> 1.14.7
 https://github.com/DisplayLink/evdi/releases/tag/v1.14.7

(cherry picked from commit b6d57c6bf0238f386ab6170e118b610c7d542f9c)
---
 pkgs/os-specific/linux/evdi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix
index 85897310893d..fb664e92cf17 100644
--- a/pkgs/os-specific/linux/evdi/default.nix
+++ b/pkgs/os-specific/linux/evdi/default.nix
@@ -13,13 +13,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "evdi";
-  version = "1.14.6";
+  version = "1.14.7";
 
   src = fetchFromGitHub {
     owner = "DisplayLink";
     repo = "evdi";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-/XIWacrsB7qBqlLUwIGuDdahvt2dAwiK7dauFaYh7lU=";
+    hash = "sha256-z3GawjaokbmmUC1LihwGSnF3tUp9n/FO+kDiWvBq+mY=";
   };
 
   env.NIX_CFLAGS_COMPILE = toString [