Merge master into staging-next

2024-09-26 18:04:33 +00:00 · 2024-09-26 18:04:33 +00:00 · c8c18095f9
commit c8c18095f9
parent d35cb928af c7f9378f34
63 changed files with 2858 additions and 455 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -1028,12 +1028,6 @@
    githubId = 30437811;
    name = "Alex Andrews";
  };
-  alibabzo = {
-    email = "alistair.bill@gmail.com";
-    github = "alistairbill";
-    githubId = 2822871;
-    name = "Alistair Bill";
-  };
  alirezameskin = {
    email = "alireza.meskin@gmail.com";
    github = "alirezameskin";
--- a/nixos/README.md
+++ b/nixos/README.md
@ -80,6 +80,7 @@ Reviewing process:

 - Ensure that all file paths [fit the guidelines](../CONTRIBUTING.md#file-naming-and-organisation).
 - Ensure that the module tests, if any, are succeeding.
+- Ensure that new module tests are added to the package `passthru.tests`.
 - Ensure that the introduced options are correct.
  - Type should be appropriate (string related types differs in their merging capabilities, `loaOf` and `string` types are deprecated).
  - Description, default and example should be provided.
@ -95,7 +96,8 @@ Sample template for a new module review is provided below.
 ##### Reviewed points

 - [ ] module path fits the guidelines
- [ ] module tests succeed on ARCHITECTURE
+- [ ] module tests, if any, succeed on ARCHITECTURE
+- [ ] module tests, if any, are added to package `passthru.tests`
 - [ ] options have appropriate types
 - [ ] options have default
 - [ ] options have example
--- a/nixos/doc/manual/configuration/linux-kernel.chapter.md
+++ b/nixos/doc/manual/configuration/linux-kernel.chapter.md
@ -133,20 +133,3 @@ This section was moved to the [Nixpkgs manual](https://nixos.org/nixpkgs/manual#
 It's a common issue that the latest stable version of ZFS doesn't support the latest
 available Linux kernel. It is recommended to use the latest available LTS that's compatible
 with ZFS. Usually this is the default kernel provided by nixpkgs (i.e. `pkgs.linuxPackages`).
-
-Alternatively, it's possible to pin the system to the latest available kernel
-version _that is supported by ZFS_ like this:
-
-```nix
-{
-  boot.kernelPackages = pkgs.zfs.latestCompatibleLinuxPackages;
-}
-```
-
-Please note that the version this attribute points to isn't monotonic because the latest kernel
-version only refers to kernel versions supported by the Linux developers. In other words,
-the latest kernel version that ZFS is compatible with may decrease over time.
-
-An example: the latest version ZFS is compatible with is 5.19 which is a non-longterm version. When 5.19
-is out of maintenance, the latest supported kernel version is 5.15 because it's longterm and the versions
-5.16, 5.17 and 5.18 are already out of maintenance because they're non-longterm.
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@ -528,6 +528,9 @@

 - `lib.misc.mapAttrsFlatten` is now formally deprecated and will be removed in future releases; use the identical [`lib.attrsets.mapAttrsToList`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.attrsets.mapAttrsToList) instead.

+- Tailscale's `authKeyFile` can now have its corresponding parameters set through `config.services.tailscale.authKeyParameters`, allowing for non-ephemeral unsupervised deployment and more.
+  See [Registering new nodes using OAuth credentials](https://tailscale.com/kb/1215/oauth-clients#registering-new-nodes-using-oauth-credentials) for the supported options.
+
 - `nixosTests` now provide a working IPv6 setup for VLAN 1 by default.

 - Kanidm can now be provisioned using the new [`services.kanidm.provision`] option, but requires using a patched version available via `pkgs.kanidm.withSecretProvisioning`.
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@ -772,9 +772,10 @@ in
    # here and it causes a cyclic dependency.
    boot.loader.grub.enable = false;

-    environment.systemPackages =  [ grubPkgs.grub2 grubPkgs.grub2_efi ]
+    environment.systemPackages =  [ grubPkgs.grub2 ]
      ++ lib.optional (config.isoImage.makeBiosBootable) pkgs.syslinux
    ;
+    system.extraDependencies = [ grubPkgs.grub2_efi ];

    # In stage 1 of the boot, mount the CD as the root FS by label so
    # that we don't need to know its device.  We pass the label of the
--- a/nixos/modules/services/desktop-managers/plasma6.nix
+++ b/nixos/modules/services/desktop-managers/plasma6.nix
@ -245,7 +245,10 @@ in {
    xdg.icons.enable = true;

    xdg.portal.enable = true;
-    xdg.portal.extraPortals = [kdePackages.xdg-desktop-portal-kde];
+    xdg.portal.extraPortals = [
+      kdePackages.xdg-desktop-portal-kde
+      pkgs.xdg-desktop-portal-gtk
+    ];
    xdg.portal.configPackages = mkDefault [kdePackages.xdg-desktop-portal-kde];
    services.pipewire.enable = mkDefault true;

--- a/nixos/modules/services/networking/tailscale.nix
+++ b/nixos/modules/services/networking/tailscale.nix
@ -60,6 +60,33 @@ in {
      '';
    };

+    authKeyParameters = mkOption {
+      type = types.submodule {
+        options = {
+          ephemeral = mkOption {
+            type = types.nullOr types.bool;
+            default = null;
+            description = "Whether to register as an ephemeral node.";
+          };
+          preauthorized = mkOption {
+            type = types.nullOr types.bool;
+            default = null;
+            description = "Whether to skip manual device approval.";
+          };
+          baseURL = mkOption {
+            type = types.nullOr types.str;
+            default = null;
+            description = "Base URL for the Tailscale API.";
+          };
+        };
+      };
+      default = { };
+      description = ''
+        Extra parameters to pass after the auth key.
+        See https://tailscale.com/kb/1215/oauth-clients#registering-new-nodes-using-oauth-credentials
+      '';
+    };
+
    extraUpFlags = mkOption {
      description = ''
        Extra flags to pass to {command}`tailscale up`. Only applied if `authKeyFile` is specified.";
@ -124,13 +151,22 @@ in {
      # https://github.com/tailscale/tailscale/blob/v1.72.1/ipn/backend.go#L24-L32
      script = let
        statusCommand = "${lib.getExe cfg.package} status --json --peers=false | ${lib.getExe pkgs.jq} -r '.BackendState'";
+        paramToString = v:
+          if (builtins.isBool v) then (lib.boolToString v)
+          else (toString v);
+        params = lib.pipe cfg.authKeyParameters [
+          (lib.filterAttrs (_: v: v != null))
+          (lib.mapAttrsToList (k: v: "${k}=${paramToString v}"))
+          (builtins.concatStringsSep "&")
+          (params: if params != "" then "?${params}" else "")
+        ];
      in ''
        while [[ "$(${statusCommand})" == "NoState" ]]; do
          sleep 0.5
        done
        status=$(${statusCommand})
        if [[ "$status" == "NeedsLogin" || "$status" == "NeedsMachineAuth" ]]; then
-          ${lib.getExe cfg.package} up --auth-key 'file:${cfg.authKeyFile}' ${escapeShellArgs cfg.extraUpFlags}
+          ${lib.getExe cfg.package} up --auth-key "$(cat ${cfg.authKeyFile})${params}" ${escapeShellArgs cfg.extraUpFlags}
        fi
      '';
    };
--- a/nixos/modules/services/web-apps/immich.nix
+++ b/nixos/modules/services/web-apps/immich.nix
@ -290,7 +290,7 @@ in
      wantedBy = [ "multi-user.target" ];
      inherit (cfg.machine-learning) environment;
      serviceConfig = commonServiceConfig // {
-        ExecStart = lib.getExe cfg.package.machine-learning;
+        ExecStart = lib.getExe (cfg.package.machine-learning.override { immich = cfg.package; });
        CacheDirectory = "immich";
        User = cfg.user;
        Group = cfg.group;
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@ -129,12 +129,9 @@ let
  ''));

  commonHttpConfig = ''
-      # Load mime types.
+      # Load mime types and configure maximum size of the types hash tables.
      include ${cfg.defaultMimeTypes};
-      # When recommendedOptimisation is disabled nginx fails to start because the mailmap mime.types database
-      # contains 1026 entries and the default is only 1024. Setting to a higher number to remove the need to
-      # overwrite it because nginx does not allow duplicated settings.
-      types_hash_max_size 4096;
+      types_hash_max_size ${toString cfg.typesHashMaxSize};

      include ${cfg.package}/conf/fastcgi.conf;
      include ${cfg.package}/conf/uwsgi_params;
@ -896,6 +893,19 @@ in
          '';
      };

+      typesHashMaxSize = mkOption {
+        type = types.ints.positive;
+        default = if cfg.defaultMimeTypes == "${pkgs.mailcap}/etc/nginx/mime.types" then 2688 else 1024;
+        defaultText = literalExpression ''if cfg.defaultMimeTypes == "''${pkgs.mailcap}/etc/nginx/mime.types" then 2688 else 1024'';
+        description = ''
+          Sets the maximum size of the types hash tables (`types_hash_max_size`).
+          It is recommended that the minimum size possible size is used.
+          If {option}`recommendedOptimisation` is disabled, nginx would otherwise
+          fail to start since the mailmap `mime.types` database has more entries
+          than the nginx default value 1024.
+        '';
+      };
+
      proxyCachePath = mkOption {
        type = types.attrsOf (types.submodule ({ ... }: {
          options = {
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@ -670,6 +670,7 @@ in {
  nginx-etag-compression = handleTest ./nginx-etag-compression.nix {};
  nginx-globalredirect = handleTest ./nginx-globalredirect.nix {};
  nginx-http3 = handleTest ./nginx-http3.nix {};
+  nginx-mime = handleTest ./nginx-mime.nix {};
  nginx-modsecurity = handleTest ./nginx-modsecurity.nix {};
  nginx-moreheaders = handleTest ./nginx-moreheaders.nix {};
  nginx-njs = handleTest ./nginx-njs.nix {};
--- a/nixos/tests/nginx-mime.nix
+++ b/nixos/tests/nginx-mime.nix
@ -0,0 +1,26 @@
+import ./make-test-python.nix (
+  { lib, pkgs, ... }:
+  {
+    name = "nginx-mime";
+    meta.maintainers = with pkgs.lib.maintainers; [ izorkin ];
+
+    nodes = {
+      server =
+        { pkgs, ... }:
+        {
+          services.nginx = {
+            enable = true;
+            virtualHosts."localhost" = { };
+          };
+        };
+    };
+
+    testScript = ''
+      server.start()
+      server.wait_for_unit("nginx")
+      # Check optimal size of types_hash
+      server.fail("journalctl --unit nginx --grep 'could not build optimal types_hash'")
+      server.shutdown()
+    '';
+  }
+)
--- a/nixos/tests/zfs.nix
+++ b/nixos/tests/zfs.nix
@ -204,12 +204,12 @@ in {

  unstable = makeZfsTest rec {
    zfsPackage = pkgs.zfs_unstable;
-    kernelPackages = zfsPackage.latestCompatibleLinuxPackages;
+    kernelPackages = pkgs.linuxPackages;
  };

  unstableWithSystemdStage1 = makeZfsTest rec {
    zfsPackage = pkgs.zfs_unstable;
-    kernelPackages = zfsPackage.latestCompatibleLinuxPackages;
+    kernelPackages = pkgs.linuxPackages;
    enableSystemdStage1 = true;
  };

--- a/pkgs/applications/backup/pika-backup/default.nix
+++ b/pkgs/applications/backup/pika-backup/default.nix
@ -21,20 +21,20 @@

 stdenv.mkDerivation rec {
  pname = "pika-backup";
-  version = "0.7.2";
+  version = "0.7.4";

  src = fetchFromGitLab {
    domain = "gitlab.gnome.org";
    owner = "World";
    repo = "pika-backup";
    rev = "v${version}";
-    hash = "sha256-Z9vRuz5PwOhJ3DQD9zvCilgTMww7bRL4aR6fRoHIayI=";
+    hash = "sha256-DtLGD7+Ydj2fvEHU+bDQDMC/E/9VgrlVNMCG6OlPmfg=";
  };

  cargoDeps = rustPlatform.fetchCargoTarball {
    inherit src;
    name = "${pname}-${version}";
-    hash = "sha256-hcfkwxwLOUBMj6rvhI5F4OO9UaSP7CAE0JNOGlh2lVY=";
+    hash = "sha256-8nFkc77FiLxMA1hMm8k5VB84l+pQeL0JSzYDytXrNUE=";
  };

  patches = [
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@ -1,11 +1,11 @@
 {
  stable = {
    chromedriver = {
-      hash_darwin = "sha256-303weqU04cCCwlLlSVnEyvKvHu09RjGFLmg5cf/exss=";
+      hash_darwin = "sha256-m5kuSeaK4v8GtjlqJOP3isN/o+9uOxPuSEegi0nYaOM=";
      hash_darwin_aarch64 =
-        "sha256-TybJYKeMzm9FQp0Jqx82VF1OOiVSpS/QgNUEDlWG7Uc=";
-      hash_linux = "sha256-D8aKGKnbFT6YUhyhZUuz/XhCrUVS+Y7I7GaI6Qfv2bE=";
-      version = "129.0.6668.58";
+        "sha256-9WQH8Z7v3PtFKHA6bsrXgCJDWevh1YPjPyDp7M/xhlI=";
+      hash_linux = "sha256-dp060EKhFI4aRTBGLB8PyqeOj25Ov5Bd29KyESUDcwQ=";
+      version = "129.0.6668.70";
    };
    deps = {
      gn = {
@ -15,8 +15,8 @@
        version = "2024-08-19";
      };
    };
-    hash = "sha256-8dKWu2/ZKw5ZthH1s5wR+h9b0aIqlDhNsPUrlE9DMQg=";
-    version = "129.0.6668.58";
+    hash = "sha256-L9h9jbwEMcUi/cu7FP2O/6wD0Br/3SzWCazu7m9ua+o=";
+    version = "129.0.6668.70";
  };
  ungoogled-chromium = {
    deps = {
@ -27,11 +27,11 @@
        version = "2024-08-19";
      };
      ungoogled-patches = {
-        hash = "sha256-3BK1HZiQ9SnRuMMviC8gm9ZLiu8ImceBlcAp24/aYlM=";
-        rev = "129.0.6668.58-1";
+        hash = "sha256-LKtkNFb0y1v+p6hInulR7CrRO5pPk5J5Jd4nlAwZRwI=";
+        rev = "129.0.6668.70-1";
      };
    };
-    hash = "sha256-8dKWu2/ZKw5ZthH1s5wR+h9b0aIqlDhNsPUrlE9DMQg=";
-    version = "129.0.6668.58";
+    hash = "sha256-L9h9jbwEMcUi/cu7FP2O/6wD0Br/3SzWCazu7m9ua+o=";
+    version = "129.0.6668.70";
  };
 }
--- a/pkgs/applications/networking/irc/thelounge/default.nix
+++ b/pkgs/applications/networking/irc/thelounge/default.nix
@ -5,7 +5,7 @@
 , nodejs
 , yarn
 , fixup-yarn-lock
-, python3
+, python311
 , npmHooks
 , cctools
 , sqlite
@ -16,13 +16,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "thelounge";
-  version = "4.4.1";
+  version = "4.4.3";

  src = fetchFromGitHub {
    owner = "thelounge";
    repo = "thelounge";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-4FdNYP9VLgv/rfvT7KHCF+ABFsZvPbJjfz6IvvDkRNA=";
+    hash = "sha256-lDbyqVFjhF2etRx31ax7KiQ1QKgVhD8xkTog/E3pUlA=";
  };

  # Allow setting package path for the NixOS module.
@ -35,10 +35,12 @@ stdenv.mkDerivation (finalAttrs: {

  offlineCache = fetchYarnDeps {
    yarnLock = "${finalAttrs.src}/yarn.lock";
-    hash = "sha256-MM6SgVT7Pjdu96A4eWRucEzT7uNPxBqUDgHKl8mH2C0=";
+    hash = "sha256-csVrgsEy9HjSBXxtgNG0hcBrR9COlcadhMQrw6BWPc4=";
  };

-  nativeBuildInputs = [ nodejs yarn fixup-yarn-lock python3 npmHooks.npmInstallHook ] ++ lib.optional stdenv.hostPlatform.isDarwin cctools;
+  # Distutils was deprecated in 3.10, and removed in 3.12. This build needs it. An alternative could be adding
+  # setuptools, but testing with that and 3.12 still fails.
+  nativeBuildInputs = [ nodejs yarn fixup-yarn-lock python311 npmHooks.npmInstallHook ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ];
  buildInputs = [ sqlite ];

  configurePhase = ''
--- a/pkgs/applications/video/mpv/0001-fix-darwin-build.patch
+++ b/pkgs/applications/video/mpv/0001-fix-darwin-build.patch
@ -1,29 +0,0 @@
--- a/osdep/mac/input_helper.swift
-+++ b/osdep/mac/input_helper.swift
-@@ -18,6 +18,14 @@
- import Cocoa
- import Carbon.HIToolbox
- 
-+extension NSCondition {
-+    fileprivate func withLock<T>(_ body: () throws -> T) rethrows -> T {
-+        self.lock()
-+        defer { self.unlock() }
-+        return try body()
-+    }
-+}
-+
- class InputHelper: NSObject {
-     var option: OptionHelper?
-     var lock = NSCondition()
--- a/audio/out/ao_avfoundation.m
-+++ b/audio/out/ao_avfoundation.m
-@@ -312,7 +312,8 @@
-
-+    #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 120000
-     p->observer = [[AVObserver alloc] initWithAO:ao];
-     NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
-     [center addObserver:p->observer selector:@selector(handleRestartNotification:) name:AVSampleBufferAudioRendererOutputConfigurationDidChangeNotification object:p->renderer];
-     [center addObserver:p->observer selector:@selector(handleRestartNotification:) name:AVSampleBufferAudioRendererWasFlushedAutomaticallyNotification object:p->renderer];
-
-+    #endif
-     return CONTROL_OK;
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@ -135,7 +135,7 @@ let
 in
 stdenv'.mkDerivation (finalAttrs: {
  pname = "mpv";
-  version = "0.38.0";
+  version = "0.39.0";

  outputs = [
    "out"
@ -148,14 +148,9 @@ stdenv'.mkDerivation (finalAttrs: {
    owner = "mpv-player";
    repo = "mpv";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-dFajnCpGlNqUv33A8eFEn8kjtzIPkcBY5j0gNVlaiIY=";
+    hash = "sha256-BOGh+QBTO7hrHohh+RqjSF8eHQH8jVBPjG/k4eyFaaM=";
  };

-  patches = [
-    # Fix build with Darwin SDK 11
-    ./0001-fix-darwin-build.patch
-  ];
-
  postPatch = lib.concatStringsSep "\n" [
    # Don't reference compile time dependencies or create a build outputs cycle
    # between out and dev
@ -315,9 +310,6 @@ stdenv'.mkDerivation (finalAttrs: {
      popd
      pushd $out/share/applications

-      # patch out smb protocol reference, since our ffmpeg can't handle it
-      substituteInPlace mpv.desktop --replace-fail "smb," ""
-
      sed -e '/Icon=/ ! s|mpv|umpv|g; s|^Exec=.*|Exec=umpv %U|' \
        mpv.desktop > umpv.desktop
      printf "NoDisplay=true\n" >> umpv.desktop
--- a/pkgs/by-name/am/amiberry/package.nix
+++ b/pkgs/by-name/am/amiberry/package.nix
@ -0,0 +1,91 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  makeWrapper,
+  flac,
+  libmpeg2,
+  libmpg123,
+  libpng,
+  libserialport,
+  portmidi,
+  SDL2,
+  SDL2_image,
+  SDL2_ttf,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "amiberry";
+  version = "5.7.4";
+
+  src = fetchFromGitHub {
+    owner = "BlitterStudio";
+    repo = "amiberry";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-EOoVJYefX2pQ2Zz9bLD1RS47u/+7ZWTMwZYha0juF64=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    makeWrapper
+  ];
+
+  buildInputs = [
+    flac
+    libmpeg2
+    libmpg123
+    libpng
+    libserialport
+    portmidi
+    SDL2
+    SDL2_image
+    SDL2_ttf
+  ];
+
+  enableParallelBuilding = true;
+
+  # Amiberry has traditionally behaved as a "Portable" app, meaning that it was designed to expect everything
+  # under the same directory. This is not compatible with Nix package conventions.
+  # The Amiberry behavior has changed since versions 5.7.4 and 6.3.4 (see
+  # https://github.com/BlitterStudio/amiberry/wiki/FAQ#q-where-does-amiberry-look-for-its-files-can-i-change-that
+  # for more information), however this is still not compatible with Nix packaging. The AMIBERRY_DATA_DIR can go
+  # in the nix store but the Amiberry configuration files must be stored in a user writable location.
+  # Fortunately Amiberry provides environment variables for specifying these locations which we can supply with the
+  # wrapper script below.
+  # One more caveat: Amiberry expects the configuration files path (AMIBERRY_HOME_DIR) to exist, otherwise it will
+  # fall back to behaving like a "Portable" app. The wrapper below ensures that the AMIBERRY_HOME_DIR path exists,
+  # preventing that fallback.
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/bin
+    cp amiberry $out/bin/
+    cp -r abr data $out/
+    wrapProgram $out/bin/amiberry \
+      --set-default AMIBERRY_DATA_DIR $out \
+      --run 'AMIBERRY_HOME_DIR="$HOME/.amiberry"' \
+      --run 'mkdir -p \
+        $AMIBERRY_HOME_DIR/kickstarts \
+        $AMIBERRY_HOME_DIR/conf \
+        $AMIBERRY_HOME_DIR/nvram \
+        $AMIBERRY_HOME_DIR/plugins \
+        $AMIBERRY_HOME_DIR/screenshots \
+        $AMIBERRY_HOME_DIR/savestates \
+        $AMIBERRY_HOME_DIR/controllers \
+        $AMIBERRY_HOME_DIR/whdboot \
+        $AMIBERRY_HOME_DIR/lha \
+        $AMIBERRY_HOME_DIR/floppies \
+        $AMIBERRY_HOME_DIR/cdroms \
+        $AMIBERRY_HOME_DIR/harddrives'
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/BlitterStudio/amiberry";
+    description = "Optimized Amiga emulator for Linux/macOS";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ michaelshmitty ];
+    mainProgram = "amiberry";
+  };
+})
--- a/pkgs/by-name/ci/cinnamon-screensaver/package.nix
+++ b/pkgs/by-name/ci/cinnamon-screensaver/package.nix
@ -28,13 +28,13 @@

 stdenv.mkDerivation rec {
  pname = "cinnamon-screensaver";
-  version = "6.2.0";
+  version = "6.2.1";

  src = fetchFromGitHub {
    owner = "linuxmint";
    repo = pname;
    rev = version;
-    hash = "sha256-hXgDTQnOlskzyOogvk7BQ9iJ3oXRtgUUX5bXtgD+gFo=";
+    hash = "sha256-f1Z3fmtCokWNLJwsTOAIAZB3lwFfqakJJco3umyEaYk=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/co/contrast/package.nix
+++ b/pkgs/by-name/co/contrast/package.nix
@ -21,7 +21,7 @@

 stdenv.mkDerivation rec {
  pname = "contrast";
-  version = "0.0.10";
+  version = "0.0.11";

  src = fetchFromGitLab {
    domain = "gitlab.gnome.org";
@ -29,13 +29,13 @@ stdenv.mkDerivation rec {
    owner = "design";
    repo = "contrast";
    rev = version;
-    hash = "sha256-Y0CynBvnCOBesONpxUicR7PgMJgmM0ZQX/uOwIppj7w=";
+    hash = "sha256-8A1qX1H0cET5AUvMoHC1/VyIQiaTysEY5RJRrVYvGng=";
  };

  cargoDeps = rustPlatform.fetchCargoTarball {
    inherit src;
    name = "${pname}-${version}";
-    hash = "sha256-BdwY2YDJyDApGgE0Whz3xRU/0gRbkwbKUvPbWEObXE8=";
+    hash = "sha256-Z5Gn1J/ziDlSowUk3HYLdx1PDg0WlQJQDjto2xYYK44=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/networking/deck/default.nix
+++ b/pkgs/applications/networking/deck/default.nix
--- a/pkgs/by-name/er/eris-go/package.nix
+++ b/pkgs/by-name/er/eris-go/package.nix
@ -2,7 +2,7 @@

 buildGoModule rec {
  pname = "eris-go";
-  version = "20240826";
+  version = "20240920";
  outputs = [ "out" "man" ];

  src = fetchFromGitea {
@ -10,7 +10,7 @@ buildGoModule rec {
    owner = "eris";
    repo = "eris-go";
    rev = version;
-    hash = "sha256-qw3HdHtyMuWqwkuGzVzQ8bXnXlJJPDpiYrQZb0lIYj8=";
+    hash = "sha256-ZC4MBt1ucbZOn3sgs2xEiLLSDq7mz5Nj/in/TzydAbk=";
  };

  vendorHash = "sha256-TnB4BSO2Yb9AtcHgdEgNrFHAQJ7u4IzmhLdcSjbZ7SA=";
--- a/pkgs/by-name/fa/fastcompmgr/package.nix
+++ b/pkgs/by-name/fa/fastcompmgr/package.nix
@ -7,13 +7,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "fastcompmgr";
-  version = "0.3";
+  version = "0.4";

  src = fetchFromGitHub {
    owner = "tycho-kirchner";
    repo = "fastcompmgr";
    rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-UKX0gjhbbXSXfyw/NGA31vTOfgd4kdnxO7lIs+mkgFs=";
+    hash = "sha256-FrPM6k4280SNnmi/jiwKU/O2eBue+5h8aNDCiIqZ3+c=";
  };

  nativeBuildInputs = [ pkgs.pkg-config ];
--- a/pkgs/by-name/ha/harmonia/package.nix
+++ b/pkgs/by-name/ha/harmonia/package.nix
@ -13,16 +13,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "harmonia";
-  version = "1.0.1";
+  version = "1.0.2";

  src = fetchFromGitHub {
    owner = "nix-community";
    repo = "harmonia";
    rev = "refs/tags/harmonia-v${version}";
-    hash = "sha256-K4pll1YUqCkiqUxyWMgPKzNEJ2AMf3C/5YVBOn0SFtw=";
+    hash = "sha256-72nDVSvUfZsLa2HbyricOpA0Eb8gxs/VST25b6DNBpM=";
  };

-  cargoHash = "sha256-1ITnTlLVgSC0gsXtELHOPqM4jPZd0TeVgM5GYkqaNVA=";
+  cargoHash = "sha256-gW/OljEngDQddIovtgwghu7uHLFVZHvWIijPgbOOkDc=";

  doCheck = false;

--- a/pkgs/by-name/ho/home-manager/package.nix
+++ b/pkgs/by-name/ho/home-manager/package.nix
@ -5,7 +5,9 @@
 , findutils
 , gettext
 , gnused
+, inetutils
 , installShellFiles
+, jq
 , less
 , ncurses
 , nixos-option
@ -40,9 +42,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
    install -D -m755 home-manager/home-manager $out/bin/home-manager
    install -D -m755 lib/bash/home-manager.sh $out/share/bash/home-manager.sh

-    installShellCompletion --bash --name home-manager.bash home-manager/completion.bash
-    installShellCompletion --fish --name home-manager.fish home-manager/completion.fish
-    installShellCompletion --zsh --name _home-manager home-manager/completion.zsh
+    installShellCompletion --cmd home-manager \
+      --bash home-manager/completion.bash \
+      --fish home-manager/completion.fish \
+      --zsh home-manager/completion.zsh

    for pofile in home-manager/po/*.po; do
      lang="''${pofile##*/}"
@ -63,15 +66,16 @@ stdenvNoCC.mkDerivation (finalAttrs: {
          findutils
          gettext
          gnused
+          jq
          less
          ncurses
          nixos-option
-          unixtools.hostname
+          inetutils # for `hostname`
        ]
      }" \
-      --subst-var-by HOME_MANAGER_LIB '${placeholder "out"}/share/bash/home-manager.sh' \
+      --subst-var-by HOME_MANAGER_LIB "$out/share/bash/home-manager.sh" \
      --subst-var-by HOME_MANAGER_PATH "${finalAttrs.src}" \
-      --subst-var-by OUT '${placeholder "out"}'
+      --subst-var-by OUT "$out"
  '';

  passthru.updateScript = unstableGitUpdater {
@ -89,7 +93,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
    '';
    license = lib.licenses.mit;
    mainProgram = "home-manager";
-    maintainers = with lib.maintainers; [ AndersonTorres ];
+    maintainers = with lib.maintainers; [ AndersonTorres bryango ];
    platforms = lib.platforms.unix;
  };
 })
--- a/pkgs/by-name/im/immich-machine-learning/package.nix
+++ b/pkgs/by-name/im/immich-machine-learning/package.nix
@ -1,46 +1,43 @@
 {
  lib,
-  src,
  fetchFromGitHub,
  immich,
  python3,
-  # Override Python packages using
-  # self: super: { pkg = super.pkg.overridePythonAttrs (oldAttrs: { ... }); }
-  # Applied after defaultOverrides
-  packageOverrides ? self: super: { },
 }:
 let
-  defaultOverrides = self: super: {
-    pydantic = super.pydantic_1;
-
-    versioningit = super.versioningit.overridePythonAttrs (_: {
-      doCheck = false;
-    });
-
-    albumentations = super.albumentations.overridePythonAttrs (_: rec {
-      version = "1.4.3";
-      src = fetchFromGitHub {
-        owner = "albumentations-team";
-        repo = "albumentations";
-        rev = version;
-        hash = "sha256-JIBwjYaUP4Sc1bVM/zlj45cz9OWpb/LOBsIqk1m+sQA=";
-      };
-    });
-  };
-
  python = python3.override {
    self = python;
-    packageOverrides = lib.composeExtensions defaultOverrides packageOverrides;
+
+    packageOverrides = self: super: {
+      pydantic = super.pydantic_1;
+
+      versioningit = super.versioningit.overridePythonAttrs (_: {
+        doCheck = false;
+      });
+
+      albumentations = super.albumentations.overridePythonAttrs (_: rec {
+        version = "1.4.3";
+        src = fetchFromGitHub {
+          owner = "albumentations-team";
+          repo = "albumentations";
+          rev = version;
+          hash = "sha256-JIBwjYaUP4Sc1bVM/zlj45cz9OWpb/LOBsIqk1m+sQA=";
+        };
+      });
+    };
  };
 in
 python.pkgs.buildPythonApplication {
  pname = "immich-machine-learning";
  inherit (immich) version;
-  src = "${src}/machine-learning";
+  src = "${immich.src}/machine-learning";
  pyproject = true;

  postPatch = ''
    substituteInPlace pyproject.toml --replace-fail 'fastapi-slim' 'fastapi'
+
+    # AttributeError: module 'cv2' has no attribute 'Mat'
+    substituteInPlace app/test_main.py --replace-fail ": cv2.Mat" ""
  '';

  pythonRelaxDeps = [ "setuptools" ];
@ -72,7 +69,12 @@ python.pkgs.buildPythonApplication {
    ]
    ++ uvicorn.optional-dependencies.standard;

-  doCheck = false;
+  nativeCheckInputs = with python.pkgs; [
+    httpx
+    pytest-asyncio
+    pytest-mock
+    pytestCheckHook
+  ];

  postInstall = ''
    mkdir -p $out/share/immich
--- a/pkgs/by-name/im/immich/package.nix
+++ b/pkgs/by-name/im/immich/package.nix
@ -8,7 +8,7 @@
  node-gyp,
  runCommand,
  nixosTests,
-  callPackage,
+  immich-machine-learning,
  # build-time deps
  glib,
  pkg-config,
@ -210,7 +210,7 @@ buildNpmPackage' {
      inherit (nixosTests) immich;
    };

-    machine-learning = callPackage ./machine-learning.nix { inherit src; };
+    machine-learning = immich-machine-learning;

    inherit
      src
--- a/pkgs/by-name/im/immich/update.sh
+++ b/pkgs/by-name/im/immich/update.sh
@ -41,4 +41,4 @@ for npm_component in cli server web "open-api/typescript-sdk"; do
 done

 rm "$lock"
-cp "$sources_tmp" sources.json
+mv "$sources_tmp" sources.json
--- a/pkgs/by-name/ni/nickel/package.nix
+++ b/pkgs/by-name/ni/nickel/package.nix
@ -7,16 +7,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "nickel";
-  version = "1.8.0";
+  version = "1.8.1";

  src = fetchFromGitHub {
    owner = "tweag";
    repo = "nickel";
    rev = "refs/tags/${version}";
-    hash = "sha256-mjmT1ogvUJgy3Jb6m/npE+1if1Uy191wPU80nNlVwdM=";
+    hash = "sha256-hlcF04m3SI66d1C9U1onog2QoEMfqtHb7V++47ZmeW4=";
  };

-  cargoHash = "sha256-XDDvuIVWvmsO09aQLF28OyH5n+9aO5J+89EQLru7Jrc=";
+  cargoHash = "sha256-VFjZb7lsqOSt5Rc94dhS4Br/5i/HXPHZMqC1c0/LzHU=";

  cargoBuildFlags = [ "-p nickel-lang-cli" "-p nickel-lang-lsp" ];

--- a/pkgs/by-name/oh/oh-my-posh/package.nix
+++ b/pkgs/by-name/oh/oh-my-posh/package.nix
@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "oh-my-posh";
-  version = "23.12.0";
+  version = "23.14.1";

  src = fetchFromGitHub {
    owner = "jandedobbeleer";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-9Yyq0tssLBcRKWFboDzJ0p7Z5WgeDb880KhX6w56+DE=";
+    hash = "sha256-yOp4DnPfigdpz32/78w+pjFXpsXEAK9N4Bvv2tmT6iI=";
  };

-  vendorHash = "sha256-SXcBhjgANPi/eWkcYBUGmCKID/1jkdGq7Q8m/y1Euzc=";
+  vendorHash = "sha256-EBLfbdTV15wSTOThzBY0d2KrSJzRaB8vNH53Uwc+XfM=";

  sourceRoot = "${src.name}/src";

--- a/pkgs/by-name/om/omnom/0001-fix-minimal-go-version.patch
+++ b/pkgs/by-name/om/omnom/0001-fix-minimal-go-version.patch
@ -0,0 +1,83 @@
+Bump the minimal Go version as some features require Go 1.17 and higher to work
+
+---
+ go.mod | 48 ++++++++++++++++++++++++++++++++++++++----------
+ 1 file changed, 38 insertions(+), 10 deletions(-)
+
+diff --git a/go.mod b/go.mod
+index 1756ffe..81f7fa2 100644
+--- a/go.mod
+++ b/go.mod
+@@ -1,31 +1,59 @@
+ module github.com/asciimoo/omnom
+
+-go 1.15
+go 1.17
+
+ require (
+-	github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff // indirect
+-	github.com/bytedance/sonic v1.12.1 // indirect
+-	github.com/gabriel-vasile/mimetype v1.4.5 // indirect
+ 	github.com/gin-contrib/multitemplate v1.0.1
+ 	github.com/gin-gonic/contrib v0.0.0-20240508051311-c1c6bf0061b0
+ 	github.com/gin-gonic/gin v1.10.0
+	github.com/spf13/cobra v1.8.1
+	github.com/xhit/go-simple-mail/v2 v2.16.0
+	golang.org/x/net v0.27.0
+	gopkg.in/yaml.v2 v2.4.0
+	gorm.io/driver/sqlite v1.5.6
+	gorm.io/gorm v1.25.11
+)
+
+require (
+	github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff // indirect
+	github.com/bytedance/sonic v1.12.1 // indirect
+	github.com/bytedance/sonic/loader v0.2.0 // indirect
+	github.com/cloudwego/base64x v0.1.4 // indirect
+	github.com/cloudwego/iasm v0.2.0 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.5 // indirect
+	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/go-playground/locales v0.14.1 // indirect
+	github.com/go-playground/universal-translator v0.18.1 // indirect
+ 	github.com/go-playground/validator/v10 v10.22.0 // indirect
+ 	github.com/go-test/deep v1.1.1 // indirect
+ 	github.com/goccy/go-json v0.10.3 // indirect
+	github.com/gomodule/redigo v2.0.0+incompatible // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+ 	github.com/gorilla/context v1.1.2 // indirect
+	github.com/gorilla/securecookie v1.1.2 // indirect
+ 	github.com/gorilla/sessions v1.3.0 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/jinzhu/now v1.1.5 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+ 	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
+ 	github.com/kr/pretty v0.3.0 // indirect
+	github.com/leodido/go-urn v1.4.0 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-sqlite3 v1.14.22 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
+ 	github.com/rogpeppe/go-internal v1.8.0 // indirect
+-	github.com/spf13/cobra v1.8.1
+	github.com/spf13/pflag v1.0.5 // indirect
+ 	github.com/toorop/go-dkim v0.0.0-20240103092955-90b7d1423f92 // indirect
+-	github.com/xhit/go-simple-mail/v2 v2.16.0
+	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
+	github.com/ugorji/go/codec v1.2.12 // indirect
+ 	golang.org/x/arch v0.9.0 // indirect
+-	golang.org/x/net v0.27.0
+	golang.org/x/crypto v0.25.0 // indirect
+ 	golang.org/x/sys v0.23.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
+ 	google.golang.org/protobuf v1.34.2 // indirect
+ 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+-	gopkg.in/yaml.v2 v2.4.0
+-	gorm.io/driver/sqlite v1.5.6
+-	gorm.io/gorm v1.25.11
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+ )
+--
+2.45.2
+
--- a/pkgs/by-name/om/omnom/package.nix
+++ b/pkgs/by-name/om/omnom/package.nix
@ -0,0 +1,60 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  makeWrapper,
+}:
+
+buildGoModule {
+  pname = "omnom";
+  version = "0-unstable-2024-08-29";
+
+  src = fetchFromGitHub {
+    owner = "asciimoo";
+    repo = "omnom";
+    rev = "1fcd7787886503f703bbcd31b193d4c93acc5610";
+    hash = "sha256-o/n8rgngQkYEn8J0aFpCiD4qrWVFaaa305OxiscU6+8=";
+    fetchSubmodules = true;
+  };
+
+  vendorHash = "sha256-dsS5w8JXIwkneWScOFzLSDiXq+clgK+RdYiMw0+FnvY=";
+
+  patches = [ ./0001-fix-minimal-go-version.patch ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  postPatch = ''
+    # For the default config to work, we have to put `static/data` and
+    # `db.sqlite3` in a temporary directory since they need to be writeable.
+    #
+    # NOTE: Currently, `static/data` only holds the snapshots directory.
+    substituteInPlace config.yml \
+      --replace-fail 'root: "./static/data"' 'root: "/tmp/omnom/static/data"' \
+      --replace-fail 'connection: "./db.sqlite3"' 'connection: "/tmp/omnom/db.sqlite3"' \
+      --replace-fail 'debug: true' 'debug: false'
+  '';
+
+  postInstall = ''
+    mkdir -p $out/share
+    cp -r config.yml static templates $out/share
+
+    wrapProgram $out/bin/omnom \
+      --chdir $out/share \
+      --set-default GIN_MODE release
+  '';
+
+  meta = {
+    description = "A webpage bookmarking and snapshotting service";
+    homepage = "https://github.com/asciimoo/omnom";
+    license = lib.licenses.agpl3Only;
+    maintainers = [
+      # maintained by the team working on NGI-supported software, no group for this yet
+    ];
+    mainProgram = "omnom";
+  };
+}
--- a/pkgs/by-name/pa/patch2pr/package.nix
+++ b/pkgs/by-name/pa/patch2pr/package.nix
@ -7,16 +7,16 @@

 buildGoModule rec {
  pname = "patch2pr";
-  version = "0.27.0";
+  version = "0.28.0";

  src = fetchFromGitHub {
    owner = "bluekeyes";
    repo = "patch2pr";
    rev = "v${version}";
-    hash = "sha256-HKPw9yKJGakY2XTuMr2Beq+UxMnu/je3aEHsM1UR/Sk=";
+    hash = "sha256-Pr2h5iezn//oyvuUoq5B49wEL1cUXOHhHjR3ylMXowQ=";
  };

-  vendorHash = "sha256-1ufdkCvTi5hNlpwZZKrkfpoRhWUp7fwHuZ1BPbkkxkY=";
+  vendorHash = "sha256-6w49XQNElSHpOamEZNpvvr67vYrZYXy2Sm7dWMh6OiU=";

  ldflags = [
    "-X main.version=${version}"
--- a/pkgs/by-name/ru/ruff/Cargo.lock
+++ b/pkgs/by-name/ru/ruff/Cargo.lock
@ -129,9 +129,9 @@ dependencies = [

 [[package]]
 name = "anyhow"
-version = "1.0.86"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"

 [[package]]
 name = "append-only-vec"
@ -353,9 +353,9 @@ dependencies = [

 [[package]]
 name = "clap"
-version = "4.5.16"
+version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019"
+checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3"
 dependencies = [
 "clap_builder",
 "clap_derive",
@ -363,9 +363,9 @@ dependencies = [

 [[package]]
 name = "clap_builder"
-version = "4.5.15"
+version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
+checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b"
 dependencies = [
 "anstream",
 "anstyle",
@ -406,9 +406,9 @@ dependencies = [

 [[package]]
 name = "clap_derive"
-version = "4.5.13"
+version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
 dependencies = [
 "heck",
 "proc-macro2",
@ -437,9 +437,9 @@ dependencies = [

 [[package]]
 name = "codspeed"
-version = "2.6.0"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a104ac948e0188b921eb3fcbdd55dcf62e542df4c7ab7e660623f6288302089"
+checksum = "450a0e9df9df1c154156f4344f99d8f6f6e69d0fc4de96ef6e2e68b2ec3bce97"
 dependencies = [
 "colored",
 "libc",
@ -448,9 +448,9 @@ dependencies = [

 [[package]]
 name = "codspeed-criterion-compat"
-version = "2.6.0"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "722c36bdc62d9436d027256ce2627af81ac7a596dfc7d13d849d0d212448d7fe"
+checksum = "8eb1a6cb9c20e177fde58cdef97c1c7c9264eb1424fe45c4fccedc2fb078a569"
 dependencies = [
 "codspeed",
 "colored",
@ -722,9 +722,9 @@ dependencies = [

 [[package]]
 name = "dashmap"
-version = "6.0.1"
+version = "6.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28"
+checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
 dependencies = [
 "cfg-if",
 "crossbeam-utils",
@ -894,9 +894,9 @@ dependencies = [

 [[package]]
 name = "filetime"
-version = "0.2.24"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
 dependencies = [
 "cfg-if",
 "libc",
@ -987,9 +987,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"

 [[package]]
 name = "globset"
-version = "0.4.14"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
+checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19"
 dependencies = [
 "aho-corasick",
 "bstr",
@ -1106,9 +1106,9 @@ dependencies = [

 [[package]]
 name = "ignore"
-version = "0.4.22"
+version = "0.4.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1"
+checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b"
 dependencies = [
 "crossbeam-deque",
 "globset",
@ -1142,9 +1142,9 @@ dependencies = [

 [[package]]
 name = "indexmap"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c"
+checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
 dependencies = [
 "equivalent",
 "hashbrown",
@ -1193,9 +1193,9 @@ dependencies = [

 [[package]]
 name = "insta"
-version = "1.39.0"
+version = "1.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5"
+checksum = "6593a41c7a73841868772495db7dc1e8ecab43bb5c0b6da2059246c4b506ab60"
 dependencies = [
 "console",
 "globset",
@ -1427,9 +1427,9 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"

 [[package]]
 name = "lsp-server"
-version = "0.7.6"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248f65b78f6db5d8e1b1604b4098a28b43d21a8eb1deeca22b1c421b276c7095"
+checksum = "550446e84739dcaf6d48a4a093973850669e13e8a34d8f8d64851041be267cd9"
 dependencies = [
 "crossbeam-channel",
 "log",
@ -1644,9 +1644,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"

 [[package]]
 name = "ordermap"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61d7d835be600a7ac71b24e39c92fe6fad9e818b3c71bfc379e3ba65e327d77f"
+checksum = "31f2bd7b03bf2c767e1bb7b91505dbe022833776e60480275e6f2fb0db0c7503"
 dependencies = [
 "indexmap",
 ]
@ -1934,9 +1934,9 @@ dependencies = [

 [[package]]
 name = "pretty_assertions"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66"
+checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
 dependencies = [
 "diff",
 "yansi",
@ -2253,7 +2253,7 @@ dependencies = [

 [[package]]
 name = "ruff"
-version = "0.6.7"
+version = "0.6.8"
 dependencies = [
 "anyhow",
 "argfile",
@ -2351,7 +2351,7 @@ version = "0.0.0"
 dependencies = [
 "camino",
 "countme",
- "dashmap 6.0.1",
+ "dashmap 6.1.0",
 "filetime",
 "ignore",
 "insta",
@ -2472,7 +2472,7 @@ dependencies = [

 [[package]]
 name = "ruff_linter"
-version = "0.6.7"
+version = "0.6.8"
 dependencies = [
 "aho-corasick",
 "annotate-snippets 0.9.2",
@ -2803,7 +2803,7 @@ dependencies = [

 [[package]]
 name = "ruff_wasm"
-version = "0.6.7"
+version = "0.6.8"
 dependencies = [
 "console_error_panic_hook",
 "console_log",
@ -2944,12 +2944,12 @@ checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
 [[package]]
 name = "salsa"
 version = "0.18.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=f608ff8b24f07706492027199f51132244034f29#f608ff8b24f07706492027199f51132244034f29"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=4a7c955255e707e64e43f3ce5eabb771ae067768#4a7c955255e707e64e43f3ce5eabb771ae067768"
 dependencies = [
 "append-only-vec",
 "arc-swap",
 "crossbeam",
- "dashmap 6.0.1",
+ "dashmap 6.1.0",
 "hashlink",
 "indexmap",
 "lazy_static",
@ -2964,12 +2964,12 @@ dependencies = [
 [[package]]
 name = "salsa-macro-rules"
 version = "0.1.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=f608ff8b24f07706492027199f51132244034f29#f608ff8b24f07706492027199f51132244034f29"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=4a7c955255e707e64e43f3ce5eabb771ae067768#4a7c955255e707e64e43f3ce5eabb771ae067768"

 [[package]]
 name = "salsa-macros"
 version = "0.18.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=f608ff8b24f07706492027199f51132244034f29#f608ff8b24f07706492027199f51132244034f29"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=4a7c955255e707e64e43f3ce5eabb771ae067768#4a7c955255e707e64e43f3ce5eabb771ae067768"
 dependencies = [
 "heck",
 "proc-macro2",
@ -3031,9 +3031,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"

 [[package]]
 name = "serde"
-version = "1.0.209"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
 dependencies = [
 "serde_derive",
 ]
@ -3051,9 +3051,9 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.209"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
 "proc-macro2",
 "quote",
@ -3073,9 +3073,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.127"
+version = "1.0.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
 dependencies = [
 "itoa",
 "memchr",
@ -3245,9 +3245,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"

 [[package]]
 name = "syn"
-version = "2.0.76"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
 "proc-macro2",
 "quote",
@ -3342,18 +3342,18 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
 dependencies = [
 "proc-macro2",
 "quote",
@ -3614,15 +3614,15 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"

 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"

 [[package]]
 name = "unicode-normalization"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
 dependencies = [
 "tinyvec",
 ]
@ -3635,9 +3635,9 @@ checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"

 [[package]]
 name = "unicode_names2"
-version = "1.2.2"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "addeebf294df7922a1164f729fb27ebbbcea99cc32b3bf08afab62757f707677"
+checksum = "d1673eca9782c84de5f81b82e4109dcfb3611c8ba0d52930ec4a9478f547b2dd"
 dependencies = [
 "phf",
 "unicode_names2_generator",
@ -3645,9 +3645,9 @@ dependencies = [

 [[package]]
 name = "unicode_names2_generator"
-version = "1.2.2"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f444b8bba042fe3c1251ffaca35c603f2dc2ccc08d595c65a8c4f76f3e8426c0"
+checksum = "b91e5b84611016120197efd7dc93ef76774f4e084cd73c9fb3ea4a86c570c56e"
 dependencies = [
 "getopts",
 "log",
@ -4133,9 +4133,9 @@ checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904"

 [[package]]
 name = "yansi"
-version = "0.5.1"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"

 [[package]]
 name = "yansi-term"
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@ -14,20 +14,20 @@

 rustPlatform.buildRustPackage rec {
  pname = "ruff";
-  version = "0.6.7";
+  version = "0.6.8";

  src = fetchFromGitHub {
    owner = "astral-sh";
    repo = "ruff";
    rev = "refs/tags/${version}";
-    hash = "sha256-1udxvl98RveGJmnG8kwlecWD9V+BPadA/YE8jbt9jNo=";
+    hash = "sha256-guRg35waq6w+P8eaXJFwMtROoXU3d3yURGwzG2SIzhc=";
  };

  cargoLock = {
    lockFile = ./Cargo.lock;
    outputHashes = {
      "lsp-types-0.95.1" = "sha256-8Oh299exWXVi6A39pALOISNfp8XBya8z+KT/Z7suRxQ=";
-      "salsa-0.18.0" = "sha256-EjpCTOB6E7n5oNn1bvzNyznzs0uRJvAXrNsZggk4hgM=";
+      "salsa-0.18.0" = "sha256-zHXLNK6SCiJ3MmT0PMIauA1eolyJ4wfVWxN6wcvmhts=";
    };
  };

--- a/pkgs/by-name/sm/smtp4dev/deps.nix
+++ b/pkgs/by-name/sm/smtp4dev/deps.nix
--- a/pkgs/by-name/sm/smtp4dev/package.nix
+++ b/pkgs/by-name/sm/smtp4dev/package.nix
@ -0,0 +1,58 @@
+{
+  lib,
+  stdenv,
+  buildDotnetModule,
+  fetchFromGitHub,
+  nodejs,
+  npmHooks,
+  fetchNpmDeps,
+  dotnetCorePackages,
+}:
+let
+  version = "3.3.4";
+  src = fetchFromGitHub {
+    owner = "rnwood";
+    repo = "smtp4dev";
+    rev = "refs/tags/${version}";
+    hash = "sha256-ARq5OpFJ4o9KdBXvzOx7QLB8GNfmXWjO0RR4jKP8qRI=";
+  };
+  npmRoot = "Rnwood.Smtp4dev/ClientApp";
+in
+buildDotnetModule {
+  inherit version src npmRoot;
+  pname = "smtp4dev";
+
+  nativeBuildInputs = [
+    nodejs
+    nodejs.python
+    npmHooks.npmConfigHook
+    stdenv.cc # c compiler is needed for compiling npm-deps
+  ];
+
+  npmDeps = fetchNpmDeps {
+    src = "${src}/${npmRoot}";
+    hash = "sha256-VBcfRKYe/uPf6urWuLI5TrnX9bgiKiZKo+N4zL7O3SM=";
+  };
+
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
+  dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;
+  projectFile = "Rnwood.Smtp4dev/Rnwood.Smtp4dev.csproj";
+  nugetDeps = ./deps.nix;
+  executables = [ "Rnwood.Smtp4dev" ];
+
+  postFixup = ''
+    mv $out/bin/Rnwood.Smtp4dev $out/bin/smtp4dev
+  '';
+
+  meta = {
+    description = "Fake smtp email server for development and testing";
+    homepage = "https://github.com/rnwood/smtp4dev";
+    license = lib.licenses.bsd3;
+    mainProgram = "smtp4dev";
+    maintainers = with lib.maintainers; [
+      rucadi
+      jchw
+    ];
+    platforms = lib.platforms.unix;
+  };
+}
--- a/pkgs/by-name/st/stevenblack-blocklist/package.nix
+++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix
@ -6,13 +6,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "stevenblack-blocklist";
-  version = "3.14.107";
+  version = "3.14.112";

  src = fetchFromGitHub {
    owner = "StevenBlack";
    repo = "hosts";
    rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-2YJRNkIDqU5ruMNPiU1PvfURBE93WGPJuwBmyUJw5Ho=";
+    hash = "sha256-ESgu1n7Fa9UrR/OJkMsldcyqV7R3Bdq3GRouTn3GIrw=";
  };

  outputs = [
--- a/pkgs/by-name/ze/zed-editor/Cargo.lock
+++ b/pkgs/by-name/ze/zed-editor/Cargo.lock
@ -10993,6 +10993,7 @@ dependencies = [
 "text",
 "theme",
 "ui",
+ "unicode-segmentation",
 "util",
 "windows 0.58.0",
 ]
@ -14374,7 +14375,7 @@ dependencies = [

 [[package]]
 name = "zed"
-version = "0.154.1"
+version = "0.154.2"
 dependencies = [
 "activity_indicator",
 "anyhow",
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@ -86,13 +86,13 @@ let
 in
 rustPlatform.buildRustPackage rec {
  pname = "zed-editor";
-  version = "0.154.1";
+  version = "0.154.2";

  src = fetchFromGitHub {
    owner = "zed-industries";
    repo = "zed";
    rev = "refs/tags/v${version}";
-    hash = "sha256-ZYaWkmLWhmGM7muU70JqD5HjgsI+oaouilqjUYUQcg8=";
+    hash = "sha256-DcSlsBwZW2RhzX74eNi0+VBwnxYLl22CbCbZrEOSiFQ=";
    fetchSubmodules = true;
  };

--- a/pkgs/data/misc/mailcap/default.nix
+++ b/pkgs/data/misc/mailcap/default.nix
@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchurl
+, nixosTests

 # updater
 , git
@ -44,6 +45,8 @@ stdenv.mkDerivation rec {
    exec nix-update --version "$VERSION" "$@"
  '';

+  passthru.tests.nginx-mime = nixosTests.nginx-mime;
+
  meta = with lib; {
    description = "Helper application and MIME type associations for file types";
    homepage = "https://pagure.io/mailcap";
--- a/pkgs/desktops/xfce/applications/xfce4-dict/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-dict/default.nix
@ -10,9 +10,9 @@
 mkXfceDerivation {
  category = "apps";
  pname = "xfce4-dict";
-  version = "0.8.6";
+  version = "0.8.7";

-  sha256 = "sha256-a7St9iH+jzwq/llrMJkuqwgQrDFEjqebs/N6Lxa3dkI=";
+  sha256 = "sha256-1xjprnQG2P+LYAhEGxdu1wpoP/+C+udmNqb/3zEojr0=";

  buildInputs = [
    glib
--- a/pkgs/development/libraries/xdg-desktop-portal/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix
@ -65,6 +65,12 @@ stdenv.mkDerivation (finalAttrs: {
    ./trash-test.patch
  ];

+  # until/unless bubblewrap ships a pkg-config file, meson has no way to find it when cross-compiling.
+  postPatch = ''
+    substituteInPlace meson.build \
+      --replace-fail "find_program('bwrap'"  "find_program('${lib.getExe bubblewrap}'"
+  '';
+
  nativeBuildInputs = [
    docbook_xml_dtd_412
    docbook_xml_dtd_43
@ -117,8 +123,12 @@ stdenv.mkDerivation (finalAttrs: {
    (lib.mesonEnable "systemd" enableSystemd)
  ] ++ lib.optionals (!enableGeoLocation) [
    "-Dgeoclue=disabled"
+  ] ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [
+    "-Dpytest=disabled"
  ];

+  strictDeps = true;
+
  doCheck = true;

  preCheck = ''
--- a/pkgs/development/misc/datafusion/default.nix
+++ b/pkgs/development/misc/datafusion/default.nix
@ -1,35 +1,43 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, stdenv
-, darwin
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  stdenv,
+  darwin,
 }:

 rustPlatform.buildRustPackage rec {
  pname = "datafusion-cli";
-  version = "33.0.0";
+  version = "42.0.0";

  src = fetchFromGitHub {
    name = "datafusion-cli-source";
    owner = "apache";
    repo = "arrow-datafusion";
    rev = version;
-    sha256 = "sha256-ywyzvk50Fr9TSaCrqd14lSi1PJ9ggA1YQ/X0aFGFk1M=";
+    sha256 = "sha256-d8DR9I+6ddl5h8WSYBM3UyLUhZe+ICsTfraQkBouMYY=";
  };

  sourceRoot = "${src.name}/datafusion-cli";

-  cargoHash = "sha256-0a/O9nNi3JLufQxG+5EgCXtV0y03X7R6UY+f/tVGB90=";
+  cargoHash = "sha256-/ofwZI+v0zoszq5zAQRCyqeVrF/ozS8mHHpPdaklhaE=";

  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
    darwin.apple_sdk.frameworks.Security
  ];

  checkFlags = [
-    # fails even outside the Nix sandbox
-    "--skip=object_storage::tests::s3_region_validation"
-    # broken
-    "--skip=exec::tests::create_object_store_table_gcs"
+    # Some tests not found fake path
+    "--skip=catalog::tests::query_gs_location_test"
+    "--skip=catalog::tests::query_http_location_test"
+    "--skip=catalog::tests::query_s3_location_test"
+    "--skip=exec::tests::copy_to_external_object_store_test"
+    "--skip=exec::tests::copy_to_object_store_table_s3"
+    "--skip=exec::tests::create_object_store_table_cos"
+    "--skip=exec::tests::create_object_store_table_http"
+    "--skip=exec::tests::create_object_store_table_oss"
+    "--skip=exec::tests::create_object_store_table_s3"
+    "--skip=tests::test_parquet_metadata_works_with_strings"
  ];

  meta = with lib; {
--- a/pkgs/development/python-modules/arviz/default.nix
+++ b/pkgs/development/python-modules/arviz/default.nix
@ -1,5 +1,6 @@
 {
  lib,
+  stdenv,
  buildPythonPackage,
  pythonOlder,
  fetchFromGitHub,
@ -104,6 +105,9 @@ buildPythonPackage rec {
    "test_plot_pair"
  ];

+  # Tests segfault on darwin
+  doCheck = !stdenv.isDarwin;
+
  pythonImportsCheck = [ "arviz" ];

  meta = {
--- a/pkgs/development/python-modules/autobahn/default.nix
+++ b/pkgs/development/python-modules/autobahn/default.nix
@ -1,7 +1,7 @@
 {
  lib,
  buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
  attrs,
  argon2-cffi,
  base58,
@ -28,7 +28,7 @@
  pygobject3,
  pyopenssl,
  qrcode,
-  pytest-asyncio_0_21,
+  pytest-asyncio,
  python-snappy,
  pytestCheckHook,
  pythonOlder,
@ -50,21 +50,18 @@

 buildPythonPackage rec {
  pname = "autobahn";
-  version = "23.6.2";
+  version = "24.4.2";
  pyproject = true;

  disabled = pythonOlder "3.9";

-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-7JQhxSohAzZNHvBGgDbmAZ7oT3FyHoazb+Ga1pZsEYE=";
+  src = fetchFromGitHub {
+    owner = "crossbario";
+    repo = "autobahn-python";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-aeTE4a37zr83KZ+v947XikzFrHAhkZ4mj4tXdkQnB84=";
  };

-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace-fail "pytest>=2.8.6,<3.3.0" "pytest"
-  '';
-
  build-system = [ setuptools ];

  dependencies = [
@ -77,7 +74,7 @@ buildPythonPackage rec {
  nativeCheckInputs =
    [
      mock
-      pytest-asyncio_0_21
+      pytest-asyncio
      pytestCheckHook
    ]
    ++ optional-dependencies.scram ++ optional-dependencies.serialization ++ optional-dependencies.xbr;
@ -87,7 +84,10 @@ buildPythonPackage rec {
    export USE_ASYNCIO=1
  '';

-  pytestFlagsArray = [ "--pyargs autobahn" ];
+  pytestFlagsArray = [
+    "--ignore=./autobahn/twisted"
+    "./autobahn"
+  ];

  pythonImportsCheck = [ "autobahn" ];

@ -141,6 +141,7 @@ buildPythonPackage rec {
  };

  meta = with lib; {
+    changelog = "https://github.com/crossbario/autobahn-python/blob/${src.rev}/docs/changelog.rst";
    description = "WebSocket and WAMP in Python for Twisted and asyncio";
    homepage = "https://crossbar.io/autobahn";
    license = licenses.mit;
--- a/pkgs/development/python-modules/cohere/default.nix
+++ b/pkgs/development/python-modules/cohere/default.nix
@ -22,14 +22,14 @@

 buildPythonPackage rec {
  pname = "cohere";
-  version = "5.9.4";
+  version = "5.10.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "cohere-ai";
    repo = "cohere-python";
    rev = "refs/tags/${version}";
-    hash = "sha256-RtBbS2t0298EyW30yRnqstmXkiU36tou0dsbf6Tq1xE=";
+    hash = "sha256-9d72JWEz2L8yyZQKkdwQMgwQM3nz4yVHnmVCERaa5C8=";
  };

  build-system = [ poetry-core ];
--- a/pkgs/development/python-modules/contextlib2/default.nix
+++ b/pkgs/development/python-modules/contextlib2/default.nix
@ -1,34 +1,36 @@
 {
  lib,
  buildPythonPackage,
-  fetchPypi,
-  pythonAtLeast,
+  fetchFromGitHub,
+  setuptools,
  pythonOlder,
  unittestCheckHook,
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "contextlib2";
-  version = "21.6.0";
-  format = "setuptools";
+  version = "21.6.0-unstable-2024-05-23";
+  pyproject = true;

-  # Python 3.11 not currently supported
-  # https://github.com/jazzband/contextlib2/issues/43
-  disabled = pythonOlder "3.6" || pythonAtLeast "3.11";
+  disabled = pythonOlder "3.6";

-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-qx4r/h0B2Wjht+jZAjvFHvNQm7ohe7cwzuOCfh7oKGk=";
+  src = fetchFromGitHub {
+    owner = "jazzband";
+    repo = "contextlib2";
+    rev = "f64cf04df8a1f6a32ce2095192b4638d229ff25e";
+    hash = "sha256-HX9N8G8jl6cpEwdJ80pDcoo4osTO/f8fz5sNcY/R1Nk=";
  };

+  build-system = [ setuptools ];
+
  nativeCheckInputs = [ unittestCheckHook ];

  pythonImportsCheck = [ "contextlib2" ];

-  meta = with lib; {
+  meta = {
    description = "Backports and enhancements for the contextlib module";
    homepage = "https://contextlib2.readthedocs.org/";
-    license = licenses.psfl;
-    maintainers = [ ];
+    license = lib.licenses.psfl;
+    maintainers = with lib.maintainers; [ sigmanificient ];
  };
 }
--- a/pkgs/development/python-modules/geopandas/default.nix
+++ b/pkgs/development/python-modules/geopandas/default.nix
@ -13,6 +13,17 @@
  pyproj,
  rtree,
  shapely,
+
+  # optional-dependencies
+  folium,
+  geoalchemy2,
+  geopy,
+  mapclassify,
+  matplotlib,
+  psycopg,
+  pyarrow,
+  sqlalchemy,
+  xyzservices,
 }:

 buildPythonPackage rec {
@ -39,10 +50,30 @@ buildPythonPackage rec {
    shapely
  ];

+  optional-dependencies = {
+    all = [
+      # prevent infinite recursion
+      (folium.overridePythonAttrs (prevAttrs: {
+        doCheck = false;
+      }))
+      geoalchemy2
+      geopy
+      # prevent infinite recursion
+      (mapclassify.overridePythonAttrs (prevAttrs: {
+        doCheck = false;
+      }))
+      matplotlib
+      psycopg
+      pyarrow
+      sqlalchemy
+      xyzservices
+    ];
+  };
+
  nativeCheckInputs = [
    pytestCheckHook
    rtree
-  ];
+  ] ++ optional-dependencies.all;

  doCheck = !stdenv.hostPlatform.isDarwin;

--- a/pkgs/development/python-modules/magic-wormhole/default.nix
+++ b/pkgs/development/python-modules/magic-wormhole/default.nix
@ -58,6 +58,10 @@ buildPythonPackage rec {

  build-system = [ setuptools ];

+  pythonRelaxDeps = [
+    "spake2"
+  ];
+
  dependencies = [
    attrs
    autobahn
--- a/pkgs/development/python-modules/mmengine/default.nix
+++ b/pkgs/development/python-modules/mmengine/default.nix
@ -1,24 +1,32 @@
 {
  lib,
-  addict,
+  stdenv,
  buildPythonPackage,
-  coverage,
  fetchFromGitHub,
-  lmdb,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  addict,
  matplotlib,
-  mlflow,
  numpy,
  opencv4,
-  parameterized,
-  pytestCheckHook,
-  pythonOlder,
  pyyaml,
  rich,
-  setuptools,
-  stdenv,
  termcolor,
-  torch,
  yapf,
+
+  # checks
+  bitsandbytes,
+  coverage,
+  dvclive,
+  lion-pytorch,
+  lmdb,
+  mlflow,
+  parameterized,
+  pytestCheckHook,
+  transformers,
 }:

 buildPythonPackage rec {
@ -26,13 +34,11 @@ buildPythonPackage rec {
  version = "0.10.5";
  pyproject = true;

-  disabled = pythonOlder "3.7";
-
  src = fetchFromGitHub {
    owner = "open-mmlab";
    repo = "mmengine";
    rev = "refs/tags/v${version}";
-    hash = "sha256-+YDtYHp3BwKvzhmHC6hAZ3Qtc9uRZMo/TpWqdpm2hn0=";
+    hash = "sha256-bZ6O4UOYUCwq11YmgRWepOIngYxYD/fNfM/VmcyUv9k=";
  };

  build-system = [ setuptools ];
@ -49,12 +55,15 @@ buildPythonPackage rec {
  ];

  nativeCheckInputs = [
+    # bitsandbytes (broken as of 2024-07-06)
    coverage
+    dvclive
+    lion-pytorch
    lmdb
    mlflow
    parameterized
    pytestCheckHook
-    torch
+    transformers
  ];

  preCheck =
@ -108,12 +117,12 @@ buildPythonPackage rec {
    "test_close"
  ];

-  meta = with lib; {
+  meta = {
    description = "Library for training deep learning models based on PyTorch";
    homepage = "https://github.com/open-mmlab/mmengine";
    changelog = "https://github.com/open-mmlab/mmengine/releases/tag/v${version}";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ rxiao ];
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [ rxiao ];
    broken =
      stdenv.hostPlatform.isDarwin || (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
  };
--- a/pkgs/development/python-modules/spake2/default.nix
+++ b/pkgs/development/python-modules/spake2/default.nix
@ -1,35 +1,28 @@
 {
  lib,
  buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
  fetchpatch2,
  setuptools,
-  hkdf,
+  cryptography,
  pytestCheckHook,
 }:

 buildPythonPackage rec {
  pname = "spake2";
-  version = "0.8";
+  version = "0.9";
  pyproject = true;

-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "c17a614b29ee4126206e22181f70a406c618d3c6c62ca6d6779bce95e9c926f4";
+  src = fetchFromGitHub {
+    owner = "warner";
+    repo = "python-spake2";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-WPMGH1OzG+5O+2lNl2sv06/dNardY+BHYDS290Z36vQ=";
  };

-  patches = [
-    # https://github.com/warner/python-spake2/pull/16
-    (fetchpatch2 {
-      name = "python312-compat.patch";
-      url = "https://github.com/warner/python-spake2/commit/1b04d33106b105207c97c64b2589c45790720b0b.patch";
-      hash = "sha256-OoBz0lN17VyVGg6UfT+Zj9M1faFTNpPIhxrwCgUwMc8=";
-    })
-  ];
+  build-system = [ setuptools ];

-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [ hkdf ];
+  dependencies = [ cryptography ];

  pythonImportsCheck = [ "spake2" ];

--- a/pkgs/development/tools/msgpack-tools/default.nix
+++ b/pkgs/development/tools/msgpack-tools/default.nix
@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
    homepage = "https://github.com/ludocode/msgpack-tools";
    license = licenses.mit;
    platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [ alibabzo ];
+    maintainers = [ ];
  };
 }
--- a/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix
+++ b/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix
@ -4,13 +4,13 @@

 callPackage ../generic.nix rec {
  pname = "rat-king-adventure";
-  version = "1.5.3";
+  version = "2.0.0";

  src = fetchFromGitHub {
    owner = "TrashboxBobylev";
    repo = "Rat-King-Adventure";
    rev = version;
-    hash = "sha256-Q/smIObu7khcRnwdT8m7+WstpPE1tbDFJcZ4OGYJ338=";
+    hash = "sha256-RobFWEqIxI2gdgbJqaUWJ9MpOcAeOGOaJlrIY2NNUs8=";
  };

  desktopName = "Rat King Adventure";
--- a/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/deps.json
+++ b/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/deps.json
@ -1,51 +1,65 @@
 {
 "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
 "!version": 1,
+ "https://oss.sonatype.org/content/repositories/snapshots/com/badlogicgames": {
+  "gdx-controllers#gdx-controllers-core/2.2.4-20231021.200112-6/SNAPSHOT": {
+   "jar": "sha256-Gdz2J1IvDJFktUD2XeGNS0SIrOyym19X/+dCbbbe3/U=",
+   "pom": "sha256-90QW/Mtz1jbDUhKjdJ88ekhulZR2a7eCaEJoswmeny4="
+  },
+  "gdx-controllers#gdx-controllers-desktop/2.2.4-20231021.200114-6/SNAPSHOT": {
+   "jar": "sha256-4mhLijZwQHk2pP5qXIIzrsO9CwNC3CDti/5szclkVa8=",
+   "pom": "sha256-10+zD8flpKIPzji5NFgtYcwE5O74hSzzvvqBh84wLf4="
+  },
+  "gdx-controllers/gdx-controllers-core/2.2.4-SNAPSHOT/maven-metadata": {
+   "xml": {
+    "groupId": "com.badlogicgames.gdx-controllers",
+    "lastUpdated": "20231021200112"
+   }
+  },
+  "gdx-controllers/gdx-controllers-desktop/2.2.4-SNAPSHOT/maven-metadata": {
+   "xml": {
+    "groupId": "com.badlogicgames.gdx-controllers",
+    "lastUpdated": "20231021200114"
+   }
+  }
+ },
 "https://repo.maven.apache.org/maven2": {
-  "com/badlogicgames/gdx#gdx-backend-lwjgl3/1.11.0": {
-   "jar": "sha256-my0CJorGB5QwSi4E5ep1H62fX5bsyvFdgCOm4LF6994=",
-   "module": "sha256-o7gpPFXSp2lb60LCcKrfKpQcK4NqQL8Ob4W6OOY0VwY=",
-   "pom": "sha256-wa55d83hp9muWlhfDe8Ap2d4LzcR5/+RYTX2UPA2HOo="
+  "com/badlogicgames/gdx#gdx-backend-lwjgl3/1.12.1": {
+   "jar": "sha256-B3OwjHfBoHcJPFlyy4u2WJuRe4ZF/+tKh7gKsDg41o0=",
+   "module": "sha256-9O7d2ip5+E6OiwN47WWxC8XqSX/mT+b0iDioCRTTyqc=",
+   "pom": "sha256-IRSihaCUPC2d0QzB0MVDoOWM1DXjcisTYtnaaxR9SRo="
  },
-  "com/badlogicgames/gdx#gdx-freetype-platform/1.11.0": {
-   "pom": "sha256-a5PHPPIyrqNpnueP5GEkJ14KwbsROJkXUcz96l8Au9c="
+  "com/badlogicgames/gdx#gdx-freetype-platform/1.12.1": {
+   "pom": "sha256-cAGFUunqi4o21kDX8V86OT6aMmXjJUqyMHLHhUWLBm4="
  },
-  "com/badlogicgames/gdx#gdx-freetype-platform/1.11.0/natives-desktop": {
-   "jar": "sha256-9GCzmqhP9bnWC4mT4j/zKtpWellmThTrfha7VcWk9yE="
+  "com/badlogicgames/gdx#gdx-freetype-platform/1.12.1/natives-desktop": {
+   "jar": "sha256-1g5ZN21QWpk+yLogowR3rwaQKx4pJ/8uN17/2/Ql2UE="
  },
-  "com/badlogicgames/gdx#gdx-freetype/1.11.0": {
-   "jar": "sha256-u5hP1RQ13YCN0HaSWOqzJikXG19OnkPzmvRUPh7E3yI=",
-   "module": "sha256-n5oGuAY9dyn7H94+ippXm3vuPUqevY+xrDubsj78b/M=",
-   "pom": "sha256-xkjQNIE46uOtYmScUTA8R5rr5czpsbXQeLX3rkVQG+0="
+  "com/badlogicgames/gdx#gdx-freetype/1.12.1": {
+   "jar": "sha256-rbjskAa7YdrW0pdslaHeGN5eGmUULRilgH0OUkyL8WU=",
+   "module": "sha256-HG9UGDxQFjSvGqLrKEkE7YnVvqtURs7FyqWwunHdXKE=",
+   "pom": "sha256-pLaMZBcEufzo+xszIlcUPJSYJJQg1uY6rm7tb6fHyT8="
  },
  "com/badlogicgames/gdx#gdx-jnigen-loader/2.3.1": {
   "jar": "sha256-ZJDdoiWmHHYCwnu+xOSBE3/1lfjOCy3bpBTww0Bq7mA=",
   "module": "sha256-nNWFK9nlHTbRJxrypGzZfOwk5XEHblQTbsmtNxhGua8=",
   "pom": "sha256-7e2XZPzSpbw8peeAUEHppiAZ+ovkNLWZ8D1JR+KkQng="
  },
-  "com/badlogicgames/gdx#gdx-platform/1.11.0": {
-   "pom": "sha256-8cBBk8LQnXP8lVNQL05ZFMIOgDWrdpoZ0z4bxJJ0AkA="
+  "com/badlogicgames/gdx#gdx-platform/1.12.1": {
+   "pom": "sha256-bZhlcVVYfr/+qIAG20v12CgcyUetGduKZP28TnOzkZc="
  },
-  "com/badlogicgames/gdx#gdx-platform/1.11.0/natives-desktop": {
-   "jar": "sha256-yUFpxwl25LGMCL1qKWtETqiLtUlF67EtHy5DK5L4OTA="
+  "com/badlogicgames/gdx#gdx-platform/1.12.1/natives-desktop": {
+   "jar": "sha256-P+utqUwiNjYQkXufuMJLD55h4+bGnHO9DTUDhYTA4e0="
  },
-  "com/badlogicgames/gdx#gdx/1.11.0": {
-   "jar": "sha256-IxU8Z+GVYGROD6EjUjK12F7kHPKJKBwtp+yMKONXULk=",
-   "module": "sha256-twUVE1CLWninINOZQrsifRvrOrzgBpskstIAA2TPbbM=",
-   "pom": "sha256-2W6H3BZixRugifIY1Cy3/U3b3sZQiytosvCsZ5dvJSU="
+  "com/badlogicgames/gdx#gdx/1.12.1": {
+   "jar": "sha256-jTIJ6UghH96c2swrAfrO0yPlSKpS73jlx2CEWoh0aXA=",
+   "module": "sha256-7Th6fCSDcEBGAyOsXYZIZwKAPw88K1h448x4If03n6o=",
+   "pom": "sha256-Qg9vfLMYtQsglKsHYme67w6bBlI0yHqWCqkvtCEYpZY="
  },
-  "com/badlogicgames/gdx-controllers#gdx-controllers-core/2.2.2": {
-   "jar": "sha256-DKa7jeeMTIY2ycrjhvrAU4LdMp9y1xCU+62wL89aEAQ=",
-   "pom": "sha256-Y0QV6aRkzGOr46Gb6+AYM2OdS95sUt2zIoaOQduz724="
-  },
-  "com/badlogicgames/gdx-controllers#gdx-controllers-desktop/2.2.2": {
-   "jar": "sha256-oJnxlAyrkj1QtnHH4uK6HkXq44+mxdzq6piktPUqTl0=",
-   "pom": "sha256-ZAhAV2hHVAbq8aLVysozRiKXIYdZmkssHWSOf+rarn8="
-  },
-  "com/badlogicgames/jamepad#jamepad/2.0.20.0": {
-   "jar": "sha256-6fFqB9SpRCSs0DiOw6P+TsZLfhiWxlgUwv9rRisTs2Y=",
-   "module": "sha256-vXFX36GUJsdj2VgYbnHR3+lKnBRgBeEI9pwUameDrmY=",
-   "pom": "sha256-+gwaoDndosNqw/VslH3vLEOptLnkbCPhrqddHQaZ3eQ="
+  "com/badlogicgames/jamepad#jamepad/2.26.5.0": {
+   "jar": "sha256-sO+RC6Uxyt/gQYSWow2Hy6xGAhsGJUf1tZR+A1Q1cRo=",
+   "module": "sha256-KGmFPVwJdU2vuY9u6veZLc2Q6K3uFxL/bgjmUgBKflA=",
+   "pom": "sha256-Up7mQ8lbw+6SfuSnRqwFaOQSnbb5dscD82IjN9/6Inc="
  },
  "com/badlogicgames/jlayer#jlayer/1.0.1-gdx": {
   "jar": "sha256-qrze3C4/pBxOE4hwUj10MzfxiZMQgGMLoaIoVTjNAPs=",
@ -59,174 +73,174 @@
   "jar": "sha256-gT835IIPGFTopOtPgN+UvxsfLsbDtyaS8jq5pVYlavY=",
   "pom": "sha256-ZMFVQ6PV2yeaIK6w36A0oqecIVn4zUAd6kj/DyNMGN0="
  },
-  "org/lwjgl#lwjgl-glfw/3.3.1": {
-   "jar": "sha256-CLvDTrdS+GPjf4OrHHsMIvfLJtD4+wpKSoxgKKxFs4U=",
-   "pom": "sha256-TKQrQ8iqDodIWWB0d0C5lFqqH99+QTTm+iTo+d8cF2A="
+  "org/lwjgl#lwjgl-glfw/3.3.3": {
+   "jar": "sha256-vtx1f9KxslUUbbJrdLnL0fz1ZEuJtHsQT6chx0FgQlk=",
+   "pom": "sha256-fJuPWGrEz36esvNnrphUzK7i2Nf2LiOHxJ0sGvrtirM="
  },
-  "org/lwjgl#lwjgl-glfw/3.3.1/natives-linux": {
-   "jar": "sha256-Ze0Ev/fQf+ybf958OxHEBShsjWbk609Mm3kuJn7OWwY="
+  "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux": {
+   "jar": "sha256-uDBgYrF3QfNCaQiHUUIfGsIaWXv7vQxsYSJjAc3nRLg="
  },
-  "org/lwjgl#lwjgl-glfw/3.3.1/natives-linux-arm32": {
-   "jar": "sha256-hOvo8klGPrF84PrpnYsto8G/kcjUEHOjtYNFd7dS4/s="
+  "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux-arm32": {
+   "jar": "sha256-3Z1NZxT8k1nUfdoNR8HYyLvkmQG393wj/Kepyb/CmFg="
  },
-  "org/lwjgl#lwjgl-glfw/3.3.1/natives-linux-arm64": {
-   "jar": "sha256-IgDyzcENHaZ215o+oFybpVnaCZUFwbdWtu0iL2FagSA="
+  "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux-arm64": {
+   "jar": "sha256-zGE5yD95nQ4UhOpMIByM5tV8jHokSlIXEWqAax60F5s="
  },
-  "org/lwjgl#lwjgl-glfw/3.3.1/natives-macos": {
-   "jar": "sha256-G2z/nmSKci7gzBRmlhIFKqW6gJRp+os/sh8kw6vnDek="
+  "org/lwjgl#lwjgl-glfw/3.3.3/natives-macos": {
+   "jar": "sha256-qJtVNirsnlo7vRNkYBu4WxR9trrmiJHKmiMtbPstVew="
  },
-  "org/lwjgl#lwjgl-glfw/3.3.1/natives-macos-arm64": {
-   "jar": "sha256-nHlVeHSNWPQtXUcu2A0ulpk71Psf/ABYztosYx7zmJo="
+  "org/lwjgl#lwjgl-glfw/3.3.3/natives-macos-arm64": {
+   "jar": "sha256-uUUdZ7wXyQb7goKlUi8liwIvMFaeC2LaAB1ZChe0Xhk="
  },
-  "org/lwjgl#lwjgl-glfw/3.3.1/natives-windows": {
-   "jar": "sha256-nnROy4QCnXrO2uh24lV2WRhKKa/uVeRT9KslZzSb+Ek="
+  "org/lwjgl#lwjgl-glfw/3.3.3/natives-windows": {
+   "jar": "sha256-mBVbRR38b1hQid7HehL5wFeJxNzrjaRy+dMIFgEBpw0="
  },
-  "org/lwjgl#lwjgl-glfw/3.3.1/natives-windows-x86": {
-   "jar": "sha256-pYAgBm4ePVP/xMf7ShWMDLP/tPM6rrPlTSVScyGUxBI="
+  "org/lwjgl#lwjgl-glfw/3.3.3/natives-windows-x86": {
+   "jar": "sha256-lkZVXUBfDSo6lXa1BvV8FjKvZPaaiuWMsESK4EqceCQ="
  },
-  "org/lwjgl#lwjgl-jemalloc/3.3.1": {
-   "jar": "sha256-7kn8Co2UVkUuVM1vd3gj7aZm4sY/wU1lsv0sws/tXb4=",
-   "pom": "sha256-+ZSGEVVV8RPaHOOs1f7LyWk7X9o1P/era9Lj1//dsn4="
+  "org/lwjgl#lwjgl-jemalloc/3.3.3": {
+   "jar": "sha256-6Z4xJp5meKS/xi7yTFCkgcAcvdAEhh7Omlm6EnaMZRY=",
+   "pom": "sha256-IJuMfX+cGXLVyNX5zhmjUW/5BxRD0N+Khm2hNDvS46k="
  },
-  "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-linux": {
-   "jar": "sha256-m3mvXH/Q2UkG7h0qU6NCCidQfWYiS0/0a59ncmRd7TQ="
+  "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux": {
+   "jar": "sha256-TkoT1wFdQmBbvPfvn66tRt6sZAnkN3qO1K6oFfFGNLM="
  },
-  "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-linux-arm32": {
-   "jar": "sha256-Bj8Lsu2V5d4q0G4Q0xJ/hJDdviBKyj5qOc5C3pF4TF8="
+  "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux-arm32": {
+   "jar": "sha256-5IM/wmIeLnMCBXPmKZcJIPHNHfmE/hyc7bszSNzDeG8="
  },
-  "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-linux-arm64": {
-   "jar": "sha256-X4nVRq4fr1Gv+/sMZBR60swze/ajLwv4fEbTTDQvxdU="
+  "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux-arm64": {
+   "jar": "sha256-44PVJBwNR/QBKnU+C//+Ra/DDQBiGbm9iQN1ahA3ibU="
  },
-  "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-macos": {
-   "jar": "sha256-B6qwMJQFjjiph2upM54IoiQDlO+Ii35/z9R2I1j22Wg="
+  "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-macos": {
+   "jar": "sha256-ICTapcaqQHhmQUi3OQ+4sjHyNw6g4X1AeJTbp+nlZOw="
  },
-  "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-macos-arm64": {
-   "jar": "sha256-500OE6wC9BAsIMF/DUFmCK2FNDSV7K4wAp32VousLSc="
+  "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-macos-arm64": {
+   "jar": "sha256-Y5Vuokb/ZKqpzg4dbjzK1obPv5N9H81suNX0T2OCFgw="
  },
-  "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-windows": {
-   "jar": "sha256-Il8331UAYUZ1vprLYnjLbJyAo0kmR5iyz8fsQ08e1HI="
+  "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-windows": {
+   "jar": "sha256-mUnI5JmYvQyHjYQohAEfE4PihRAFCR4LK897dnG4SOs="
  },
-  "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-windows-x86": {
-   "jar": "sha256-Y5uy113z3Vnqewv4uEfgr1cHRpTXk5ILoclTeJeyw9g="
+  "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-windows-x86": {
+   "jar": "sha256-2bTgbiqEIFWD+wVEDSI4OFqRywGgYN2x03YiOuIl8Uo="
  },
-  "org/lwjgl#lwjgl-openal/3.3.1": {
-   "jar": "sha256-cyXuG5GooQwGJsabVXqI8t9qwb3KDlLiqS0yQknyytA=",
-   "pom": "sha256-+ZzowctqhyXSbdyzNFxAPNu8x8qO6WYIu/PCxP2WaiE="
+  "org/lwjgl#lwjgl-openal/3.3.3": {
+   "jar": "sha256-rg6Cdnys8Ikh9Xj7qdhHU93rAM6toFEKK0qIK+KPv5U=",
+   "pom": "sha256-f6aiEbvk5FuCmHU31kN6e1KUM07TrBbLhElV70PV5w8="
  },
-  "org/lwjgl#lwjgl-openal/3.3.1/natives-linux": {
-   "jar": "sha256-C3OB9R7cYQy2ByRdw0p2LSsht0R4FARAaKGmADu4eDg="
+  "org/lwjgl#lwjgl-openal/3.3.3/natives-linux": {
+   "jar": "sha256-kDD+2SinHqwv30zhZDzE7HJNhxDjtDe9znUL3J6YKyo="
  },
-  "org/lwjgl#lwjgl-openal/3.3.1/natives-linux-arm32": {
-   "jar": "sha256-PQ39lwowYdM7FdvxjT7u/PB83EFx6skgUU8DhkY4mmI="
+  "org/lwjgl#lwjgl-openal/3.3.3/natives-linux-arm32": {
+   "jar": "sha256-xyXRfh5GJsf0O29NCKRnSW4JECXnHxn0+x8xN8Tabmc="
  },
-  "org/lwjgl#lwjgl-openal/3.3.1/natives-linux-arm64": {
-   "jar": "sha256-RPO9inlEGNtNU+51Rtkdl9nK9/QuE+ojU2PMM18u9ig="
+  "org/lwjgl#lwjgl-openal/3.3.3/natives-linux-arm64": {
+   "jar": "sha256-q/OSSHs1h9qJtlUlAAjfSjYKL9Xh7gCr1h9/UpFSBaE="
  },
-  "org/lwjgl#lwjgl-openal/3.3.1/natives-macos": {
-   "jar": "sha256-UYTKJLjf6XJVtstVjFKb1qOImBu+VeITcY4/0r2ehuQ="
+  "org/lwjgl#lwjgl-openal/3.3.3/natives-macos": {
+   "jar": "sha256-gmSuMqyfQTxPRQGGPF9udXam/avcXQUtMoG7rMM3fx0="
  },
-  "org/lwjgl#lwjgl-openal/3.3.1/natives-macos-arm64": {
-   "jar": "sha256-wi7Lzvj+5K7q+YEDLfPiy8MKkRqQJS7awfFJeX1YdXU="
+  "org/lwjgl#lwjgl-openal/3.3.3/natives-macos-arm64": {
+   "jar": "sha256-OZJGOhao3xn2MRewiD6tDtko3U3wF/VbXk4St6JwSJo="
  },
-  "org/lwjgl#lwjgl-openal/3.3.1/natives-windows": {
-   "jar": "sha256-X35maqJMqLP7dY5ywD/7nYCbMEicantH6tZ8aXf/ZU4="
+  "org/lwjgl#lwjgl-openal/3.3.3/natives-windows": {
+   "jar": "sha256-49p8PbJcgduNQl7x49v6FQALBA1mnwCLCBPJQzOslsg="
  },
-  "org/lwjgl#lwjgl-openal/3.3.1/natives-windows-x86": {
-   "jar": "sha256-fVtbb61e+7Lowk80dgDHy8bv3RNh/TewtaEzGSMehR4="
+  "org/lwjgl#lwjgl-openal/3.3.3/natives-windows-x86": {
+   "jar": "sha256-hSyk42sf390++2zkLwi30PlXsExLz714BXsMeZ85kjE="
  },
-  "org/lwjgl#lwjgl-opengl/3.3.1": {
-   "jar": "sha256-5DbSFE86Nv/3cv1kIzMWgJt5XzkN79TVVmD8aG58KDQ=",
-   "pom": "sha256-LL9XxnqNBGatgI4aJ/4908EQ6KwC3IqyushKhRl3VUE="
+  "org/lwjgl#lwjgl-opengl/3.3.3": {
+   "jar": "sha256-UGLadQ5ffsieJ+i2e31A+oxLFokBWeNfgoEWzmyOyh4=",
+   "pom": "sha256-RDkltWQq0xjUnfrpe66c3QnkkCWzAqlLAQf8iIm+bN0="
  },
-  "org/lwjgl#lwjgl-opengl/3.3.1/natives-linux": {
-   "jar": "sha256-vPzZ+N/SKUiK2ew1PUjHsC3lyiG63UCS8ZAiOaHtBpA="
+  "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux": {
+   "jar": "sha256-2COpLGooELURLaME3MarzUyxAnBvdPfpNKIjzqIFElA="
  },
-  "org/lwjgl#lwjgl-opengl/3.3.1/natives-linux-arm32": {
-   "jar": "sha256-IDPJfXY+YL2sAX/bsI06Q7vlwXqjZ7QsU3ycw6tAYY8="
+  "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux-arm32": {
+   "jar": "sha256-BbGiXD+3Ipdao78siIQ3I9puEFmhktVo3e/AGkV/qkc="
  },
-  "org/lwjgl#lwjgl-opengl/3.3.1/natives-linux-arm64": {
-   "jar": "sha256-EFjEunNUzavz75NZUeKT91tJYedT13/XU13ccy4oPyg="
+  "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux-arm64": {
+   "jar": "sha256-Cyt1Mn1HRRY0EjNI1VUDrgPlFVGwyIea6QyOS04aT5w="
  },
-  "org/lwjgl#lwjgl-opengl/3.3.1/natives-macos": {
-   "jar": "sha256-cR8plyiIUJJiqVfxsxOL+ptQVRnRHfbldj0cmj+LPF0="
+  "org/lwjgl#lwjgl-opengl/3.3.3/natives-macos": {
+   "jar": "sha256-TBBz0OWumZZtDvHWp3lXWEdtJH2TD9xewYZeOMuEfM4="
  },
-  "org/lwjgl#lwjgl-opengl/3.3.1/natives-macos-arm64": {
-   "jar": "sha256-29EQBE6uitvKjjx6cwUpo1FVnnTOqIe7PNbvDcAW8pU="
+  "org/lwjgl#lwjgl-opengl/3.3.3/natives-macos-arm64": {
+   "jar": "sha256-8bPx3oP5c6uuOkvDLbWyKa5dVcyA27xffIQYEv4gtf4="
  },
-  "org/lwjgl#lwjgl-opengl/3.3.1/natives-windows": {
-   "jar": "sha256-hRubWTysIeOvUd1MMD6N8/5qNEo/gda5vMGG5+VAv9o="
+  "org/lwjgl#lwjgl-opengl/3.3.3/natives-windows": {
+   "jar": "sha256-9F5fYFlrA7Lj2LmKEjyFXr0LUVTIFV3CpWuJDMyQdHc="
  },
-  "org/lwjgl#lwjgl-opengl/3.3.1/natives-windows-x86": {
-   "jar": "sha256-aD2K09DQl3puoYuIpMvn6P1PBsGrIbq+2riDCXQLzGA="
+  "org/lwjgl#lwjgl-opengl/3.3.3/natives-windows-x86": {
+   "jar": "sha256-nZnSA95OMShsrnU6HfuYE2fJNzTxlEZEunG+Uhs68sw="
  },
-  "org/lwjgl#lwjgl-stb/3.3.1": {
-   "jar": "sha256-ZOXMzi/Hy88Mg0pb6GQtniSYzj/jHBT/HfdBh4o/gSE=",
-   "pom": "sha256-dKgsbPvqhNIxAk2f2FgO2VumPCAafUeqsmO6hofDCVk="
+  "org/lwjgl#lwjgl-stb/3.3.3": {
+   "jar": "sha256-DP96pG6p1w/MIIVwFSk+qA+/Ia3Kw0YAyE2puBpEypM=",
+   "pom": "sha256-jR2kP3mIdcV5yokH95rk/D6tFVQl6pVVxvqqsT1Q5J0="
  },
-  "org/lwjgl#lwjgl-stb/3.3.1/natives-linux": {
-   "jar": "sha256-+BuZjoxdYj1XHi/NRvy4e30w7SXfd95jrsjP7bNMSnA="
+  "org/lwjgl#lwjgl-stb/3.3.3/natives-linux": {
+   "jar": "sha256-xEiQaN3G3ESxAwcZQ/gBotB2Y01LdNtHCSf4SjCCGeE="
  },
-  "org/lwjgl#lwjgl-stb/3.3.1/natives-linux-arm32": {
-   "jar": "sha256-6xnGjFt5MUjKOT24bzHQ3pVALZ9MFOUADjkYSA9iKkc="
+  "org/lwjgl#lwjgl-stb/3.3.3/natives-linux-arm32": {
+   "jar": "sha256-/WYDpBauUJJiAxV7ajQOiPX60GyAjvQcsDUBcTn+Lzw="
  },
-  "org/lwjgl#lwjgl-stb/3.3.1/natives-linux-arm64": {
-   "jar": "sha256-XOyb0h8xIAJaLIOB3BCax+yI5o5xX9fK27kPXVVfZZs="
+  "org/lwjgl#lwjgl-stb/3.3.3/natives-linux-arm64": {
+   "jar": "sha256-F/DPG45SLuprS5fBkHCznlT1+H7YT7iVhXR+QPkF4ds="
  },
-  "org/lwjgl#lwjgl-stb/3.3.1/natives-macos": {
-   "jar": "sha256-oXjWYDA5nGmJeN/kqVALdVep2vTAYeg8iHAzfpsL0+c="
+  "org/lwjgl#lwjgl-stb/3.3.3/natives-macos": {
+   "jar": "sha256-MpN6NS20usPpKqG72uKYipWOS5B6tbVXdky6gtsgupc="
  },
-  "org/lwjgl#lwjgl-stb/3.3.1/natives-macos-arm64": {
-   "jar": "sha256-DXoP8tto86vkFpFn4vSJ3/d72igvQvhuQelEvnxDbdg="
+  "org/lwjgl#lwjgl-stb/3.3.3/natives-macos-arm64": {
+   "jar": "sha256-sfZYdf2d3SgJe+YHYCniuPq168FibiHO92FhHfynFcI="
  },
-  "org/lwjgl#lwjgl-stb/3.3.1/natives-windows": {
-   "jar": "sha256-/W/3om6GRa95oNIcpz6NyeRz80AtEzPlRKgdIcpQd+c="
+  "org/lwjgl#lwjgl-stb/3.3.3/natives-windows": {
+   "jar": "sha256-0Sq4Zv4RaekkrFtNa7d2eueEKp/IZSeYaCwAabtz/PI="
  },
-  "org/lwjgl#lwjgl-stb/3.3.1/natives-windows-x86": {
-   "jar": "sha256-v3PjtRu0MOWIvRWOlsyimOmMoS8p3FzxRFwfDFw5uhs="
+  "org/lwjgl#lwjgl-stb/3.3.3/natives-windows-x86": {
+   "jar": "sha256-RkJORUWXM7JsSnsN0mlSCctpONr6OpASxqVoLJSixA4="
  },
-  "org/lwjgl#lwjgl-tinyfd/3.3.1": {
-   "jar": "sha256-SI9R7ZXw+sSNHYfLDjusCMAS3L9u88FohoXXCM28zVY=",
-   "pom": "sha256-78RtVita7rFRzJnBhn5KUeVLzwWs+2EwOtZUh45Nyq8="
+  "org/lwjgl#lwjgl-tinyfd/3.3.3": {
+   "jar": "sha256-7gUVBU7hmj9AiEJv7p2HnrLuZXsH5QZOTiyFH2rc8Us=",
+   "pom": "sha256-LBvRGfQeZaVEYT+R5xYOAGuBkW5zpu919UkkLMTzvvI="
  },
-  "org/lwjgl#lwjgl-tinyfd/3.3.1/natives-linux": {
-   "jar": "sha256-e9cLKCM/RiGdoZiaw+n27vcuvyEc43Uv8eZFzqQYpM8="
+  "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-linux": {
+   "jar": "sha256-oHb6BaTRdHYuq1hS7nLCnRSrEKVlTyf7AGZO8bUsDAU="
  },
-  "org/lwjgl#lwjgl-tinyfd/3.3.1/natives-linux-arm64": {
-   "jar": "sha256-pLai7OGbhNkzyXmwx1+46BgCpoLVJEmWXDP0xaH+cAw="
+  "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-linux-arm64": {
+   "jar": "sha256-gNNOdtFcBJUXRBSIMpCDkdqLFPaKAwtksLQHAqNzkdc="
  },
-  "org/lwjgl#lwjgl-tinyfd/3.3.1/natives-macos": {
-   "jar": "sha256-H1yGorLASVqlahKnTHwvwsk1PMOKoAzBOjJAR2QcMk0="
+  "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-macos": {
+   "jar": "sha256-RGXdRv35MJwM5kw1KaDaZ5L7ZxHDKB6MXbqTXmqb/Dw="
  },
-  "org/lwjgl#lwjgl-tinyfd/3.3.1/natives-macos-arm64": {
-   "jar": "sha256-EY1ViXZdZobUeDcZwt6MpmWiSX2LncKK00/RDtU0P6o="
+  "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-macos-arm64": {
+   "jar": "sha256-b32XlBRlHjQ9yLiz+q3g4tnk/fmdVl1WI+EtQNuuSiI="
  },
-  "org/lwjgl#lwjgl-tinyfd/3.3.1/natives-windows": {
-   "jar": "sha256-7McVIQloBZdWnZsyIEXynBp93uxxgs9pGJ2uFUE4ucg="
+  "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-windows": {
+   "jar": "sha256-AihZEfHIgXNfpNDrFB/+qv2aK7k0nZj3wfuKnLScD1g="
  },
-  "org/lwjgl#lwjgl/3.3.1": {
-   "jar": "sha256-z4P5DjL7lz/17fyk7zX1XKUbtwpXm2ofKQdE9VLo5IQ=",
-   "pom": "sha256-xMXHr6uOt4JTZqIwhsPf7droMIwRXF1iF6gm7DJLN+M="
+  "org/lwjgl#lwjgl/3.3.3": {
+   "jar": "sha256-3Jx7LUjoOW1oiV+JAv+gHkYlPeRN/pJ1M/8JRX6/7sQ=",
+   "pom": "sha256-gx1Gb8AWKUUrRhNzEeFYI8CWx9b66VKYxke5+/XWgfQ="
  },
-  "org/lwjgl#lwjgl/3.3.1/natives-linux": {
-   "jar": "sha256-Iu8q+jGhdAozfsnGgGxrjZfpMaY+LEMnDLrxT7P2/E4="
+  "org/lwjgl#lwjgl/3.3.3/natives-linux": {
+   "jar": "sha256-5mNzjFGaBvbWWYgvqOTgmvfxDpIZKe5cxUp1h/Yu1Mk="
  },
-  "org/lwjgl#lwjgl/3.3.1/natives-linux-arm32": {
-   "jar": "sha256-9rVYGOx25ewBfiW8OvbsTbe3ol56KhdW+i/6uojIZWQ="
+  "org/lwjgl#lwjgl/3.3.3/natives-linux-arm32": {
+   "jar": "sha256-cNP3SNRawTWDKplV6lGcpv7Tqn0dR+tnR8uHk2hGyUE="
  },
-  "org/lwjgl#lwjgl/3.3.1/natives-linux-arm64": {
-   "jar": "sha256-T9lq94+cKTsXAAEcfbGg7AI3xNGIPjf6vgj3To0uAiQ="
+  "org/lwjgl#lwjgl/3.3.3/natives-linux-arm64": {
+   "jar": "sha256-OXp5pdiQcobUAY0CbLw3NYxTu7aqvDoVNPGf8jt/hVg="
  },
-  "org/lwjgl#lwjgl/3.3.1/natives-macos": {
-   "jar": "sha256-9I5hCpgdylFbm75zRcx240UME0BLBS2Kw1fvCvjpCr8="
+  "org/lwjgl#lwjgl/3.3.3/natives-macos": {
+   "jar": "sha256-ApTuTi3X72vvr/r8C7maKom3YHC1zYMC89dWJLZ4bQM="
  },
-  "org/lwjgl#lwjgl/3.3.1/natives-macos-arm64": {
-   "jar": "sha256-cZfomrgKKiGDtO6SXMtE5XLwy3V6kndq34JlJpIAo2o="
+  "org/lwjgl#lwjgl/3.3.3/natives-macos-arm64": {
+   "jar": "sha256-UKycoJ5Z8FHcrPTcCyFF6ekW5qsUYzt1aUIxv+WTFKg="
  },
-  "org/lwjgl#lwjgl/3.3.1/natives-windows": {
-   "jar": "sha256-CT0T1ipkNLxla/EKOzfiUw/ZrzsLwg+OlUW+WGWdFEM="
+  "org/lwjgl#lwjgl/3.3.3/natives-windows": {
+   "jar": "sha256-XuY6GRh+/lu4dH/ST3sTJX2zSN9a1kEROjaV5D8hOVk="
  },
-  "org/lwjgl#lwjgl/3.3.1/natives-windows-x86": {
-   "jar": "sha256-6QwfnPVwGu7ymC6/CQWiuZH0YiuKf4JQ6vCHO1oKAiM="
+  "org/lwjgl#lwjgl/3.3.3/natives-windows-x86": {
+   "jar": "sha256-IqIjOCYlVOteEzyEQd7u2shNoILrO6yE0DLaT682l0k="
  },
  "org/sonatype/oss#oss-parent/7": {
   "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
--- a/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/default.nix
+++ b/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/default.nix
@ -4,13 +4,13 @@

 callPackage ../generic.nix rec {
  pname = "shorter-pixel-dungeon";
-  version = "1.4.0";
+  version = "1.5.0";

  src = fetchFromGitHub {
    owner = "TrashboxBobylev";
    repo = "Shorter-Pixel-Dungeon";
    rev = "Short-${version}";
-    hash = "sha256-iG90T/Ho8/JY3HgkACiBnGdbUGsVRlfxXbcNFHhzZi4=";
+    hash = "sha256-y4DKSdq0LofKxlAi6RoaF8q+QD5KrTcmCmx9cpBxGgs=";
  };

  desktopName = "Shorter Pixel Dungeon";
--- a/pkgs/servers/home-assistant/custom-components/bodymiscale/default.nix
+++ b/pkgs/servers/home-assistant/custom-components/bodymiscale/default.nix
@ -0,0 +1,35 @@
+{
+  lib,
+  buildHomeAssistantComponent,
+  fetchFromGitHub,
+
+  cachetools,
+}:
+
+buildHomeAssistantComponent rec {
+  owner = "dckiller51";
+  domain = "bodymiscale";
+  version = "2024.6.0";
+
+  src = fetchFromGitHub {
+    inherit owner;
+    repo = domain;
+    rev = version;
+    hash = "sha256-6bYKqU9yucISjTrmCUx1bNn9kqvT9jW1OBrqAa4ayEQ=";
+  };
+
+  postPatch = ''
+    substituteInPlace custom_components/bodymiscale/manifest.json --replace-fail 'cachetools==5.3.0' 'cachetools>=5.3.0'
+  '';
+
+  propagatedBuildInputs = [
+    cachetools
+  ];
+
+  meta = {
+    description = "Home Assistant custom component providing body metrics for Xiaomi Mi Scale 1 and 2";
+    homepage = "https://github.com/dckiller51/bodymiscale";
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [ justinas ];
+  };
+}
--- a/pkgs/servers/home-assistant/custom-components/default.nix
+++ b/pkgs/servers/home-assistant/custom-components/default.nix
@ -14,6 +14,8 @@

  better_thermostat = callPackage ./better_thermostat {};

+  bodymiscale = callPackage ./bodymiscale { };
+
  dwd = callPackage ./dwd { };

  elevenlabs_tts = callPackage ./elevenlabs_tts {};
--- a/pkgs/servers/home-assistant/custom-components/solax_modbus/default.nix
+++ b/pkgs/servers/home-assistant/custom-components/solax_modbus/default.nix
@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
  owner = "wills106";
  domain = "solax_modbus";
-  version = "2024.09.4";
+  version = "2024.09.5";

  src = fetchFromGitHub {
    owner = "wills106";
    repo = "homeassistant-solax-modbus";
    rev = "refs/tags/${version}";
-    hash = "sha256-xWWsV57ozzEQWRfO1t4EbwD7DWiB1go+iJbTLPuufJs=";
+    hash = "sha256-mpsa+9LBnDfvMbOuEwctoPSg8IHRmkrFalVyg+1KR00=x";
  };

  dependencies = [ pymodbus ];
--- a/pkgs/tools/misc/neofetch/default.nix
+++ b/pkgs/tools/misc/neofetch/default.nix
@ -57,7 +57,7 @@ stdenvNoCC.mkDerivation rec {
    homepage = "https://github.com/dylanaraps/neofetch";
    license = licenses.mit;
    platforms = platforms.all;
-    maintainers = with maintainers; [ alibabzo konimex ];
+    maintainers = with maintainers; [ konimex ];
    mainProgram = "neofetch";
  };
 }
--- a/pkgs/tools/package-management/dnf5/default.nix
+++ b/pkgs/tools/package-management/dnf5/default.nix
@ -32,7 +32,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "dnf5";
-  version = "5.2.6.0";
+  version = "5.2.6.2";

  outputs = [
    "out"
@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "rpm-software-management";
    repo = "dnf5";
    rev = finalAttrs.version;
-    hash = "sha256-tzGpZ6Pip6SIak0L3npoh31TxVJJ0mn+jVkeNGq24N0=";
+    hash = "sha256-V/8vVKgQphWiCfdIlBMPHaJiOSIYUIEeYdt9Rm+8rCY=";
  };

  nativeBuildInputs =
--- a/pkgs/tools/text/proselint/default.nix
+++ b/pkgs/tools/text/proselint/default.nix
@ -18,6 +18,6 @@ buildPythonApplication rec {
    mainProgram = "proselint";
    homepage = "http://proselint.com";
    license = licenses.bsd3;
-    maintainers = with maintainers; [ alibabzo ];
+    maintainers = [ ];
  };
 }
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -4674,8 +4674,6 @@ with pkgs;

  dduper = callPackage ../tools/filesystems/dduper { };

-  deck = callPackage ../applications/networking/deck { };
-
  dedup = callPackage ../tools/backup/dedup { };

  deheader = callPackage ../development/tools/misc/deheader { };