Merge staging-next into staging

2025-02-09 00:16:01 +00:00
parent 52887dda76 7b8f24297e
commit 03e728b208
37 changed files with 608 additions and 8972 deletions
@@ -46,7 +46,7 @@ let
          If not specified, the amount of data to read from `source` will be
          determined by cryptsetup.

-          See `{manpage}`cryptsetup-open(8)`` for details.
+          See {manpage}`cryptsetup-open(8)` for details.
        '';
      };

@@ -60,7 +60,7 @@ let
          If not specified, the default sector size is determined from the
          underlying block device.

-          See `{manpage}`cryptsetup-open(8)`` for details.
+          See {manpage}`cryptsetup-open(8)` for details.
        '';
      };

@@ -259,7 +259,7 @@ in
        description = ''
          Thinkfan settings. Use this option to configure thinkfan
          settings not exposed in a NixOS option or to bypass one.
-          Before changing this, read the `{manpage}`thinkfan.conf(5)``
+          Before changing this, read the {manpage}`thinkfan.conf(5)`
          manpage and take a look at the example config file at
          <https://github.com/vmatare/thinkfan/blob/master/examples/thinkfan.yaml>
        '';
@@ -28,7 +28,11 @@ in {
      wants = [ "network-online.target" ];
      after = [ "network-online.target" ];
      script = ''
-        timedatectl set-timezone "$(${lib.getExe pkgs.tzupdate} --print-only)"
+        timezone="$(${lib.getExe pkgs.tzupdate} --print-only)"
+        if [[ -n "$timezone" ]]; then
+          echo "Setting timezone to '$timezone'"
+          timedatectl set-timezone "$timezone"
+        fi
      '';

      serviceConfig = {
@@ -58,9 +58,8 @@ stdenv.mkDerivation (finalAttrs: {
      for prog in "$out/bin/"*; do
        wrapProgram "$prog" --prefix PATH ":" "$out/bin:${searchPath}"
      done
-      # Move emacs modules and documentation into the right place.
-      mkdir -p $out/share/emacs $out/share/doc
-      ln -s ../maxima/${finalAttrs.version}/emacs $out/share/emacs/site-lisp
+      # Move documentation into the right place.
+      mkdir -p $out/share/doc
      ln -s ../maxima/${finalAttrs.version}/doc $out/share/doc/maxima
    ''
    + (lib.optionalString (lisp-compiler.pname == "ecl") ''
@@ -55,6 +55,7 @@ let
        rustPlatform.fetchCargoVendor {
          inherit src;
          name = "mercurial-${version}";
+          allowGitDependencies = false;
          hash = "sha256-k/K1BupCqnlB++2T7hJxu82yID0jG8HwLNmb2eyx29o=";
          sourceRoot = "mercurial-${version}/rust";
        }
@@ -30,6 +30,7 @@
  unshareUts ? false,
  unshareCgroup ? false,
  privateTmp ? false,
+  chdirToPwd ? true,
  dieWithParent ? true,
  ...
 }@args:
@@ -279,7 +280,7 @@ let
        ${bubblewrap}/bin/bwrap
        --dev-bind /dev /dev
        --proc /proc
-        --chdir "$(pwd)"
+        ${optionalString chdirToPwd ''--chdir "$(pwd)"''}
        ${optionalString unshareUser "--unshare-user"}
        ${optionalString unshareIpc "--unshare-ipc"}
        ${optionalString unsharePid "--unshare-pid"}
@@ -45,13 +45,13 @@

 stdenv.mkDerivation {
  pname = "cinelerra-cv";
-  version = "2.3-unstable-2024-03-20";
+  version = "2.3-unstable-2025-01-25";

  src = fetchFromGitHub {
    owner = "cinelerra-cv-team";
    repo = "cinelerra-cv";
-    rev = "18a693425f78f7c4c68b5a342efce3e8db2a30dc";
-    hash = "sha256-+47Xa63GoKiQzEXbxmKUwJLDIFUnzc/FfxRPXCCxzpE=";
+    rev = "fb6eb391fe907d0f3b48b90f87e7a416408054f3";
+    hash = "sha256-mu6yY44IlbmoBn1DUARQm5p16y6WShPc3gVML8+59xc=";
  };

  preConfigure = ''
@@ -0,0 +1,43 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  versionCheckHook,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "files-to-prompt";
+  version = "0.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "simonw";
+    repo = "files-to-prompt";
+    tag = version;
+    hash = "sha256-gl3j0ok/hlFfIF3HhhzYrUZuNlAtU7y+Ej29sQv9tP4=";
+  };
+
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
+    click
+  ];
+
+  nativeCheckInputs = with python3Packages; [
+    pytestCheckHook
+    versionCheckHook
+  ];
+
+  versionCheckProgramArg = [ "--version" ];
+
+  meta = {
+    description = "Concatenate a directory full of files into a single prompt for use with LLMs";
+    homepage = "https://github.com/simonw/files-to-prompt/";
+    changelog = "https://github.com/simonw/files-to-prompt/releases/tag/${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ erethon ];
+    mainProgram = "files-to-prompt";
+  };
+}
@@ -1,8 +1,8 @@
 import ./generic.nix {
-  version = "7.0.12";
-  hash = "sha256-8rX/w4EqZwbs1xaHEkwN02+PQQD7e9VAXVrCqYwm3o0=";
-  npmDepsHash = "sha256-suPR7qcxXuK8AJfk47EcQRWtSo5V3jad4Ci122lbBR0=";
-  vendorHash = "sha256-seC8HzndQ10LecU+ii3kCO3ZZeCc3lqAujWbMKwNbpI=";
+  version = "7.0.13";
+  hash = "sha256-mqpqxr5HE0CoDZkTIdZQEcWFywVw4HVwvPfrdXKp8tk=";
+  npmDepsHash = "sha256-R78/L6HS8pUNccrctBJ2E8ndS/RBHd+mTvl0JPoxr8Q=";
+  vendorHash = "sha256-FyFmuJQqe+MUjhXEoB5VlSmTLSsCVbigz4H3jaQhKrE=";
  lts = true;
  nixUpdateExtraArgs = [
    "--override-filename"
@@ -1,7 +1,7 @@
 import ./generic.nix {
-  version = "10.0.0";
-  hash = "sha256-FcXL+lF2B+EUUEbdD31b1pV7GWbYxk6ewljAXuiV8QY=";
-  npmDepsHash = "sha256-YQDTw5CccnR7zJpvvEcmHZ2pLLNGYEg/mvncNYzcYY8=";
+  version = "10.0.1";
+  hash = "sha256-JLy/edAkbsOqQTQqqoyxc0UX9fPnP8HD54IUzcsyGe4=";
+  npmDepsHash = "sha256-e3SE6cu1xCBdoMRqp2Gcjcay/EwjF+bTdPOlpL1STvw=";
  vendorHash = "sha256-fqHwqpIetX2jTAWAonRWqF1tArL7Ik/XXURY51jGOn0=";
  lts = false;
  nixUpdateExtraArgs = [
@@ -4,6 +4,7 @@
  fetchurl,
  fetchpatch,
  fetchDebianPatch,
+  fetchFromGitHub,
  copyDesktopItems,
  pkg-config,
  wrapGAppsHook3,
@@ -17,9 +18,30 @@
  makeDesktopItem,
 }:

+let
+  wxwidgets_3_3 = wxGTK32.overrideAttrs (
+    finalAttrs: previousAttrs: {
+      version = "3.3.0-unstable-2025-02-02";
+      src = fetchFromGitHub {
+        owner = "wxWidgets";
+        repo = "wxWidgets";
+        rev = "969c5a46b5c1da57836f721a4ce5df9feaa437f9";
+        fetchSubmodules = true;
+        hash = "sha256-ODPE896xc5RxdyfIzdPB5fsTeBm3O+asYJd99fuW6AY=";
+      };
+      patches = [
+        ./wxcolorhook.patch
+      ];
+      configureFlags = lib.subtractLists [
+        "--disable-compat28"
+        "--enable-unicode"
+      ] previousAttrs.configureFlags;
+    }
+  );
+in
 stdenv.mkDerivation (finalAttrs: {
  pname = "freefilesync";
-  version = "13.9";
+  version = "14.0";

  src = fetchurl {
    url = "https://freefilesync.org/download/FreeFileSync_${finalAttrs.version}_Source.zip";
@@ -28,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
      rm -f $out
      tryDownload "$url"
    '';
-    hash = "sha256-53UPGg02JZr15r99ntkpZKqB/DgPjkGTQyuMt703t6s=";
+    hash = "sha256-qxt6fpJT0jKcSYJ+WVneks6PI18/wwSc5H84qICegag=";
  };

  sourceRoot = ".";
@@ -72,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
    gtk3
    libssh2
    openssl
-    wxGTK32
+    wxwidgets_3_3
  ];

  env.NIX_CFLAGS_COMPILE = toString [
@@ -0,0 +1,50 @@
+diff --git a/include/wx/settings.h b/include/wx/settings.h
+index 3967b98b46..8d7f3d2870 100644
+--- a/include/wx/settings.h
+++ b/include/wx/settings.h
+@@ -13,6 +13,8 @@
+ #include "wx/colour.h"
+ #include "wx/font.h"
+ 
+#include <memory>
+
+ class WXDLLIMPEXP_FWD_CORE wxWindow;
+ 
+ // possible values for wxSystemSettings::GetFont() parameter
+@@ -241,9 +243,28 @@ public:
+ // include the declaration of the real platform-dependent class
+ // ----------------------------------------------------------------------------
+ 
+struct wxColorHook
+{
+    virtual ~wxColorHook() {}
+    virtual wxColor getColor(wxSystemColour index) const = 0;
+};
+WXDLLIMPEXP_CORE inline std::unique_ptr<wxColorHook>& refGlobalColorHook()
+{
+    static std::unique_ptr<wxColorHook> globalColorHook;
+    return globalColorHook;
+}
+
+ class WXDLLIMPEXP_CORE wxSystemSettings : public wxSystemSettingsNative
+ {
+ public:
+    static wxColour GetColour(wxSystemColour index)
+    {
+        if (refGlobalColorHook())
+			return refGlobalColorHook()->getColor(index);
+
+        return wxSystemSettingsNative::GetColour(index);
+    }
+
+ #ifdef __WXUNIVERSAL__
+     // in wxUniversal we want to use the theme standard colours instead of the
+     // system ones, otherwise wxSystemSettings is just the same as
+@@ -264,7 +285,6 @@ public:
+ 
+     // Value
+     static wxSystemScreenType ms_screen;
+-
+ };
+ 
+ #endif
@@ -134,6 +134,7 @@ stdenv.mkDerivation rec {
    # https://github.com/NixOS/nixpkgs/pull/192548#discussion_r992824942
    rm -r "$out/share/gap/pkg"
    cp -ar pkg tst "$out/share/gap"
+    cp -a etc/Makefile.gappkg "$out/share/gap/etc"
  '';

  preFixup = ''
@@ -209,7 +209,9 @@ stdenv.mkDerivation rec {

      if [ -n "$doc" ]; then
        mkdir -p "$doc/share/giac"
+        # $out/share/giac/doc/aide_cas is a symlink to ../aide_cas
        mv "$out/share/giac/doc" "$doc/share/giac"
+        ln -sf "$out/share/giac/aide_cas" "$doc/share/giac/doc/aide_cas"
        mv "$out/share/giac/examples" "$doc/share/giac"
      fi
    ''
@@ -11,7 +11,6 @@
  gettext,
  makeWrapper,
  gnutls,
-  p11-kit,
  libproxy,
  gnome,
  gsettings-desktop-schemas,
@@ -60,7 +59,6 @@ stdenv.mkDerivation rec {
  buildInputs = [
    glib
    gnutls
-    p11-kit
    libproxy
    gsettings-desktop-schemas
    bash # installed-tests shebangs
@@ -23,13 +23,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "gswatcher";
-  version = "1.7.1";
+  version = "1.7.2";

  src = fetchFromGitHub {
    owner = "lxndr";
    repo = "gswatcher";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-U09vovOanYmDl5ymFC3bXU8pi8aUq2tPUE5AEoqmfpc=";
+    hash = "sha256-qohd18bXr7gDSW51tCyslFX54Caux+YrsuJtoLs9Ofk=";
  };

  nativeBuildInputs = [
@@ -5,20 +5,24 @@
  pkg-config,
  cmake,
  ninja,
+  perl,
+  brotli,
  openssl,
+  libcap,
  libuv,
+  wslay,
  zlib,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "h2o";
-  version = "2.3.0-beta2";
+  version = "2.3.0.20250130";

  src = fetchFromGitHub {
    owner = "h2o";
    repo = "h2o";
-    tag = "v${version}";
-    sha256 = "0lwg5sfsr7fw7cfy0hrhadgixm35b5cgcvlhwhbk89j72y1bqi6n";
+    rev = "26b116e9536be8cf07036185e3edf9d721c9bac2";
+    sha256 = "sha256-WjsUUnSs3kXjAmh+V/lzL1QlxxXNCph99UsC29YAirQ=";
  };

  outputs = [
@@ -32,18 +36,25 @@ stdenv.mkDerivation rec {
    pkg-config
    cmake
    ninja
+    perl
  ];
  buildInputs = [
+    brotli
    openssl
+    libcap
    libuv
    zlib
+    wslay
  ];

  meta = with lib; {
-    description = "Optimized HTTP/1 and HTTP/2 server";
+    description = "Optimized HTTP/1.x, HTTP/2, HTTP/3 server";
    homepage = "https://h2o.examp1e.net";
    license = licenses.mit;
-    maintainers = with maintainers; [ thoughtpolice ];
+    maintainers = with maintainers; [
+      toastal
+      thoughtpolice
+    ];
    platforms = platforms.linux;
  };
-}
+})
@@ -8,16 +8,16 @@
 }:
 buildNpmPackage rec {
  pname = "nextcloud-whiteboard-server";
-  version = "1.0.4";
+  version = "1.0.5";

  src = fetchFromGitHub {
    owner = "nextcloud";
    repo = "whiteboard";
    tag = "v${version}";
-    hash = "sha256-27w8FZz9PbVdYV7yR5iRXi5edw7U/3bLVYfdRa8yPzo=";
+    hash = "sha256-WdaAMSID8MekVL6nA8YRWUiiI+pi1WgC0nN3dDAJHf8=";
  };

-  npmDepsHash = "sha256-SwFQRDRo7Q8+0zYWx5szahJzDSoxkkJDPQ3qEdNLVaE=";
+  npmDepsHash = "sha256-T27oZdvITj9ZCEvd13fDZE3CS35XezgVmQ4iCeN75UA=";

  nativeBuildInputs = [ makeWrapper ];

@@ -2,22 +2,20 @@
  lib,
  buildGoModule,
  fetchFromGitHub,
-  testers,
-  pb,
 }:

 buildGoModule rec {
  pname = "pb";
-  version = "0.5.2";
+  version = "0.6.0";

  src = fetchFromGitHub {
    owner = "parseablehq";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-KedO/ngAlabuf3/NPKhutnzLphz6/VxJ+XJvADIP3PQ=";
+    repo = "pb";
+    tag = "v${version}";
+    hash = "sha256-OXxLHi7v/xJZVvxHZvJ0eH4MYrlLFxDAMT9CVG2mWTM=";
  };

-  vendorHash = "sha256-RAb2OvN3DF54fsVI5tRtNp1BYwB2qfYome7tj8zxxCY=";
+  vendorHash = "sha256-N6m0qvj65Ls3yQmVGw0AklsO1zs1KHdi/Y6FZRghnCs=";

  ldflags = [
    "-s"
@@ -27,10 +25,7 @@ buildGoModule rec {

  tags = [ "kqueue" ];

-  passthru.tests.version = testers.testVersion {
-    package = pb;
-    command = "pb version";
-  };
+  # Version test has been removed since it requires network access.

  meta = {
    homepage = "https://github.com/parseablehq/pb";
@@ -48,8 +48,8 @@ let
    ];
    language = "sage";
    # just one 16x16 logo is available
-    logo32 = "${sage-src}/src/doc/common/themes/sage/static/sageicon.png";
-    logo64 = "${sage-src}/src/doc/common/themes/sage/static/sageicon.png";
+    logo32 = "${sage-src}/src/doc/common/static/sageicon.png";
+    logo64 = "${sage-src}/src/doc/common/static/sageicon.png";
  };

  jupyter-kernel-specs = pkgs.jupyter-kernel.create {
@@ -99,6 +99,9 @@ stdenv.mkDerivation rec {
    "-p1"
  ];

+  # harmless broken symlinks to (not) generated files used by sage-the-distro
+  dontCheckForBrokenSymlinks = true;
+
  postPatch = ''
    # Make sure sage can at least be imported without setting any environment
    # variables. It won't be close to feature complete though.
@@ -1,4 +1,9 @@
 [
+  {
+    "pname": "BouncyCastle.Cryptography",
+    "version": "2.5.0",
+    "hash": "sha256-4JTx7QKSu3BE7kPuspN1KK2LtA9BWKLHZRLfOBEzWHY="
+  },
  {
    "pname": "Castle.Core",
    "version": "5.1.1",
@@ -18,8 +23,8 @@
  },
  {
    "pname": "Dapper",
-    "version": "2.0.123",
-    "hash": "sha256-Ic3pMHtq5jF94tPi8l5MFDGyLnEZYofcqxbH5yDLHZY="
+    "version": "2.1.35",
+    "hash": "sha256-zeroySx7lO1yLtbhKhFQ87diWXOq9gPnv3qFcmNcs9M="
  },
  {
    "pname": "Diacritical.Net",
@@ -38,8 +43,8 @@
  },
  {
    "pname": "Dynamitey",
-    "version": "2.0.9.136",
-    "hash": "sha256-wRvKTW4WisziZmglLOqbUXVv9pPh9MmF7HS/hcoj7fM="
+    "version": "3.0.3",
+    "hash": "sha256-69DyYSGu1sjpr8DupZWEiwcVmW9vT197c00vQ7H9k1s="
  },
  {
    "pname": "Equ",
@@ -48,8 +53,8 @@
  },
  {
    "pname": "FluentAssertions",
-    "version": "6.10.0",
-    "hash": "sha256-+IRWEaSkEmL9Eab0P2hpHQgf/TKS04t80x+mcq1O/Ck="
+    "version": "6.12.0",
+    "hash": "sha256-LGlPe+G7lBwj5u3ttQZiKX2+C195ddRAHPuDkY6x0BE="
  },
  {
    "pname": "FluentValidation",
@@ -58,18 +63,18 @@
  },
  {
    "pname": "GitHubActionsTestLogger",
-    "version": "2.3.3",
-    "hash": "sha256-/TxZ7f3AvArXXe6isyom6ZHLFZR2hi1ejaQuY/6KN4s="
+    "version": "2.4.1",
+    "hash": "sha256-bY8RXB3fIsgYIrlLeEuq8dsOfIn8zcbZ0dj2Ra1sFZg="
  },
  {
    "pname": "Ical.Net",
-    "version": "4.2.0",
-    "hash": "sha256-OcUvqj2nIyZ93MUYvRN+752xPkbtE/Uoi6T+W51eDKc="
+    "version": "4.3.1",
+    "hash": "sha256-jpohvCiUBe61A3O+BJwCqsPW+3jUt4cKeCqZb/0cw0M="
  },
  {
    "pname": "ImpromptuInterface",
-    "version": "7.0.1",
-    "hash": "sha256-61KY5H3W/sGX12y0oREPX7W22VJokL9U3VJpOHW50s8="
+    "version": "8.0.6",
+    "hash": "sha256-u0J8n7ShZX+lk5aX9copjwgym5TtglRGT7QtPdZeHeA="
  },
  {
    "pname": "Instances",
@@ -78,73 +83,53 @@
  },
  {
    "pname": "IPAddressRange",
-    "version": "6.0.0",
-    "hash": "sha256-3qa0BOBto1+SzJjepSWrvjRryw8RBaKOlPFXtVTvyjo="
+    "version": "6.1.0",
+    "hash": "sha256-Fvgeh6X6/XtRuU6rwi/38tBRMcXgQlqjLClzsI/iAQ4="
  },
  {
    "pname": "Lib.Harmony",
-    "version": "2.0.1",
-    "hash": "sha256-mmzIoIUDbByhbGIA87aVHlyMpFBZnpJPZiD1Gja2MVU="
+    "version": "2.3.3",
+    "hash": "sha256-h7Y925LwT8uJwwt+uuRzyUjdZegFaeuUrvCLFjvDv2M="
  },
  {
    "pname": "MailKit",
-    "version": "3.6.0",
-    "hash": "sha256-ECpS2Bt7e3h/uJ5Twng2/lw3j20C3UZgiivcW+KW7sQ="
+    "version": "4.9.0",
+    "hash": "sha256-7M+Qf0e/J50ua6ieBHDPHQ19CPjlNv1S4DRRFlHHrOQ="
  },
  {
    "pname": "Microsoft.AspNetCore.Cryptography.Internal",
-    "version": "6.0.21",
-    "hash": "sha256-YMveWdyikWEfczNSMSh0LlBS87gsMxMto1RW8Unjnro="
+    "version": "8.0.12",
+    "hash": "sha256-IuTJ5+i8lJJI8IhtqlM259LusDDIkSbsFEEDPawDwek="
  },
  {
    "pname": "Microsoft.AspNetCore.Cryptography.KeyDerivation",
-    "version": "6.0.21",
-    "hash": "sha256-oc4Vfo6XUJRp3qDVrcknXNmQWgrCsqWMHZdMVZuYaD8="
-  },
-  {
-    "pname": "Microsoft.AspNetCore.Owin",
-    "version": "6.0.21",
-    "hash": "sha256-F+plTVM6HblPFWetEX3M+AxQ8oNqqc3sRqrB1FmKcpU="
-  },
-  {
-    "pname": "Microsoft.Bcl.AsyncInterfaces",
-    "version": "6.0.0",
-    "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="
-  },
-  {
-    "pname": "Microsoft.Bcl.TimeProvider",
-    "version": "8.0.0",
-    "hash": "sha256-fBvDSXDSIYMzTa8+A+98KqhEXYP6E17wLo+UNwlyf4U="
-  },
-  {
-    "pname": "Microsoft.Build.Tasks.Git",
-    "version": "1.1.1",
-    "hash": "sha256-PHxHmsCty8Si5dCUQSizeHkJrHa9+j2nRsg6Sz+5Za0="
+    "version": "8.0.12",
+    "hash": "sha256-CYDhD+SkwKHjrBirfloJ2aqdGLz3ZOi5ULFEeAti3z4="
  },
  {
    "pname": "Microsoft.CodeCoverage",
-    "version": "17.5.0",
-    "hash": "sha256-RBFO0YLp1//Li2a9s1oAhR+C4TMXgD7TTH+V9QDgMS8="
+    "version": "17.10.0",
+    "hash": "sha256-yQFwqVChRtIRpbtkJr92JH2i+O7xn91NGbYgnKs8G2g="
  },
  {
    "pname": "Microsoft.CSharp",
    "version": "4.0.1",
    "hash": "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="
  },
-  {
-    "pname": "Microsoft.CSharp",
-    "version": "4.4.1",
-    "hash": "sha256-7/gsQHWAuFWrcVpVharASTNL+Mvl6Gw+AAw41k0MzXw="
-  },
  {
    "pname": "Microsoft.CSharp",
    "version": "4.5.0",
    "hash": "sha256-dAhj/CgXG5VIy2dop1xplUsLje7uBPFjxasz9rdFIgY="
  },
+  {
+    "pname": "Microsoft.CSharp",
+    "version": "4.7.0",
+    "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="
+  },
  {
    "pname": "Microsoft.Data.SqlClient",
-    "version": "2.1.2",
-    "hash": "sha256-f70eHp8t/kB56AOumNb2MkkEuHsMzCLKw1WG1/DeONE="
+    "version": "2.1.7",
+    "hash": "sha256-gJrFmVSx+XT0hrltODk/TK7MyR5YA2rfdYWARUv89IM="
  },
  {
    "pname": "Microsoft.Data.SqlClient.SNI.runtime",
@@ -163,13 +148,8 @@
  },
  {
    "pname": "Microsoft.Extensions.Configuration",
-    "version": "6.0.0",
-    "hash": "sha256-SIO/Q+OD2bG+Q0EoOXRgJYzZMhahGXDG1fXZn0VUvv0="
-  },
-  {
-    "pname": "Microsoft.Extensions.Configuration",
-    "version": "6.0.1",
-    "hash": "sha256-v55PAURxnSGYgbv9x+4/pMeI51H27ikRfHBuUB+N5nE="
+    "version": "8.0.0",
+    "hash": "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="
  },
  {
    "pname": "Microsoft.Extensions.Configuration.Abstractions",
@@ -178,38 +158,38 @@
  },
  {
    "pname": "Microsoft.Extensions.Configuration.Abstractions",
-    "version": "6.0.0",
-    "hash": "sha256-Evg+Ynj2QUa6Gz+zqF+bUyfGD0HI5A2fHmxZEXbn3HA="
+    "version": "8.0.0",
+    "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="
  },
  {
    "pname": "Microsoft.Extensions.Configuration.Binder",
-    "version": "6.0.0",
-    "hash": "sha256-7NZcKkiXWSuhhVcA/fXHPY/62aGUyMsRdiHm91cWC5Y="
+    "version": "8.0.2",
+    "hash": "sha256-aGB0VuoC34YadAEqrwoaXLc5qla55pswDV2xLSmR7SE="
  },
  {
    "pname": "Microsoft.Extensions.Configuration.CommandLine",
-    "version": "6.0.0",
-    "hash": "sha256-jFACPqLvGo14eg4G3hV/UYY/d9i3hNKvgL+3nnDGZME="
+    "version": "8.0.0",
+    "hash": "sha256-fmPC/o8S+weTtQJWykpnGHm6AKVU21xYE/CaHYU7zgg="
  },
  {
    "pname": "Microsoft.Extensions.Configuration.EnvironmentVariables",
-    "version": "6.0.1",
-    "hash": "sha256-h0Q7CJ/xrtaaVs3gAdW9+TgMZ8bilQfOq2NKdr/Dt5s="
+    "version": "8.0.0",
+    "hash": "sha256-+bjFZvqCsMf2FRM2olqx/fub+QwfM1kBhjGVOT5HC48="
  },
  {
    "pname": "Microsoft.Extensions.Configuration.FileExtensions",
-    "version": "6.0.0",
-    "hash": "sha256-PLnSa0JMfDC62OTv8sL0QFJbANE7QSnJ997ySFBS1go="
+    "version": "8.0.1",
+    "hash": "sha256-iRA8L7BX/fe5LHCVOhzBSk30GfshP7V2Qj2nxpEvStA="
  },
  {
    "pname": "Microsoft.Extensions.Configuration.Json",
-    "version": "6.0.0",
-    "hash": "sha256-owzLlamhIWWEoV2oumAxv4G3IlYzYGaDse0GVb8u1LA="
+    "version": "8.0.1",
+    "hash": "sha256-J8EK/yhsfTpeSUY8F81ZTBV9APHiPUliN7d+n2OX9Ig="
  },
  {
    "pname": "Microsoft.Extensions.Configuration.UserSecrets",
-    "version": "6.0.1",
-    "hash": "sha256-YTbqJElzPCfph1Nxyq2PUGV5lSY5GXFdshpKOPdvTTk="
+    "version": "8.0.1",
+    "hash": "sha256-yGvWfwBhyFudcIv96pKWaQ1MIMOiv5LHSCn+9J7Doz0="
  },
  {
    "pname": "Microsoft.Extensions.DependencyInjection",
@@ -218,13 +198,13 @@
  },
  {
    "pname": "Microsoft.Extensions.DependencyInjection",
-    "version": "6.0.0",
-    "hash": "sha256-gZuMaunMJVyvvepuzNodGPRc6eqKH//bks3957dYkPI="
+    "version": "8.0.0",
+    "hash": "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ="
  },
  {
    "pname": "Microsoft.Extensions.DependencyInjection",
-    "version": "6.0.1",
-    "hash": "sha256-V+CulDoU3NXWn5EjH64JhDVQ0h+ev5BW95T+2uL1hU4="
+    "version": "8.0.1",
+    "hash": "sha256-O9g0jWS+jfGoT3yqKwZYJGL+jGSIeSbwmvomKDC3hTU="
  },
  {
    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
@@ -238,28 +218,43 @@
  },
  {
    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "6.0.0",
-    "hash": "sha256-SZke0jNKIqJvvukdta+MgIlGsrP2EdPkkS8lfLg7Ju4="
+    "version": "7.0.0",
+    "hash": "sha256-55lsa2QdX1CJn1TpW1vTnkvbGXKCeE9P0O6AkW49LaA="
  },
  {
    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "7.0.0",
-    "hash": "sha256-55lsa2QdX1CJn1TpW1vTnkvbGXKCeE9P0O6AkW49LaA="
+    "version": "8.0.0",
+    "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "version": "8.0.2",
+    "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY="
  },
  {
    "pname": "Microsoft.Extensions.DependencyModel",
    "version": "2.1.0",
    "hash": "sha256-7dFo5itkB2OgSgS7dN87h0Xf2p5/f6fl2Ka6+CTEhDY="
  },
+  {
+    "pname": "Microsoft.Extensions.Diagnostics",
+    "version": "8.0.1",
+    "hash": "sha256-CraHNCaVlMiYx6ff9afT6U7RC/MoOCXM3pn2KrXkiLc="
+  },
+  {
+    "pname": "Microsoft.Extensions.Diagnostics.Abstractions",
+    "version": "8.0.1",
+    "hash": "sha256-d5DVXhA8qJFY9YbhZjsTqs5w5kDuxF5v+GD/WZR1QL0="
+  },
  {
    "pname": "Microsoft.Extensions.FileProviders.Abstractions",
-    "version": "6.0.0",
-    "hash": "sha256-uBjWjHKEXjZ9fDfFxMjOou3lhfTNhs1yO+e3fpWreLk="
+    "version": "8.0.0",
+    "hash": "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU="
  },
  {
    "pname": "Microsoft.Extensions.FileProviders.Physical",
-    "version": "6.0.0",
-    "hash": "sha256-5BAQOqnaEXM2YjdrmrCinXBeZ5FKxCWtebEXMdwcbMY="
+    "version": "8.0.0",
+    "hash": "sha256-29y5ZRQ1ZgzVOxHktYxyiH40kVgm5un2yTGdvuSWnRc="
  },
  {
    "pname": "Microsoft.Extensions.FileSystemGlobbing",
@@ -268,28 +263,33 @@
  },
  {
    "pname": "Microsoft.Extensions.FileSystemGlobbing",
-    "version": "6.0.0",
-    "hash": "sha256-RAWHjkkfvGpjc49Q0kJbZyXgU6UEq/EJ0j557sj2/iU="
+    "version": "8.0.0",
+    "hash": "sha256-+Oz41JR5jdcJlCJOSpQIL5OMBNi+1Hl2d0JUHfES7sU="
  },
  {
    "pname": "Microsoft.Extensions.Hosting",
-    "version": "6.0.1",
-    "hash": "sha256-L57B/mAxkzK7QEipV0KtHzxMtsxEZ+a4FdFkn/3/XIY="
+    "version": "8.0.1",
+    "hash": "sha256-FFLo6em0N2vaWg6//vaQhxoOgT9LLH5Y2KWkCeX5xQ4="
  },
  {
    "pname": "Microsoft.Extensions.Hosting.Abstractions",
-    "version": "6.0.0",
-    "hash": "sha256-ksIPO6RhfbYx/i3su4J3sDhoL+TDnITKsgIpEqnpktc="
+    "version": "8.0.1",
+    "hash": "sha256-/bIVL9uvBQhV/KQmjA1ZjR74sMfaAlBb15sVXsGDEVA="
  },
  {
    "pname": "Microsoft.Extensions.Hosting.WindowsServices",
-    "version": "6.0.2",
-    "hash": "sha256-hgLydinnGforEzR2SCq6568IWhjnIoX8vyR3Z8xRIxg="
+    "version": "8.0.1",
+    "hash": "sha256-JBrZuv1RxpJf5wR81g91bE1/JQgBeOtnJDvA98rlYKE="
  },
  {
    "pname": "Microsoft.Extensions.Logging",
-    "version": "6.0.0",
-    "hash": "sha256-8WsZKRGfXW5MsXkMmNVf6slrkw+cR005czkOP2KUqTk="
+    "version": "8.0.0",
+    "hash": "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging",
+    "version": "8.0.1",
+    "hash": "sha256-vkfVw4tQEg86Xg18v6QO0Qb4Ysz0Njx57d1XcNuj6IU="
  },
  {
    "pname": "Microsoft.Extensions.Logging.Abstractions",
@@ -298,33 +298,38 @@
  },
  {
    "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "6.0.0",
-    "hash": "sha256-QNqcQ3x+MOK7lXbWkCzSOWa/2QyYNbdM/OEEbWN15Sw="
+    "version": "8.0.0",
+    "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "8.0.2",
+    "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc="
  },
  {
    "pname": "Microsoft.Extensions.Logging.Configuration",
-    "version": "6.0.0",
-    "hash": "sha256-IeMOza71UDzsEIVIlYuI0RYKk+d+VOC6zCqYCQs6nV4="
+    "version": "8.0.1",
+    "hash": "sha256-E2JbJG2EXlv2HUWLi17kIkAL6RC9rC2E18C3gAyOuaE="
  },
  {
    "pname": "Microsoft.Extensions.Logging.Console",
-    "version": "6.0.0",
-    "hash": "sha256-LQw/najhYDdvtrsogHEQue+U+/+YJcgyBP+3MTJYA40="
+    "version": "8.0.1",
+    "hash": "sha256-2thhF1JbDNj3Bx2fcH7O26uHGNeMd9MYah6N60lIpIU="
  },
  {
    "pname": "Microsoft.Extensions.Logging.Debug",
-    "version": "6.0.0",
-    "hash": "sha256-kweko71W7/hIAUO3ZYYbNXksVLgj8wrDN028QthMFCs="
+    "version": "8.0.1",
+    "hash": "sha256-gKFqBg5lbjy5VBEcAuoQ/SsXAxvrYdBYOu9dV60eJKg="
  },
  {
    "pname": "Microsoft.Extensions.Logging.EventLog",
-    "version": "6.0.0",
-    "hash": "sha256-1BXQjw/ySWmddAZ79bv3OhmC4SPTG8PHyTOlrNEUb0g="
+    "version": "8.0.1",
+    "hash": "sha256-1UkEOwl3Op2b3jTvpI10hHxIe9FqeVVy+VB1tZp6Lc8="
  },
  {
    "pname": "Microsoft.Extensions.Logging.EventSource",
-    "version": "6.0.0",
-    "hash": "sha256-j2Begn1+Xoa+9yPoQC6b6aPmUIpBrjkTGQhRhYfJaDI="
+    "version": "8.0.1",
+    "hash": "sha256-EINT/PgfB4Dvf+1JBzL1plPT35ezT7kyS8y/XMMgYxA="
  },
  {
    "pname": "Microsoft.Extensions.Options",
@@ -333,13 +338,18 @@
  },
  {
    "pname": "Microsoft.Extensions.Options",
-    "version": "6.0.0",
-    "hash": "sha256-DxnEgGiCXpkrxFkxXtOXqwaiAtoIjA8VSSWCcsW0FwE="
+    "version": "8.0.0",
+    "hash": "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="
+  },
+  {
+    "pname": "Microsoft.Extensions.Options",
+    "version": "8.0.2",
+    "hash": "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys="
  },
  {
    "pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
-    "version": "6.0.0",
-    "hash": "sha256-au0Y13cGk/dQFKuvSA5NnP/++bErTk0oOTlgmHdI2Mw="
+    "version": "8.0.0",
+    "hash": "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="
  },
  {
    "pname": "Microsoft.Extensions.Primitives",
@@ -348,8 +358,8 @@
  },
  {
    "pname": "Microsoft.Extensions.Primitives",
-    "version": "6.0.0",
-    "hash": "sha256-AgvysszpQ11AiTBJFkvSy8JnwIWTj15Pfek7T7ThUc4="
+    "version": "8.0.0",
+    "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="
  },
  {
    "pname": "Microsoft.Identity.Client",
@@ -383,8 +393,8 @@
  },
  {
    "pname": "Microsoft.NET.Test.Sdk",
-    "version": "17.5.0",
-    "hash": "sha256-XgahgoL+VfAN4NB6qxeAHxvGj9s1Dsl9wLSSPlEU/wE="
+    "version": "17.10.0",
+    "hash": "sha256-rkHIqB2mquNXF89XBTFpUL2z5msjTBsOcyjSBCh36I0="
  },
  {
    "pname": "Microsoft.NETCore.Platforms",
@@ -421,16 +431,6 @@
    "version": "1.6.14",
    "hash": "sha256-dSJUic2orPGfYVgto9DieRckbtLpPyxHtf+RJ2tmKPM="
  },
-  {
-    "pname": "Microsoft.SourceLink.Common",
-    "version": "1.1.1",
-    "hash": "sha256-b4FaNFneDVDbvJVX1iNyhhLTrnxUfnmyypeJr47GbXY="
-  },
-  {
-    "pname": "Microsoft.SourceLink.GitHub",
-    "version": "1.1.1",
-    "hash": "sha256-3hc9ym5ReONp00ruCKio/Ka1gYXo/jDlUHtfK1wZPiU="
-  },
  {
    "pname": "Microsoft.TestPlatform.ObjectModel",
    "version": "16.9.1",
@@ -438,18 +438,13 @@
  },
  {
    "pname": "Microsoft.TestPlatform.ObjectModel",
-    "version": "17.5.0",
-    "hash": "sha256-mj5UH+aqVk7f3Uu0+L47aqZUudJNCx3Lk7cbP4fzcmI="
-  },
-  {
-    "pname": "Microsoft.TestPlatform.ObjectModel",
-    "version": "17.7.1",
-    "hash": "sha256-KfqM1E0jhAg07QfpjfEcjQ+HX13XZfdvveT5qxm89Sk="
+    "version": "17.10.0",
+    "hash": "sha256-3YjVGK2zEObksBGYg8b/CqoJgLQ1jUv4GCWNjDhLRh4="
  },
  {
    "pname": "Microsoft.TestPlatform.TestHost",
-    "version": "17.5.0",
-    "hash": "sha256-A/LU0UTQ7ee9n1Yww8FGPGELvYTPkjeRWvkhW/KY4J0="
+    "version": "17.10.0",
+    "hash": "sha256-+yzP3FY6WoOosSpYnB7duZLhOPUZMQYy8zJ1d3Q4hK4="
  },
  {
    "pname": "Microsoft.Win32.Primitives",
@@ -476,26 +471,16 @@
    "version": "5.0.0",
    "hash": "sha256-mGUKg+bmB5sE/DCwsTwCsbe00MCwpgxsVW3nCtQiSmo="
  },
-  {
-    "pname": "Microsoft.Win32.SystemEvents",
-    "version": "6.0.0",
-    "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="
-  },
  {
    "pname": "MimeKit",
-    "version": "3.6.0",
-    "hash": "sha256-z6s6cAHlU9XaKdQtjfh21pJOG63lE2XAAtJioIdrpFA="
+    "version": "4.9.0",
+    "hash": "sha256-V7M7ejLKzE/RZZPtnUVaPlFq4xo8xViBIlDZ7FWBKAA="
  },
  {
    "pname": "Mono.Cecil",
    "version": "0.11.1",
    "hash": "sha256-J8+oOA/aJIit4nmhZ3NugJKRupHp9SgivRZUvMHP+jA="
  },
-  {
-    "pname": "Mono.Cecil",
-    "version": "0.11.2",
-    "hash": "sha256-qvQjZ5FXIJ+yu4F5EXvxzPUST94vmAZQidcapaRvkYQ="
-  },
  {
    "pname": "Mono.Nat",
    "version": "3.0.1",
@@ -507,11 +492,6 @@
    "hash": "sha256-aqzdoJkz+Vnof1hM9NCccE+/5otsiEvuF+ZiEztAz7Y=",
    "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/9845f7c9-6c8c-4845-b5ee-58375c59e0d8/nuget/v3/flat2/mono.posix.netstandard/5.20.1.34-servarr24/mono.posix.netstandard.5.20.1.34-servarr24.nupkg"
  },
-  {
-    "pname": "MonoMod.Common",
-    "version": "20.5.7.1",
-    "hash": "sha256-LwfM2W7oNaX8l34NjD1RFlekMkDwy0G+KoMEW04MRqk="
-  },
  {
    "pname": "MonoTorrent",
    "version": "2.0.7",
@@ -554,18 +534,18 @@
  },
  {
    "pname": "NLog",
-    "version": "5.3.2",
-    "hash": "sha256-b/y/IFUSe7qsSeJ8JVB0VFmJlkviFb8h934ktnn9Fgc="
+    "version": "5.3.4",
+    "hash": "sha256-Cwr1Wu9VbOcRz3GdVKkt7lIpNwC1E4Hdb0g+qEkEr3k="
  },
  {
    "pname": "NLog.Extensions.Logging",
-    "version": "5.3.11",
-    "hash": "sha256-DP3R51h+9kk06N63U+1C4/JCZTFiADeYTROToAA2R0g="
+    "version": "5.3.15",
+    "hash": "sha256-otzOJncsEmzeGkJ9yxuwQgYFlKIG9ALX+DaKJ/Jhux4="
  },
  {
    "pname": "NLog.Layouts.ClefJsonLayout",
-    "version": "1.0.0",
-    "hash": "sha256-WLtMT2pa+hQoZe8joknTEoJEVARNzdKRLYIn++L1kX0="
+    "version": "1.0.2",
+    "hash": "sha256-VTdLir7lZdMHCexnT0oiyDx3X75lCZiWbkGZd+VltgM="
  },
  {
    "pname": "NLog.Targets.Syslog",
@@ -574,33 +554,23 @@
  },
  {
    "pname": "NodaTime",
-    "version": "3.0.0",
-    "hash": "sha256-kOiGkTez5eIWsBJVYURe8WRuyIhQgMiq/c/m42+XZuY="
+    "version": "3.2.0",
+    "hash": "sha256-kt59MWEzmMFBgpw5tOPlcYwZKe74WkA9N5ggrLS3tUM="
  },
  {
    "pname": "Npgsql",
-    "version": "7.0.7",
-    "hash": "sha256-AvHPEO2QP7r0kCOHSLhXLJDzYMOLGH2dyhHgEUPSWuc="
+    "version": "9.0.2",
+    "hash": "sha256-T1IEIWCYqTchgGO37x8v80oeuLA+FU3m7ureXdi2RwA="
  },
  {
    "pname": "NuGet.Frameworks",
    "version": "5.0.0",
    "hash": "sha256-WWLh+v9Y9as+WURW8tUPowQB8HWIiVJzbpKzEWTdMqI="
  },
-  {
-    "pname": "NuGet.Frameworks",
-    "version": "5.11.0",
-    "hash": "sha256-n+hxcrf+sXM80Tv9YH9x4+hwTslVidFq4tjBNPAzYnM="
-  },
-  {
-    "pname": "NuGet.Frameworks",
-    "version": "6.5.0",
-    "hash": "sha256-ElqfN4CcKxT3hP2qvxxObb4mnBlYG89IMxO0Sm5oZ2g="
-  },
  {
    "pname": "NUnit",
-    "version": "3.13.3",
-    "hash": "sha256-Zn+sJIF7ieNqu/t2RwJx6WPFb1jl9UuNHidb/Px0v3E="
+    "version": "3.14.0",
+    "hash": "sha256-CuP/q5HovPWfAW3Cty/QxRi7VpjykJ3TDLq5TENI6KY="
  },
  {
    "pname": "NUnit3TestAdapter",
@@ -614,8 +584,8 @@
  },
  {
    "pname": "Polly",
-    "version": "8.3.1",
-    "hash": "sha256-VPPoVGvEJBHoUR4hU57sdY2pF3P9igLSQSBtPRLRB6c="
+    "version": "8.5.1",
+    "hash": "sha256-fAeM5Th1OtfB0iqKFxdPE8sDz1Pfl2YnMweh58/lqJI="
  },
  {
    "pname": "Polly.Contrib.WaitAndRetry",
@@ -624,13 +594,8 @@
  },
  {
    "pname": "Polly.Core",
-    "version": "8.3.1",
-    "hash": "sha256-i1R9e4aKZ5U+y96+GOxTknsAtGn7fmeBNSdfzhqe1Jc="
-  },
-  {
-    "pname": "Portable.BouncyCastle",
-    "version": "1.9.0",
-    "hash": "sha256-GOXM4TdTTodWlGzEfbMForTfTQI/ObJGnFZMSD6X8E4="
+    "version": "8.5.1",
+    "hash": "sha256-XP9nIeYSnZISHW8JMTi8zFFV3zRFGvDZTPbE2bBgG6k="
  },
  {
    "pname": "RestSharp",
@@ -990,8 +955,8 @@
  },
  {
    "pname": "SixLabors.ImageSharp",
-    "version": "3.1.5",
-    "hash": "sha256-3UehX9T+I81nfgv2dTHlpoPgYzXFk7kHr1mmlQOCBfw="
+    "version": "3.1.6",
+    "hash": "sha256-FQjLyC4158F1GyhlKjzjGo6TxAu698rYWTY9lkko/fA="
  },
  {
    "pname": "Swashbuckle.AspNetCore.Annotations",
@@ -1085,8 +1050,8 @@
  },
  {
    "pname": "System.Configuration.ConfigurationManager",
-    "version": "6.0.1",
-    "hash": "sha256-U/0HyekAZK5ya2VNfGA1HeuQyJChoaqcoIv57xLpzLQ="
+    "version": "8.0.1",
+    "hash": "sha256-2vgU/BBFDOO2506UX6mtuBQ9c2bCShLLhoy67l7418E="
  },
  {
    "pname": "System.Console",
@@ -1119,16 +1084,16 @@
    "version": "4.7.0",
    "hash": "sha256-wSJTNjJGcEa0tOrXXHGNVkjPpBPnLLP7ZKpQ9FvZIDM="
  },
-  {
-    "pname": "System.Diagnostics.DiagnosticSource",
-    "version": "6.0.0",
-    "hash": "sha256-RY9uWSPdK2fgSwlj1OHBGBVo3ZvGQgBJNzAsS5OGMWc="
-  },
  {
    "pname": "System.Diagnostics.EventLog",
    "version": "6.0.0",
    "hash": "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM="
  },
+  {
+    "pname": "System.Diagnostics.EventLog",
+    "version": "8.0.1",
+    "hash": "sha256-zvqd72pwgcGoa1nH3ZT1C0mP9k53vFLJ69r5MCQ1saA="
+  },
  {
    "pname": "System.Diagnostics.Process",
    "version": "4.3.0",
@@ -1159,11 +1124,6 @@
    "version": "5.0.2",
    "hash": "sha256-+g0aHEpoLVNfmFY3/CaFiM6aMLiZQt0B4hDy8riPbyI="
  },
-  {
-    "pname": "System.Drawing.Common",
-    "version": "6.0.0",
-    "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="
-  },
  {
    "pname": "System.Dynamic.Runtime",
    "version": "4.0.11",
@@ -1171,8 +1131,8 @@
  },
  {
    "pname": "System.Formats.Asn1",
-    "version": "6.0.0",
-    "hash": "sha256-KaMHgIRBF7Nf3VwOo+gJS1DcD+41cJDPWFh+TDQ8ee8="
+    "version": "8.0.1",
+    "hash": "sha256-may/Wg+esmm1N14kQTG4ESMBi+GQKPp0ZrrBo/o6OXM="
  },
  {
    "pname": "System.Globalization",
@@ -1266,8 +1226,8 @@
  },
  {
    "pname": "System.Memory",
-    "version": "4.5.5",
-    "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="
+    "version": "4.6.0",
+    "hash": "sha256-OhAEKzUM6eEaH99DcGaMz2pFLG/q/N4KVWqqiBYUOFo="
  },
  {
    "pname": "System.Net.Http",
@@ -1324,6 +1284,11 @@
    "version": "4.3.0",
    "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="
  },
+  {
+    "pname": "System.Reflection.Emit",
+    "version": "4.7.0",
+    "hash": "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg="
+  },
  {
    "pname": "System.Reflection.Emit.ILGeneration",
    "version": "4.0.1",
@@ -1334,11 +1299,6 @@
    "version": "4.3.0",
    "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="
  },
-  {
-    "pname": "System.Reflection.Emit.ILGeneration",
-    "version": "4.7.0",
-    "hash": "sha256-GUnQeGo/DtvZVQpFnESGq7lJcjB30/KnDY7Kd2G/ElE="
-  },
  {
    "pname": "System.Reflection.Emit.Lightweight",
    "version": "4.0.1",
@@ -1349,11 +1309,6 @@
    "version": "4.3.0",
    "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="
  },
-  {
-    "pname": "System.Reflection.Emit.Lightweight",
-    "version": "4.7.0",
-    "hash": "sha256-V0Wz/UUoNIHdTGS9e1TR89u58zJjo/wPUWw6VaVyclU="
-  },
  {
    "pname": "System.Reflection.Extensions",
    "version": "4.0.1",
@@ -1394,11 +1349,6 @@
    "version": "4.3.0",
    "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="
  },
-  {
-    "pname": "System.Reflection.TypeExtensions",
-    "version": "4.7.0",
-    "hash": "sha256-GEtCGXwtOnkYejSV+Tfl+DqyGq5jTUaVyL9eMupMHBM="
-  },
  {
    "pname": "System.Resources.ResourceManager",
    "version": "4.0.1",
@@ -1429,16 +1379,6 @@
    "version": "4.4.0",
    "hash": "sha256-SeTI4+yVRO2SmAKgOrMni4070OD+Oo8L1YiEVeKDyig="
  },
-  {
-    "pname": "System.Runtime.CompilerServices.Unsafe",
-    "version": "4.7.1",
-    "hash": "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U="
-  },
-  {
-    "pname": "System.Runtime.CompilerServices.Unsafe",
-    "version": "6.0.0",
-    "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
-  },
  {
    "pname": "System.Runtime.Extensions",
    "version": "4.1.0",
@@ -1499,11 +1439,6 @@
    "version": "4.7.0",
    "hash": "sha256-/9ZCPIHLdhzq7OW4UKqTsR0O93jjHd6BRG1SRwgHE1g="
  },
-  {
-    "pname": "System.Security.AccessControl",
-    "version": "6.0.0",
-    "hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="
-  },
  {
    "pname": "System.Security.AccessControl",
    "version": "6.0.0-preview.5.21301.5",
@@ -1546,8 +1481,8 @@
  },
  {
    "pname": "System.Security.Cryptography.Pkcs",
-    "version": "6.0.0",
-    "hash": "sha256-xMSJGgn+UGGe9eGNaZ04OsyiFO7fYtDfz7zsya/9AOE="
+    "version": "8.0.1",
+    "hash": "sha256-KMNIkJ3yQ/5O6WIhPjyAIarsvIMhkp26A6aby5KkneU="
  },
  {
    "pname": "System.Security.Cryptography.Primitives",
@@ -1566,8 +1501,8 @@
  },
  {
    "pname": "System.Security.Cryptography.ProtectedData",
-    "version": "6.0.0",
-    "hash": "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY="
+    "version": "8.0.0",
+    "hash": "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs="
  },
  {
    "pname": "System.Security.Cryptography.X509Certificates",
@@ -1579,11 +1514,6 @@
    "version": "4.7.0",
    "hash": "sha256-BGgXMLUi5rxVmmChjIhcXUxisJjvlNToXlyaIbUxw40="
  },
-  {
-    "pname": "System.Security.Permissions",
-    "version": "6.0.0",
-    "hash": "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs="
-  },
  {
    "pname": "System.Security.Principal",
    "version": "4.3.0",
@@ -1606,8 +1536,8 @@
  },
  {
    "pname": "System.ServiceProcess.ServiceController",
-    "version": "6.0.1",
-    "hash": "sha256-ZYf+7ln6IlrSZHnoFvZyootRMsLqcUaZduJnh6mz25Y="
+    "version": "8.0.1",
+    "hash": "sha256-2cXTzNOyXqJinFPzdVJ9Gu6qrFtycfivu7RHDzBJic8="
  },
  {
    "pname": "System.Text.Encoding",
@@ -1626,8 +1556,8 @@
  },
  {
    "pname": "System.Text.Encoding.CodePages",
-    "version": "6.0.0",
-    "hash": "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4="
+    "version": "8.0.0",
+    "hash": "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE="
  },
  {
    "pname": "System.Text.Encoding.Extensions",
@@ -1641,18 +1571,18 @@
  },
  {
    "pname": "System.Text.Encodings.Web",
-    "version": "6.0.0",
-    "hash": "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo="
+    "version": "8.0.0",
+    "hash": "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="
  },
  {
    "pname": "System.Text.Json",
-    "version": "6.0.0",
-    "hash": "sha256-9AE/5ds4DqEfb0l+27fCBTSeYCdRWhxh2Bhg8IKvIuo="
+    "version": "8.0.1",
+    "hash": "sha256-Y0ba+eTXdrJZgET0xaurt1nkKbQRNBhod+KMcg9IdR4="
  },
  {
    "pname": "System.Text.Json",
-    "version": "6.0.10",
-    "hash": "sha256-UijYh0dxFjFinMPSTJob96oaRkNm+Wsa+7Ffg6mRnsc="
+    "version": "8.0.5",
+    "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68="
  },
  {
    "pname": "System.Text.RegularExpressions",
@@ -1724,11 +1654,6 @@
    "version": "4.7.0",
    "hash": "sha256-yW+GvQranReaqPw5ZFv+mSjByQ5y1pRLl05JIEf3tYU="
  },
-  {
-    "pname": "System.Windows.Extensions",
-    "version": "6.0.0",
-    "hash": "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM="
-  },
  {
    "pname": "System.Xml.ReaderWriter",
    "version": "4.0.11",
@@ -1,29 +1,57 @@
-{ lib
-, stdenvNoCC
-, fetchFromGitHub
-, buildDotnetModule
-, dotnetCorePackages
-, sqlite
-, withFFmpeg ? true # replace bundled ffprobe binary with symlink to ffmpeg package.
-, ffmpeg
-, fetchYarnDeps
-, yarn
-, fixup-yarn-lock
-, nodejs
-, nixosTests
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  buildDotnetModule,
+  dotnetCorePackages,
+  sqlite,
+  withFFmpeg ? true, # replace bundled ffprobe binary with symlink to ffmpeg package.
+  ffmpeg,
+  fetchYarnDeps,
+  yarn,
+  fixup-yarn-lock,
+  nodejs,
+  nixosTests,
  # update script
-, writers
-, python3Packages
-, nix
-, prefetch-yarn-deps
+  writers,
+  python3Packages,
+  nix,
+  prefetch-yarn-deps,
+  fetchpatch,
+  applyPatches,
 }:
 let
-  version = "4.0.11.2680";
-  src = fetchFromGitHub {
-    owner = "Sonarr";
-    repo = "Sonarr";
-    tag = "v${version}";
-    hash = "sha256-+Ezr+O5BeOAf21l1TjHSQ7OoHPuQ9HXVvmuQvo8V9ss=";
+  version = "4.0.12.2823";
+  # The dotnet8 compatibility patches also change `yarn.lock`, so we must pass
+  # the already patched lockfile to `fetchYarnDeps`.
+  src = applyPatches {
+    src = fetchFromGitHub {
+      owner = "Sonarr";
+      repo = "Sonarr";
+      tag = "v${version}";
+      hash = "sha256-gAvbA3Idx73QEDthLwrM8Jbt6YhXxK8LzEJI6eF2k20=";
+    };
+    patches =
+      [
+        ./nuget-config.patch
+      ]
+      ++ lib.optionals (lib.versionOlder version "5.0") [
+        # See https://github.com/Sonarr/Sonarr/issues/7442 and
+        # https://github.com/Sonarr/Sonarr/pull/7443.
+        # Unfortunately, the .NET 8 upgrade was only merged into the v5 branch,
+        # and it may take some time for that to become stable.
+        # However, the patches cleanly apply to v4 as well.
+        (fetchpatch {
+          name = "dotnet8-compatibility";
+          url = "https://github.com/Sonarr/Sonarr/commit/518f1799dca96a7481004ceefe39be465de3d72d.patch";
+          hash = "sha256-e+/rKZrTf6lWq9bmCAwnZrbEPRkqVmI7qNavpLjfpUE=";
+        })
+        (fetchpatch {
+          name = "dotnet8-darwin-compatibility";
+          url = "https://github.com/Sonarr/Sonarr/commit/1a5fa185d11d2548f45fefb8a0facd3731a946d0.patch";
+          hash = "sha256-6Lzo4ph1StA05+B1xYhWH+BBegLd6DxHiEiaRxGXn7k=";
+        })
+      ];
  };
  rid = dotnetCorePackages.systemToDotnetRid stdenvNoCC.hostPlatform.system;
 in
@@ -31,16 +59,17 @@ buildDotnetModule {
  pname = "sonarr";
  inherit version src;

-  patches = [
-    ./nuget-config.patch
-  ];
-
  strictDeps = true;
-  nativeBuildInputs = [ nodejs yarn prefetch-yarn-deps fixup-yarn-lock ];
+  nativeBuildInputs = [
+    nodejs
+    yarn
+    prefetch-yarn-deps
+    fixup-yarn-lock
+  ];

  yarnOfflineCache = fetchYarnDeps {
    yarnLock = "${src}/yarn.lock";
-    hash = "sha256-S1USzvQ/BcIr+od+gQd+uWxaEz5/qtyOkuIIVK5b7lg=";
+    hash = "sha256-YkBFvv+g4p22HdM/GQAHVGGW1yLYGWpNtRq7+QJiLIw=";
  };

  ffprobe = lib.optionalDrvAttr withFFmpeg (lib.getExe' ffmpeg "ffprobe");
@@ -54,12 +83,14 @@ buildDotnetModule {
  postBuild = ''
    yarn --offline run build --env production
  '';
-  postInstall = lib.optionalString withFFmpeg ''
-    rm -- "$out/lib/sonarr/ffprobe"
-    ln -s -- "$ffprobe" "$out/lib/sonarr/ffprobe"
-  '' + ''
-    cp -a -- _output/UI "$out/lib/sonarr/UI"
-  '';
+  postInstall =
+    lib.optionalString withFFmpeg ''
+      rm -- "$out/lib/sonarr/ffprobe"
+      ln -s -- "$ffprobe" "$out/lib/sonarr/ffprobe"
+    ''
+    + ''
+      cp -a -- _output/UI "$out/lib/sonarr/UI"
+    '';
  # Add an alias for compatibility with Sonarr v3 package.
  postFixup = ''
    ln -s -- Sonarr "$out/bin/NzbDrone"
@@ -69,8 +100,8 @@ buildDotnetModule {

  runtimeDeps = [ sqlite ];

-  dotnet-sdk = dotnetCorePackages.sdk_6_0-bin;
-  dotnet-runtime = dotnetCorePackages.aspnetcore_6_0-bin;
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
+  dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;

  doCheck = true;

@@ -96,10 +127,10 @@ buildDotnetModule {
  ];

  dotnetFlags = [
-    "--property:TargetFramework=net6.0"
+    "--property:TargetFramework=net8.0"
    "--property:EnableAnalyzers=false"
    # Override defaults in src/Directory.Build.props that use current time.
-    "--property:Copyright=Copyright 2014-2024 sonarr.tv (GNU General Public v3)"
+    "--property:Copyright=Copyright 2014-2025 sonarr.tv (GNU General Public v3)"
    "--property:AssemblyVersion=${version}"
    "--property:AssemblyConfiguration=main"
    "--property:RuntimeIdentifier=${rid}"
@@ -107,32 +138,38 @@ buildDotnetModule {

  # Skip manual, integration, automation and platform-dependent tests.
  dotnetTestFlags = [
-    "--filter:${lib.concatStringsSep "&" [
-      "TestCategory!=ManualTest"
-      "TestCategory!=IntegrationTest"
-      "TestCategory!=AutomationTest"
+    "--filter:${
+      lib.concatStringsSep "&" (
+        [
+          "TestCategory!=ManualTest"
+          "TestCategory!=IntegrationTest"
+          "TestCategory!=AutomationTest"

-      # setgid tests
-      "FullyQualifiedName!=NzbDrone.Mono.Test.DiskProviderTests.DiskProviderFixture.should_preserve_setgid_on_set_folder_permissions"
-      "FullyQualifiedName!=NzbDrone.Mono.Test.DiskProviderTests.DiskProviderFixture.should_clear_setgid_on_set_folder_permissions"
+          # setgid tests
+          "FullyQualifiedName!=NzbDrone.Mono.Test.DiskProviderTests.DiskProviderFixture.should_preserve_setgid_on_set_folder_permissions"
+          "FullyQualifiedName!=NzbDrone.Mono.Test.DiskProviderTests.DiskProviderFixture.should_clear_setgid_on_set_folder_permissions"

-      # we do not set application data directory during tests (i.e. XDG data directory)
-      "FullyQualifiedName!=NzbDrone.Mono.Test.DiskProviderTests.FreeSpaceFixture.should_return_free_disk_space"
+          # we do not set application data directory during tests (i.e. XDG data directory)
+          "FullyQualifiedName!=NzbDrone.Mono.Test.DiskProviderTests.FreeSpaceFixture.should_return_free_disk_space"

-      # attempts to read /etc/*release and fails since it does not exist
-      "FullyQualifiedName!=NzbDrone.Mono.Test.EnvironmentInfo.ReleaseFileVersionAdapterFixture.should_get_version_info"
+          # attempts to read /etc/*release and fails since it does not exist
+          "FullyQualifiedName!=NzbDrone.Mono.Test.EnvironmentInfo.ReleaseFileVersionAdapterFixture.should_get_version_info"

-      # fails to start test dummy because it cannot locate .NET runtime for some reason
-      "FullyQualifiedName!=NzbDrone.Common.Test.ProcessProviderFixture.Should_be_able_to_start_process"
-      "FullyQualifiedName!=NzbDrone.Common.Test.ProcessProviderFixture.kill_all_should_kill_all_process_with_name"
+          # fails to start test dummy because it cannot locate .NET runtime for some reason
+          "FullyQualifiedName!=NzbDrone.Common.Test.ProcessProviderFixture.Should_be_able_to_start_process"
+          "FullyQualifiedName!=NzbDrone.Common.Test.ProcessProviderFixture.kill_all_should_kill_all_process_with_name"

-      # makes real HTTP requests
-      "FullyQualifiedName!~NzbDrone.Core.Test.TvTests.RefreshEpisodeServiceFixture"
-      "FullyQualifiedName!~NzbDrone.Core.Test.UpdateTests.UpdatePackageProviderFixture"
-
-      # fails on macOS
-      "FullyQualifiedName!~NzbDrone.Core.Test.Http.HttpProxySettingsProviderFixture"
-    ]}"
+          # makes real HTTP requests
+          "FullyQualifiedName!~NzbDrone.Core.Test.TvTests.RefreshEpisodeServiceFixture"
+          "FullyQualifiedName!~NzbDrone.Core.Test.UpdateTests.UpdatePackageProviderFixture"
+        ]
+        ++ lib.optionals stdenvNoCC.buildPlatform.isDarwin [
+          # fails on macOS
+          "FullyQualifiedName!~NzbDrone.Core.Test.Http.HttpProxySettingsProviderFixture"
+          "FullyQualifiedName!=NzbDrone.Common.Test.ServiceFactoryFixture.event_handlers_should_be_unique"
+        ]
+      )
+    }"
  ];

  passthru = {
@@ -140,24 +177,30 @@ buildDotnetModule {
      inherit (nixosTests) sonarr;
    };

-    updateScript = writers.writePython3 "sonarr-updater"
-      {
-        libraries = with python3Packages; [ requests ];
-        makeWrapperArgs = [
-          "--prefix"
-          "PATH"
-          ":"
-          (lib.makeBinPath [ nix prefetch-yarn-deps ])
-        ];
-      }
-      ./update.py;
+    updateScript = writers.writePython3 "sonarr-updater" {
+      libraries = with python3Packages; [ requests ];
+      makeWrapperArgs = [
+        "--prefix"
+        "PATH"
+        ":"
+        (lib.makeBinPath [
+          nix
+          prefetch-yarn-deps
+        ])
+      ];
+    } ./update.py;
  };

  meta = {
    description = "Smart PVR for newsgroup and bittorrent users";
    homepage = "https://sonarr.tv";
    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ fadenb purcell tie ];
+    maintainers = with lib.maintainers; [
+      fadenb
+      purcell
+      tie
+      niklaskorz
+    ];
    mainProgram = "Sonarr";
    # platforms inherited from dotnet-sdk.
  };
@@ -55,7 +55,7 @@ package_attrs = json.loads(subprocess.run(
        "--apply", """p: {
          dir = builtins.dirOf p.meta.position;
          version = p.version;
-          sourceHash = p.src.outputHash;
+          sourceHash = p.src.src.outputHash;
          yarnHash = p.yarnOfflineCache.outputHash;
        }""",
        "--",
@@ -97,22 +97,9 @@ source_nix_hash, source_store_path = subprocess.run(
 old_source_hash = package_attrs["sourceHash"]
 new_source_hash = nix_hash_to_sri(source_nix_hash)

-old_yarn_hash = package_attrs["yarnHash"]
-new_yarn_hash = nix_hash_to_sri(subprocess.run(
-    [
-        "prefetch-yarn-deps",
-        # does not support "--" separator :(
-        # Also --verbose writes to stdout, yikes.
-        os.path.join(source_store_path, "yarn.lock"),
-    ],
-    stdout=subprocess.PIPE,
-    text=True,
-    check=True,
-).stdout.rstrip())
-
 package_dir = package_attrs["dir"]
 package_file_name = "package.nix"
-deps_file_name = "deps.nix"
+deps_file_name = "deps.json"

 # To update deps.nix, we copy the package to a temporary directory and run
 # passthru.fetch-deps script there.
@@ -127,6 +114,39 @@ with tempfile.TemporaryDirectory() as work_dir:
        # Try to be more specific to avoid false positive matches.
        f"version = \"{old_version}\"": f"version = \"{new_version}\"",
        old_source_hash: new_source_hash,
+    })
+
+    # We need access to the patched and updated src to get the patched `yarn.lock`.
+    patched_src = os.path.join(work_dir, "patched-src")
+    subprocess.run(
+        [
+            "nix",
+            "--extra-experimental-features", "nix-command",
+            "build",
+            "--impure",
+            "--nix-path", "",
+            "--include", f"nixpkgs={nixpkgs_path}",
+            "--include", f"package={package_file}",
+            "--expr", "(import <nixpkgs> { }).callPackage <package> { }",
+            "--out-link", patched_src,
+            "src",
+        ],
+        check=True,
+    )
+    old_yarn_hash = package_attrs["yarnHash"]
+    new_yarn_hash = nix_hash_to_sri(subprocess.run(
+        [
+            "prefetch-yarn-deps",
+            # does not support "--" separator :(
+            # Also --verbose writes to stdout, yikes.
+            os.path.join(patched_src, "yarn.lock"),
+        ],
+        stdout=subprocess.PIPE,
+        text=True,
+        check=True,
+    ).stdout.rstrip())
+
+    replace_in_file(package_file, {
        old_yarn_hash: new_yarn_hash,
    })

@@ -1,6 +1,6 @@
 { mkDerivation }:

 mkDerivation {
-  version = "26.2.5.6";
-  sha256 = "sha256-5FsLAhbWqXjP18UQGNkbNQmFXlHiNoLY1aTzutLubZI=";
+  version = "26.2.5.7";
+  sha256 = "sha256-SpiovwRjmV+hIIY+qXPs2QOgjhzo3sRtW+cXhOdiwCs=";
 }
@@ -25,7 +25,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "libadwaita";
-  version = "1.6.3";
+  version = "1.6.4";

  outputs = [
    "out"
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "GNOME";
    repo = "libadwaita";
    rev = finalAttrs.version;
-    hash = "sha256-4rYiNI6Oj++iqbPIwe8KvwviGnh93sAZ9wp1cIPZcBA=";
+    hash = "sha256-7AI8Eb6o/Gysli9CprwsgAzz1cGmNU79Qm7OzlsaTFw=";
  };

  depsBuildBuild = [
@@ -128,8 +128,8 @@ let
 in
 {
  ogre_14 = common {
-    version = "14.3.3";
-    hash = "sha256-+ZWrYwgQFmL+9QA+pDQHqacJoONUDVTT+PQLmpLTChg=";
+    version = "14.3.4";
+    hash = "sha256-4ZfScIBGy5J3pwGpnoFkiMhfaZKJz9oSOtFrK2pZnvc=";
    # https://github.com/OGRECave/ogre/blob/v14.3.3/Components/Overlay/CMakeLists.txt
    imguiVersion = "1.91.2";
    imguiHash = "sha256-B7XXQNuEPcT1ID5nMYbAV+aNCG9gIrC9J7BLnYB8yjI=";
@@ -79,7 +79,7 @@
 # https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang.
 clangStdenv.mkDerivation (finalAttrs: {
  pname = "webkitgtk";
-  version = "2.46.5";
+  version = "2.46.6";
  name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${
    if lib.versionAtLeast gtk3.version "4.0" then
      "6.0"
@@ -99,7 +99,7 @@ clangStdenv.mkDerivation (finalAttrs: {

  src = fetchurl {
    url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
-    hash = "sha256-utQCC7DPs+dA3zCCwtnL9nz0CVWWWIpWrs3eZwITeAU=";
+    hash = "sha256-8rMd5pMiC6m6t2zm3f5bC/qyUVyysKcPPFTUBQdmwys=";
  };

  patches = lib.optionals clangStdenv.hostPlatform.isLinux [
@@ -65,37 +65,39 @@ buildPythonPackage rec {

  pythonImportsCheck = [ "kaleido" ];

-  postInstall = ''
-    # Expose kaleido binary
-    mkdir -p $out/bin
-    ln -s $out/${python.sitePackages}/kaleido/executable/bin/kaleido $out/bin/kaleido
+  postInstall =
+    ''
+      # Expose kaleido binary
+      mkdir -p $out/bin
+      ln -s $out/${python.sitePackages}/kaleido/executable/bin/kaleido $out/bin/kaleido

-    # Replace bundled swiftshader with libGL
-    rm -rf $out/${python.sitePackages}/kaleido/executable/bin/swiftshader
-    ln -s ${libGL}/lib $out/${python.sitePackages}/kaleido/executable/bin/swiftshader
+      # Relace bundled libraries with nixpkgs-packaged libraries
+      rm -rf $out/${python.sitePackages}/kaleido/executable/lib
+      mkdir -p $out/${python.sitePackages}/kaleido/executable/lib
+      ln -s ${expat}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/
+      ln -s ${nspr}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/
+      ln -s ${nss}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/
+      ln -s ${sqlite}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/

-    # Relace bundled libraries with nixpkgs-packaged libraries
-    rm -rf $out/${python.sitePackages}/kaleido/executable/lib
-    mkdir -p $out/${python.sitePackages}/kaleido/executable/lib
-    ln -s ${expat}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/
-    ln -s ${nspr}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/
-    ln -s ${nss}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/
-    ln -s ${sqlite}/lib/* $out/${python.sitePackages}/kaleido/executable/lib/
+      # Replace bundled font configuration with nixpkgs-packaged font configuration
+      rm -rf $out/${python.sitePackages}/kaleido/executable/etc/fonts
+      mkdir -p $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d
+      ln -s ${fontconfig.out}/etc/fonts/fonts.conf $out/${python.sitePackages}/kaleido/executable/etc/fonts/
+      ls -s ${fontconfig.out}/etc/fonts/conf.d/* $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d/
+      ln -s ${sbclPackages.cl-dejavu}/dejavu-fonts-ttf-2.37/fontconfig/* $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d/

-    # Replace bundled font configuration with nixpkgs-packaged font configuration
-    rm -rf $out/${python.sitePackages}/kaleido/executable/etc/fonts
-    mkdir -p $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d
-    ln -s ${fontconfig.out}/etc/fonts/fonts.conf $out/${python.sitePackages}/kaleido/executable/etc/fonts/
-    ls -s ${fontconfig.out}/etc/fonts/conf.d/* $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d/
-    ln -s ${sbclPackages.cl-dejavu}/dejavu-fonts-ttf-2.37/fontconfig/* $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d/
-
-    # Replace bundled fonts with nixpkgs-packaged fonts
-    # Currently this causes an issue where the fonts aren't found. I'm not sure why, so I'm leaving this commented out for now.
-    #rm -rf $out/${python.sitePackages}/kaleido/executable/xdg/fonts
-    #mkdir -p $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/dejavu $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/lato
-    #ln -s ${dejavu_fonts}/share/fonts/truetype/* $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/dejavu/
-    #ln -s ${lato}/share/fonts/lato/* $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/lato/
-  '';
+      # Replace bundled fonts with nixpkgs-packaged fonts
+      # Currently this causes an issue where the fonts aren't found. I'm not sure why, so I'm leaving this commented out for now.
+      #rm -rf $out/${python.sitePackages}/kaleido/executable/xdg/fonts
+      #mkdir -p $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/dejavu $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/lato
+      #ln -s ${dejavu_fonts}/share/fonts/truetype/* $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/dejavu/
+      #ln -s ${lato}/share/fonts/lato/* $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/lato/
+    ''
+    + lib.optionalString (!stdenv.isDarwin) ''
+      # Replace bundled swiftshader with libGL
+      rm -rf $out/${python.sitePackages}/kaleido/executable/bin/swiftshader
+      ln -s ${libGL}/lib $out/${python.sitePackages}/kaleido/executable/bin/swiftshader
+    '';

  passthru.tests = lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
    kaleido = callPackage ./tests.nix { };
@@ -2,16 +2,21 @@
  lib,
  stdenv,
  buildPythonPackage,
-  rustPlatform,
  fetchFromGitHub,
-  darwin,
-  libiconv,
+  rustPlatform,
+
+  # buildInputs
  openssl,
+
+  # nativeBuildInputs
  pkg-config,
  protobuf,
+
+  # dependencies
  attrs,
  cachetools,
  deprecation,
+  nest-asyncio,
  overrides,
  packaging,
  pydantic,
@@ -19,6 +24,8 @@
  requests,
  retry,
  tqdm,
+
+  # tests
  aiohttp,
  pandas,
  polars,
@@ -30,23 +37,22 @@

 buildPythonPackage rec {
  pname = "lancedb";
-  version = "0.18.0";
+  version = "0.19.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "lancedb";
    repo = "lancedb";
    tag = "python-v${version}";
-    hash = "sha256-URgJFSrCccp9DBdW2VQgft1GZHu48pb8RrLHmBBow5Q=";
+    hash = "sha256-AvISt9YpnHFrxRQYkkycXmsHSRs9QcBUe0DLXMYGrEI=";
  };

  buildAndTestSubdir = "python";

-  cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; };
-
-  postPatch = ''
-    ln -s ${./Cargo.lock} Cargo.lock
-  '';
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit pname version src;
+    hash = "sha256-0mBCBQTv9nsHiQDUrZfm5+ZUGp3A2k8+DH/T85Vq2KA=";
+  };

  build-system = [ rustPlatform.maturinBuildHook ];

@@ -56,24 +62,15 @@ buildPythonPackage rec {
    rustPlatform.cargoSetupHook
  ];

-  buildInputs =
-    [
-      libiconv
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin (
-      with darwin.apple_sdk.frameworks;
-      [
-        IOKit
-        Security
-        SystemConfiguration
-      ]
-    );
+  buildInputs = [
+    openssl
+  ];

  dependencies = [
    attrs
    cachetools
    deprecation
+    nest-asyncio
    overrides
    packaging
    pydantic
@@ -100,37 +97,30 @@ buildPythonPackage rec {

  pytestFlagsArray = [ "-m 'not slow'" ];

-  disabledTests =
+  disabledTests = [
+    # require tantivy which is not packaged in nixpkgs
+    "test_basic"
+    "test_fts_native"
+
+    # polars.exceptions.ComputeError: TypeError: _scan_pyarrow_dataset_impl() got multiple values for argument 'batch_size'
+    # https://github.com/lancedb/lancedb/issues/1539
+    "test_polars"
+  ];
+
+  disabledTestPaths =
    [
-      # require tantivy which is not packaged in nixpkgs
-      "test_basic"
-
-      # polars.exceptions.ComputeError: TypeError: _scan_pyarrow_dataset_impl() got multiple values for argument 'batch_size'
-      # https://github.com/lancedb/lancedb/issues/1539
-      "test_polars"
-
-      # Requires tantivy which is not packaged in nixpkgs
-      "test_fts_native"
+      # touch the network
+      "test_s3.py"
    ]
    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # fail with darwin sandbox
-      "test_async_remote_db"
-      "test_http_error"
-      "test_retry_error"
+      # socket.gaierror: [Errno 8] nodename nor servname provided, or not known
+      "test_remote_db.py"
    ];

-  disabledTestPaths = [
-    # touch the network
-    "test_s3.py"
-  ];
-
  passthru.updateScript = nix-update-script {
    extraArgs = [
      "--version-regex"
      "python-v(.*)"
-      "--generate-lockfile"
-      "--lockfile-metadata-path"
-      "python"
    ];
  };

@@ -78,6 +78,7 @@ buildPythonPackage rec {
    maintainers = with lib.maintainers; [
      drupol
      natsukium
+      sarahec
    ];
  };
 }
@@ -125,6 +125,9 @@ buildPythonPackage rec {
    description = "Community contributed LangChain integrations";
    homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/community";
    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ natsukium ];
+    maintainers = with lib.maintainers; [
+      natsukium
+      sarahec
+    ];
  };
 }
@@ -145,7 +145,10 @@ buildPythonPackage rec {
    homepage = "https://github.com/langchain-ai/langchain";
    changelog = "https://github.com/langchain-ai/langchain/releases/tag/v${version}";
    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ natsukium ];
+    maintainers = with lib.maintainers; [
+      natsukium
+      sarahec
+    ];
    mainProgram = "langchain-server";
  };
 }
@@ -9,10 +9,8 @@
  pkg-config,

  # buildInputs
-  libiconv,
  openssl,
  protobuf,
-  darwin,

  # dependencies
  numpy,
@@ -36,14 +34,14 @@

 buildPythonPackage rec {
  pname = "pylance";
-  version = "0.22.0";
+  version = "0.23.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "lancedb";
    repo = "lance";
    tag = "v${version}";
-    hash = "sha256-UOrkVHgTX1JK6chYJ6I+VJUquwsKLnOI5solS9W21HY=";
+    hash = "sha256-I8v690MTEYWy3NjbElD3bzhBR4RcvzRKoJoKbL2f/JE=";
  };

  sourceRoot = "${src.name}/python";
@@ -55,7 +53,7 @@ buildPythonPackage rec {
      src
      sourceRoot
      ;
-    hash = "sha256-D9+rKV4rF5AVMxFfEohHufHC2mO75M80TuZaHDI0XMU=";
+    hash = "sha256-vNVS+ps+lTQ4M5hl+0TWItVO3U2SN64jDHhblODmIT0=";
  };

  nativeBuildInputs = [
@@ -69,19 +67,10 @@ buildPythonPackage rec {
    rustPlatform.maturinBuildHook
  ];

-  buildInputs =
-    [
-      libiconv
-      openssl
-      protobuf
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin (
-      with darwin.apple_sdk.frameworks;
-      [
-        Security
-        SystemConfiguration
-      ]
-    );
+  buildInputs = [
+    openssl
+    protobuf
+  ];

  pythonRelaxDeps = [ "pyarrow" ];

@@ -111,22 +100,26 @@ buildPythonPackage rec {
  '';

  disabledTests =
-    lib.optionals stdenv.hostPlatform.isDarwin [
+    [
+      # Writes to read-only build directory
+      "test_add_data_storage_version"
+      "test_fix_data_storage_version"
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+      # OSError: LanceError(IO): Resources exhausted: Failed to allocate additional 1245184 bytes for ExternalSorter[0]...
+      "test_merge_insert_large"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
      # AttributeError: module 'torch.distributed' has no attribute 'is_initialized'
+      "test_blob_api"
      "test_convert_int_tensors"
+      "test_filtered_sampling_odd_batch_size"
      "test_ground_truth"
      "test_index_cast_centroids"
      "test_index_with_no_centroid_movement"
      "test_iter_filter"
      "test_iter_over_dataset_fixed_shape_tensor"
      "test_iter_over_dataset_fixed_size_lists"
-    ]
-    ++ [
-      # incompatible with duckdb 1.1.1
-      "test_duckdb_pushdown_extension_types"
-      # Writes to read-only build directory
-      "test_add_data_storage_version"
-      "test_fix_data_storage_version"
    ];

  passthru.updateScript = nix-update-script { };
@@ -137,8 +130,5 @@ buildPythonPackage rec {
    changelog = "https://github.com/lancedb/lance/releases/tag/v${version}";
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [ natsukium ];
-    # test_indices.py ...sss.Fatal Python error: Fatal Python error: Illegal instructionIllegal instruction
-    # File "/nix/store/wiiccrs0vd1qbh4j6ki9p40xmamsjix3-python3.12-pylance-0.17.0/lib/python3.12/site-packages/lance/indices.py", line 237 in train_ivf
-    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
  };
 }
@@ -24,30 +24,6 @@ buildPythonPackage rec {
    hash = "sha256-fdLZg3MFMS9EIPC5EPE8DAT6K5a6l780msCfzTiZwoo=";
  };

-  # Backport magics for newer newer python versions
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/rocky/python-xdis/commit/fcba74a7f64c5e2879ca0779ff10f38f9229e7da.patch";
-      hash = "sha256-D7eJ97g4G6pmYL/guq0Ndf8yKTVBD2gAuUCAKwvlYbE=";
-    })
-    (fetchpatch {
-      url = "https://github.com/rocky/python-xdis/commit/b66976ff53a2c6e17a73fb7652ddd6c8054df8db.patch";
-      hash = "sha256-KO1y0nDTPmEZ+0/3Pjh+CvTdpr/p4AYZ8XdH5J+XzXo=";
-    })
-    (fetchpatch {
-      url = "https://github.com/rocky/python-xdis/commit/a9f50c0ba77cdbf4693388404c13a02796a4221a.patch";
-      hash = "sha256-gwMagKBY7d/+ohESTSl6M2IEjzABxfrddpdr58VJAk8=";
-    })
-    (fetchpatch {
-      url = "https://github.com/rocky/python-xdis/commit/d9e15acae76a413667912a10fbf8259711ed9c65.patch";
-      hash = "sha256-hpmKg+K1RiLSnmUIS8KtZRVBfvTO9bWbpsNhBFUM38o=";
-    })
-    (fetchpatch {
-      url = "https://github.com/rocky/python-xdis/commit/b412c878d0bc1b516bd01612d46d8830c36a14ad.patch";
-      hash = "sha256-W1JuIXYLO6iyjWiSnzCoXzFsedZjesq31gEPgrtjxas=";
-    })
-  ];
-
  build-system = [
    setuptools
  ];
@@ -10729,9 +10729,7 @@ self: super: with self; {

  pykrakenapi = callPackage ../development/python-modules/pykrakenapi { };

-  pylance = callPackage ../development/python-modules/pylance {
-    inherit (pkgs) protobuf;
-  };
+  pylance = callPackage ../development/python-modules/pylance { };

  pyldavis = callPackage ../development/python-modules/pyldavis { };