Merge master into staging-next

2024-11-25 08:23:09 +00:00 · 2024-09-23 00:14:30 +00:00 · 2024-09-23 00:14:30 +00:00 · 3625d99bb2
commit 3625d99bb2
parent 744ccbf84f 122d20b8ba
51 changed files with 4362 additions and 827 deletions
--- a/nixos/modules/services/web-servers/darkhttpd.nix
+++ b/nixos/modules/services/web-servers/darkhttpd.nix
@ -1,11 +1,11 @@
 { config, lib, pkgs, ... }:

-with lib;
-
 let
+  inherit (lib) mkIf mkOption optional;
+  inherit (lib.types) path bool listOf str port;
  cfg = config.services.darkhttpd;

-  args = concatStringsSep " " ([
+  args = lib.concatStringsSep " " ([
    cfg.rootDir
    "--port ${toString cfg.port}"
    "--addr ${cfg.address}"
@ -14,12 +14,12 @@ let
    ++ optional config.networking.enableIPv6 "--ipv6");

 in {
-  options.services.darkhttpd = with types; {
-    enable = mkEnableOption "DarkHTTPd web server";
+  options.services.darkhttpd = {
+    enable = lib.mkEnableOption "DarkHTTPd web server";

    port = mkOption {
      default = 80;
-      type = types.port;
+      type = port;
      description = ''
        Port to listen on.
        Pass 0 to let the system choose any free port for you.
--- a/pkgs/applications/emulators/vbam/default.nix
+++ b/pkgs/applications/emulators/vbam/default.nix
@ -19,12 +19,12 @@

 stdenv.mkDerivation rec {
  pname = "visualboyadvance-m";
-  version = "2.1.10";
+  version = "2.1.11";
  src = fetchFromGitHub {
    owner = "visualboyadvance-m";
    repo = "visualboyadvance-m";
    rev = "v${version}";
-    sha256 = "sha256-ca+BKedHuOwHOCXgjLkkpR6Pd+59X2R66dbPWEg2O5A=";
+    sha256 = "sha256-OtJ632H449kPRY1i4Ydlcc1tgG00Mv622KrCyJ80OF4=";
  };

  nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 ];
--- a/pkgs/applications/graphics/geeqie/default.nix
+++ b/pkgs/applications/graphics/geeqie/default.nix
@ -9,13 +9,13 @@

 stdenv.mkDerivation rec {
  pname = "geeqie";
-  version = "2.4";
+  version = "2.5";

  src = fetchFromGitHub {
    owner = "BestImageViewer";
    repo = "geeqie";
    rev = "v${version}";
-    hash = "sha256-MVBKaiKcKknU0rChUYJ+N4oX4tVm145s+NqGQuDHY2g=";
+    hash = "sha256-k2FXj2ZKZzB5XpCcWzEv7Q1ozATfU3221XKcOFdWOGU=";
  };

  patches = [
--- a/pkgs/applications/networking/cluster/nixops/default.nix
+++ b/pkgs/applications/networking/cluster/nixops/default.nix
@ -19,13 +19,13 @@ let
    };

    plugins = ps: _super: with ps; rec {
-      nixops-aws = callPackage ./plugins/nixops-aws.nix { };
      nixops-digitalocean = callPackage ./plugins/nixops-digitalocean.nix { };
      nixops-encrypted-links = callPackage ./plugins/nixops-encrypted-links.nix { };
      nixops-hercules-ci = callPackage ./plugins/nixops-hercules-ci.nix { };
      nixops-vbox = callPackage ./plugins/nixops-vbox.nix { };
      nixos-modules-contrib = callPackage ./plugins/nixos-modules-contrib.nix { };

+      nixops-aws = throw "nixops-aws was broken and was removed from nixpkgs";
      nixops-gce = throw "nixops-gce was broken and was removed from nixpkgs";
      nixops-libvirtd = throw "nixops-libvirtd was broken and was removed from nixpkgs";
      nixops-hetzner = throw "nixops-hetzner was broken and was removed from nixpkgs";
@ -42,7 +42,7 @@ let
    selectedPlugins = [];

    # selector is a function mapping pythonPackages to a list of plugins
-    # e.g. nixops_unstable.withPlugins (ps: with ps; [ nixops-aws ])
+    # e.g. nixops_unstable.withPlugins (ps: with ps; [ nixops-digitalocean ])
    withPlugins = selector:
      this.extend (this: _old: {
        selectedPlugins = selector this.availablePlugins;
@ -109,8 +109,6 @@ in

  # Not recommended; too fragile.
  nixops_unstable_full = minimal.withPlugins (ps: [
-    # currently broken
-    # ps.nixops-aws
    ps.nixops-digitalocean
    ps.nixops-encrypted-links
    ps.nixops-hercules-ci
--- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix
+++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix
@ -1,59 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, unstableGitUpdater
-, poetry-core
-, boto
-, boto3
-, nixops
-, nixos-modules-contrib
-, typing-extensions
-}:
-
-buildPythonPackage {
-  pname = "nixops-aws";
-  version = "1.0.0-unstable-2024-02-29";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "NixOS";
-    repo = "nixops-aws";
-    rev = "d173b2f14ec767d782ceab45fb22b32fe3b5a1f7";
-    hash = "sha256-ocTtc7POt1bugb9Bki2ew2Eh5uc933GftNw1twoOJsc=";
-  };
-
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-    --replace poetry.masonry.api poetry.core.masonry.api \
-    --replace "poetry>=" "poetry-core>="
-  '';
-
-  nativeBuildInputs = [
-    poetry-core
-  ];
-
-  buildInputs = [
-    nixops
-  ];
-
-  propagatedBuildInputs = [
-    boto
-    boto3
-    nixos-modules-contrib
-    typing-extensions
-  ];
-
-  pythonImportsCheck = [ "nixops_aws" ];
-
-  passthru.updateScript = unstableGitUpdater {
-    tagPrefix = "v";
-  };
-
-  meta = with lib; {
-    description = "AWS plugin for NixOps";
-    homepage = "https://github.com/NixOS/nixops-aws";
-    license = licenses.lgpl3Only;
-    broken = true; # fails with `nose-1.3.7 not supported for interpreter python3.12`
-    maintainers = nixops.meta.maintainers;
-  };
-}
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix
@ -2,7 +2,7 @@
 callPackage ./generic.nix { } rec {
  pname = "signal-desktop";
  dir = "Signal";
-  version = "7.24.1";
+  version = "7.25.0";
  url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-  hash = "sha256-wT8pbUcdDYVEVAOroHeORl4+rwzfWJvZNxC1pnNsnjQ=";
+  hash = "sha256-KcVCQkDSpI+eq2/wvPZxq6ILLQk3xe+wrKfbnJnTQTo=";
 }
--- a/pkgs/applications/science/electronics/nvc/default.nix
+++ b/pkgs/applications/science/electronics/nvc/default.nix
@ -15,13 +15,13 @@

 stdenv.mkDerivation rec {
  pname = "nvc";
-  version = "1.13.3";
+  version = "1.14.0";

  src = fetchFromGitHub {
    owner = "nickg";
    repo = "nvc";
    rev = "r${version}";
-    hash = "sha256-u+EmZ+h+TVBHEmrELgU4s1C+Z8Cfp3gN9BnQruwCsYU=";
+    hash = "sha256-xaJt3zMAv+Op7cQAaKJOyI28oEssMw/7zvEnfReS4aw=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/science/misc/toil/default.nix
+++ b/pkgs/applications/science/misc/toil/default.nix
@ -1,90 +0,0 @@
-{ lib
-, fetchFromGitHub
-, python3
-, rsync
-}:
-
-python3.pkgs.buildPythonApplication rec {
-  pname = "toil";
-  version = "5.12.0";
-  format = "setuptools";
-
-  src = fetchFromGitHub {
-    owner = "DataBiosphere";
-    repo = pname;
-    rev = "refs/tags/releases/${version}";
-    hash = "sha256-cTpbQo9tPZifUO59vbnIa3XUinFJ2/5Slfe4yszglFM=";
-  };
-
-  propagatedBuildInputs = with python3.pkgs; [
-    addict
-    dill
-    docker
-    enlighten
-    psutil
-    py-tes
-    pypubsub
-    python-dateutil
-    pytz
-    pyyaml
-    requests
-    typing-extensions
-  ];
-
-  nativeCheckInputs = [
-    rsync
-  ] ++ (with python3.pkgs; [
-    boto
-    botocore
-    flask
-    pytestCheckHook
-    stubserver
-  ]);
-
-  pytestFlagsArray = [
-    "src/toil/test"
-  ];
-
-  pythonImportsCheck = [
-    "toil"
-  ];
-
-  disabledTestPaths = [
-    # Tests are reaching their timeout
-    "src/toil/test/docs/scriptsTest.py"
-    "src/toil/test/jobStores/jobStoreTest.py"
-    "src/toil/test/provisioners/aws/awsProvisionerTest.py"
-    "src/toil/test/src"
-    "src/toil/test/wdl"
-    "src/toil/test/utils/utilsTest.py"
-    "src/toil/test/cwl/cwlTest.py"
-    "src/toil/test/lib/test_ec2.py"
-    "src/toil/test/lib/aws/test_iam.py"
-    "src/toil/test/lib/aws/test_s3.py"
-  ];
-
-  disabledTests = [
-    # Tests fail starting with 5.7.1
-    "testServices"
-    "testConcurrencyWithDisk"
-    "testJobConcurrency"
-    "testNestedResourcesDoNotBlock"
-    "test_omp_threads"
-    "testFileSingle"
-    "testFileSingle10000"
-    "testFileSingleCheckpoints"
-    "testFileSingleNonCaching"
-    "testFetchJobStoreFiles"
-    "testFetchJobStoreFilesWSymlinks"
-    "testJobStoreContents"
-    "test_cwl_on_arm"
-    "test_cwl_toil_kill"
-  ];
-
-  meta = with lib; {
-    description = "Workflow engine written in pure Python";
-    homepage = "https://toil.ucsc-cgl.org/";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ veprbl ];
-  };
-}
--- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
@ -2,15 +2,16 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  fetchpatch,
  cmake,
-  pkg-config,
-  wayland-scanner,
  makeWrapper,
+  pkg-config,
  wrapQtAppsHook,
  nix-update-script,
+  hyprland,
  hyprland-protocols,
  hyprlang,
+  hyprutils,
+  hyprwayland-scanner,
  libdrm,
  mesa,
  pipewire,
@ -18,58 +19,39 @@
  qttools,
  qtwayland,
  sdbus-cpp,
+  slurp,
  systemd,
  wayland,
  wayland-protocols,
-  hyprland,
-  hyprpicker,
-  slurp,
+  wayland-scanner,
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "xdg-desktop-portal-hyprland";
-  version = "1.3.3";
+  version = "1.3.5";

  src = fetchFromGitHub {
    owner = "hyprwm";
    repo = "xdg-desktop-portal-hyprland";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-cyyxu/oj4QEFp3CVx2WeXa9T4OAUyynuBJHGkBZSxJI=";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-xTqnMoJsEojuvqJLuM+U7EZ7q71efaj3pbvjutq4TXc=";
  };

-  patches = [
-    # CMake formatting, required for the next two commits to cleanly apply
-    (fetchpatch {
-      url = "https://github.com/hyprwm/xdg-desktop-portal-hyprland/commit/5555f467f68ce7cdf1060991c24263073b95e9da.patch";
-      hash = "sha256-yNkg7GCXDPJdsE7M6J98YylnRxQWpcM5N3olix7Oc1A=";
-    })
-    # removes wayland-scanner from deps, as it includes a pkg-config that
-    # defines that it has a non-existent include directory which trips up CMake
-    (fetchpatch {
-      url = "https://github.com/hyprwm/xdg-desktop-portal-hyprland/commit/0dd9af698b9386bcf25d3ea9f5017eca721831c1.patch";
-      hash = "sha256-Y6eWASHoMXVN2rYJ1rs0jy2qP81/qbHsZU+6b7XNBBg=";
-    })
-    # handle finding wayland-scanner more nicely
-    (fetchpatch {
-      url = "https://github.com/hyprwm/xdg-desktop-portal-hyprland/commit/2425e8f541525fa7409d9f26a8ffaf92a3767251.patch";
-      hash = "sha256-6dCg/U/SIjtvo07Z3tn0Hn8Xwx72nwVz6Q2cFnObonU=";
-    })
-  ];
-
  depsBuildBuild = [
    pkg-config
  ];

  nativeBuildInputs = [
    cmake
-    pkg-config
-    wayland-scanner
    makeWrapper
+    pkg-config
    wrapQtAppsHook
+    hyprwayland-scanner
  ];

  buildInputs = [
    hyprland-protocols
    hyprlang
+    hyprutils
    libdrm
    mesa
    pipewire
@ -80,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
    systemd
    wayland
    wayland-protocols
+    wayland-scanner
  ];

  dontWrapQtApps = true;
@ -95,12 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
      }

    wrapProgramShell $out/libexec/xdg-desktop-portal-hyprland \
-      --prefix PATH ":" ${
-        lib.makeBinPath [
-          (placeholder "out")
-          hyprpicker
-        ]
-      }
+      --prefix PATH ":" ${lib.makeBinPath [ (placeholder "out") ]}
  '';

  passthru = {
--- a/pkgs/by-name/ai/aider-chat/package.nix
+++ b/pkgs/by-name/ai/aider-chat/package.nix
@ -12,7 +12,7 @@ let
    self = python3;
    packageOverrides = _: super: { tree-sitter = super.tree-sitter_0_21; };
  };
-  version = "0.56.0";
+  version = "0.57.0";
 in
 python3.pkgs.buildPythonApplication {
  pname = "aider-chat";
@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication {
    owner = "paul-gauthier";
    repo = "aider";
    rev = "refs/tags/v${version}";
-    hash = "sha256-e0Fqj67vYt41Zbr1FN2fuLp6cHRius8RtacBHLgB9dM=";
+    hash = "sha256-ErDepSju8B4GochHKxL03aUfOLAiNfTaXBAllAZ144M=";
  };

  pythonRelaxDeps = true;
@ -60,6 +60,7 @@ python3.pkgs.buildPythonApplication {
      pypandoc
      pyperclip
      pyyaml
+      psutil
      rich
      scipy
      sounddevice
--- a/pkgs/by-name/do/doublecmd/package.nix
+++ b/pkgs/by-name/do/doublecmd/package.nix
@ -13,13 +13,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "doublecmd";
-  version = "1.1.17";
+  version = "1.1.18";

  src = fetchFromGitHub {
    owner = "doublecmd";
    repo = "doublecmd";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-TKlhPvfnq62XWTo2twKO8hEjBZW0mWkKruXWhwirtR4=";
+    hash = "sha256-1lmDmtvkLMLxvF6ZTOShr5fsYN++Jm6+ngzgFyNjFn4=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/emulators/dynamips/default.nix
+++ b/pkgs/applications/emulators/dynamips/default.nix
@ -1,10 +1,11 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, libelf
-, libpcap
-, nix-update-script
+{
+  lib,
+  stdenv,
+  cmake,
+  fetchFromGitHub,
+  libelf,
+  libpcap,
+  nix-update-script,
 }:

 stdenv.mkDerivation rec {
@ -13,30 +14,40 @@ stdenv.mkDerivation rec {

  src = fetchFromGitHub {
    owner = "GNS3";
-    repo = pname;
-    rev = "v${version}";
+    repo = "dynamips";
+    rev = "refs/tags/v${version}";
    hash = "sha256-+h+WsZ/QrDd+dNrR6CJb2uMG+vbUvK8GTxFJZOxknL0=";
  };

  nativeBuildInputs = [ cmake ];
-  buildInputs = [ libelf libpcap ];

-  cmakeFlags = [ "-DDYNAMIPS_CODE=stable" ];
+  buildInputs = [
+    libelf
+    libpcap
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeFeature "DYNAMIPS_CODE" "stable")
+  ];

  passthru = {
    updateScript = nix-update-script { };
  };

  meta = with lib; {
-    inherit (src.meta) homepage;
    description = "Cisco router emulator";
    longDescription = ''
      Dynamips is an emulator computer program that was written to emulate Cisco
      routers.
    '';
+    homepage = "https://github.com/GNS3/dynamips";
+    changelog = "https://github.com/GNS3/dynamips/releases/tag/v${version}";
    license = licenses.gpl2Plus;
    mainProgram = "dynamips";
-    maintainers = with maintainers; [ primeos ];
+    maintainers = with maintainers; [
+      primeos
+      anthonyroussel
+    ];
    platforms = platforms.linux ++ platforms.darwin;
  };
 }
--- a/pkgs/by-name/fa/fastfetch/package.nix
+++ b/pkgs/by-name/fa/fastfetch/package.nix
@ -47,13 +47,13 @@ let
 in
 stdenv'.mkDerivation (finalAttrs: {
  pname = "fastfetch";
-  version = "2.24.0";
+  version = "2.25.0";

  src = fetchFromGitHub {
    owner = "fastfetch-cli";
    repo = "fastfetch";
    rev = finalAttrs.version;
-    hash = "sha256-MnN+XZTiIjXGVM6rF5J7sDTndLijGCdgsBF8oYzRHqY=";
+    hash = "sha256-I8In6JK9XWM29QdAj3wU2WHn/RsrDJo7s5S7R79HV8g=";
  };

  outputs = [
--- a/pkgs/by-name/hy/hyprutils/package.nix
+++ b/pkgs/by-name/hy/hyprutils/package.nix
@ -10,13 +10,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "hyprutils";
-  version = "0.2.1";
+  version = "0.2.2";

  src = fetchFromGitHub {
    owner = "hyprwm";
    repo = "hyprutils";
    rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-D3wIZlBNh7LuZ0NaoCpY/Pvu+xHxIVtSN+KkWZYvvVs=";
+    hash = "sha256-PNnIpwGqpTvMU3N2r0wMQwK1E+t4Bb5fbJwblQvr+80=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/nw/nwg-drawer/package.nix
+++ b/pkgs/by-name/nw/nwg-drawer/package.nix
@ -12,16 +12,16 @@

 let
  pname = "nwg-drawer";
-  version = "0.4.9";
+  version = "0.5.0";

  src = fetchFromGitHub {
    owner = "nwg-piotr";
    repo = "nwg-drawer";
    rev = "v${version}";
-    hash = "sha256-KhgALKJNS7Y+u5pAfpvTup0W1+Vi6r1uaVFQZRiv4Dk=";
+    hash = "sha256-0ksvat0NDC2P+T0TyDAKh7YNLYhH+znxqLCqQ/5GDj8=";
  };

-  vendorHash = "sha256-J7r3YyfV5lRZbjKo7ZNHQrOqR1GNbUB7GxRMlXuuw/c=";
+  vendorHash = "sha256-KULOXphc6GWIGP79C9sgfAIRMoqwcjaVp4jVyF6of/E=";
 in
 buildGoModule {
  inherit pname version src vendorHash;
--- a/pkgs/by-name/op/openmsx/package.nix
+++ b/pkgs/by-name/op/openmsx/package.nix
@ -20,13 +20,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "openmsx";
-  version = "19.1";
+  version = "20_0";

  src = fetchFromGitHub {
    owner = "openMSX";
    repo = "openMSX";
    rev = "RELEASE_${builtins.replaceStrings ["."] ["_"] finalAttrs.version}";
-    hash = "sha256-5ULljLmEDGFp32rnrXKLfL6P3ad2STJUNngBuWlRCbc=";
+    hash = "sha256-iY+oZ7fHZnnEGunM4kOxOGH2Biqj2PfdLhbT8J4mYrA=";
    fetchSubmodules = true;
  };

--- a/pkgs/by-name/op/openscad-unstable/package.nix
+++ b/pkgs/by-name/op/openscad-unstable/package.nix
@ -28,6 +28,7 @@
 , libsForQt5
 , libspnav
 , libzip
+, manifold
 , mesa
 , mpfr
 , python3
@ -36,61 +37,23 @@
 , wayland-protocols
 , wrapGAppsHook3
 , xorg
+, mimalloc
+, opencsg
 }:
-let
-  # get cccl from source to avoid license issues
-  nvidia-cccl = clangStdenv.mkDerivation {
-    pname = "nvidia-cccl";
-    # note, after v2.2.0, manifold dependency fails with some swap() ambiguities
-    version = "2.2.0";
-    src = fetchFromGitHub {
-      owner = "NVIDIA";
-      repo = "cccl";
-      fetchSubmodules = true;
-      rev = "v2.2.0";
-      hash = "sha256-azHDAuK0rAHrH+XkN3gHDrbwZOclP3zbEMe8VRpMjDQ=";
-    };
-    patches = [ ./thrust-cmake.patch ];
-    nativeBuildInputs = [ cmake pkg-config ];
-    buildInputs = [ tbb_2021_11 ];
-    cmakeFlags = [
-      # only enable what we need
-      "-DCCCL_ENABLE_CUB=OFF"
-      "-DCCCL_ENABLE_LIBCUDACXX=ON"
-      "-DCCCL_ENABLE_THRUST=ON"
-      "-DCCCL_ENABLE_TESTING=OFF"
-      "-DCCCL_ENABLE_EXAMPLES=OFF"
-
-      "-DTHRUST_DEVICE_SYSTEM=TBB"
-      "-DTHRUST_HOST_SYSTEM=CPP"
-      "-DTHRUST_ENABLE_HEADER_TESTING=OFF"
-      "-DTHRUST_ENABLE_TESTING=OFF"
-      "-DTHRUST_ENABLE_EXAMPLES=OFF"
-
-      "-DLIBCUDACXX_ENABLE_CUDA=OFF"
-      "-DLIBCUDACXX_ENABLE_STATIC_LIBRARY=OFF"
-      "-DLIBCUDACXX_ENABLE_LIBCUDACXX_TESTS=OFF"
-    ];
-    meta = with lib; {
-      description = "CUDA C++ Core Libraries";
-      homepage = "https://github.com/NVIDIA/cccl";
-      license = licenses.asl20;
-      platforms = platforms.unix;
-    };
-  };
-in
 # clang consume much less RAM than GCC
 clangStdenv.mkDerivation rec {
  pname = "openscad-unstable";
-  version = "2024-08-17";
+  version = "2024-09-22";
  src = fetchFromGitHub {
    owner = "openscad";
    repo = "openscad";
-    rev = "a16ca2a670840cfecb76254967380385d4d573cb";
-    hash = "sha256-YadbrYaxxdVNejasFW0MbcYwjwTHHQbVjqen9PKEsYQ=";
-    fetchSubmodules = true;
+    rev = "1cf4e97ed488d606c823f107dcc361f218aa84ca";
+    hash = "sha256-5WzLAQnjH+4JjJhh9pCgY3j8+lyNPrtY9a104tzkglo=";
+    fetchSubmodules = true;  # Only really need sanitizers-cmake and MCAD
  };
+
  patches = [ ./test.diff ];
+
  nativeBuildInputs = [
    (python3.withPackages (ps: with ps; [ numpy pillow ]))
    bison
@ -103,12 +66,10 @@ clangStdenv.mkDerivation rec {
    pkg-config
  ];
  buildInputs = with libsForQt5; with qt5; [
-    # manifold dependencies
    clipper2
    glm
    tbb_2021_11
-    nvidia-cccl
-
+    mimalloc
    boost
    cairo
    cgal_5
@ -119,11 +80,13 @@ clangStdenv.mkDerivation rec {
    ghostscript
    glib
    gmp
+    opencsg
    harfbuzz
    hidapi
    lib3mf
    libspnav
    libzip
+    manifold
    mpfr
    qscintilla
    qtbase
@ -143,7 +106,8 @@ clangStdenv.mkDerivation rec {
  cmakeFlags = [
    "-DEXPERIMENTAL=ON" # enable experimental options
    "-DSNAPSHOT=ON" # nightly icons
-    "-DUSE_BUILTIN_OPENCSG=ON" # bundled latest opencsg
+    "-DUSE_BUILTIN_OPENCSG=OFF"
+    "-DUSE_BUILTIN_MANIFOLD=OFF"
    "-DOPENSCAD_VERSION=\"${builtins.replaceStrings ["-"] ["."] version}\""
    "-DCMAKE_UNITY_BUILD=ON" # faster build
    # IPO
@ -180,6 +144,5 @@ clangStdenv.mkDerivation rec {
    platforms = lib.platforms.unix;
    maintainers = with lib.maintainers; [ pca006132 raskin ];
    mainProgram = "openscad";
-    broken = true;  # https://github.com/NixOS/nixpkgs/issues/341043
  };
 }
--- a/pkgs/tools/misc/plantuml/plantuml-c4.nix
+++ b/pkgs/tools/misc/plantuml/plantuml-c4.nix
@ -1,4 +1,13 @@
-{ lib, stdenv, makeWrapper, fetchzip, runCommand, plantuml, plantuml-c4, jre }:
+{
+  lib,
+  stdenv,
+  fetchzip,
+  jre,
+  makeWrapper,
+  plantuml-c4,
+  plantuml,
+  runCommand,
+}:

 # The C4-PlantUML docs say that it suffices to run plantuml with the
 # -DRELATIVE_INCLUDE="..." arg to make plantuml find the C4 templates
@ -12,13 +21,13 @@

 let
  c4-lib = fetchzip {
-    url = "https://github.com/plantuml-stdlib/C4-PlantUML/archive/refs/tags/v2.8.0.zip";
-    hash = "sha256-pGtTFg7HcAFYPrjd+CAaxS4C6Cqaj94aq45v3NpiAxM=";
+    url = "https://github.com/plantuml-stdlib/C4-PlantUML/archive/refs/tags/v2.10.0.zip";
+    hash = "sha256-p9Njb7VauXVf6yOBDQrO9mS+za9NntFUCK5tig0mH3U=";
  };

  sprites = fetchzip {
-    url = "https://github.com/tupadr3/plantuml-icon-font-sprites/archive/fa3f885dbd45c9cd0cdf6c0e5e4fb51ec8b76582.zip";
-    hash = "sha256-lt9+NNMIaZSkKNsGyHoqXUCTlKmZFGfNYYGjer6X0Xc=";
+    url = "https://github.com/tupadr3/plantuml-icon-font-sprites/archive/refs/tags/v3.0.0.zip";
+    hash = "sha256-I/cR1VPR7aKyTZF9X/4GkgcxV9+sLgNpTZugvCy0Dvs=";
  };

  # In order to pre-fix the plantuml.jar parameter with the argument
@ -26,22 +35,24 @@ let
  # This way the plantuml derivation can remain unchanged.
  plantumlWithExtraPath =
    let
-      plantumlIncludePath = lib.concatStringsSep ":" [ c4-lib sprites ];
+      plantumlIncludePath = lib.concatStringsSep ":" [
+        c4-lib
+        sprites
+      ];
      includeFlag = "-Dplantuml.include.path=${lib.escapeShellArg plantumlIncludePath}";
-      postFixedJre =
-        runCommand "jre-postfixed" { nativeBuildInputs = [ makeWrapper ]; } ''
-          mkdir -p $out/bin
+      postFixedJre = runCommand "jre-postfixed" { nativeBuildInputs = [ makeWrapper ]; } ''
+        mkdir -p $out/bin

-          makeWrapper ${jre}/bin/java $out/bin/java \
-            --add-flags ${lib.escapeShellArg includeFlag}
-        '';
+        makeWrapper ${jre}/bin/java $out/bin/java \
+          --add-flags ${lib.escapeShellArg includeFlag}
+      '';
    in
    plantuml.override { jre = postFixedJre; };
 in

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "plantuml-c4";
-  version = "2.8.0";
+  version = "2.10.0";

  nativeBuildInputs = [ makeWrapper ];

@ -55,20 +66,24 @@ stdenv.mkDerivation rec {
  '';

  passthru.tests.example-c4-diagram =
-    runCommand "c4-plantuml-sample.png" { nativeBuildInputs = [ plantuml-c4 ]; } ''
-      sed 's/https:.*\///' "${c4-lib}/samples/C4_Context Diagram Sample - enterprise.puml" > sample.puml
-      plantuml sample.puml -o $out
+    runCommand "c4-plantuml-sample.png" { nativeBuildInputs = [ plantuml-c4 ]; }
+      ''
+        sed 's/https:.*\///' "${c4-lib}/samples/C4_Context Diagram Sample - enterprise.puml" > sample.puml
+        plantuml sample.puml -o $out

-      sed 's/!include ..\//!include /' ${sprites}/examples/complex-example.puml > sprites.puml
-      plantuml sprites.puml -o $out
-    '';
+        sed 's/!include ..\//!include /' ${sprites}/examples/complex-example.puml > sprites.puml
+        plantuml sprites.puml -o $out
+      '';

  meta = with lib; {
    description = "PlantUML bundled with C4-Plantuml and plantuml sprites library";
    mainProgram = "plantuml";
    homepage = "https://github.com/plantuml-stdlib/C4-PlantUML";
    license = licenses.mit;
-    maintainers = with maintainers; [ tfc ];
+    maintainers = with maintainers; [
+      tfc
+      anthonyroussel
+    ];
    platforms = platforms.unix;
  };
 }
--- a/pkgs/by-name/pl/plantuml-server/package.nix
+++ b/pkgs/by-name/pl/plantuml-server/package.nix
@ -1,18 +1,22 @@
-{ lib, stdenv, fetchurl, nixosTests }:
+{
+  lib,
+  stdenv,
+  fetchurl,
+  nixosTests,
+}:

-let
-  version = "1.2024.7";
-in
 stdenv.mkDerivation rec {
  pname = "plantuml-server";
-  inherit version;
+  version = "1.2024.7";
+
  src = fetchurl {
    url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war";
-    sha256 = "sha256-9YTclV+FoiNbcpeNtlbbozqjB1BN9EJn03CzyHDbC+8=";
+    hash = "sha256-9YTclV+FoiNbcpeNtlbbozqjB1BN9EJn03CzyHDbC+8=";
  };

  dontUnpack = true;
-  installPhase = ''
+
+  postInstall = ''
    mkdir -p "$out/webapps"
    cp "$src" "$out/webapps/plantuml.war"
  '';
@ -27,6 +31,9 @@ stdenv.mkDerivation rec {
    sourceProvenance = with sourceTypes; [ binaryBytecode ];
    license = licenses.gpl3Plus;
    platforms = platforms.all;
-    maintainers = with maintainers; [ truh ];
+    maintainers = with maintainers; [
+      truh
+      anthonyroussel
+    ];
  };
 }
--- a/pkgs/by-name/pl/plantuml/package.nix
+++ b/pkgs/by-name/pl/plantuml/package.nix
@ -1,18 +1,20 @@
-{ lib
-, stdenvNoCC
-, fetchurl
-, makeBinaryWrapper
-, jre
-, graphviz
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  graphviz,
+  jre,
+  makeBinaryWrapper,
+  testers,
 }:

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "plantuml";
-  version = "1.2024.5";
+  version = "1.2024.7";

  src = fetchurl {
    url = "https://github.com/plantuml/plantuml/releases/download/v${finalAttrs.version}/plantuml-pdf-${finalAttrs.version}.jar";
-    hash = "sha256-YayIedHIIpecVF7BZSvBTp66Eb7He+l+1RCir5KuL28=";
+    hash = "sha256-8BlAPc2BeojyTcZVboUA6+sOA5AO5eG871mSIWinm5E=";
  };

  nativeBuildInputs = [
@ -30,18 +32,28 @@ stdenvNoCC.mkDerivation (finalAttrs: {
  '';

  doInstallCheck = true;
+
  postCheckInstall = ''
    $out/bin/plantuml -help
    $out/bin/plantuml -testdot
  '';

+  passthru.tests.version = testers.testVersion {
+    package = finalAttrs.finalPackage;
+    command = "plantuml --version";
+  };
+
  meta = {
    description = "Draw UML diagrams using a simple and human readable text description";
    homepage = "https://plantuml.com/";
    # "plantuml -license" says GPLv3 or later
    license = lib.licenses.gpl3Plus;
    mainProgram = "plantuml";
-    maintainers = with lib.maintainers; [ bjornfor Mogria ];
+    maintainers = with lib.maintainers; [
+      bjornfor
+      Mogria
+      anthonyroussel
+    ];
    platforms = lib.platforms.unix;
    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
  };
--- a/pkgs/development/tools/analysis/stylelint/default.nix
+++ b/pkgs/development/tools/analysis/stylelint/default.nix
@ -1,8 +1,15 @@
-{ buildNpmPackage, fetchFromGitHub, lib }:
+{
+  buildNpmPackage,
+  fetchFromGitHub,
+  lib,
+}:

-buildNpmPackage rec {
-  pname = "stylelint";
+let
  version = "16.9.0";
+in
+buildNpmPackage {
+  pname = "stylelint";
+  inherit version;

  src = fetchFromGitHub {
    owner = "stylelint";
@ -15,11 +22,11 @@ buildNpmPackage rec {

  dontNpmBuild = true;

-  meta = with lib; {
+  meta = {
    description = "Mighty CSS linter that helps you avoid errors and enforce conventions";
    mainProgram = "stylelint";
    homepage = "https://stylelint.io";
-    license = licenses.mit;
-    maintainers = [ ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ momeemt ];
  };
 }
--- a/pkgs/by-name/yu/yubico-piv-tool/package.nix
+++ b/pkgs/by-name/yu/yubico-piv-tool/package.nix
@ -18,7 +18,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "yubico-piv-tool";
-  version = "2.6.0";
+  version = "2.6.1";

  outputs = [
    "out"
@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "Yubico";
    repo = "yubico-piv-tool";
    rev = "refs/tags/yubico-piv-tool-${finalAttrs.version}";
-    hash = "sha256-53cgwXMzVKnouwHhbt6pODhjF2MH0sK5CPWpbZe71jE=";
+    hash = "sha256-RYT/kBlUfVkJG8RNELVQ5gyC+HDteD5xqaI479nsvKw=";
  };

  postPatch = ''
--- a/pkgs/development/compilers/dart/sources.nix
+++ b/pkgs/development/compilers/dart/sources.nix
@ -1,24 +1,24 @@
-let version = "3.5.2"; in
+let version = "3.5.3"; in
 { fetchurl }: {
  versionUsed = version;
  "${version}-x86_64-darwin" = fetchurl {
    url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip";
-    sha256 = "0k1h7kbcagm7s0n8696lzws814rabz3491khd7z78mb3ivahxw35";
+    sha256 = "1z6hl6pqsg2l7pfchzr5dk90b2dchidhwnnnc4q5dzz0xjikqrvx";
  };
  "${version}-aarch64-darwin" = fetchurl {
    url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip";
-    sha256 = "036jw4qq3wicyfpamy7v6qsbrj0m7dyny45yzdgil4snvfagvfsv";
+    sha256 = "12rzl1nm1y0q5ff9p8gslki4cz37y3bdn8p2s3x2nc81bdda4gn7";
  };
  "${version}-aarch64-linux" = fetchurl {
    url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip";
-    sha256 = "1wm1157hbsms872pp1fkn0i3khz3h4r909bdvpk2rhag2l928f0a";
+    sha256 = "1rp54g8di8j715n955wdr6i0pcrx2dn73qmvmrisyahi0qjrk0py";
  };
  "${version}-x86_64-linux" = fetchurl {
    url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip";
-    sha256 = "160dk1dpdzdh0pphmvdw7agavpyxniw8zf5w30yamkdi7r9g0l0b";
+    sha256 = "001mpb3fniamlmnqmhxdpbvp8crdvnf6sam13vvfmnr6na1fpxil";
  };
  "${version}-i686-linux" = fetchurl {
    url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip";
-    sha256 = "0nrgjdzc2skqc2b52pzw78056jqrqmiwzwwd9wh699dwwfnrjcf4";
+    sha256 = "0z9qjx2b2rmiqyqww0a5slj0pi1k8sn4fjihkn53im65rhhqra2y";
  };
 }
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@ -38,26 +38,26 @@ let
 in
 jdk.overrideAttrs (oldAttrs: rec {
  pname = "jetbrains-jdk" + lib.optionalString withJcef "-jcef";
-  javaVersion = "21.0.3";
-  build = "509.11";
+  javaVersion = "21.0.4";
+  build = "598.4";
  # To get the new tag:
  # git clone https://github.com/jetbrains/jetbrainsruntime
  # cd jetbrainsruntime
  # git checkout jbr-release-${javaVersion}b${build}
  # git log --simplify-by-decoration --decorate=short --pretty=short | grep "jbr-" --color=never | cut -d "(" -f2 | cut -d ")" -f1 | awk '{print $2}' | sort -t "-" -k 2 -g | tail -n 1 | tr -d ","
-  openjdkTag = "jbr-21.0.2+13";
+  openjdkTag = "jbr-21.0.4+8";
  version = "${javaVersion}-b${build}";

  src = fetchFromGitHub {
    owner = "JetBrains";
    repo = "JetBrainsRuntime";
    rev = "jb${version}";
-    hash = "sha256-zTstmrH4KteR40BVDRfxOrl8aUQ26acE+ywscBd8sw8=";
+    hash = "sha256-YF5Z1A4qmD9Z4TE6f2i8wv9ZD+NqHGY5Q0oIVQiC3Bg=";
  };

  BOOT_JDK = jdk.home;
  # run `git log -1 --pretty=%ct` in jdk repo for new value on update
-  SOURCE_DATE_EPOCH = 1723453663;
+  SOURCE_DATE_EPOCH = 1726275531;

  patches = [ ];

--- a/pkgs/development/python-modules/boto/0005-Don-t-mock-list-subclass.patch
+++ b/pkgs/development/python-modules/boto/0005-Don-t-mock-list-subclass.patch
@ -1,21 +0,0 @@
-From: Jochen Sprickerhof <jspricke@debian.org>
-Date: Thu, 15 Dec 2022 07:44:54 +0100
-Subject: Don't mock list subclass
-
---
- tests/unit/ec2/test_volume.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/unit/ec2/test_volume.py b/tests/unit/ec2/test_volume.py
-index 81d7f55..d4d8e4f 100644
--- a/tests/unit/ec2/test_volume.py
-+++ b/tests/unit/ec2/test_volume.py
-@@ -55,7 +55,7 @@ class VolumeTests(unittest.TestCase):
-     @mock.patch("boto.resultset.ResultSet")
-     def test_startElement_with_name_tagSet_calls_ResultSet(self, ResultSet, startElement):
-         startElement.return_value = None
-        result_set = mock.Mock(ResultSet([("item", Tag)]))
-+        result_set = ResultSet([("item", Tag)])
-         volume = Volume()
-         volume.tags = result_set
-         retval = volume.startElement("tagSet", None, None)
--- a/pkgs/development/python-modules/boto/bug-953970_python3.8-compat.patch
+++ b/pkgs/development/python-modules/boto/bug-953970_python3.8-compat.patch
@ -1,53 +0,0 @@
-Index: python-boto/tests/unit/utils/test_utils.py
-===================================================================
--- python-boto.orig/tests/unit/utils/test_utils.py
-+++ python-boto/tests/unit/utils/test_utils.py
-@@ -85,7 +85,7 @@ class TestPassword(unittest.TestCase):
-         def hmac_hashfunc(cls, msg):
-             if not isinstance(msg, bytes):
-                 msg = msg.encode('utf-8')
-            return hmac.new(b'mysecretkey', msg)
-+            return hmac.new(b'mysecretkey', msg, digestmod='sha256')
-
-         class HMACPassword(Password):
-             hashfunc = hmac_hashfunc
-@@ -95,15 +95,15 @@ class TestPassword(unittest.TestCase):
-         password.set('foo')
-
-         self.assertEquals(str(password),
-                          hmac.new(b'mysecretkey', b'foo').hexdigest())
-+                          hmac.new(b'mysecretkey', b'foo', digestmod='sha256').hexdigest())
-
-     def test_constructor(self):
-        hmac_hashfunc = lambda msg: hmac.new(b'mysecretkey', msg)
-+        hmac_hashfunc = lambda msg: hmac.new(b'mysecretkey', msg, digestmod='sha256')
-
-         password = Password(hashfunc=hmac_hashfunc)
-         password.set('foo')
-         self.assertEquals(password.str,
-                          hmac.new(b'mysecretkey', b'foo').hexdigest())
-+                          hmac.new(b'mysecretkey', b'foo', digestmod='sha256').hexdigest())
-
-
- class TestPythonizeName(unittest.TestCase):
-Index: python-boto/boto/ecs/item.py
-===================================================================
--- python-boto.orig/boto/ecs/item.py
-+++ python-boto/boto/ecs/item.py
-@@ -22,6 +22,7 @@
-
- import xml.sax
- import cgi
-+from html import escape
- from boto.compat import six, StringIO
-
- class ResponseGroup(xml.sax.ContentHandler):
-@@ -67,7 +68,7 @@ class ResponseGroup(xml.sax.ContentHandl
-         return None
-
-     def endElement(self, name, value, connection):
-        self._xml.write("%s</%s>" % (cgi.escape(value).replace("&amp;amp;", "&amp;"), name))
-+        self._xml.write("%s</%s>" % (escape(value).replace("&amp;amp;", "&amp;"), name))
-         if len(self._nodepath) == 0:
-             return
-         obj = None
--- a/pkgs/development/python-modules/boto/default.nix
+++ b/pkgs/development/python-modules/boto/default.nix
@ -1,66 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  python,
-  nose,
-  mock,
-  requests,
-  httpretty,
-}:
-
-buildPythonPackage rec {
-  pname = "boto";
-  version = "2.49.0";
-  format = "setuptools";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a";
-  };
-
-  patches = [
-    # fixes hmac tests
-    # https://sources.debian.org/src/python-boto/2.49.0-4/debian/patches/bug-953970_python3.8-compat.patch/
-    ./bug-953970_python3.8-compat.patch
-    # fixes test_startElement_with_name_tagSet_calls_ResultSet
-    # https://sources.debian.org/src/python-boto/2.49.0-4.1/debian/patches/0005-Don-t-mock-list-subclass.patch/
-    ./0005-Don-t-mock-list-subclass.patch
-  ];
-
-  # boto is deprecated by upstream as of 2021-05-27 (https://github.com/boto/boto/commit/4980ac58764c3d401cb0b9552101f9c61c18f445)
-  # this patch is a bit simpler than https://github.com/boto/boto/pull/3898
-  # as we don't have to take care of pythonOlder "3.3".
-  postPatch = ''
-    substituteInPlace boto/dynamodb/types.py --replace 'from collections import Mapping' 'from collections.abc import Mapping'
-    substituteInPlace boto/mws/connection.py --replace 'import collections' 'import collections.abc as collections'
-  '';
-
-  checkPhase = ''
-    ${python.interpreter} tests/test.py default
-  '';
-
-  nativeCheckInputs = [
-    nose
-    mock
-  ];
-  propagatedBuildInputs = [
-    requests
-    httpretty
-  ];
-
-  meta = with lib; {
-    homepage = "https://github.com/boto/boto";
-    license = licenses.mit;
-    description = "Python interface to Amazon Web Services";
-    longDescription = ''
-      The boto module is an integrated interface to current and
-      future infrastructural services offered by Amazon Web
-      Services.  This includes S3, SQS, EC2, among others.
-    '';
-    maintainers = [ ];
-    # Unmaintained since 2020, archived in the beginning of May 2024 and broken
-    # https://github.com/boto/boto/issues/3951
-    broken = true;
-  };
-}
--- a/pkgs/development/python-modules/cirq-rigetti/default.nix
+++ b/pkgs/development/python-modules/cirq-rigetti/default.nix
@ -1,6 +1,7 @@
 {
  buildPythonPackage,
  cirq-core,
+  fetchpatch2,
  lib,
  pytestCheckHook,
  attrs,
@ -31,6 +32,16 @@ buildPythonPackage rec {

  disabled = pythonOlder "3.7";

+  patches = [
+    # https://github.com/quantumlib/Cirq/pull/6734
+    (fetchpatch2 {
+      name = "fix-rigetti-check-for-aspen-family-device-kind.patch";
+      url = "https://github.com/quantumlib/Cirq/commit/dd395fb71fb7f92cfd34f008bf2a98fc70b57fae.patch";
+      stripLen = 1;
+      hash = "sha256-EWB2CfMS2+M3zNFX5PwFNtEBdgJkNVUVNd+I/E6n9kI=";
+    })
+  ];
+
  sourceRoot = "${src.name}/${pname}";

  pythonRelaxDeps = [
--- a/pkgs/development/python-modules/flask-admin/default.nix
+++ b/pkgs/development/python-modules/flask-admin/default.nix
@ -1,7 +1,6 @@
 {
  lib,
  azure-storage-blob,
-  boto,
  buildPythonPackage,
  fetchpatch,
  fetchFromGitHub,
@ -53,7 +52,6 @@ buildPythonPackage rec {
  ];

  optional-dependencies = {
-    aws = [ boto ];
    azure = [ azure-storage-blob ];
  };

--- a/pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix
+++ b/pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix
@ -1,61 +0,0 @@
-{
-  lib,
-  boto,
-  buildPythonPackage,
-  fetchFromGitHub,
-  freezegun,
-  google-reauth,
-  httplib2,
-  oauth2client,
-  pyopenssl,
-  pytestCheckHook,
-  pythonOlder,
-  retry-decorator,
-  rsa,
-  six,
-}:
-
-buildPythonPackage rec {
-  pname = "gcs-oauth2-boto-plugin";
-  version = "3.0";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
-
-  src = fetchFromGitHub {
-    owner = "GoogleCloudPlatform";
-    repo = pname;
-    rev = "refs/tags/v${version}";
-    hash = "sha256-slTxh2j9VhLiSyiTmJIFFakzpzH/+mgilDRxx0VqqKQ=";
-  };
-
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "rsa==4.7.2" "rsa" \
-      --replace "version='2.7'" "version='${version}'"
-  '';
-
-  propagatedBuildInputs = [
-    boto
-    freezegun
-    google-reauth
-    httplib2
-    oauth2client
-    pyopenssl
-    retry-decorator
-    rsa
-    six
-  ];
-
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  pythonImportsCheck = [ "gcs_oauth2_boto_plugin" ];
-
-  meta = with lib; {
-    description = "Auth plugin allowing use the use of OAuth 2.0 credentials for Google Cloud Storage";
-    homepage = "https://github.com/GoogleCloudPlatform/gcs-oauth2-boto-plugin";
-    changelog = "https://github.com/GoogleCloudPlatform/gcs-oauth2-boto-plugin/releases/tag/v${version}";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ fab ];
-  };
-}
--- a/pkgs/development/python-modules/hishel/default.nix
+++ b/pkgs/development/python-modules/hishel/default.nix
@ -18,7 +18,7 @@

 buildPythonPackage rec {
  pname = "hishel";
-  version = "0.0.30";
+  version = "0.0.31";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -27,7 +27,7 @@ buildPythonPackage rec {
    owner = "karpetrosyan";
    repo = "hishel";
    rev = "refs/tags/${version}";
-    hash = "sha256-+ine7Q60dT9GyFWGHtbH6G1E4TzTQaY5y9Yxxxbgnp8=";
+    hash = "sha256-mJPvzGmu0veFlG7jlWdf919qOp3KfGv6SPRcFVFjhnc=";
  };

  build-system = [
--- a/pkgs/development/python-modules/lockfile/default.nix
+++ b/pkgs/development/python-modules/lockfile/default.nix
@ -4,7 +4,7 @@
  fetchPypi,
  setuptools,
  pbr,
-  nose,
+  pytestCheckHook,
 }:

 buildPythonPackage rec {
@ -14,25 +14,21 @@ buildPythonPackage rec {

  src = fetchPypi {
    inherit pname version;
-    sha256 = "6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799";
+    hash = "sha256-au0C3gPLok76vNYAswVAFAY0/AbPpgOCLVCNU2Hp95k=";
  };

+  patches = [ ./fix-tests.patch ];
+
  build-system = [
    pbr
    setuptools
  ];

-  nativeCheckInputs = [ nose ];
+  nativeCheckInputs = [ pytestCheckHook ];

-  checkPhase = ''
-    runHook preCheck
-    nosetests
-    runHook postcheck
-  '';
-
-  meta = with lib; {
+  meta = {
    homepage = "https://launchpad.net/pylockfile";
    description = "Platform-independent advisory file locking capability for Python applications";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
  };
 }
--- a/pkgs/development/python-modules/lockfile/fix-tests.patch
+++ b/pkgs/development/python-modules/lockfile/fix-tests.patch
@ -0,0 +1,28 @@
+diff --git a/test/compliancetest.py b/test/compliancetest.py
+index bf4e59c..f55e258 100644
+--- a/test/compliancetest.py
+++ b/test/compliancetest.py
+@@ -6,18 +6,19 @@ import lockfile
+ 
+ 
+ class ComplianceTest(object):
+-    def __init__(self):
+-        self.saved_class = lockfile.LockFile
+    @classmethod
+    def setup_class(cls):
+        cls.saved_class = lockfile.LockFile
+ 
+     def _testfile(self):
+         """Return platform-appropriate file.  Helper for tests."""
+         import tempfile
+         return os.path.join(tempfile.gettempdir(), 'trash-%s' % os.getpid())
+ 
+-    def setup(self):
+    def setup_method(self):
+         lockfile.LockFile = self.class_to_test
+ 
+-    def teardown(self):
+    def teardown_method(self):
+         try:
+             tf = self._testfile()
+             if os.path.isdir(tf):
--- a/pkgs/development/python-modules/pydy/default.nix
+++ b/pkgs/development/python-modules/pydy/default.nix
@ -6,22 +6,36 @@
  scipy,
  sympy,
  setuptools,
-  nose,
+  pytestCheckHook,
  cython,
+  fetchpatch2,
 }:

 buildPythonPackage rec {
  pname = "pydy";
  version = "0.7.1";
-
  pyproject = true;
-  build-system = [ setuptools ];

  src = fetchPypi {
    inherit pname version;
    hash = "sha256-aaRinJMGR8v/OVkeSp1hA4+QLOrmDWq50wvA6b/suvk=";
  };

+  build-system = [ setuptools ];
+
+  patches = [
+    # Migrate tests to pytest
+    (fetchpatch2 {
+      url = "https://github.com/pydy/pydy/commit/e679638fecf80def25f5ed20f01c49c5d931e4d8.patch?full_index=1";
+      hash = "sha256-wJmYkyc5Yh0152OyNL5ZbZJxmpX7C65Hqrms4gm3zt0=";
+      excludes = [
+        ".github/workflows/oldest.yml"
+        ".github/workflows/tests.yml"
+        "bin/test"
+      ];
+    })
+  ];
+
  dependencies = [
    numpy
    scipy
@ -29,24 +43,16 @@ buildPythonPackage rec {
  ];

  nativeCheckInputs = [
-    nose
+    pytestCheckHook
    cython
  ];

-  checkPhase = ''
-    runHook preCheck
-
-    nosetests pydy
-
-    runHook postCheck
-  '';
-
  pythonImportsCheck = [ "pydy" ];

-  meta = with lib; {
+  meta = {
    description = "Python tool kit for multi-body dynamics";
    homepage = "http://pydy.org";
-    license = licenses.bsd3;
-    maintainers = [ ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ sigmanificient ];
  };
 }
--- a/pkgs/development/python-modules/qcs-api-client-common/Cargo.lock
+++ b/pkgs/development/python-modules/qcs-api-client-common/Cargo.lock
--- a/pkgs/development/python-modules/qcs-api-client-common/default.nix
+++ b/pkgs/development/python-modules/qcs-api-client-common/default.nix
@ -0,0 +1,77 @@
+{
+  buildPythonPackage,
+  cargo,
+  fetchFromGitHub,
+  grpc-interceptor,
+  grpcio,
+  httpx,
+  lib,
+  pytest-asyncio,
+  pytest-mock,
+  pytestCheckHook,
+  rustc,
+  rustPlatform,
+  syrupy,
+}:
+
+buildPythonPackage rec {
+  pname = "qcs-api-client-common";
+  version = "0.10.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "rigetti";
+    repo = "qcs-api-client-rust";
+    rev = "refs/tags/common/v${version}";
+    hash = "sha256-WXTqzdbBZmBj/+mVK/watOuaq/WqKtaMVhp+ogjmhqM=";
+  };
+
+  cargoDeps = rustPlatform.importCargoLock {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "hyper-proxy-0.9.1" = "sha256-P9/qMHfq56rkQoBQF3o/SmbOfcePcFf8yh1YQve3oGM=";
+    };
+  };
+
+  # FIXME use
+  #     buildAndTestSubdir = "qcs-api-client-common";
+  # instead, which makes the tests fail
+  postPatch = ''
+    cd qcs-api-client-common
+  '';
+  cargoRoot = "..";
+
+  build-system = [ rustPlatform.maturinBuildHook ];
+
+  nativeBuildInputs = [
+    cargo
+    rustPlatform.cargoSetupHook
+    rustc
+  ];
+
+  dependencies = [
+    grpc-interceptor
+    grpcio
+    httpx
+  ];
+
+  preCheck = ''
+    # import from $out
+    rm -r qcs_api_client_common
+  '';
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytest-mock
+    pytestCheckHook
+    syrupy
+  ];
+
+  meta = {
+    changelog = "https://github.com/rigetti/qcs-api-client-rust/blob/${src.rev}/qcs-api-client-common/CHANGELOG-py.md";
+    description = "Contains core QCS client functionality and middleware implementations";
+    homepage = "https://github.com/rigetti/qcs-api-client-rust/tree/main/qcs-api-client-common";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
--- a/pkgs/development/python-modules/qcs-sdk-python/Cargo.lock
+++ b/pkgs/development/python-modules/qcs-sdk-python/Cargo.lock
@ -1592,18 +1592,18 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"

 [[package]]
 name = "lexical"
-version = "6.1.1"
+version = "7.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7aefb36fd43fef7003334742cbf77b243fcd36418a1d1bdd480d613a67968f6"
+checksum = "8ecd3381ac77c22d4e2607284ac71e44b21c21bd3785ee807d21976d54ee16f9"
 dependencies = [
 "lexical-core",
 ]

 [[package]]
 name = "lexical-core"
-version = "0.8.5"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46"
+checksum = "0885f6cdfe75c96e45bbf1c4e49511f128201391ce3b56e60e29f5a1fadbc1c1"
 dependencies = [
 "lexical-parse-float",
 "lexical-parse-integer",
@ -1614,9 +1614,9 @@ dependencies = [

 [[package]]
 name = "lexical-parse-float"
-version = "0.8.5"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f"
+checksum = "924f7ec090cd4f60bd873f160b0fb69a0c80bb3a98f2e778a1893ae0e5c4b0b9"
 dependencies = [
 "lexical-parse-integer",
 "lexical-util",
@ -1625,9 +1625,9 @@ dependencies = [

 [[package]]
 name = "lexical-parse-integer"
-version = "0.8.6"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9"
+checksum = "8feab1da84a2ab0ddbbad2fb1830b755f71a9a8d996c7a1f2a553faf72aa3686"
 dependencies = [
 "lexical-util",
 "static_assertions",
@ -1635,18 +1635,18 @@ dependencies = [

 [[package]]
 name = "lexical-util"
-version = "0.8.5"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc"
+checksum = "591ce1a12ecd3b26d4121ab360a6a4483a67f05a5372add6acbfd0b65c9285d9"
 dependencies = [
 "static_assertions",
 ]

 [[package]]
 name = "lexical-write-float"
-version = "0.8.5"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862"
+checksum = "05b0f3f9ddada5942b54e97654d535df37c9340ad66c24b50360a90619779f41"
 dependencies = [
 "lexical-util",
 "lexical-write-integer",
@ -1655,9 +1655,9 @@ dependencies = [

 [[package]]
 name = "lexical-write-integer"
-version = "0.8.5"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446"
+checksum = "48c6d47254ddb292771dce7697ae2be9619f8e369d01a9ccda15ef2ff50443fc"
 dependencies = [
 "lexical-util",
 "static_assertions",
@ -2551,7 +2551,7 @@ dependencies = [
 "num-complex",
 "parking_lot",
 "portable-atomic",
- "pyo3-build-config",
+ "pyo3-build-config 0.20.3",
 "pyo3-ffi",
 "pyo3-macros",
 "unindent",
@ -2580,6 +2580,16 @@ dependencies = [
 "target-lexicon",
 ]

+[[package]]
+name = "pyo3-build-config"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7879eb018ac754bba32cb0eec7526391c02c14a093121857ed09fbf1d1057d41"
+dependencies = [
+ "once_cell",
+ "target-lexicon",
+]
+
 [[package]]
 name = "pyo3-ffi"
 version = "0.20.3"
@ -2587,7 +2597,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa"
 dependencies = [
 "libc",
- "pyo3-build-config",
+ "pyo3-build-config 0.20.3",
 ]

 [[package]]
@ -2621,7 +2631,7 @@ checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185"
 dependencies = [
 "heck 0.4.1",
 "proc-macro2",
- "pyo3-build-config",
+ "pyo3-build-config 0.20.3",
 "quote",
 "syn 2.0.66",
 ]
@ -2674,7 +2684,7 @@ dependencies = [

 [[package]]
 name = "qcs"
-version = "0.23.2"
+version = "0.24.1"
 dependencies = [
 "assert2",
 "async-trait",
@ -2736,19 +2746,25 @@ dependencies = [

 [[package]]
 name = "qcs-api-client-common"
-version = "0.8.4"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "040552f233992abe94376304cf17dab2d79ff62d4a9ee986d75efe3d19337f57"
+checksum = "1cf1692d12ab36478f43f1ef493a8b2445f7f5d17164f739d8b0fd57ad59e6e6"
 dependencies = [
 "async-trait",
 "backoff",
+ "base64 0.22.1",
 "derive_builder 0.20.0",
 "figment",
 "futures",
 "home",
 "http",
 "jsonwebtoken",
+ "paste",
+ "pyo3",
+ "pyo3-asyncio",
+ "pyo3-build-config 0.22.1",
 "reqwest",
+ "rigetti-pyo3 0.3.6",
 "serde",
 "shellexpand",
 "thiserror",
@ -2762,9 +2778,9 @@ dependencies = [

 [[package]]
 name = "qcs-api-client-grpc"
-version = "0.8.4"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb755cd59b1b3ce99abe52ff6898ad74ca26463e94300c103cafaac4f345c4f3"
+checksum = "b6224aeaaafb92d44439a398a03b042889edacbe23a115cfb1ff1e17c80c8bf2"
 dependencies = [
 "backoff",
 "http",
@ -2795,9 +2811,9 @@ dependencies = [

 [[package]]
 name = "qcs-api-client-openapi"
-version = "0.9.4"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "008d06c4051dd4b3e7d5b6c1f31457c68384f8f36b05b304de6059bbd81c6128"
+checksum = "c5107bbd313d31d1eede8dec2bc9c69e0aa50ffc6207457bb4d8c3ab3cb32434"
 dependencies = [
 "anyhow",
 "qcs-api-client-common",
@ -2815,7 +2831,7 @@ dependencies = [

 [[package]]
 name = "qcs-sdk-python"
-version = "0.19.3"
+version = "0.20.1"
 dependencies = [
 "async-trait",
 "numpy",
@ -2823,9 +2839,10 @@ dependencies = [
 "opentelemetry 0.23.0",
 "opentelemetry_sdk 0.23.0",
 "paste",
+ "prost",
 "pyo3",
 "pyo3-asyncio",
- "pyo3-build-config",
+ "pyo3-build-config 0.20.3",
 "pyo3-log",
 "pyo3-opentelemetry",
 "pyo3-tracing-subscriber",
@ -2835,7 +2852,7 @@ dependencies = [
 "qcs-api-client-grpc",
 "qcs-api-client-openapi",
 "quil-rs",
- "rigetti-pyo3",
+ "rigetti-pyo3 0.4.1",
 "serde_json",
 "thiserror",
 "tokio",
@ -2850,8 +2867,8 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"

 [[package]]
 name = "quil-rs"
-version = "0.27.1"
-source = "git+https://github.com/rigetti/quil-rs?tag=quil-py/v0.11.1#ab5b976573b38f3ba2605f57482ccadb1f13bf30"
+version = "0.28.1"
+source = "git+https://github.com/rigetti/quil-rs?tag=quil-py/v0.12.1#a0f2776893d3ce33eb9f29449f3b4b0e9ed24174"
 dependencies = [
 "approx",
 "indexmap 2.2.6",
@ -3099,6 +3116,19 @@ dependencies = [
 "time",
 ]

+[[package]]
+name = "rigetti-pyo3"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f924032d36104a859f936762576a9e6fc0811b37a1f4a8144c0b9b25ee89607b"
+dependencies = [
+ "num-complex",
+ "num-traits",
+ "paste",
+ "pyo3",
+ "time",
+]
+
 [[package]]
 name = "ring"
 version = "0.16.20"
--- a/pkgs/development/python-modules/qcs-sdk-python/default.nix
+++ b/pkgs/development/python-modules/qcs-sdk-python/default.nix
@ -8,6 +8,7 @@
  pytest-asyncio,
  pytestCheckHook,
  pythonOlder,
+  qcs-api-client-common,
  quil,
  rustPlatform,
  darwin,
@ -17,7 +18,7 @@

 buildPythonPackage rec {
  pname = "qcs-sdk-python";
-  version = "0.19.3";
+  version = "0.20.1";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -26,13 +27,13 @@ buildPythonPackage rec {
    owner = "rigetti";
    repo = "qcs-sdk-rust";
    rev = "python/v${version}";
-    hash = "sha256-TyXUkuiYdz6Z6s96DD33QdEuI0ch4hRjUGWahEBpkX4=";
+    hash = "sha256-OuFEygZWfNnhRDLeEY10gGYD9EF5LkPd+K3Uu8X0hwY=";
  };

  cargoDeps = rustPlatform.importCargoLock {
    lockFile = ./Cargo.lock;
    outputHashes = {
-      "quil-rs-0.27.1" = "sha256-w97kkdwRnVVfKNTIKypl3shFQJV5Rh/kF6jp7jCiyqw=";
+      "quil-rs-0.28.1" = "sha256-nyKLBL5Q51u2OTkpr9oKb0c5saWeW3wmZC3g7vxyeEQ=";
    };
  };

@ -43,7 +44,10 @@ buildPythonPackage rec {
    rustPlatform.maturinBuildHook
  ];

-  dependencies = [ quil ];
+  dependencies = [
+    qcs-api-client-common
+    quil
+  ];

  optional-dependencies = {
    tracing-opentelemetry = [ opentelemetry-api ];
--- a/pkgs/development/python-modules/qds-sdk/default.nix
+++ b/pkgs/development/python-modules/qds-sdk/default.nix
@ -1,51 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-  boto,
-  inflection,
-  requests,
-  six,
-  urllib3,
-  mock,
-  pytestCheckHook,
-}:
-
-buildPythonPackage rec {
-  pname = "qds-sdk";
-  version = "1.16.1";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "qubole";
-    repo = "qds-sdk-py";
-    rev = "refs/tags/V${version}";
-    hash = "sha256-8aPIE2E3Fy2EiBM2FPRyjnJolIBdOzafI3Fvlod5hxU=";
-  };
-
-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [
-    boto
-    inflection
-    requests
-    six
-    urllib3
-  ];
-
-  nativeCheckInputs = [
-    pytestCheckHook
-    mock
-  ];
-
-  pythonImportsCheck = [ "qds_sdk" ];
-
-  meta = with lib; {
-    description = "Python module that provides the tools you need to authenticate with, and use the Qubole Data Service API";
-    homepage = "https://github.com/qubole/qds-sdk-py";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ shahrukh330 ];
-    mainProgram = "qds.py";
-  };
-}
--- a/pkgs/development/python-modules/quil/default.nix
+++ b/pkgs/development/python-modules/quil/default.nix
@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "quil";
-  version = "0.11.4";
+  version = "0.12.1";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -22,13 +22,13 @@ buildPythonPackage rec {
    owner = "rigetti";
    repo = "quil-rs";
    rev = "quil-py/v${version}";
-    hash = "sha256-I8LV7lqJP2xc8eVxMbixeHMRYiTpmpSahfA3WWRjoHA=";
+    hash = "sha256-OCQp8WKOxyZNMu2waeasSZ4E8VhFqDZcgGbDoMpKeHg=";
  };

  cargoDeps = rustPlatform.fetchCargoTarball {
    name = "${pname}-${version}";
    inherit src;
-    hash = "sha256-U9AVJ4i9E0TeG5cPxdx9hJcMKkZvUXcRfZF7VkM7ddI=";
+    hash = "sha256-EmSDjheLEyFr0w6XOvJYdRmGGlv2L/wh3qAN8Nn5lyg=";
  };

  buildAndTestSubdir = "quil-py";
--- a/pkgs/development/tools/fq/default.nix
+++ b/pkgs/development/tools/fq/default.nix
@ -7,16 +7,16 @@

 buildGoModule rec {
  pname = "fq";
-  version = "0.12.0";
+  version = "0.13.0";

  src = fetchFromGitHub {
    owner = "wader";
    repo = "fq";
    rev = "v${version}";
-    hash = "sha256-XvR2Ja3x75unzs7BeyuppmyzDdTZw+BlUmnjqfDTQI0=";
+    hash = "sha256-bHyLEJiSM42arZiM1VVKga6wp3Q3EAMgUrFnh3hbk9M=";
  };

-  vendorHash = "sha256-QYeOd144ko04Aowi1gtPxgR+3mo7DozCca2xtEN8ARs=";
+  vendorHash = "sha256-in+c8Wl7ffXAqMvs+3K6dzAd5ePqBpRaxU2iM81moQM=";

  ldflags = [
    "-s"
--- a/pkgs/games/steam/fhsenv.nix
+++ b/pkgs/games/steam/fhsenv.nix
@ -299,7 +299,7 @@ in buildFHSEnv rec {
  '' + args.extraPreBwrapCmds or "";

  extraBwrapArgs = [
-    "--bind /etc/NIXOS /etc/NIXOS" # required 32bit driver check in runScript
+    "--bind-try /etc/NIXOS /etc/NIXOS" # required 32bit driver check in runScript
    "--bind-try /tmp/dumps /tmp/dumps"
  ] ++ args.extraBwrapArgs or [];

--- a/pkgs/servers/web-apps/kavita/default.nix
+++ b/pkgs/servers/web-apps/kavita/default.nix
@ -1,23 +1,22 @@
-{ lib
-, stdenvNoCC
-, fetchFromGitHub
-, buildDotnetModule
-, buildNpmPackage
-, dotnetCorePackages
-, nixosTests
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  buildDotnetModule,
+  buildNpmPackage,
+  dotnetCorePackages,
+  nixosTests,
 }:

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "kavita";
-  version = "0.8.2";
+  version = "0.8.3.2";

  src = fetchFromGitHub {
    owner = "kareadita";
    repo = "kavita";
-    # commit immediately following the v${version} tag
-    # for correct version reporting
-    rev = "44c046176e54fa81e3420a1a40dcd9871e0a45f1";
-    hash = "sha256-cHX6nzajFqygdFF9y4KEAMv0tdNx9xFbpOoVNo8uafs=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-8ZE3zlWX8DxLYUFj3AA04cIJTUWYgnNM+5FZhGmlRz8=";
  };

  backend = buildDotnetModule {
@ -49,7 +48,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
    dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;
  };

-  frontend =  buildNpmPackage {
+  frontend = buildNpmPackage {
    pname = "kavita-frontend";
    inherit (finalAttrs) version src;

@ -58,7 +57,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
    npmBuildScript = "prod";
    npmFlags = [ "--legacy-peer-deps" ];
    npmRebuildFlags = [ "--ignore-scripts" ]; # Prevent playwright from trying to install browsers
-    npmDepsHash = "sha256-H53lwRr43MQWBbwc8N0GikAOkN2N0CwyiY8eGHveNFc=";
+    npmDepsHash = "sha256-EB4B6BHiRi6A4nhj2dR+3q1MZKcfcYUuo4ls4WMJEUI=";
  };

  dontBuild = true;
@ -75,7 +74,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
  '';

  passthru = {
-    tests = { inherit (nixosTests) kavita; };
+    tests = {
+      inherit (nixosTests) kavita;
+    };
    updateScript = ./update.sh;
  };

@ -85,7 +86,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
    changelog = "https://github.com/kareadita/kavita/releases/tag/${finalAttrs.src.rev}";
    license = lib.licenses.gpl3Only;
    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ misterio77 nevivurn ];
+    maintainers = with lib.maintainers; [
+      misterio77
+      nevivurn
+    ];
    mainProgram = "kavita";
  };
 })
--- a/pkgs/servers/web-apps/kavita/nuget-deps.nix
+++ b/pkgs/servers/web-apps/kavita/nuget-deps.nix
@ -25,18 +25,18 @@
  (fetchNuGet { pname = "Hangfire.NetCore"; version = "1.8.14"; hash = "sha256-AcBAONay/nnNrGy0Hjt1UA7rxzIeTm0rQgZO+AJpQbM="; })
  (fetchNuGet { pname = "Hangfire.SqlServer"; version = "1.8.14"; hash = "sha256-OkKb2D2kKN9ESrSwFH1up9/KC4qZHblGiuLLwMWojfE="; })
  (fetchNuGet { pname = "Hangfire.Storage.SQLite"; version = "0.4.2"; hash = "sha256-//40m/V+kgcDrKJ7/YfX1upOK9ZQEG/Bpbk7c5PmQuk="; })
-  (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.61"; hash = "sha256-exRJTP7mHNt31CKaejKSSkKPm74ratfnpGl50AqZwlY="; })
+  (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.64"; hash = "sha256-tj0yh2B2st0k4DABKA/LFh7lH3c07soEfxwH8AL7PSY="; })
  (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; hash = "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="; })
-  (fetchNuGet { pname = "MailKit"; version = "4.7.0"; hash = "sha256-9KcpzvO9MKAlxCh2B2XOBWbPfQ8TRo27gxuSJpB57vs="; })
+  (fetchNuGet { pname = "MailKit"; version = "4.7.1.1"; hash = "sha256-g9VnuGYTPNUa6woEO/gVbxNfaidHgGtoQw2qOgYLK0o="; })
  (fetchNuGet { pname = "MarkdownDeep.NET.Core"; version = "1.5.0.4"; hash = "sha256-NO//QjqAcE4yDmQARbThyp8fdFrE2U0Bed5XToOG+jI="; })
  (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.Abstractions"; version = "2.2.0"; hash = "sha256-0JcJYAoU+AEM0dWaXk2qnqxrVM0Ak9/ntCU1MC90R24="; })
-  (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.JwtBearer"; version = "8.0.6"; hash = "sha256-rUg3keud5JjMtyncxNc2/8Sey2bMTth/AFjeketJR88="; })
-  (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.OpenIdConnect"; version = "8.0.6"; hash = "sha256-tTPB/xKJA9BJiwcrBhcV+kwqxyumew2RXDlicn85fgE="; })
+  (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.JwtBearer"; version = "8.0.8"; hash = "sha256-HnRXaASyL3Q3tA++0C4JiIhUSTeFtEX+acybs8uiXZ8="; })
+  (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.OpenIdConnect"; version = "8.0.8"; hash = "sha256-7Nbhyn29No/p2/nqFc+C41J1mnU5DBYUrnVSxbod+QM="; })
  (fetchNuGet { pname = "Microsoft.AspNetCore.Authorization"; version = "2.2.0"; hash = "sha256-PaMYICjQ0rprUv53Uza/jQvvWTcbPjGLMMp12utF+NY="; })
  (fetchNuGet { pname = "Microsoft.AspNetCore.Authorization.Policy"; version = "2.2.0"; hash = "sha256-onFYB+jtCbGyfZsIglReCPRdDMmwah2EDMhJN4uBP7Q="; })
  (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "2.2.0"; hash = "sha256-MoieWAe7zT/0a7PAn3gMKO8YpHTbOtiGIwF/sFAmieY="; })
-  (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.Internal"; version = "8.0.6"; hash = "sha256-8+2aRr6mWkdzcGEpIAA9mwI+HPAxqZek8MtNS50mPJQ="; })
-  (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.KeyDerivation"; version = "8.0.6"; hash = "sha256-5ss60ArZhhZCml464QwlRdvRdyBWIR8cmCZfiPt05vo="; })
+  (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.Internal"; version = "8.0.8"; hash = "sha256-VS+6L2gvDAIS51kpAamt8FHDbiIwYBpBh2ADvKO3uRU="; })
+  (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.KeyDerivation"; version = "8.0.8"; hash = "sha256-nwzIcerY8JKBkkJgw2ozTmGRyXrVkP6BnMYbDYNLe24="; })
  (fetchNuGet { pname = "Microsoft.AspNetCore.Hosting.Abstractions"; version = "2.2.0"; hash = "sha256-GzqYrTqCCVy41AOfmgIRY1kkqxekn5T0gFC7tUMxcxA="; })
  (fetchNuGet { pname = "Microsoft.AspNetCore.Hosting.Server.Abstractions"; version = "2.2.0"; hash = "sha256-8PnZFCkMwAeEHySmmjJOnQvOyx2199PesYHBnfka51s="; })
  (fetchNuGet { pname = "Microsoft.AspNetCore.Http"; version = "2.2.0"; hash = "sha256-+ARZomTXSD1m/PR3TWwifXb67cQtoqDVWEqfoq5Tmbk="; })
@ -45,7 +45,7 @@
  (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Common"; version = "1.1.0"; hash = "sha256-PooDjJHsIcZkL2IOp530pJr4GLGlre2sIdboNRrAcHQ="; })
  (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Extensions"; version = "2.2.0"; hash = "sha256-1rXxGQnkNR+SiNMtDShYoQVGOZbvu4P4ZtWj5Wq4D4U="; })
  (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Features"; version = "2.2.0"; hash = "sha256-odvntHm669YtViNG5fJIxU4B+akA2SL8//DvYCLCNHc="; })
-  (fetchNuGet { pname = "Microsoft.AspNetCore.Identity.EntityFrameworkCore"; version = "8.0.6"; hash = "sha256-8Jc28VhEkWgW0dE5riY/Ye7w6vlkIQ44dduLBx1p/s4="; })
+  (fetchNuGet { pname = "Microsoft.AspNetCore.Identity.EntityFrameworkCore"; version = "8.0.8"; hash = "sha256-fgnUFp18Uop3gpfs/jLFEf/leDJoWtECVvEX5ZN9cyw="; })
  (fetchNuGet { pname = "Microsoft.AspNetCore.Routing"; version = "2.2.0"; hash = "sha256-mvsF973Cm48XUB6lPBiGp7U7vkfBjB3oILdnIQUwe4o="; })
  (fetchNuGet { pname = "Microsoft.AspNetCore.Routing.Abstractions"; version = "2.2.0"; hash = "sha256-nqJjxKXkdPAY1XvQjIRNW2y855Xi+LAX1S5AncPnPDU="; })
  (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR"; version = "1.1.0"; hash = "sha256-VCTxQAWRKBk640FhkGu4XUcfWXWSV8x4jEfezDoM4Jo="; })
@ -62,14 +62,14 @@
  (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.5.0"; hash = "sha256-WM7AXJYHagaPx2waj2E32gG0qXq6Kx4Zhiq7Ym3WXPI="; })
  (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; hash = "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="; })
  (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; hash = "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="; })
-  (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "8.0.6"; hash = "sha256-MgUBbb0LDM1ixm8pBfBrSTVjNoGFn6NQMD36mirELmo="; })
-  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "8.0.6"; hash = "sha256-T9Pz6bCGULBEYjzdUBd1KXSAnw1c4VljSkwgbTE2MmE="; })
-  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "8.0.6"; hash = "sha256-RdcIA9WUJnHyAFdlpBPs5qUusKMUH9uLFGusKBWDCX8="; })
-  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "8.0.6"; hash = "sha256-aTWfaOL0MfWYBbR+1Q1g+sxzmcjA4Q/OBFnVZDQqKJ8="; })
-  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Design"; version = "8.0.6"; hash = "sha256-svQdeAv19bCM/RQwWFA6wFssrXecqazqs5ctbdZCBgQ="; })
-  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "8.0.6"; hash = "sha256-l2fkzSq3Tb15Uq7a879Bihat+Y7rijDwsrs/MDiApdw="; })
-  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite"; version = "8.0.6"; hash = "sha256-kb+8eSHhmaxJ5OXYSFTHtKYaQ2TV+WJ5nfZMP+XXsto="; })
-  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "8.0.6"; hash = "sha256-4rVgUuCdBUvQyEnadrieZ1RxgwGAfuRCj9kkWM24NKA="; })
+  (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "8.0.8"; hash = "sha256-5qV38l8ZeCZTE5f5+f5XFNzUCuTurqDti2qxobeYPXk="; })
+  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "8.0.8"; hash = "sha256-w4NJ3K5ot/oZO5xIGcVLE7n4x/Jnmz0/VYfumnACcuc="; })
+  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "8.0.8"; hash = "sha256-93QnvBG9lz9TuWx4o1yvEvWMq2k3jD7G77yI8pl8hz8="; })
+  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "8.0.8"; hash = "sha256-xjqccaSQW7pJinwWPv2eLuVA2vchIJcRroYVTbywTnQ="; })
+  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Design"; version = "8.0.8"; hash = "sha256-Bxfg9/w3/bUwsWgASf5TAeL/7ECBDpkCUytT+bKwrx0="; })
+  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "8.0.8"; hash = "sha256-ZdhJ4yUuxo1NIMz/qCrDKIFvYGAHhDCNsAVy+0lm/Kk="; })
+  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite"; version = "8.0.8"; hash = "sha256-i9YQkY0U64ronI8zvEDhbFNJt3QQTZ470Ysnx2ZxiJ4="; })
+  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "8.0.8"; hash = "sha256-TI77E3xSNZexiEbh/z5uVgG76cLZVn8KP7Dzh8sRciU="; })
  (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; hash = "sha256-RJjBWz+UHxkQE2s7CeGYdTZ218mCufrxl0eBykZdIt4="; })
  (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "8.0.0"; hash = "sha256-xGpKrywQvU1Wm/WolYIxgHYEFfgkNGeJ+GGc5DT3phI="; })
  (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "8.0.0"; hash = "sha256-RUQe2VgOATM9JkZ/wGm9mreKoCmOS4pPyvyJWBqMaC8="; })
@ -93,7 +93,7 @@
  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; hash = "sha256-SZke0jNKIqJvvukdta+MgIlGsrP2EdPkkS8lfLg7Ju4="; })
  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; hash = "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="; })
  (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "3.1.6"; hash = "sha256-TKEE5GJmn1wLKuiF6Wd+Q7jpIlq9gSvlWvTVopCyoo4="; })
-  (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "8.0.0"; hash = "sha256-qkCdwemqdZY/yIW5Xmh7Exv74XuE39T8aHGHCofoVgo="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "8.0.1"; hash = "sha256-m8daXRK1Qn9y2c8SmtWu9ysLHwFJtEWiUQoAnMalw7s="; })
  (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics"; version = "8.0.0"; hash = "sha256-fBLlb9xAfTgZb1cpBxFs/9eA+BlBvF8Xg0DMkBqdHD4="; })
  (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.Abstractions"; version = "8.0.0"; hash = "sha256-USD5uZOaahMqi6u7owNWx/LR4EDrOwqPrAAim7iRpJY="; })
  (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.2.0"; hash = "sha256-pLAxP15+PncMiRrUT5bBAhWg7lC6/dfQk5TLTpZzA7k="; })
@ -105,8 +105,8 @@
  (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "2.2.0"; hash = "sha256-YZcyKXL6jOpyGrDbFLu46vncfUw2FuqhclMdbEPuh/U="; })
  (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "3.0.0"; hash = "sha256-iUMCRR9uHSoub48MboewTxokP5QwrC47X5t+C+JUMo4="; })
  (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "8.0.0"; hash = "sha256-0JBx+wwt5p1SPfO4m49KxNOXPAzAU0A+8tEc/itvpQE="; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Identity.Core"; version = "8.0.6"; hash = "sha256-0cquYLpXjFMdd2VQrsr54LrbQ723jbIwoLOhO04wTnM="; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Identity.Stores"; version = "8.0.6"; hash = "sha256-/HmTyyTMpY5xpgjwU9GO8uTIefTaTztFagZKEqXX6iY="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Identity.Core"; version = "8.0.8"; hash = "sha256-Gu8lyqKUANMq7oea6WQHCieCN3AFDFbRM5ClmS096Zk="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Identity.Stores"; version = "8.0.8"; hash = "sha256-kh0GfO507LMSDZPNPNoMVBSfDpip2wXCewUDi6KsURg="; })
  (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.0.0"; hash = "sha256-Bg3bFJPjQRJnPvlEc5v7lzwRaUTzKwXDtz81GjCTfMo="; })
  (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; hash = "sha256-8WsZKRGfXW5MsXkMmNVf6slrkw+cR005czkOP2KUqTk="; })
  (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; hash = "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o="; })
@ -134,14 +134,14 @@
  (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; hash = "sha256-AgvysszpQ11AiTBJFkvSy8JnwIWTj15Pfek7T7ThUc4="; })
  (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; hash = "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="; })
  (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.1.2"; hash = "sha256-QN2btwsc8XnOp8RxwSY4ntzpqFIrWRZg6ZZEGBZ6TQY="; })
-  (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.6.2"; hash = "sha256-Ipd8+JFpj44vqouRGO8YvxzVyjKOeFXczTeKguxdcgs="; })
-  (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.6.2"; hash = "sha256-lHzkMQIlbSwmetyGLbtuptHZP+HgG8n2aLtBDqDr1S4="; })
+  (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "8.0.2"; hash = "sha256-j37WWYrYgINKVn5eWhytGad7k2GwQPCemumJXU7cHsw="; })
+  (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "8.0.2"; hash = "sha256-siKloYOZKBRV//apM/O+A+KwhAWTZ0ZnnCI7Pq+pxMs="; })
  (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.1.2"; hash = "sha256-6M7Y1u2cBVsO/dP+qrgkMLisXbZgMgyWoRs5Uq/QJ/o="; })
-  (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.6.2"; hash = "sha256-hNIbOZ6leANvh+i1I2ZXS35+yXUmhTlyomkA8PbF++w="; })
+  (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "8.0.2"; hash = "sha256-Ref5E5JXHXDAdog/Yix25fsYO7R4eCHP8L/GIJz70p8="; })
  (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols"; version = "7.1.2"; hash = "sha256-6OXP0vQ6bQ3Xvj3I73eqng6NqqMC4htWKuM8cchZhWI="; })
  (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols.OpenIdConnect"; version = "7.1.2"; hash = "sha256-cAwwCti+/ycdjqNy8PrBNEeuF7u5gYtCX8vBb2qIKRs="; })
  (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.1.2"; hash = "sha256-qf8y8KCo1ysrK+jCrnR+ARHwlfMWPXLxe7a41FVg4OA="; })
-  (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.6.2"; hash = "sha256-P0lN2+Die2ftnJh43A3X3CR207vvzfCCJjlow6yweVs="; })
+  (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "8.0.2"; hash = "sha256-VM5Tw4lS1XxVajmA8PB4yn8J+Abi388U//5//0aNOHo="; })
  (fetchNuGet { pname = "Microsoft.IO.RecyclableMemoryStream"; version = "3.0.1"; hash = "sha256-unFg/5EcU/XKJbob4GtQC43Ydgi5VjeBGs7hfhj4EYo="; })
  (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "2.2.0"; hash = "sha256-pb8AoacSvy8hGNGodU6Lhv1ooWtUSCZwjmwd89PM1HA="; })
  (fetchNuGet { pname = "Microsoft.NETCore.Jit"; version = "1.0.2"; hash = "sha256-T92T+bmdXfpAe73OKFTYXGJW1gTHuwcryBSgV7mwSkk="; })
@ -158,23 +158,23 @@
  (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.6.14"; hash = "sha256-dSJUic2orPGfYVgto9DieRckbtLpPyxHtf+RJ2tmKPM="; })
  (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; })
  (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "8.0.0"; hash = "sha256-UcxurEamYD+Bua0PbPNMYAZaRulMrov8CfbJGIgTaRQ="; })
-  (fetchNuGet { pname = "MimeKit"; version = "4.7.0"; hash = "sha256-bdBpES930ZgPaFrXJuNkW3vRryMygwXpE5dNyW1xOS0="; })
+  (fetchNuGet { pname = "MimeKit"; version = "4.7.1"; hash = "sha256-yTUqWAFU1v8jo70D09A+l8tsc+pr6IMOORD9L8EDz9o="; })
  (fetchNuGet { pname = "MimeTypeMapOfficial"; version = "1.0.17"; hash = "sha256-HuQRDUDjBlAKzbnCWvxkXp7tf2bCdd/evox8964grdA="; })
  (fetchNuGet { pname = "Mono.TextTemplating"; version = "2.2.1"; hash = "sha256-4TYsfc8q74P8FuDwkIWPO+VYY0mh4Hs4ZL8v0lMaBsY="; })
  (fetchNuGet { pname = "Nager.ArticleNumber"; version = "1.0.7"; hash = "sha256-Th3BIABiOo0vsgqznr6C6WhVdGDFalso/rAfUYDI0NE="; })
  (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="; })
  (fetchNuGet { pname = "NetVips"; version = "2.4.1"; hash = "sha256-Un1ZACxSjadaUIzmUimGshXDal8tJAq1CBwrgrNiwMk="; })
-  (fetchNuGet { pname = "NetVips.Native"; version = "8.15.2"; hash = "sha256-ak8dJNNOGJURiUVourVL0Qn8rTA4H5yzrKWfcUt2z0o="; })
-  (fetchNuGet { pname = "NetVips.Native.linux-arm"; version = "8.15.2"; hash = "sha256-Xv+EBcwNYeUXv5Z9OHDY+8xw9haW24WQCp0t+eYWjN0="; })
-  (fetchNuGet { pname = "NetVips.Native.linux-arm64"; version = "8.15.2"; hash = "sha256-PZCj5MESL+Da0pu0Lx4OpysD1m45LZVPQo3dWLsLjYc="; })
-  (fetchNuGet { pname = "NetVips.Native.linux-musl-arm64"; version = "8.15.2"; hash = "sha256-A8TYMh6L9z3gDjTyyFd9WNjU0BuxOT5Ag34EW9wazJk="; })
-  (fetchNuGet { pname = "NetVips.Native.linux-musl-x64"; version = "8.15.2"; hash = "sha256-2oUm+8OHyK1zHWCoIVXfPu+T/xmq5yTN4H048LrT9kc="; })
-  (fetchNuGet { pname = "NetVips.Native.linux-x64"; version = "8.15.2"; hash = "sha256-vTnL2ERyu8/UwfTeCtLZR0stmVx4Qyyki/yAEE537Cc="; })
-  (fetchNuGet { pname = "NetVips.Native.osx-arm64"; version = "8.15.2"; hash = "sha256-eXE7j851WlLGJWc9Kbg/eP3HxKrM8b7ujwy/r3IBUxE="; })
-  (fetchNuGet { pname = "NetVips.Native.osx-x64"; version = "8.15.2"; hash = "sha256-VRS7vWj9GYHWnyE4qjc7XnxhiwsTmqx1hfnc7WO4SIA="; })
-  (fetchNuGet { pname = "NetVips.Native.win-arm64"; version = "8.15.2"; hash = "sha256-zhLnFqPsf/+cA5JDT+7eFWaldM+mnMEgzS3ijSuC73k="; })
-  (fetchNuGet { pname = "NetVips.Native.win-x64"; version = "8.15.2"; hash = "sha256-73NkRF3um0AEO2PMQLpFb0IvGgBihYdY7ccfBg4vHXk="; })
-  (fetchNuGet { pname = "NetVips.Native.win-x86"; version = "8.15.2"; hash = "sha256-fTgnpFaq9uVx2OEOW7WuUdHHCguMeUp90KDIsNvi4iI="; })
+  (fetchNuGet { pname = "NetVips.Native"; version = "8.15.3"; hash = "sha256-MW+so2f7+IwnRIHN5u8g/B4InETKLsDgSte2qq7B+bU="; })
+  (fetchNuGet { pname = "NetVips.Native.linux-arm"; version = "8.15.3"; hash = "sha256-+m86lUEBWxbPT/sKBCFPorTkO0WMtRgaI0Ab+x4kUr4="; })
+  (fetchNuGet { pname = "NetVips.Native.linux-arm64"; version = "8.15.3"; hash = "sha256-GSX/tcblN9LZLXXXKsTqjJYwHRsQ0ol4AuC5rmBtA44="; })
+  (fetchNuGet { pname = "NetVips.Native.linux-musl-arm64"; version = "8.15.3"; hash = "sha256-pOq07bd9L3H5GdSkLSlSB/ViElUF6r87oNixWoq/WzM="; })
+  (fetchNuGet { pname = "NetVips.Native.linux-musl-x64"; version = "8.15.3"; hash = "sha256-1JdsDxKwY+tk6OSCt1PhX3wXV9noZgQp27rKsQElESQ="; })
+  (fetchNuGet { pname = "NetVips.Native.linux-x64"; version = "8.15.3"; hash = "sha256-TQoRwZ8CHi0+06dqEr9SLv7JOttIVGiUzc/LLRMtGGU="; })
+  (fetchNuGet { pname = "NetVips.Native.osx-arm64"; version = "8.15.3"; hash = "sha256-uMSH4OOgv/6PoXVvJw44JMiqytKBcOWDrjqz3coJ3sE="; })
+  (fetchNuGet { pname = "NetVips.Native.osx-x64"; version = "8.15.3"; hash = "sha256-rwQqUqgvYeNvE/S518Uw2JeL9+qaXOnhqmdVUb3ez/E="; })
+  (fetchNuGet { pname = "NetVips.Native.win-arm64"; version = "8.15.3"; hash = "sha256-dlcl9vAmu5B0K6zy0WsZQ1Q3DYrgZELIXEYIDQs8m8g="; })
+  (fetchNuGet { pname = "NetVips.Native.win-x64"; version = "8.15.3"; hash = "sha256-nRaI7ZaWpR5LWNYEBXMNfdij1nxQcDYTK4liz8T6we0="; })
+  (fetchNuGet { pname = "NetVips.Native.win-x86"; version = "8.15.3"; hash = "sha256-34+2bMn8PXNoag39r8kCOYG/vJxcmB6/Ay6ytZTswuA="; })
  (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.1"; hash = "sha256-lbR7rpS/EXgJ8TqQspuIIqAsiorrZb1oOK4HFw+QyPw="; })
  (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.2"; hash = "sha256-YhlAbGfwoxQzxb3Hef4iyV9eGdPQJJNd2GgSR0jsBJ0="; })
  (fetchNuGet { pname = "Newtonsoft.Json"; version = "12.0.2"; hash = "sha256-BW7sXT2LKpP3ylsCbTTZ1f6Mg1sR4yL68aJVHaJcTnA="; })
@ -222,22 +222,22 @@
  (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; })
  (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; })
  (fetchNuGet { pname = "Scrutor"; version = "3.3.0"; hash = "sha256-cYd6xuCn8cniuHWhiWMZRYZrYUjOvAz2wlEvOM5drmE="; })
-  (fetchNuGet { pname = "Serilog"; version = "4.0.0"; hash = "sha256-j8hQ5TdL1TjfdGiBO9PyHJFMMPvATHWN1dtrrUZZlNw="; })
-  (fetchNuGet { pname = "Serilog.AspNetCore"; version = "8.0.1"; hash = "sha256-a07P+0co6QuLuUw09PvvpLf9gix88Nw3dACsnSRcuW4="; })
+  (fetchNuGet { pname = "Serilog"; version = "4.0.1"; hash = "sha256-yenpr50Qf+nq1nrqyg3TKJqOroSyIKHke/9nfkA3wYg="; })
+  (fetchNuGet { pname = "Serilog.AspNetCore"; version = "8.0.2"; hash = "sha256-cRZHG2bqrESOxPVxq2v+mHx+oZBzZEPksrleGVXO1p0="; })
  (fetchNuGet { pname = "Serilog.Enrichers.Thread"; version = "4.0.0"; hash = "sha256-lo+3ohNHKe/hTq9vGbk29p/OWcNlcyJToGL6EpCJQm8="; })
  (fetchNuGet { pname = "Serilog.Extensions.Hosting"; version = "8.0.0"; hash = "sha256-OEVkEQoONawJF+SXeyqqgU0OGp9ubtt9aXT+rC25j4E="; })
  (fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "3.0.1"; hash = "sha256-KtHMMnepmEpOlHrIGlUkK6Vq1L0iBBnFGavbUtvxOBk="; })
  (fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "8.0.0"; hash = "sha256-GoWxCpkdahMvYd7ZrhwBxxTyjHGcs9ENNHJCp0la6iA="; })
  (fetchNuGet { pname = "Serilog.Formatting.Compact"; version = "2.0.0"; hash = "sha256-c3STGleyMijY4QnxPuAz/NkJs1r+TZAPjlmAKLF4+3g="; })
-  (fetchNuGet { pname = "Serilog.Settings.Configuration"; version = "8.0.1"; hash = "sha256-UqaNQPN5devzd8czUWu6D7zWJs/pUVsU5PJQRnyT4uw="; })
+  (fetchNuGet { pname = "Serilog.Settings.Configuration"; version = "8.0.2"; hash = "sha256-iHRQt6vDk85/6HpMXiJluAwhkjgwEnL3IKavfDgFX0k="; })
  (fetchNuGet { pname = "Serilog.Sinks.AspNetCore.SignalR"; version = "0.4.0"; hash = "sha256-KkyrLNMsoBGMJN7C8NNGhGVxFDYzfvxlX66i3NLYkmo="; })
  (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "6.0.0"; hash = "sha256-QH8ykDkLssJ99Fgl+ZBFBr+RQRl0wRTkeccQuuGLyro="; })
  (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; hash = "sha256-/PLVAE33lTdUEXdahkI5ddFiGZufWnvfsOodQsFB8sQ="; })
  (fetchNuGet { pname = "Serilog.Sinks.File"; version = "6.0.0"; hash = "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow="; })
  (fetchNuGet { pname = "Serilog.Sinks.SignalR.Core"; version = "0.1.2"; hash = "sha256-7j9SK++4U7Q6f6ofPWsaH9xQii/jBK864u/kHYwxyJk="; })
  (fetchNuGet { pname = "SharpCompress"; version = "0.37.2"; hash = "sha256-IP7/ssqWKT85YwLKrLGACHo0sgp7sMe603X+o485sYo="; })
-  (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "3.1.4"; hash = "sha256-zOqHVIInvJiqmx4JF+8USYvdKAGRZVUqQpdncrrjRjM="; })
-  (fetchNuGet { pname = "SonarAnalyzer.CSharp"; version = "9.28.0.94264"; hash = "sha256-lG8+16cWHYNhO0MFjUHv0zQGj5mipRmUr57z3CaO1wk="; })
+  (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "3.1.5"; hash = "sha256-3UehX9T+I81nfgv2dTHlpoPgYzXFk7kHr1mmlQOCBfw="; })
+  (fetchNuGet { pname = "SonarAnalyzer.CSharp"; version = "9.32.0.97167"; hash = "sha256-F8f9YjBZekwIowIm6LKfjowqmCyhLUuTFQIcjEEVDPg="; })
  (fetchNuGet { pname = "sqlite-net-pcl"; version = "1.8.116"; hash = "sha256-XlD0ycLkpMeFkZ9NCktC2ldYzD2NyJarSv5h6e4gekA="; })
  (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.6"; hash = "sha256-dZD/bZsYXjOu46ZH5Y/wgh0uhHOqIxC+S+0ecKhr718="; })
  (fetchNuGet { pname = "SQLitePCLRaw.bundle_green"; version = "2.0.4"; hash = "sha256-QjDI47nPUXx75rMABeSYefB6gw6xgrgTjYY6Uq/1J4U="; })
@ -247,14 +247,14 @@
  (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.6"; hash = "sha256-uHt5d+SFUkSd6WD7Tg0J3e8eVoxy/FM/t4PAkc9PJT0="; })
  (fetchNuGet { pname = "SQLitePCLRaw.provider.dynamic_cdecl"; version = "2.0.4"; hash = "sha256-0rzyURehoQsyDxW8Yj477TJLNcItBsJVwKBeGidKmSA="; })
  (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.6"; hash = "sha256-zHc/YZsd72eXlI8ba1tv58HZWUIiyjJaxq2CCP1hQe8="; })
-  (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.6.2"; hash = "sha256-kKz+NiXNfmrvrtbzsqnW1ItflNib3rymr3rf9yI5B1M="; })
+  (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.7.3"; hash = "sha256-pt1lBEN6Yk1QfqcgLD8Z2vE3tXUeJreQ2lRfjtMASCU="; })
  (fetchNuGet { pname = "Swashbuckle.AspNetCore.Filters"; version = "8.0.2"; hash = "sha256-RCFdFvCzUYS850axoGaprr0heFyBFCIu9jzusXJ0YAA="; })
  (fetchNuGet { pname = "Swashbuckle.AspNetCore.Filters.Abstractions"; version = "8.0.2"; hash = "sha256-oe6KYmrvaAKu0JpAwxpIiyxSaqfRg2VAyc/KKQX6xFI="; })
  (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "5.0.0"; hash = "sha256-TnAjQpCdwSH3rm1m3ptdoOGS4/9a8OOH3srAatG2gYw="; })
-  (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.6.2"; hash = "sha256-HqMmHMZXYHlRMoT3vIZF8iwhYmfknQmi3N8VmyfwI0k="; })
+  (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.7.3"; hash = "sha256-aVQ9NuqiW0EFhLwz2LMa15hWTQzmzyS3huuA42rbJSM="; })
  (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "5.0.0"; hash = "sha256-JGMmhhq6OdscsGsnSM6182ZkyWiSdr0ERmNZvJV4XAM="; })
-  (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.6.2"; hash = "sha256-km+bNoRDakEBa2dIjtxK0V6YVvm9hEpdi8xWQ8TJigI="; })
-  (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.6.2"; hash = "sha256-ED24tUcwiOkAIMQVQeQFths296yf3lL/Z1sVizQTEHA="; })
+  (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.7.3"; hash = "sha256-K2Ig2cp8Cl5tLuPhSGz5ewW1W6A1JC9rfSfVSDNdLuY="; })
+  (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.7.3"; hash = "sha256-OLcFaBuRyBhukVE4LiJm1kkAAjZtzfhGjRFEHHbI1X4="; })
  (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="; })
  (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; })
  (fetchNuGet { pname = "System.Buffers"; version = "4.5.0"; hash = "sha256-THw2znu+KibfJRfD7cE3nRYHsm7Fyn5pjOOZVonFjvs="; })
@ -281,17 +281,17 @@
  (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; hash = "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U="; })
  (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="; })
  (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; })
-  (fetchNuGet { pname = "System.Drawing.Common"; version = "8.0.6"; hash = "sha256-dHrc4lCnhmBU3j+bdmgyjNK2pZsbfBRL1zz38lVyQvM="; })
+  (fetchNuGet { pname = "System.Drawing.Common"; version = "8.0.8"; hash = "sha256-u/u0US7c0dfB8TmIdN+AI2GKrWUguuEmEKMGx7NLIKE="; })
  (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; hash = "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="; })
-  (fetchNuGet { pname = "System.Formats.Asn1"; version = "8.0.0"; hash = "sha256-AVMl6N3SG2AqAcQHFruf2QDQeQIC3CICxID+Sh0vBxI="; })
+  (fetchNuGet { pname = "System.Formats.Asn1"; version = "8.0.1"; hash = "sha256-may/Wg+esmm1N14kQTG4ESMBi+GQKPp0ZrrBo/o6OXM="; })
  (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; hash = "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="; })
  (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; })
  (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; })
  (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; })
-  (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "7.6.2"; hash = "sha256-RL7l7Xfi9a7w8v1DOTxrOFLrNVUkXWoCcE2YdCN6Q+Y="; })
+  (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "8.0.2"; hash = "sha256-SQA6LrcReEQIGz/flaXD7gDlAyu30XbQKEVimpZSFuU="; })
  (fetchNuGet { pname = "System.IO"; version = "4.1.0"; hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; })
  (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; })
-  (fetchNuGet { pname = "System.IO.Abstractions"; version = "21.0.22"; hash = "sha256-UTdB/kD39zeXjUxdgQbXSxS/yyzDtc2rLre2+pLoQWk="; })
+  (fetchNuGet { pname = "System.IO.Abstractions"; version = "21.0.29"; hash = "sha256-91e2/Bd4ZgANw19mKkTdxAy2tv7NutyG0lQTKhMiEpo="; })
  (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; hash = "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="; })
  (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; hash = "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="; })
  (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; hash = "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="; })
@ -368,6 +368,7 @@
  (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; hash = "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="; })
  (fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; hash = "sha256-xA8PZwxX9iOJvPbfdi7LWjM2RMVJ7hmtEqS9JvgNsoM="; })
  (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; hash = "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="; })
+  (fetchNuGet { pname = "System.Text.Json"; version = "8.0.4"; hash = "sha256-g5oT7fbXxQ9Iah1nMCr4UUX/a2l+EVjJyTrw3FTbIaI="; })
  (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; hash = "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="; })
  (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; })
  (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; })
@ -385,9 +386,9 @@
  (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; })
  (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; hash = "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg="; })
  (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; })
-  (fetchNuGet { pname = "TestableIO.System.IO.Abstractions"; version = "21.0.22"; hash = "sha256-900+hyDm/wCd7iD5hnPJue/In/ZcA3NlGNk9kHWLoX0="; })
-  (fetchNuGet { pname = "TestableIO.System.IO.Abstractions.Wrappers"; version = "21.0.22"; hash = "sha256-xDe16iGy2i0SyYnlauFxZMTUx44PM+kas+jRtagDV50="; })
+  (fetchNuGet { pname = "TestableIO.System.IO.Abstractions"; version = "21.0.29"; hash = "sha256-OFpu9RcDRPLYntQyesBevoG1XxyH96ukHOH0uXqO5ls="; })
+  (fetchNuGet { pname = "TestableIO.System.IO.Abstractions.Wrappers"; version = "21.0.29"; hash = "sha256-2q1HzbyRPIm6VKYzZzZnkXBJzV8S+HBtT6Lej1pv84Y="; })
  (fetchNuGet { pname = "VersOne.Epub"; version = "3.3.2"; hash = "sha256-jzkD4HDgFMevH8FRYml7UHEwMt7BWG+VpinIPlioIUo="; })
-  (fetchNuGet { pname = "xunit.assert"; version = "2.8.1"; hash = "sha256-PzTY1UeDK4t22o3GjAV1qV/zsXe/N4yOQsFu5l8Zu/A="; })
+  (fetchNuGet { pname = "xunit.assert"; version = "2.9.0"; hash = "sha256-3GUZ0loDa/3WDXRuBQdghsKXE/bZrCBJ5Bopr43SuVA="; })
  (fetchNuGet { pname = "ZstdSharp.Port"; version = "0.8.0"; hash = "sha256-nQkUIDqpgy7ZAtRWyMXQflYnWdPUcbIxIblOINO2O5k="; })
 ]
--- a/pkgs/tools/backup/wal-e/default.nix
+++ b/pkgs/tools/backup/wal-e/default.nix
@ -1,37 +0,0 @@
-{ lib, fetchFromGitHub, python3Packages, lzop, postgresql, pv }:
-
-python3Packages.buildPythonApplication rec {
-  pname = "wal-e";
-  version = "1.1.1";
-
-  namePrefix = "";
-
-  src = fetchFromGitHub {
-    owner = "wal-e";
-    repo = "wal-e";
-    rev = "v${version}";
-    hash = "sha256-I6suHkAYzDtlNFNPH4SziY93Ryp+NTHkCBuojDvv+U4=";
-  };
-
-  # needs tox
-  doCheck = false;
-
-  propagatedBuildInputs = (with python3Packages; [
-    boto
-    gevent
-    google-cloud-storage
-  ]) ++ [
-    postgresql
-    lzop
-    pv
-  ];
-
-  meta = {
-    description = "Postgres WAL-shipping disaster recovery and replication toolkit";
-    mainProgram = "wal-e";
-    homepage = "https://github.com/wal-e/wal-e";
-    maintainers = [ ];
-    license = lib.licenses.bsd3;
-    platforms = lib.platforms.linux;
-  };
-}
--- a/pkgs/tools/misc/kargo/default.nix
+++ b/pkgs/tools/misc/kargo/default.nix
@ -1,39 +0,0 @@
-{ lib, fetchurl, python3Packages }:
-
-with python3Packages;
-
-buildPythonApplication rec {
-  version = "0.4.8";
-  pname = "kargo";
-
-  src = fetchurl {
-    url = "mirror://pypi/k/kargo/${pname}-${version}.tar.gz";
-    sha256 = "1iq3vrmglag9gpsir03yz7556m0bz99nwb2mf594378cqzbr6db3";
-  };
-
-  propagatedBuildInputs = [
-    ansible-core
-    boto
-    cffi
-    cryptography
-    libcloud
-    markupsafe
-    netaddr
-    pyasn1
-    requests
-    setuptools
-  ];
-
-  checkPhase = ''
-    HOME=$TMPDIR $out/bin/kargo -v
-  '';
-
-  meta = with lib; {
-    homepage = "https://github.com/kubespray/kargo-cli";
-    description = "Tool helps to deploy a kubernetes cluster with Ansible";
-    platforms = platforms.all;
-    license = licenses.gpl3;
-    maintainers = [ ];
-    mainProgram = "kargo";
-  };
-}
--- a/pkgs/tools/system/btop/default.nix
+++ b/pkgs/tools/system/btop/default.nix
@ -15,13 +15,13 @@

 stdenv.mkDerivation rec {
  pname = "btop";
-  version = "1.3.2";
+  version = "1.4.0";

  src = fetchFromGitHub {
    owner = "aristocratos";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-kjSyIgLTObTOKMG5dk49XmWPXZpCWbLdpkmAsJcFliA=";
+    hash = "sha256-A5hOBxj8tKlkHd8zDHfDoU6fIu8gDpt3/usbiDk0/G0=";
  };

  nativeBuildInputs = [
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@ -756,6 +756,7 @@ mapAliases {
  kube3d = k3d; # Added 2022-0705
  kafkacat = kcat; # Added 2021-10-07
  kak-lsp = kakoune-lsp; # Added 2024-04-01
+  kargo = throw "kargo was removed as it is deprecated upstream and depends on the removed boto package"; # Added 2024-09-22
  kdbplus = throw "'kdbplus' has been removed from nixpkgs"; # Added 2024-05-06
  kdeconnect = plasma5Packages.kdeconnect-kde; # Added 2020-10-28
  keepassx = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17
@ -1546,6 +1547,7 @@ mapAliases {
  tightvnc = throw "'tightvnc' has been removed as the version 1.3 is not maintained upstream anymore and is insecure"; # Added 2024-08-22
  tixati = throw "'tixati' has been removed from nixpkgs as it is unfree and unmaintained"; # Added 2023-03-17
  tkcvs = tkrev; # Added 2022-03-07
+  toil = throw "toil was removed as it was broken and requires obsolete versions of libraries"; # Added 2024-09-22
  tokodon = plasma5Packages.tokodon;
  tokyo-night-gtk = tokyonight-gtk-theme; # Added 2024-01-28
  tomcat_connectors = apacheHttpdPackages.mod_jk; # Added 2024-06-07
@ -1640,6 +1642,7 @@ mapAliases {

  ### W ###
  wakatime = wakatime-cli; # 2024-05-30
+  wal_e = throw "wal_e was removed as it is unmaintained upstream and depends on the removed boto package; upstream recommends using wal-g or pgbackrest"; # Added 2024-09-22
  waybar-hyprland = throw "waybar-hyprland has been removed: hyprland support is now built into waybar by default."; # Added 2023-08-21
  wayfireApplications-unwrapped = throw ''
    'wayfireApplications-unwrapped.wayfire' has been renamed to/replaced by 'wayfire'
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -1341,7 +1341,7 @@ with pkgs;

  desktopToDarwinBundle = makeSetupHook {
    name = "desktop-to-darwin-bundle-hook";
-    propagatedBuildInputs = [ writeDarwinBundle librsvg imagemagick python3Packages.icnsutil ];
+    propagatedBuildInputs = [ writeDarwinBundle librsvg imagemagick (onlyBin python3Packages.icnsutil) ];
  } ../build-support/setup-hooks/desktop-to-darwin-bundle.sh;

  keepBuildTree = makeSetupHook {
@ -2545,8 +2545,6 @@ with pkgs;
    inherit (darwin.apple_sdk_11_0.frameworks) AudioUnit Carbon Cocoa;
  };

-  dynamips = callPackage ../applications/emulators/dynamips { };
-
  fceux = libsForQt5.callPackage ../applications/emulators/fceux { };

  firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { };
@ -9020,8 +9018,6 @@ with pkgs;

  k2pdfopt = callPackage ../applications/misc/k2pdfopt { };

-  kargo = callPackage ../tools/misc/kargo { };
-
  kazam = callPackage ../applications/video/kazam { };

  kalibrate-rtl = callPackage ../applications/radio/kalibrate-rtl { };
@ -11301,12 +11297,6 @@ with pkgs;

  pk2cmd = callPackage ../tools/misc/pk2cmd { };

-  plantuml = callPackage ../tools/misc/plantuml { };
-
-  plantuml-c4 = callPackage ../tools/misc/plantuml/plantuml-c4.nix { };
-
-  plantuml-server = callPackage ../tools/misc/plantuml-server { };
-
  plan9port = darwin.apple_sdk_11_0.callPackage ../tools/system/plan9port {
    inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa IOKit Metal QuartzCore;
    inherit (darwin) DarwinTools;
@ -13564,8 +13554,6 @@ with pkgs;

  wego = callPackage ../applications/misc/wego { };

-  wal_e = callPackage ../tools/backup/wal-e { };
-
  wander = callPackage ../tools/admin/wander { };

  watchexec = callPackage ../tools/misc/watchexec {
@ -18684,8 +18672,6 @@ with pkgs;

  strace-analyzer = callPackage ../development/tools/misc/strace-analyzer { };

-  stylelint = callPackage ../development/tools/analysis/stylelint { };
-
  stylua = callPackage ../development/tools/stylua { };

  summon = callPackage ../development/tools/summon { };
@ -18787,8 +18773,6 @@ with pkgs;

  todoist-electron = callPackage ../applications/misc/todoist-electron { };

-  toil = callPackage ../applications/science/misc/toil { };
-
  travis = callPackage ../development/tools/misc/travis { };

  tree-sitter = makeOverridable (callPackage ../development/tools/parsing/tree-sitter) {
@ -37797,7 +37781,7 @@ with pkgs;
    # Not recommended; too fragile
    nixops_unstable_full;

-  # Useful with ofborg, e.g. commit prefix `nixops_unstablePlugins.nixops-aws: ...` to trigger automatically.
+  # Useful with ofborg, e.g. commit prefix `nixops_unstablePlugins.nixops-digitalocean: ...` to trigger automatically.
  nixops_unstablePlugins = recurseIntoAttrs nixops_unstable_minimal.availablePlugins;

  /*
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@ -76,6 +76,7 @@ mapAliases ({
  blessings = throw "blessings has been removed in favor of blessed, as it was unmaintained"; # added 2024-08-20
  BlinkStick = blinkstick; # added 2023-02-19
  blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29
+  boto = throw "boto was removed as it is deprecated upstream, had not been updated since 2018, and failed to build; please use boto3 and botocore"; # Added 2024-09-22
  bsblan = python-bsblan; # added 2022-11-04
  btchip = btchip-python; # added 2023-03-03
  buildbot = throw "use pkgs.buildbot instead"; # added 2022-04-07
@ -220,6 +221,7 @@ mapAliases ({
  fritzprofiles = throw "fritzprofiles was removed from nixpkgs, because it was removed as dependency of home-assistant for which it was pacakged."; # added 2024-01-05
  garages-amsterdam = throw "garages-amsterdam has been renamed odp-amsterdam."; # added 2023-01-04
  garminconnect-ha = garminconnect; # added 2022-02-05
+  gcs-oauth2-boto-plugin = throw "gcs-oauth2-boto-plugin was removed as it depends on the removed boto package"; # Added 2024-09-22
  gdtoolkit = throw "gdtoolkit has been promoted to a top-level attribute name: `pkgs.gdtoolkit`"; # added 2023-02-15
  GeoIP = geoip; # added 2023-02-19
  gigalixir = throw "gigalixir has been promoted to a top-level attribute name: `pkgs.gigalixir`"; # Added 2022-10-02
@ -523,6 +525,7 @@ mapAliases ({
  pyxb = throw "pyxb has been removed, its last release was in 2017 and it has finally been archived in April 2023."; # added 2024-01-05
  pyzufall =  throw "pyzufall was removed, because it is no longer maintained"; # added 2024-05-14
  qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09
+  qds-sdk = throw "qds-sdk was removed as it is unmaintained upstream and depends on the removed boto package"; # Added 2024-09-22
  qds_sdk = qds-sdk; # added 2023-10-21
  Quandl = quandl; # added 2023-02-19
  querystring_parser = querystring-parser; # added 2024-01-07
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -1788,8 +1788,6 @@ self: super: with self; {

  boto3-stubs = callPackage ../development/python-modules/boto3-stubs { };

-  boto = callPackage ../development/python-modules/boto { };
-
  botocore = callPackage ../development/python-modules/botocore { };

  botocore-stubs = callPackage ../development/python-modules/botocore-stubs { };
@ -4869,8 +4867,6 @@ self: super: with self; {

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

-  gcs-oauth2-boto-plugin = callPackage ../development/python-modules/gcs-oauth2-boto-plugin { };
-
  gcsa = callPackage ../development/python-modules/gcsa { };

  gcsfs = callPackage ../development/python-modules/gcsfs { };
@ -13136,6 +13132,8 @@ self: super: with self; {

  qcs-api-client = callPackage ../development/python-modules/qcs-api-client { };

+  qcs-api-client-common = callPackage ../development/python-modules/qcs-api-client-common { };
+
  qcs-sdk-python = callPackage ../development/python-modules/qcs-sdk-python { };

  qdarkstyle = callPackage ../development/python-modules/qdarkstyle { };
@ -13144,8 +13142,6 @@ self: super: with self; {

  qdrant-client = callPackage ../development/python-modules/qdrant-client { };

-  qds-sdk = callPackage ../development/python-modules/qds-sdk { };
-
  qgrid = callPackage ../development/python-modules/qgrid { };

  qemu = callPackage ../development/python-modules/qemu {