Merge master into staging-next

2025-11-15 18:19:57 +00:00
parent a0befb49fa 839a7d6dc2
commit 3ab7eb53a9
118 changed files with 1092 additions and 892 deletions
@@ -42,7 +42,7 @@ The manpages must have a section suffix, and may optionally be compressed (with
 {
  nativeBuildInputs = [ installShellFiles ];

-  # Sometimes the manpage file has an undersirable name; e.g., it conflicts with
+  # Sometimes the manpage file has an undesirable name; e.g., it conflicts with
  # another software with an equal name. To install it with a different name,
  # the installed name must be provided before the path to the file.
  #
@@ -2088,12 +2088,6 @@
    githubId = 8049011;
    name = "Arik Grahl";
  };
-  aristid = {
-    email = "aristidb@gmail.com";
-    github = "aristidb";
-    githubId = 30712;
-    name = "Aristid Breitkreuz";
-  };
  ariutta = {
    email = "anders.riutta@gmail.com";
    github = "ariutta";
@@ -21,6 +21,7 @@ in
  config = mkIf cfg.enable {
    environment.systemPackages = [ cfg.package ];
    systemd.packages = [ cfg.package ];
+    systemd.user.services.orca.wantedBy = [ "graphical-session.target" ];
    services.speechd.enable = true;
  };
 }
@@ -226,7 +226,6 @@ in
            gnome-menus
            adwaita-icon-theme
            gtk3.out # for gtk-launch program
-            onboard
            sound-theme-freedesktop
            xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
          ])
@@ -10,7 +10,6 @@ in
  name = "containers-bridge";
  meta = {
    maintainers = with lib.maintainers; [
-      aristid
      aszlig
    ];
  };
@@ -3,7 +3,6 @@
  name = "containers-imperative";
  meta = {
    maintainers = with lib.maintainers; [
-      aristid
      aszlig
    ];
  };
@@ -17,7 +17,6 @@ in
  name = "containers-ipv4-ipv6";
  meta = {
    maintainers = with lib.maintainers; [
-      aristid
      aszlig
    ];
  };
@@ -10,7 +10,6 @@ in
  name = "containers-portforward";
  meta = {
    maintainers = with lib.maintainers; [
-      aristid
      aszlig
      ianwookim
    ];
@@ -6,7 +6,7 @@
  };

  nodes.machine =
-    { config, pkgs, ... }:
+    { pkgs, ... }:
    {
      imports = [ ./common/x11.nix ];

@@ -80,37 +80,17 @@

    machine.wait_for_x()

-    with subtest("starting shadps4 works"):
-        machine.succeed("shadps4 >&2 &")
-        machine.wait_for_text("Directory to install games")
-        machine.screenshot("0001-shadps4-dir-setup-prompt")
-
-        machine.send_chars("/root\n")
-        machine.wait_for_text("Game List")
-        # Make it fullscreen, so mouse coords are simpler & content isn't cut off
-        machine.send_key("alt-f10")
-        # Should now see the rest too
-        machine.wait_for_text("Play Time")
-        machine.screenshot("0002-shadps4-started")
-
    with subtest("running example works"):
        # Ensure that chosen openorbis logo colour isn't present already
        assert (
            check_for_color(openorbisColor)(True) == False
        ), "openorbisColor {} was present on the screen before we launched anything!".format(openorbisColor)

-        machine.succeed("xdotool mousemove 20 30 click 1") # click on "File"
-        machine.wait_for_text("Boot Game")
-        machine.send_key("down")
-        machine.send_key("ret")
-
-        # Pick the PNG sample (hello world runs too, but text-only output is currently broken)
-        machine.wait_for_text("Look in")
-        machine.send_chars("/etc/openorbis-sample-packages/OpenOrbis-PNG-Sample/uroot/eboot.bin\n")
+        machine.succeed("shadps4 /etc/openorbis-sample-packages/OpenOrbis-PNG-Sample/uroot/eboot.bin >&2 &")

        # Look for logo
        with machine.nested("Waiting for the screen to have openorbisColor {} on it:".format(openorbisColor)):
            retry(check_for_color(openorbisColor))
-        machine.screenshot("0003-shadps4-sample-running")
+        machine.screenshot("0001-shadps4-sample-running")
  '';
 }
@@ -210,9 +210,6 @@ let
                  output = json.loads(client.succeed(f"bw --nointeraction --raw --session {key} list items"))

                  assert output[0]['login']['password'] == "${storedPassword}"
-
-              with subtest("Check systemd unit hardening"):
-                  server.log(server.succeed("systemd-analyze security vaultwarden.service | grep -v ✓"))
            '';
      }
    );
@@ -239,7 +236,6 @@ builtins.mapAttrs (k: v: makeVaultwardenTest k v) {
      with subtest("Check that backup exists"):
          server.succeed('[ -d "/srv/backups/vaultwarden" ]')
          server.succeed('[ -f "/srv/backups/vaultwarden/db.sqlite3" ]')
-          server.succeed('[ -d "/srv/backups/vaultwarden/attachments" ]')
          server.succeed('[ -f "/srv/backups/vaultwarden/rsa_key.pem" ]')
          # Ensure only the db backed up with the backup command exists and not the other db files.
          server.succeed('[ ! -f "/srv/backups/vaultwarden/db.sqlite3-shm" ]')
@@ -23,16 +23,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "librespot";
-  version = "0.7.1";
+  version = "0.8.0";

  src = fetchFromGitHub {
    owner = "librespot-org";
    repo = "librespot";
    rev = "v${version}";
-    hash = "sha256-gBMzvQxmy+GYzrOKWmbhl56j49BK8W8NYO2RrvS4mWI=";
+    hash = "sha256-twWndV6z5Cdivz7pfAJzdlIjddEiZPEFnTzipMczmJo=";
  };

-  cargoHash = "sha256-PiGIxMIA/RL+YkpG1f46zyAO5anx9Ii+anKrANCM+rk=";
+  cargoHash = "sha256-Kf3w6tD/MQaXXegtiCkFbUcYwr4OMw6ipLxNLxJ2NTQ=";

  nativeBuildInputs = [
    pkg-config
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
  mktplcRef = {
    name = "claude-dev";
    publisher = "saoudrizwan";
-    version = "3.36.1";
-    hash = "sha256-8pkX3KYwLr/jIHtWVmt+cx8CionKGjgSz6yFApSHR3g=";
+    version = "3.37.1";
+    hash = "sha256-wS893/I6uc6aUy2chPYCTdG7PzLl5tqx8dhMDasmtYA=";
  };

  meta = {
@@ -1,73 +0,0 @@
-{
-  lib,
-  stdenv,
-  cmake,
-  extra-cmake-modules,
-  plasma-framework,
-  kwindowsystem,
-  redshift,
-  fetchFromGitHub,
-  fetchpatch,
-}:
-
-let
-  version = "1.0.18";
-in
-
-stdenv.mkDerivation {
-  pname = "redshift-plasma-applet";
-  inherit version;
-
-  src = fetchFromGitHub {
-    owner = "kotelnik";
-    repo = "plasma-applet-redshift-control";
-    rev = "v${version}";
-    sha256 = "122nnbafa596rxdxlfshxk45lzch8c9342bzj7kzrsjkjg0xr9pq";
-  };
-
-  patches = [
-    # This patch fetches from out-of-source repo because the GitHub copy is frozen,
-    #     the active fork is now on invent.kde.org. Remove this patch when a new version is released and src is updated
-    # Redshift version >= 1.12 requires the -P option to clear the existing effects before applying shading.
-    #     Without it scrolling makes the screen gets darker and darker until it is impossible to see anything.
-    (fetchpatch {
-      url = "https://invent.kde.org/plasma/plasma-redshift-control/-/commit/898c3a4cfc6c317915f1e664078d8606497c4049.patch";
-      sha256 = "0b6pa3fcj698mgqnc85jbbmcl3qpf418mh06qgsd3c4v237my0nv";
-    })
-  ];
-
-  patchPhase = ''
-    substituteInPlace package/contents/ui/main.qml \
-      --replace "redshiftCommand: 'redshift'" \
-                "redshiftCommand: '${redshift}/bin/redshift'" \
-      --replace "redshiftOneTimeCommand: 'redshift -O " \
-                "redshiftOneTimeCommand: '${redshift}/bin/redshift -O "
-
-    substituteInPlace package/contents/ui/config/ConfigAdvanced.qml \
-      --replace "'redshift -V'" \
-                "'${redshift}/bin/redshift -V'"
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  buildInputs = [
-    plasma-framework
-    kwindowsystem
-  ];
-
-  dontWrapQtApps = true;
-
-  meta = with lib; {
-    description = "KDE Plasma 5 widget for controlling Redshift";
-    homepage = "https://github.com/kotelnik/plasma-applet-redshift-control";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [
-      benley
-      zraexy
-    ];
-  };
-}
@@ -86,8 +86,8 @@ rec {
  thunderbird = thunderbird-latest;

  thunderbird-latest = common {
-    version = "144.0.1";
-    sha512 = "e1859ecd247260c9303a335d14f51d2b80bca7fe0125c41cf6f6bdf1331072dcef490d75fba588b37db5410ce2e7084bbe1c8f568d40c46303891ae2bfbe431c";
+    version = "145.0";
+    sha512 = "f33835e4d740b32d072ac915124d988ef9d4cbe55d7c972c817991d19b64e8bc95b75b503ad3cb9abf4fd1d220fc7cb61720ea84dc49482faa13da1690d7d80e";

    updateScript = callPackage ./update.nix {
      attrPath = "thunderbirdPackages.thunderbird-latest";
@@ -9,23 +9,23 @@

 buildGoModule (finalAttrs: {
  pname = "adguardhome";
-  version = "0.107.65";
+  version = "0.107.69";
  src = fetchFromGitHub {
    owner = "AdguardTeam";
    repo = "AdGuardHome";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-OOW77CJRR5vi5jHFOCyF/OyCXaQdTgEc8xZKPcF9vQE=";
+    hash = "sha256-eUMssp4rYmkreYdaSDlYP0bQsZgsrrN9e65UF7NseN8=";
  };

-  vendorHash = "sha256-spBMVSZhiM0R5tf8dhZD+N4ucFZ9Wno9Y+BhZMdzQRM=";
+  vendorHash = "sha256-qee3ifDDR1U23VZAu0gj1CPPaDrSQfwfrKte1OUZPlE=";

  dashboard = buildNpmPackage {
-    inherit (finalAttrs) src;
-    name = "dashboard";
+    inherit (finalAttrs) src version;
+    pname = "adguardhome-dashboard";
    postPatch = ''
      cd client
    '';
-    npmDepsHash = "sha256-s7TJvGyk05HkAOgjYmozvIQ3l2zYUhWrGRJrWdp9ZJQ=";
+    npmDepsHash = "sha256-AYm4ZgTsPJ6aNL7fo9DJqC0yq9i1mJghO7zWWC1X9eA=";
    npmBuildScript = "build-prod";
    postBuild = ''
      mkdir -p $out/build/
@@ -45,7 +45,7 @@ buildGoModule (finalAttrs: {

  passthru = {
    updateScript = ./update.sh;
-    schema_version = 30;
+    schema_version = 31;
    tests.adguardhome = nixosTests.adguardhome;
    tests.version = testers.testVersion {
      package = finalAttrs.finalPackage;
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
    owner = "ValHaris";
    repo = "asc-hq";
    rev = "fa3bca082a5cea2b35812349f99b877f0113aef0";
-    sha256 = "atamYCN2mOqxV6auToTeWdpKuFfC+GLfLdRsfT0ouwQ=";
+    hash = "sha256-atamYCN2mOqxV6auToTeWdpKuFfC+GLfLdRsfT0ouwQ=";
  };

  nativeBuildInputs = [ pkg-config ];
@@ -67,7 +67,7 @@ stdenv.mkDerivation {
    libsigcxx
  ];

-  meta = with lib; {
+  meta = {
    description = "Turn based strategy game";

    longDescription = ''
@@ -78,9 +78,9 @@ stdenv.mkDerivation {

    homepage = "https://www.asc-hq.org/";

-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;

-    maintainers = with maintainers; [ raskin ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ raskin ];
+    platforms = lib.platforms.linux;
  };
 }
@@ -21,6 +21,9 @@
  # useful, but have to disable tests for now, as /dev/tpmrm0 is not accessible
  withTpm2 ? false,
  policy ? null,
+  # create additional "selftests" output and put botan-test binary together with
+  # test vectors there. Useful to perform initial botan self-tests before using it
+  exposeSelftests ? false,
 }@args:

 assert lib.assertOneOf "policy" policy [
@@ -65,6 +68,9 @@ stdenv.mkDerivation (finalAttrs: {
    "dev"
    "doc"
    "man"
+  ]
+  ++ lib.optionals exposeSelftests [
+    "selftests"
  ];

  src = fetchurl {
@@ -102,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: {
  buildTargets = [
    "cli"
  ]
-  ++ lib.optionals finalAttrs.finalPackage.doCheck [ "tests" ]
+  ++ lib.optionals (finalAttrs.finalPackage.doCheck || exposeSelftests) [ "tests" ]
  ++ lib.optionals static [ "static" ]
  ++ lib.optionals (!static) [ "shared" ];

@@ -156,10 +162,21 @@ stdenv.mkDerivation (finalAttrs: {
    fi
  '';

-  postInstall = ''
-    cd "$out"/lib/pkgconfig
-    ln -s botan-*.pc botan.pc || true
-  '';
+  postInstall =
+    lib.optionalString exposeSelftests ''
+      mkdir -p $selftests/bin
+      install -Dpm755 -D botan-test $selftests/bin/botan-test
+
+      # don't copy leading source folder structure
+      pushd src/tests/data &> /dev/null
+      find . -type d -exec install -d $selftests/test-data/{} \;
+      find . -type f -exec install -Dpm644 {} $selftests/test-data/{} \;
+      popd &> /dev/null
+    ''
+    + ''
+      cd "$out"/lib/pkgconfig
+      ln -s botan-*.pc botan.pc || true
+    '';

  doCheck = true;

@@ -19,19 +19,19 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "bustle";
-  version = "0.12.0";
+  version = "0.13.0";

  src = fetchFromGitLab {
    domain = "gitlab.gnome.org";
    owner = "World";
    repo = "bustle";
    tag = finalAttrs.version;
-    hash = "sha256-gzPFODVLvv+Ore1XR+XTi2fjVh3OJOZF0k9vilVnst4=";
+    hash = "sha256-+Pl4ze1nrC27NIfJ4FNc3iqYWBtCBpHp2zZNAxAPbJk=";
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit (finalAttrs) pname version src;
-    hash = "sha256-DYkicVDjQRIMfKl0f9aLWIyQfR153I43EpSuskenmoA=";
+    hash = "sha256-el1zVFE8hsmIisHO+btvnA0WVN9bN8iuVPaSF02ovCI=";
  };

  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
@@ -4,7 +4,7 @@
  fetchgit,
  cmake,
  pkg-config,
-  ffmpeg,
+  ffmpeg_7,
  libopus,
  SDL2,
  libevdev,
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
  '';

  buildInputs = [
-    ffmpeg
+    ffmpeg_7 # needs avcodec_close which was removed in ffmpeg 8
    libopus
    libsForQt5.qtbase
    libsForQt5.qtmultimedia
@@ -7,13 +7,13 @@
 }:
 llvmPackages.stdenv.mkDerivation rec {
  pname = "enzyme";
-  version = "0.0.208";
+  version = "0.0.215";

  src = fetchFromGitHub {
    owner = "EnzymeAD";
    repo = "Enzyme";
    rev = "v${version}";
-    hash = "sha256-/WNiGeKoEvKYlXIK4cU6z5gFGujQbAE13qyvnhMniXc=";
+    hash = "sha256-XK3d47Q/6+sJ2RL+on483z9PvZrdaKxIT9/GUQuLPl8=";
  };

  postPatch = ''
@@ -8,7 +8,7 @@

 buildNpmPackage (finalAttrs: {
  pname = "ergogen";
-  version = "4.1.0";
+  version = "4.2.1";

  forceGitDeps = true;

@@ -16,10 +16,10 @@ buildNpmPackage (finalAttrs: {
    owner = "ergogen";
    repo = "ergogen";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Y4Ri5nLxbQ78LvyGARPxsvoZ9gSMxY14QuxZJg6Cu3Y=";
+    hash = "sha256-pddohqq08w/PpU3ZF3tCGSjUMLKnhCn/Db6WLKytjo0=";
  };

-  npmDepsHash = "sha256-BQbf/2lWLYnrSjwWjDo6QceFyR+J/vhDcVgCaytGfl0=";
+  npmDepsHash = "sha256-gSF4L4QiScW3ZaAm8QFCBGhbw7NhFe4gHWitN/OuQi4=";

  makeCacheWritable = true;
  dontNpmBuild = true;
@@ -8,18 +8,18 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "gdscript-formatter";
-  version = "0.14.0";
+  version = "0.17.0";

  src = fetchFromGitHub {
    owner = "GDQuest";
    repo = "GDScript-formatter";
    tag = finalAttrs.version;
-    hash = "sha256-cY6Ow1f8o40M9/knneAod8ABj7ObQAkzs3yODMpkCxQ=";
+    hash = "sha256-pxJGn2MXJN+NIhDTbJBRDT+0nynuELYLk3kPzGb4Ia0=";
    # Needed due to .gitattributes being used for the Godot addon and export-ignoring all files
    deepClone = true;
  };

-  cargoHash = "sha256-U3M1xuSybP9WVHNMYaY6QrBZ//cAGCIOIo2dY0jpJzc=";
+  cargoHash = "sha256-F0L6/9HU9zkFSFHGpgX8UDRTJm/yVKuv4GakgjFuG6Y=";

  cargoBuildFlags = [
    "--bin=gdscript-formatter"
@@ -3,7 +3,7 @@
  stdenv,
  fetchFromGitHub,
  installShellFiles,
-  python312,
+  python3,

  # Override Python packages using
  # self: super: { pkg = super.pkg.overridePythonAttrs (oldAttrs: { ... }); }
@@ -13,21 +13,11 @@
 let
  defaultOverrides = [
    (self: super: {
-      av = (
-        super.av.overridePythonAttrs rec {
-          version = "13.1.0";
-          src = fetchFromGitHub {
-            owner = "PyAV-Org";
-            repo = "PyAV";
-            tag = "v${version}";
-            hash = "sha256-x2a9SC4uRplC6p0cD7fZcepFpRidbr6JJEEOaGSWl60=";
-          };
-        }
-      );
+      av = self.av_13;
    })
  ];

-  python = python312.override {
+  python = python3.override {
    self = python;
    packageOverrides = lib.composeManyExtensions (defaultOverrides ++ [ packageOverrides ]);
  };
@@ -36,6 +36,10 @@ stdenv.mkDerivation (finalAttrs: {
  postPatch = ''
    substituteInPlace src/libgpaste/gpaste/gpaste-settings.c \
      --subst-var-by gschemasCompiled ${glib.makeSchemaPath (placeholder "out") "${finalAttrs.pname}-${finalAttrs.version}"}
+
+    substituteInPlace src/gnome-shell/metadata.json.in --replace-fail \
+      '"shell-version": [ "45", "46", "47", "48" ],' \
+      '"shell-version": [ "45", "46", "47", "48", "49" ],'
  '';

  nativeBuildInputs = [
@@ -59,9 +63,9 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  mesonFlags = [
-    "-Dcontrol-center-keybindings-dir=${placeholder "out"}/share/gnome-control-center/keybindings"
-    "-Ddbus-services-dir=${placeholder "out"}/share/dbus-1/services"
-    "-Dsystemd-user-unit-dir=${placeholder "out"}/etc/systemd/user"
+    (lib.mesonOption "control-center-keybindings-dir" "${placeholder "out"}/share/gnome-control-center/keybindings")
+    (lib.mesonOption "dbus-services-dir" "${placeholder "out"}/share/dbus-1/services")
+    (lib.mesonOption "systemd-user-unit-dir" "${placeholder "out"}/etc/systemd/user")
  ];

  postInstall = ''
@@ -78,13 +82,13 @@ stdenv.mkDerivation (finalAttrs: {
      --subst-var-by typelibDir "${placeholder "out"}/lib/girepository-1.0"
  '';

-  meta = with lib; {
+  meta = {
    homepage = "https://github.com/Keruspe/GPaste";
    changelog = "https://github.com/Keruspe/GPaste/blob/v${finalAttrs.version}/NEWS";
    description = "Clipboard management system with GNOME integration";
    mainProgram = "gpaste-client";
-    license = licenses.bsd2;
-    platforms = platforms.linux;
-    teams = [ teams.gnome ];
+    license = lib.licenses.bsd2;
+    platforms = lib.platforms.linux;
+    teams = [ lib.teams.gnome ];
  };
 })
@@ -1,5 +1,5 @@
 import GIRepository from 'gi://GIRepository';

-GIRepository.Repository.prepend_search_path('@typelibDir@');
+GIRepository.Repository.dup_default().prepend_search_path('@typelibDir@');

 export default (await import('./.@originalName@-wrapped.js')).default;
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
    '';
    license = licenses.gpl2Plus;
    platforms = platforms.unix;
-    maintainers = with maintainers; [ aristid ];
+    maintainers = [ ];
    mainProgram = "ideviceinstaller";
  };
 }
@@ -109,7 +109,6 @@ stdenv.mkDerivation (finalAttrs: {
    changelog = "https://github.com/ispc/ispc/releases/tag/${finalAttrs.version}";
    license = lib.licenses.bsd3;
    maintainers = with lib.maintainers; [
-      aristid
      thoughtpolice
      athas
      alexfmpe
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
    description = "Optimize JPEG files";
    homepage = "https://www.kokkonen.net/tjko/projects.html";
    license = licenses.gpl3Plus;
-    maintainers = [ maintainers.aristid ];
+    maintainers = [ ];
    platforms = platforms.all;
    mainProgram = "jpegoptim";
  };
@@ -21,6 +21,11 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-hfdeztEyHvuOnLS71oSv8sPqFe2UCX5KlANqrT/Gfx8=";
  };

+  postPatch = ''
+    substituteInPlace CMakeLists.txt ext/bifrost/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
  nativeBuildInputs = [
    autoconf
    cmake
@@ -8,13 +8,13 @@

 buildGoModule rec {
  pname = "lazydocker";
-  version = "0.24.1";
+  version = "0.24.2";

  src = fetchFromGitHub {
    owner = "jesseduffield";
    repo = "lazydocker";
    rev = "v${version}";
-    sha256 = "sha256-cVjDdrxmGt+hj/WWP9B3BT739k9SSr4ryye5qWb3XNM=";
+    sha256 = "sha256-Dw7FBJ78b835iVkV8OrA06CAZ/GRCEXlLg/RfHZXfF0=";
  };

  vendorHash = null;
@@ -1,31 +1,33 @@
 {
  lib,
-  stdenv,
+  gcc15Stdenv,
  fetchFromGitHub,
  gtk3,
  jansson,
  luajit,
+  meson,
+  ninja,
  pkg-config,
  unstableGitUpdater,
  wrapGAppsHook3,
-  xxd,
 }:

-stdenv.mkDerivation {
+gcc15Stdenv.mkDerivation {
  pname = "libresplit";
-  version = "0-unstable-2025-10-15";
+  version = "0-unstable-2025-11-11";

  src = fetchFromGitHub {
-    owner = "wins1ey";
+    owner = "LibreSplit";
    repo = "LibreSplit";
-    rev = "7628922ba2c6b6a9e6d6d144b55d20479d7ceeb3";
-    hash = "sha256-3UXDHmcW6lxXGno5ijG6OlQ58F1z/J2O8S1y2O+7+p4=";
+    rev = "1a149e2d6d02c456e787bffc07b3c7ca67d7bd44";
+    hash = "sha256-EEYocgSKgQsGxJfyRYsfTGFmR8+TWPOLfOKjv6uXKuU=";
  };

  nativeBuildInputs = [
+    meson
+    ninja
    pkg-config
    wrapGAppsHook3
-    xxd
  ];

  buildInputs = [
@@ -34,12 +36,10 @@ stdenv.mkDerivation {
    luajit
  ];

-  makeFlags = [ "PREFIX=$(out)" ];
-
  passthru.updateScript = unstableGitUpdater { };

  meta = {
-    homepage = "https://github.com/wins1ey/LibreSplit";
+    homepage = "https://github.com/LibreSplitDev/LibreSplit";
    description = "Speedrun timer with auto splitting and load removal for Linux";
    license = lib.licenses.gpl3Plus;
    maintainers = with lib.maintainers; [ fgaz ];
@@ -16,124 +16,117 @@
  withJava ? true,
  jre_headless,
 }:
-
-let
-  version = "1.18.2";
-  # Using two URLs as the first one will break as soon as a new version is released
-  src_bin = fetchurl {
-    urls = [
-      "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz"
-      "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz"
-    ];
-    hash = "sha256-v8THzrwPAEl2cf/Vbmo08HcKnmr37/LwEn76FD8oY24=";
-  };
-  src_oss = fetchurl {
-    urls = [
-      "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz"
-      "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz"
-    ];
-    hash = "sha256-uUl/VVXCV/XTx/GLarA8dM/z6kQ36ANJ1hjRFb9fpEU=";
-  };
-in
-stdenv.mkDerivation {
-  pname = "makemkv";
-  inherit version;
-
-  srcs = [
-    src_bin
-    src_oss
-  ];
-
-  sourceRoot = "makemkv-oss-${version}";
-
-  patches = [ ./r13y.patch ];
-
-  enableParallelBuilding = true;
-
-  nativeBuildInputs = [
-    autoPatchelfHook
-    pkg-config
-    qt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    ffmpeg
-    openssl
-    qt5.qtbase
-    zlib
-  ];
-
-  runtimeDependencies = [ (lib.getLib curl) ];
-
-  qtWrapperArgs =
-    let
-      binPath = lib.makeBinPath [ jre_headless ];
-    in
-    lib.optionals withJava [ "--prefix PATH : ${binPath}" ];
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm555 -t $out/bin                              out/makemkv out/mmccextr out/mmgplsrv ../makemkv-bin-${version}/bin/amd64/makemkvcon
-    install -D     -t $out/lib                              out/lib{driveio,makemkv,mmbd}.so.*
-    install -D     -t $out/share/MakeMKV                    ../makemkv-bin-${version}/src/share/*
-    install -Dm444 -t $out/share/applications               ../makemkv-oss-${version}/makemkvgui/share/makemkv.desktop
-    install -Dm444 -t $out/share/icons/hicolor/16x16/apps   ../makemkv-oss-${version}/makemkvgui/share/icons/16x16/*
-    install -Dm444 -t $out/share/icons/hicolor/32x32/apps   ../makemkv-oss-${version}/makemkvgui/share/icons/32x32/*
-    install -Dm444 -t $out/share/icons/hicolor/64x64/apps   ../makemkv-oss-${version}/makemkvgui/share/icons/64x64/*
-    install -Dm444 -t $out/share/icons/hicolor/128x128/apps ../makemkv-oss-${version}/makemkvgui/share/icons/128x128/*
-    install -Dm444 -t $out/share/icons/hicolor/256x256/apps ../makemkv-oss-${version}/makemkvgui/share/icons/256x256/*
-
-    runHook postInstall
-  '';
-
-  passthru = {
-    srcs = {
-      inherit src_bin src_oss;
-    };
-    updateScript = lib.getExe (writeShellApplication {
-      name = "update-makemkv";
-      runtimeInputs = [
-        common-updater-scripts
-        curl
-        rubyPackages.nokogiri
+stdenv.mkDerivation (
+  finalAttrs:
+  let
+    inherit (finalAttrs) version;
+    # Using two URLs as the first one will break as soon as a new version is released
+    srcs.bin = fetchurl {
+      urls = [
+        "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz"
+        "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz"
      ];
-      text = ''
-        get_version() {
-          # shellcheck disable=SC2016
-          curl --fail --silent 'https://forum.makemkv.com/forum/viewtopic.php?f=3&t=224' \
-            | nokogiri -e 'puts $_.css("head title").first.text.match(/\bMakeMKV (\d+\.\d+\.\d+) /)[1]'
-        }
-        oldVersion=${lib.escapeShellArg version}
-        newVersion=$(get_version)
-        if [[ $oldVersion == "$newVersion" ]]; then
-          echo "$0: New version same as old version, nothing to do." >&2
-          exit
-        fi
-        update-source-version makemkv "$newVersion" --source-key=passthru.srcs.src_bin
-        update-source-version makemkv "$newVersion" --source-key=passthru.srcs.src_oss --ignore-same-version
-      '';
-    });
-  };
+      hash = "sha256-v8THzrwPAEl2cf/Vbmo08HcKnmr37/LwEn76FD8oY24=";
+    };
+    srcs.oss = fetchurl {
+      urls = [
+        "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz"
+        "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz"
+      ];
+      hash = "sha256-uUl/VVXCV/XTx/GLarA8dM/z6kQ36ANJ1hjRFb9fpEU=";
+    };
+  in
+  {
+    pname = "makemkv";
+    version = "1.18.2";

-  meta = with lib; {
-    description = "Convert blu-ray and dvd to mkv";
-    longDescription = ''
-      makemkv is a one-click QT application that transcodes an encrypted
-      blu-ray or DVD disc into a more portable set of mkv files, preserving
-      subtitles, chapter marks, all video and audio tracks.
+    srcs = lib.attrValues finalAttrs.passthru.srcs;
+    sourceRoot = "makemkv-oss-${version}";
+    patches = [ ./r13y.patch ];

-      Program is time-limited -- it will stop functioning after 60 days. You
-      can always download the latest version from makemkv.com that will reset the
-      expiration date.
-    '';
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = [
-      licenses.unfree
-      licenses.lgpl21
+    enableParallelBuilding = true;
+    nativeBuildInputs = [
+      autoPatchelfHook
+      pkg-config
+      qt5.wrapQtAppsHook
    ];
-    homepage = "https://makemkv.com";
-    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ jchw ];
-  };
-}
+    buildInputs = [
+      ffmpeg
+      openssl
+      qt5.qtbase
+      zlib
+    ];
+    runtimeDependencies = [ (lib.getLib curl) ];
+
+    qtWrapperArgs =
+      let
+        binPath = lib.makeBinPath [ jre_headless ];
+      in
+      lib.optionals withJava [ "--prefix PATH : ${binPath}" ];
+
+    installPhase = ''
+      runHook preInstall
+
+      install -Dm555 -t "$out"/bin                              out/{makemkv,mmccextr,mmgplsrv} \
+                                                                ../makemkv-bin-"$version"/bin/amd64/makemkvcon
+      install -D     -t "$out"/lib                              out/lib{driveio,makemkv,mmbd}.so.*
+      install -D     -t "$out"/share/MakeMKV                    ../makemkv-bin-"$version"/src/share/*
+      install -Dm444 -t "$out"/share/applications               ../makemkv-oss-"$version"/makemkvgui/share/makemkv.desktop
+      install -Dm444 -t "$out"/share/icons/hicolor/16x16/apps   ../makemkv-oss-"$version"/makemkvgui/share/icons/16x16/*
+      install -Dm444 -t "$out"/share/icons/hicolor/32x32/apps   ../makemkv-oss-"$version"/makemkvgui/share/icons/32x32/*
+      install -Dm444 -t "$out"/share/icons/hicolor/64x64/apps   ../makemkv-oss-"$version"/makemkvgui/share/icons/64x64/*
+      install -Dm444 -t "$out"/share/icons/hicolor/128x128/apps ../makemkv-oss-"$version"/makemkvgui/share/icons/128x128/*
+      install -Dm444 -t "$out"/share/icons/hicolor/256x256/apps ../makemkv-oss-"$version"/makemkvgui/share/icons/256x256/*
+
+      runHook postInstall
+    '';
+
+    passthru = {
+      inherit srcs;
+      updateScript = lib.getExe (writeShellApplication {
+        name = "update-makemkv";
+        runtimeInputs = [
+          common-updater-scripts
+          curl
+          rubyPackages.nokogiri
+        ];
+        runtimeEnv.oldVersion = version;
+        text = ''
+          get_version() {
+            # shellcheck disable=SC2016
+            curl --fail --silent 'https://forum.makemkv.com/forum/viewtopic.php?f=3&t=224' \
+              | nokogiri -e 'puts $_.css("head title").first.text.match(/\bMakeMKV (\d+\.\d+\.\d+) /)[1]'
+          }
+          newVersion=$(get_version)
+          if [ "$oldVersion" == "$newVersion" ]; then
+            echo "$0: New version same as old version, nothing to do." >&2
+            exit
+          fi
+          update-source-version makemkv "$newVersion" --source-key=passthru.srcs.bin
+          update-source-version makemkv "$newVersion" --source-key=passthru.srcs.oss --ignore-same-version
+        '';
+      });
+    };
+
+    meta = with lib; {
+      description = "Convert blu-ray and dvd to mkv";
+      longDescription = ''
+        makemkv is a one-click QT application that transcodes an encrypted
+        blu-ray or DVD disc into a more portable set of mkv files, preserving
+        subtitles, chapter marks, all video and audio tracks.
+
+        Program is time-limited -- it will stop functioning after 60 days. You
+        can always download the latest version from makemkv.com that will reset the
+        expiration date.
+      '';
+      sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+      license = [
+        licenses.unfree
+        licenses.lgpl21
+      ];
+      homepage = "https://makemkv.com";
+      platforms = [ "x86_64-linux" ];
+      maintainers = with maintainers; [ jchw ];
+    };
+  }
+)
@@ -0,0 +1,14 @@
+{
+  python3Packages,
+}:
+
+let
+  pythonPackages = python3Packages.overrideScope (
+    self: super: {
+      av = self.av_13;
+    }
+  );
+in
+(pythonPackages.toPythonApplication pythonPackages.manim-slides).overridePythonAttrs (oldAttrs: {
+  dependencies = oldAttrs.dependencies ++ oldAttrs.optional-dependencies.pyqt6-full;
+})
@@ -0,0 +1,12 @@
+{
+  python3Packages,
+}:
+
+let
+  pythonPackages = python3Packages.overrideScope (
+    self: super: {
+      av = self.av_13;
+    }
+  );
+in
+pythonPackages.toPythonApplication pythonPackages.manim
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
    '';
    homepage = "https://github.com/mozilla/mozjpeg";
    license = lib.licenses.bsd3;
-    maintainers = [ lib.maintainers.aristid ];
+    maintainers = [ ];
    platforms = lib.platforms.all;
  };
 }
@@ -13,13 +13,13 @@ let
 in
 buildGoModule (finalAttrs: {
  pname = "nvidia-container-toolkit";
-  version = "1.17.9";
+  version = "1.18.0";

  src = fetchFromGitHub {
    owner = "NVIDIA";
    repo = "nvidia-container-toolkit";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-kcE4yDoj+CFbMy0N5v8ImxjZMJ/o5/LaAVVV1M7qGiw=";
+    hash = "sha256-VQcuN+LU7iljpSWrmLBHX67esEQN1HYNPj5cLxUB7dI=";

  };

@@ -41,9 +41,6 @@ buildGoModule (finalAttrs: {
      --replace-fail '/usr/bin/nvidia-container-runtime-hook' "$tools/bin/nvidia-container-runtime-hook" \
      --replace-fail '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig'

-    substituteInPlace tools/container/toolkit/toolkit.go \
-      --replace-fail '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig'
-
    substituteInPlace cmd/nvidia-cdi-hook/update-ldcache/update-ldcache.go \
      --replace-fail '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig'
  '';
@@ -104,6 +104,7 @@ python3.pkgs.buildPythonApplication rec {

  preFixup = ''
    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+    substituteInPlace $out/lib/systemd/user/orca.service --replace-fail ExecStart=orca ExecStart=$out/bin/orca
  '';

  passthru = {
@@ -8,8 +8,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "pdfium-binaries";
-  # also update rev of headers in python3Packages.pypdfium2
-  version = "7087";
+  version = "7363";

  src =
    let
@@ -28,17 +27,17 @@ stdenv.mkDerivation (finalAttrs: {
      hash =
        if withV8 then
          selectSystem {
-            x86_64-linux = "sha256-nKHXcBTEp165g18HLzaNGfKt8MtTYpKBGNgwIpSO0u4=";
-            aarch64-linux = "sha256-wip/ry42aDbyGiwYSUX8koxDuf88BLGZAmMZE0s+fL0=";
-            x86_64-darwin = "sha256-7pUMfNFgGqQ8Dnox57sHfrKKke+i8CGEma4tePJaTDA=";
-            aarch64-darwin = "sha256-o59kmTNC4nSCFLfww3E+4iIYs2kQ30yyFaX9f2Za7os=";
+            x86_64-linux = "sha256-KbAJUdbT3XjLs68y4xwEG5w8o/89epkXSCKpQsyuNec=";
+            aarch64-linux = "sha256-zvaTKszH5yT1afzs0W3LV1caN6gaCIJiKIh9bElfI48=";
+            x86_64-darwin = "sha256-xGnmndTkYSIGn44Y4cfYW36QmkVAOhgIlcsWaRYFbCk=";
+            aarch64-darwin = "sha256-NYY/YIVtSux4B6UZb7kkZs+GzxXNopmvtknw/HhVEQs=";
          }
        else
          selectSystem {
-            x86_64-linux = "sha256-zn7QlTvChQa2mQCe5K+zEGVUtuD+l/jEtlKticrrSKg=";
-            aarch64-linux = "sha256-080X72NNfKaanHeVtmxE/4uNV6Ue4f/1Mri/p3nOT8c=";
-            x86_64-darwin = "sha256-XMStU0MN9ieCrLQnQL4/jKrNWxgQl9OtZHg9EmemPhU=";
-            aarch64-darwin = "sha256-Q8R/p1hX6+JeVTFc6w7MC9GPNGqxlu6m+iawRIMndic=";
+            x86_64-linux = "sha256-mlSmVeE1oDQ1OlW8K7EXk51r7GCbDXH2l/tbat2aiB0=";
+            aarch64-linux = "sha256-YiCMdwQ2Y0F120iKW3ZkxJKvDgP/vpPw1ItmRnsnz9U=";
+            x86_64-darwin = "sha256-I2fWQC+GKzZwqTPwXkl9vDJ/HIH3GKzD+kNaUDcNKuw=";
+            aarch64-darwin = "sha256-AhYAr5SySWJO3jbvs+DvEZ/WaCJ+KhxpFVyOVsJxuXE=";
          };
      stripRoot = false;
    };
@@ -20,14 +20,14 @@

 let
  pname = "pgadmin";
-  version = "9.9";
-  yarnHash = "sha256-QInOfpgQgx4i/gTyWG40Sl7Me5ynC/nOfjik82ltwLM=";
+  version = "9.10";
+  yarnHash = "sha256-1xbQedxNDQaEiAT9GPNzz17cVD0v4CoxEn0SugJHaz0=";

  src = fetchFromGitHub {
    owner = "pgadmin-org";
    repo = "pgadmin4";
    rev = "REL-${lib.versions.major version}_${lib.versions.minor version}";
-    hash = "sha256-XzjotJt02mZ0Se/bZMqAl8KL6egIVqqkbiEdcRuHcuE=";
+    hash = "sha256-AUkxv7rmlb+KYhLe4vj9OvZkmBnN+TL+b/0Xf1+Wyy4=";
  };

  # keep the scope, as it is used throughout the derivation and tests
@@ -7,13 +7,13 @@

 buildGoModule rec {
  pname = "postfix-tlspol";
-  version = "1.8.20";
+  version = "1.8.21";

  src = fetchFromGitHub {
    owner = "Zuplu";
    repo = "postfix-tlspol";
    tag = "v${version}";
-    hash = "sha256-/+FWTrb39PB1L6UDXAr3w0c0bMrpptX23g8WHI794GA=";
+    hash = "sha256-EBgP2gwq3pei2TBNuinyY2PgLKaV6PBmk3aCkecGvk4=";
  };

  vendorHash = null;
@@ -50,16 +50,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "rio";
-  version = "0.2.30";
+  version = "0.2.35";

  src = fetchFromGitHub {
    owner = "raphamorim";
    repo = "rio";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-YkZq9mPQTeYtDuvGrEzV7PlDQZHUED/JuSLvsFWxYI0=";
+    hash = "sha256-KQC8I/XBZ7uBEug5QNxmNbPom0MY10fprO4iCxgLtps=";
  };

-  cargoHash = "sha256-Rr6FiievKElzWhLEXOQZdcJ4KKlfvW9p8k7r7wIm0MQ=";
+  cargoHash = "sha256-Xq387L6V7BlL7jad1liH7qEhD4T5t8N+POTCG1oZ9xU=";

  nativeBuildInputs = [
    rustPlatform.bindgenHook
@@ -37,9 +37,9 @@
  },
  {
    "pname": "Microsoft.Build",
-    "version": "17.3.4",
-    "hash": "sha256-LHtjk4vxeVSLzAKAcG8BN+S20d2sUR2DAOsSXLNIy5U=",
-    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build/17.3.4/microsoft.build.17.3.4.nupkg"
+    "version": "17.11.31",
+    "hash": "sha256-NBn5hn85Q9dG1q09joq0pJsxsZ1m5DBQVJu+Mlx4EGE=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build/17.11.31/microsoft.build.17.11.31.nupkg"
  },
  {
    "pname": "Microsoft.Build.Framework",
@@ -53,29 +53,23 @@
    "hash": "sha256-Zh78ZPYCj0B5j+lrIBAX0KAZAUWA6ItZ78tYvMDi2oI=",
    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build.framework/17.15.0-preview-25353-11/microsoft.build.framework.17.15.0-preview-25353-11.nupkg"
  },
-  {
-    "pname": "Microsoft.Build.Framework",
-    "version": "17.3.4",
-    "hash": "sha256-p2JG7pMBGfDVP6sOzBOqOkImZmwotlGvfS+8BjjVYf8=",
-    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build.framework/17.3.4/microsoft.build.framework.17.3.4.nupkg"
-  },
  {
    "pname": "Microsoft.Build.Locator",
-    "version": "1.8.1",
-    "hash": "sha256-q1oZLwPGO+Q/btm3jUzNo37eBziDD/MOXE3LsUSVeA4=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.locator/1.8.1/microsoft.build.locator.1.8.1.nupkg"
+    "version": "1.10.2",
+    "hash": "sha256-f/GyCcjeSgT0cD/icTtMDClyyTQOJD5AXNWERIBDPfA=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.locator/1.10.2/microsoft.build.locator.1.10.2.nupkg"
  },
  {
    "pname": "Microsoft.Build.Tasks.Core",
-    "version": "17.3.4",
-    "hash": "sha256-0RA95pD6zHBf1lgYyrrAuEuNeGwuCgGxNdhEJ0cJUCs=",
-    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build.tasks.core/17.3.4/microsoft.build.tasks.core.17.3.4.nupkg"
+    "version": "17.11.31",
+    "hash": "sha256-5G9ZuP/6XNmR++YyBpQuBKqNsF2FXxz+537TtVWCik8=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/17.11.31/microsoft.build.tasks.core.17.11.31.nupkg"
  },
  {
    "pname": "Microsoft.Build.Utilities.Core",
-    "version": "17.3.4",
-    "hash": "sha256-SfZxr5xDANnDnC1HCUgho2H9MnF6n51cM47Rrf07fWw=",
-    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build.utilities.core/17.3.4/microsoft.build.utilities.core.17.3.4.nupkg"
+    "version": "17.11.31",
+    "hash": "sha256-AQN2Qi4WbguyZitJR8FTYzq9k0LDyzETFpTA9aQZ4Gw=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/17.11.31/microsoft.build.utilities.core.17.11.31.nupkg"
  },
  {
    "pname": "Microsoft.CodeAnalysis.Analyzers",
@@ -133,15 +127,15 @@
  },
  {
    "pname": "Microsoft.DotNet.Arcade.Sdk",
-    "version": "11.0.0-beta.25504.3",
-    "hash": "sha256-UkkFqvq5HLl5EY4nhY4x1FvKj7QVlgC1yz25Juv9cOE=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/11.0.0-beta.25504.3/microsoft.dotnet.arcade.sdk.11.0.0-beta.25504.3.nupkg"
+    "version": "11.0.0-beta.25531.1",
+    "hash": "sha256-3zAA42msNPkvWe29bOeC44zjJyaFRU+M2+jBti/JTP4=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/11.0.0-beta.25531.1/microsoft.dotnet.arcade.sdk.11.0.0-beta.25531.1.nupkg"
  },
  {
    "pname": "Microsoft.DotNet.XliffTasks",
-    "version": "11.0.0-beta.25504.3",
-    "hash": "sha256-L4iPZRQHMW+YGda7op4orP87OyuXY5+QlpE/EmMoKd4=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/11.0.0-beta.25504.3/microsoft.dotnet.xlifftasks.11.0.0-beta.25504.3.nupkg"
+    "version": "11.0.0-beta.25531.1",
+    "hash": "sha256-6Ko4aKbQZskfE2B6xg6RZjEd51at6/Pk1OvMRfP6qWQ=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/11.0.0-beta.25531.1/microsoft.dotnet.xlifftasks.11.0.0-beta.25531.1.nupkg"
  },
  {
    "pname": "Microsoft.Extensions.Configuration",
@@ -511,9 +505,9 @@
  },
  {
    "pname": "System.CommandLine",
-    "version": "2.0.0-rc.1.25502.108",
-    "hash": "sha256-O1uciBJ6ig7JWzj/U7N40om77qtBt3fnBkbKSDGJkEU=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/2.0.0-rc.1.25502.108/system.commandline.2.0.0-rc.1.25502.108.nupkg"
+    "version": "2.0.0-rc.1.25515.110",
+    "hash": "sha256-kkWn8IJRJjafkB1WSuE0kA0gyce3eGcikK3gKUlEH3g=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/2.0.0-rc.1.25515.110/system.commandline.2.0.0-rc.1.25515.110.nupkg"
  },
  {
    "pname": "System.ComponentModel.Composition",
@@ -1,46 +0,0 @@
-diff --git a/eng/targets/TargetFrameworks.props b/eng/targets/TargetFrameworks.props
-index 58f90114f4d..8eb23c25067 100644
--- a/eng/targets/TargetFrameworks.props
-+++ b/eng/targets/TargetFrameworks.props
-@@ -17,7 +17,7 @@
-     <NetVS>net8.0</NetVS>
-     <NetVSCode>net8.0</NetVSCode>
-     <NetVSShared>net8.0</NetVSShared>
-    <NetRoslynBuildHostNetCoreVersion>net6.0</NetRoslynBuildHostNetCoreVersion>
-+    <NetRoslynBuildHostNetCoreVersion>net8.0</NetRoslynBuildHostNetCoreVersion>
-     <NetRoslynNext>net9.0</NetRoslynNext>
-   </PropertyGroup>
- 
-diff --git a/src/Workspaces/MSBuild/BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj b/src/Workspaces/MSBuild/BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj
-index 8101f56b8be..1733955dc3d 100644
--- a/src/Workspaces/MSBuild/BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj
-+++ b/src/Workspaces/MSBuild/BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj
-@@ -28,6 +28,12 @@
-     -->
-     <_MsbuildVersion>17.3.4</_MsbuildVersion>
-   </PropertyGroup>
-+  <PropertyGroup>
-+    <_MsbuildFramework>$(TargetFramework)</_MsbuildFramework>
-+  </PropertyGroup>
-+  <PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
-+    <_MsbuildFramework>net6.0</_MsbuildFramework>
-+  </PropertyGroup>
-   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
-     <PackageReference Include="Microsoft.Build" VersionOverride="$(_MsbuildVersion)" ExcludeAssets="Runtime" PrivateAssets="All" />
-     <PackageReference Include="Microsoft.Build.Framework" VersionOverride="$(_MsbuildVersion)" ExcludeAssets="Runtime" />
-@@ -36,10 +42,10 @@
-   </ItemGroup>
-   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
-     <!-- Reference MSBuild directly to avoid redistributing its package closure and including the dependencies in deps.json file. -->
-    <PackageDownloadAndReference Include="Microsoft.Build" Version="$(_MsbuildVersion)" Folder="ref/$(TargetFramework)" />
-    <PackageDownloadAndReference Include="Microsoft.Build.Framework" Version="$(_MsbuildVersion)" Folder="ref/$(TargetFramework)" />
-    <PackageDownloadAndReference Include="Microsoft.Build.Tasks.Core" Version="$(_MsbuildVersion)" Folder="ref/$(TargetFramework)" />
-    <PackageDownloadAndReference Include="Microsoft.Build.Utilities.Core" Version="$(_MsbuildVersion)" Folder="ref/$(TargetFramework)" />
-+    <PackageDownloadAndReference Include="Microsoft.Build" Version="$(_MsbuildVersion)" Folder="ref/$(_MsbuildFramework)" />
-+    <PackageDownloadAndReference Include="Microsoft.Build.Framework" Version="$(_MsbuildVersion)" Folder="ref/$(_MsbuildFramework)" />
-+    <PackageDownloadAndReference Include="Microsoft.Build.Tasks.Core" Version="$(_MsbuildVersion)" Folder="ref/$(_MsbuildFramework)" />
-+    <PackageDownloadAndReference Include="Microsoft.Build.Utilities.Core" Version="$(_MsbuildVersion)" Folder="ref/$(_MsbuildFramework)" />
-   </ItemGroup>
-   <ItemGroup>
-     <PackageReference Include="Microsoft.Build.Locator" PrivateAssets="All" />
-
@@ -5,7 +5,6 @@
  dotnetCorePackages,
  stdenvNoCC,
  testers,
-  roslyn-ls,
  jq,
  writeText,
  runCommand,
@@ -53,18 +52,18 @@ in
 buildDotnetModule (finalAttrs: rec {
  inherit pname dotnet-sdk dotnet-runtime;

-  vsVersion = "2.94.41-prerelease";
+  vsVersion = "2.100.5";
  src = fetchFromGitHub {
    owner = "dotnet";
    repo = "roslyn";
    rev = "VSCode-CSharp-${vsVersion}";
-    hash = "sha256-763RCPnFVn8QK447Ou10/9WDn2apOS1P0p/QQCpRn5s=";
+    hash = "sha256-PXb5BmXPfkitY/Lc2HMhAqX48dXqIYX+I4iFzvnvWTE=";
  };

  # versioned independently from vscode-csharp
  # "roslyn" in here:
  # https://github.com/dotnet/vscode-csharp/blob/main/package.json
-  version = "5.1.0-1.25506.3";
+  version = "5.3.0-2.25553.6";
  projectFile = "src/LanguageServer/${project}/${project}.csproj";
  useDotnetFromEnv = true;
  nugetDeps = ./deps.json;
@@ -72,9 +71,6 @@ buildDotnetModule (finalAttrs: rec {
  nativeBuildInputs = [ jq ];

  patches = [
-    # until upstream updates net6.0 here:
-    # https://github.com/dotnet/roslyn/blob/6cc106c0eaa9b0ae070dba3138a23aeab9b50c13/eng/targets/TargetFrameworks.props#L20
-    ./force-sdk_8_0.patch
    # until made configurable/and or different location
    # https://github.com/dotnet/roslyn/issues/76892
    ./cachedirectory.patch
@@ -47,9 +47,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
    mainProgram = "rq";
    homepage = "https://github.com/dflemstr/rq";
    license = with lib.licenses; [ asl20 ];
-    maintainers = with lib.maintainers; [
-      aristid
-      Br1ght0ne
-    ];
+    maintainers = with lib.maintainers; [ Br1ght0ne ];
  };
 })
@@ -0,0 +1,23 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ffi (1.17.2)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
+      ffi (~> 1.0)
+    sass (3.7.4)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    scss_lint (0.60.0)
+      sass (~> 3.5, >= 3.5.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  scss_lint
+
+BUNDLED WITH
+   2.7.1
@@ -4,10 +4,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0fgwn1grxf4zxmyqmb9i4z2hr111585n9jnk17y6y7hhs7dv1xi6";
+      sha256 = "19kdyjg3kv7x0ad4xsd4swy5izsbb1vl1rpb6qqcqisr5s23awi9";
      type = "gem";
    };
-    version = "1.17.1";
+    version = "1.17.2";
  };
  rb-fsevent = {
    groups = [ "default" ];
@@ -46,6 +46,8 @@
      "rb-fsevent"
      "rb-inotify"
    ];
+    groups = [ "default" ];
+    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
      sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df";
@@ -21,7 +21,6 @@
  pipewire,
  pkg-config,
  pugixml,
-  qt6,
  rapidjson,
  renderdoc,
  robin-map,
@@ -29,6 +28,7 @@
  sndio,
  stb,
  toml11,
+  util-linux,
  vulkan-headers,
  vulkan-loader,
  vulkan-memory-allocator,
@@ -42,13 +42,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "shadps4";
-  version = "0.11.0";
+  version = "0.12.5";

  src = fetchFromGitHub {
    owner = "shadps4-emu";
    repo = "shadPS4";
    tag = "v.${finalAttrs.version}";
-    hash = "sha256-ZHgwFWSoEaWILTafet5iQvaLwLtXy3HuCxjkQMt4PBA=";
+    hash = "sha256-H/GOnArWxMe/90qgyLb9fXbeJabUOV8CjLtpGokoStQ=";
    fetchSubmodules = true;
  };

@@ -71,11 +71,6 @@ stdenv.mkDerivation (finalAttrs: {
    libgbm
    pipewire
    pugixml
-    qt6.qtbase
-    qt6.qtdeclarative
-    qt6.qtmultimedia
-    qt6.qttools
-    qt6.qtwayland
    rapidjson
    renderdoc
    robin-map
@@ -83,6 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
    sndio
    stb
    toml11
+    util-linux
    vulkan-headers
    vulkan-loader
    vulkan-memory-allocator
@@ -95,11 +91,9 @@ stdenv.mkDerivation (finalAttrs: {
  nativeBuildInputs = [
    cmake
    pkg-config
-    qt6.wrapQtAppsHook
  ];

  cmakeFlags = [
-    (lib.cmakeBool "ENABLE_QT_GUI" true)
    (lib.cmakeBool "ENABLE_UPDATER" false)
  ];

@@ -39,11 +39,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "shotwell";
-  version = "0.32.13";
+  version = "0.32.14";

  src = fetchurl {
    url = "mirror://gnome/sources/shotwell/${lib.versions.majorMinor finalAttrs.version}/shotwell-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-vdPoT2AuL8frQoQ8kKJes6pJ+y/7de21HbAb0pBdvR4=";
+    sha256 = "sha256-QbEi9V0kWkto1ocIX9kjmNJfC7ylSDqYsreTK+Tyido=";
  };

  nativeBuildInputs = [
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "2.2.5";
+  version = "2.3.3";

  src = fetchFromGitHub {
    owner = "TandoorRecipes";
    repo = "recipes";
    tag = version;
-    hash = "sha256-N6d5T11fOAtPKAV/tqTWGdwMkWNY8rPpWT2TBSc0ybc=";
+    hash = "sha256-N9eHoQyNPbjf4XrdNvTuMKs866mO+jgn2zRkXLAMtb8=";
  };

  yarnHash = "sha256-1p79Bdsn6KDApYKz9BAwrA97svbB8ub+Wl49MTIumW8=";
@@ -4,7 +4,11 @@
  python3,
 }:
 let
-  python = python3;
+  python = python3.override {
+    packageOverrides = final: prev: {
+      django = final.django_5;
+    };
+  };

  common = callPackage ./common.nix { };

@@ -11,4 +11,4 @@ index 2755dc99..4026b96e 100644
 # addopts = -n auto --junitxml=docs/reports/tests/pytest.xml --html=docs/reports/tests/tests.html
 -asyncio_default_fixture_loop_scope = fixture
 \ No newline at end of file
-+asyncio_default_fixture_loop_scope = fixture
+asyncio_default_fixture_loop_scope = function
@@ -0,0 +1,14 @@
+diff --git a/test/test_theft_integration.c b/test/test_theft_integration.c
+index ecbad97..92c3cbe 100644
+--- a/test/test_theft_integration.c
+++ b/test/test_theft_integration.c
+@@ -1618,7 +1618,8 @@ SUITE(integration) {
+     RUN_TEST(forking_hook);
+     RUN_TEST(forking_privilege_drop_cpu_limit__slow);
+ 
+-    RUN_TEST(repeat_with_verbose_set_after_shrinking);
+    // fails on aarch64-linux
+    // RUN_TEST(repeat_with_verbose_set_after_shrinking);
+ 
+     // Regressions
+     RUN_TEST(expected_seed_should_be_used_first);
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
    sha256 = "1n2mkawfl2bpd4pwy3mdzxwlqjjvb5bdrr2x2gldlyqdwbk7qjhd";
  };

+  patches = [ ./disable-failing-test.patch ];
+
  postPatch = ''
    substituteInPlace Makefile \
      --replace "ar -rcs" "${stdenv.cc.targetPrefix}ar -rcs"
@@ -9,13 +9,13 @@

 stdenv.mkDerivation {
  pname = "vgmtools";
-  version = "0.1-unstable-2025-10-22";
+  version = "0.1-unstable-2025-11-04";

  src = fetchFromGitHub {
    owner = "vgmrips";
    repo = "vgmtools";
-    rev = "606db7fa229389b80bccb4c6e28b3d71dfddc984";
-    hash = "sha256-kOkBIN1/FG6snpriLiu8ZMqGa2MXOC79zUZwGrMyk/A=";
+    rev = "d5d1ba5bbe9f5bc78ea0202490a3432465d5f154";
+    hash = "sha256-91smzkVY+SC5zBp0v7VkIkMCZX0vs6ivPnKTyw3ZkW4=";
  };

  nativeBuildInputs = [
@@ -37,11 +37,11 @@ stdenv.mkDerivation {
    url = "https://github.com/vgmrips/vgmtools.git";
  };

-  meta = with lib; {
+  meta = {
    homepage = "https://github.com/vgmrips/vgmtools";
    description = "Collection of tools for the VGM file format";
-    license = licenses.gpl2Only; # Not clarified whether Only or Plus
-    maintainers = with maintainers; [ OPNA2608 ];
-    platforms = platforms.all;
+    license = lib.licenses.gpl2Only; # Not clarified whether Only or Plus
+    maintainers = with lib.maintainers; [ OPNA2608 ];
+    platforms = lib.platforms.all;
  };
 }
@@ -6,16 +6,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "viceroy";
-  version = "0.15.0";
+  version = "0.16.0";

  src = fetchFromGitHub {
    owner = "fastly";
    repo = "viceroy";
    rev = "v${version}";
-    hash = "sha256-CG+D4jh5p6bcc0E6qTvecwkoxCRoHJAGiAOtR8A+Otc=";
+    hash = "sha256-uZdzQ3YW3RYyJMLnyzmYi+b2rMeK7gdxXZ9QPHuu8/w=";
  };

-  cargoHash = "sha256-K4nh/ODbk++UxxIoeLpq4boWGbID2DJW845rx605Z7Y=";
+  cargoHash = "sha256-A/XQZ/stc3sUL60aBZWfHADiCLVQRD7RmZ3bUHoVtgg=";

  cargoTestFlags = [
    "--package viceroy-lib"
@@ -13,13 +13,13 @@

 buildGoModule (finalAttrs: {
  pname = "VictoriaTraces";
-  version = "0.2.0";
+  version = "0.5.0";

  src = fetchFromGitHub {
    owner = "VictoriaMetrics";
    repo = "VictoriaTraces";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-b4/ix191xtW2HpczfRbez2gibgGx7jBRm0hvuP/rTpA=";
+    hash = "sha256-jmcwn2/UB87wOBCHvquHIgc+a/sCXnxC63nddlZuSL0=";
  };

  vendorHash = null;
@@ -31,12 +31,6 @@ buildGoModule (finalAttrs: {
    ++ lib.optionals withVtStorage [ "app/vtstorage" ]
    ++ lib.optionals withVtGen [ "app/vtgen" ];

-  postPatch = ''
-    # Allow older go versions
-    substituteInPlace go.mod \
-      --replace-fail "go 1.24.6" "go ${finalAttrs.passthru.go.version}"
-  '';
-
  ldflags = [
    "-s"
    "-w"
@@ -56,7 +50,10 @@ buildGoModule (finalAttrs: {
    homepage = "https://docs.victoriametrics.com/victoriatraces/";
    description = "Fast open-source observability solution for distributed traces";
    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ cmacrae ];
+    maintainers = with lib.maintainers; [
+      cmacrae
+      ma27
+    ];
    changelog = "https://github.com/VictoriaMetrics/VictoriaTraces/releases/tag/${finalAttrs.src.tag}";
    mainProgram = "victoria-traces";
  };
@@ -9,27 +9,23 @@
 buildGoModule (
  finalAttrs:
  let
-    rev = "12269c2761734b15625017d8565745096325392f";
-    shortVer = "${finalAttrs.version} (${lib.substring 0 7 rev})";
+    version = "0.0.20250522";
  in
  {
    pname = "wireguard-go";
-    version = "0-unstable-2023-12-11";
+    inherit version;

    src = fetchzip {
-      url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${rev}.tar.xz";
-      hash = "sha256-br7/dwr/e4HvBGJXh+6lWqxBUezt5iZNy9BFqEA1bLk=";
+      url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz";
+      hash = "sha256-GRr8NKKb4SHd0WxmNL84eiofFHcauDDmSyNNrXermcA=";
    };

    postPatch = ''
      # Skip formatting tests
      rm -f format_test.go
-
-      # Inject version
-      printf 'package main\n\nconst Version = "${shortVer}"' > version.go
    '';

-    vendorHash = "sha256-RqZ/3+Xus5N1raiUTUpiKVBs/lrJQcSwr1dJib2ytwc=";
+    vendorHash = "sha256-sCajxTV26jjlmgmbV4GG6hg9NkLGS773ZbFyKucvuBE=";

    subPackages = [ "." ];

@@ -56,7 +52,7 @@ buildGoModule (

    passthru.tests.version = testers.testVersion {
      package = wireguard-go;
-      version = "v${shortVer}";
+      version = "v${version}";
    };

    meta = with lib; {
@@ -1,7 +1,7 @@
 {
  python3Packages,
  fetchFromGitHub,
-  ffmpeg,
+  ffmpeg_7,
  lib,
  versionCheckHook,
 }:
@@ -38,8 +38,8 @@ python3Packages.buildPythonApplication rec {
  ];

  makeWrapperArgs = [
-    "--set YTDL_SUB_FFMPEG_PATH ${lib.getExe' ffmpeg "ffmpeg"}"
-    "--set YTDL_SUB_FFPROBE_PATH ${lib.getExe' ffmpeg "ffprobe"}"
+    "--set YTDL_SUB_FFMPEG_PATH ${lib.getExe' ffmpeg_7 "ffmpeg"}"
+    "--set YTDL_SUB_FFPROBE_PATH ${lib.getExe' ffmpeg_7 "ffprobe"}"
  ];

  nativeCheckInputs = [
@@ -49,8 +49,8 @@ python3Packages.buildPythonApplication rec {
  versionCheckProgramArg = "--version";

  env = {
-    YTDL_SUB_FFMPEG_PATH = "${lib.getExe' ffmpeg "ffmpeg"}";
-    YTDL_SUB_FFPROBE_PATH = "${lib.getExe' ffmpeg "ffprobe"}";
+    YTDL_SUB_FFMPEG_PATH = "${lib.getExe' ffmpeg_7 "ffmpeg"}";
+    YTDL_SUB_FFPROBE_PATH = "${lib.getExe' ffmpeg_7 "ffprobe"}";
  };

  disabledTests = [
@@ -20,7 +20,6 @@
  libgnomekbd,
  libxklavier,
  ibus,
-  onboard,
  switchboard,
 }:

@@ -40,8 +39,13 @@ stdenv.mkDerivation rec {
    # https://github.com/elementary/settings-keyboard/issues/324
    ./hide-install-unlisted-engines-button.patch

+    # We no longer ship Pantheon X11 session in NixOS.
+    # https://github.com/elementary/session-settings/issues/91
+    # https://github.com/elementary/session-settings/issues/82
+    ./hide-onscreen-keyboard-settings.patch
+
    (replaceVars ./fix-paths.patch {
-      inherit onboard libgnomekbd;
+      inherit libgnomekbd;
    })
  ];

@@ -1,16 +1,3 @@
-diff --git a/src/Behavior/Behavior.vala b/src/Behavior/Behavior.vala
-index bd461685..b6371096 100644
--- a/src/Behavior/Behavior.vala
-+++ b/src/Behavior/Behavior.vala
-@@ -252,7 +252,7 @@ public class Keyboard.Behaviour.Page : Gtk.Box {
- 
-         onscreen_keyboard_settings.clicked.connect (() => {
-             try {
-                var appinfo = GLib.AppInfo.create_from_commandline ("onboard-settings", null, NONE);
-+                var appinfo = GLib.AppInfo.create_from_commandline ("@onboard@/bin/onboard-settings", null, NONE);
-                 appinfo.launch (null, null);
-             } catch (Error e) {
-                 critical ("Unable to launch onboard-settings: %s", e.message);
 diff --git a/src/Layout/Widgets/AddLayoutDialog.vala b/src/Layout/Widgets/AddLayoutDialog.vala
 index 25cc0fe9..b3e350bb 100644
 --- a/src/Layout/Widgets/AddLayoutDialog.vala
@@ -0,0 +1,12 @@
+diff --git a/src/Behavior/Behavior.vala b/src/Behavior/Behavior.vala
+index a1929fe4..2f332694 100644
+--- a/src/Behavior/Behavior.vala
+++ b/src/Behavior/Behavior.vala
+@@ -227,7 +227,6 @@ public class Keyboard.Behaviour.Page : Gtk.Box {
+         blink_grid.attach (scale_blink_time, 1, 2);
+ 
+         var box = new Gtk.Box (VERTICAL, 18);
+-        box.append (onscreen_keyboard_grid);
+         box.append (blink_grid);
+         box.append (repeat_grid);
+         box.append (stickykeys_grid);
@@ -31,13 +31,11 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-mdfmCzR9ikXDlDc7FeOITsdbPbz+G66jUrl1BobY+g8=";
  };

-  /*
-    This allows `elementary-session-settings` to not use gnome-keyring's ssh capabilities anymore, as they have been
-    moved to gcr upstream, in an effort to modularize gnome-keyring.
-
-    More info can be found here: https://gitlab.gnome.org/GNOME/gnome-keyring/-/merge_requests/60
-  */
-  patches = [ ./no-gnome-keyring-ssh-autostart.patch ];
+  patches = [
+    # See https://github.com/elementary/session-settings/issues/88 for gnome-keyring.
+    # See https://github.com/elementary/session-settings/issues/82 for onboard.
+    ./no-autostart.patch
+  ];

  nativeBuildInputs = [
    desktop-file-utils
@@ -1,12 +1,13 @@
 diff --git a/session/meson.build b/session/meson.build
-index 501e836..3254658 100644
+index 3e23650..e1f9792 100644
 --- a/session/meson.build
 +++ b/session/meson.build
-@@ -79,7 +79,6 @@ if get_option('detect-program-prefixes') == true
+@@ -79,8 +79,6 @@ if get_option('detect-program-prefixes') == true
   autostarts = {
     'gnome-keyring-pkcs11': join_paths(gnome_keyring_prefix, 'etc/xdg/autostart', 'gnome-keyring-pkcs11.desktop'),
     'gnome-keyring-secrets': join_paths(gnome_keyring_prefix, 'etc/xdg/autostart', 'gnome-keyring-secrets.desktop'),
 -    'gnome-keyring-ssh': join_paths(gnome_keyring_prefix, 'etc/xdg/autostart', 'gnome-keyring-ssh.desktop'),
-     'onboard-autostart': join_paths(onboard_prefix, 'etc/xdg/autostart', 'onboard-autostart.desktop'),
+-    'onboard-autostart': join_paths(onboard_prefix, 'etc/xdg/autostart', 'onboard-autostart.desktop'),
     'orca-autostart': join_paths(orca_prefix, 'etc/xdg/autostart', 'orca-autostart.desktop'),
   }
+ else
@@ -2,7 +2,6 @@
  stdenv,
  lib,
  fetchFromGitHub,
-  fetchpatch,
  desktop-file-utils,
  gettext,
  libxml2,
@@ -11,7 +10,7 @@
  pkg-config,
  vala,
  wayland-scanner,
-  wrapGAppsHook3,
+  wrapGAppsHook4,
  at-spi2-core,
  gnome-settings-daemon,
  gnome-desktop,
@@ -19,7 +18,6 @@
  granite7,
  gtk3,
  gtk4,
-  libcanberra,
  libgee,
  libhandy,
  mutter,
@@ -30,28 +28,15 @@

 stdenv.mkDerivation rec {
  pname = "gala";
-  version = "8.2.5";
+  version = "8.3.0";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = "gala";
-    rev = version;
-    hash = "sha256-uupFeQ73hr6ziLEtzgVJWASUxhspXJX54/U+3PLSCFY=";
+    tag = version;
+    hash = "sha256-omsAOOZCQINLTZQg3Sew+p84jv8+R2cHSVtcHFIeUBI=";
  };

-  patches = [
-    # We look for plugins in `/run/current-system/sw/lib/` because
-    # there are multiple plugin providers (e.g. gala and wingpanel).
-    ./plugins-dir.patch
-
-    # Fix gtk3 daemon menu location with x2 scaling
-    # https://github.com/elementary/gala/pull/2493
-    (fetchpatch {
-      url = "https://github.com/elementary/gala/commit/33bc3ebe7f175c61845feaf2d06083f1e3b64ddc.patch";
-      hash = "sha256-hjjiKcO5o/OABKD8vUsVyqtNKN4ffEOGZntLceLr2+k=";
-    })
-  ];
-
  depsBuildBuild = [ pkg-config ];

  nativeBuildInputs = [
@@ -63,7 +48,7 @@ stdenv.mkDerivation rec {
    pkg-config
    vala
    wayland-scanner
-    wrapGAppsHook3
+    wrapGAppsHook4
  ];

  buildInputs = [
@@ -72,9 +57,8 @@ stdenv.mkDerivation rec {
    gnome-desktop
    granite
    granite7
-    gtk3
-    gtk4 # gala-daemon
-    libcanberra
+    gtk3 # daemon-gtk3
+    gtk4
    libgee
    libhandy
    mutter
@@ -82,6 +66,16 @@ stdenv.mkDerivation rec {
    systemd
  ];

+  postPatch = ''
+    substituteInPlace meson.build \
+      --replace-fail "conf.set('PLUGINDIR', plugins_dir)" "conf.set('PLUGINDIR','/run/current-system/sw/lib/gala/plugins')"
+  '';
+
+  mesonFlags = [
+    # https://github.com/elementary/gala/commit/1e75d2a4b42e0d853fd474e90f1a52b0bcd0f690
+    "-Dold-icon-groups=true"
+  ];
+
  passthru = {
    updateScript = nix-update-script { };
  };
@@ -1,21 +0,0 @@
-diff --git a/meson.build b/meson.build
-index d0f00e5..977d2e2 100644
--- a/meson.build
-+++ b/meson.build
-@@ -25,6 +25,7 @@ vapi_dir = meson.current_source_dir() / 'vapi'
- locale_dir = join_paths(get_option('prefix'), get_option('localedir'))
- data_dir = join_paths(get_option('prefix'), get_option('datadir'))
- plugins_dir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name(), 'plugins')
-+plugins_dir_for_build = join_paths('/run/current-system/sw/lib/', meson.project_name(), 'plugins')
- pkgdata_dir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name())
- pkglib_dir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name())
- 
-@@ -33,7 +34,7 @@ conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
- conf.set_quoted('LOCALEDIR', locale_dir)
- conf.set_quoted('DATADIR', data_dir)
- conf.set_quoted('PKGDATADIR', pkgdata_dir)
-conf.set_quoted('PLUGINDIR', plugins_dir)
-+conf.set_quoted('PLUGINDIR', plugins_dir_for_build)
- conf.set_quoted('RESOURCEPATH', '/org/pantheon/desktop/gala')
- conf.set_quoted('VERSION', gala_version)
- conf.set_quoted('SCHEMA', 'org.pantheon.desktop.gala')
@@ -32,6 +32,13 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-82XlZDnXuUB0PPmInrSQh1vrwnOYt9RplKWwYxIirVo=";
  };

+  patches = [
+    # We no longer ship Pantheon X11 session in NixOS.
+    # https://github.com/elementary/session-settings/issues/91
+    # https://github.com/elementary/session-settings/issues/82
+    ./hide-onscreen-keyboard-settings.patch
+  ];
+
  nativeBuildInputs = [
    glib # glib-compile-resources
    meson
@@ -0,0 +1,25 @@
+diff --git a/src/PopoverWidget.vala b/src/PopoverWidget.vala
+index 9dd331c..438fbe0 100644
+--- a/src/PopoverWidget.vala
+++ b/src/PopoverWidget.vala
+@@ -123,7 +123,6 @@ public class QuickSettings.PopoverWidget : Gtk.Box {
+ 
+         if (server_type == GREETER || glib_settings.get_boolean ("show-a11y")) {
+             toggle_box.add (screen_reader);
+-            toggle_box.add (onscreen_keyboard);
+ 
+             scale_box.add (text_scale);
+         }
+@@ -131,12 +130,10 @@ public class QuickSettings.PopoverWidget : Gtk.Box {
+         glib_settings.changed["show-a11y"].connect (() => {
+             if (glib_settings.get_boolean ("show-a11y") && screen_reader.parent == null) {
+                 toggle_box.add (screen_reader);
+-                toggle_box.add (onscreen_keyboard);
+ 
+                 scale_box.add (text_scale);
+             } else {
+                 toggle_box.remove (screen_reader);
+-                toggle_box.remove (onscreen_keyboard);
+ 
+                 scale_box.remove (text_scale);
+             }
@@ -2,6 +2,7 @@
  lib,
  stdenv,
  fetchFromGitHub,
+  fetchpatch,
  nix-update-script,
  wayland-scanner,
  wrapGAppsHook3,
@@ -35,6 +36,13 @@ stdenv.mkDerivation rec {

  patches = [
    ./indicators.patch
+
+    # Fix build with gala 8.3.0
+    # https://github.com/elementary/wingpanel/pull/642
+    (fetchpatch {
+      url = "https://github.com/elementary/wingpanel/commit/4476df2573797310e254695a66c099b32afe9736.patch";
+      hash = "sha256-99zzXbaeW/ijqPXN7tQexMPWsUW4pX7e0tcxASBVbvI=";
+    })
  ];

  depsBuildBuild = [
@@ -7,42 +7,48 @@
  ninja,
  pkg-config,
  vala,
-  gtk3,
+  gtk4,
  glib,
-  granite,
-  libgee,
-  libhandy,
-  libcanberra-gtk3,
-  wrapGAppsHook3,
+  granite7,
+  libadwaita,
+  libcanberra,
+  wayland-scanner,
+  wrapGAppsHook4,
 }:

 stdenv.mkDerivation rec {
  pname = "elementary-notifications";
-  version = "8.1.0";
+  version = "8.1.1";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = "notifications";
-    rev = version;
-    sha256 = "sha256-2+LV3O2V42gI+ysVoeO9KpLqmAj/Zk5F8LzO2RNZ1ZY=";
+    tag = version;
+    hash = "sha256-V884jv7bleDMsuZDkodyeNBhStIoNPNxfT6mz1YjHXE=";
  };

+  strictDeps = true;
+
+  depsBuildBuild = [
+    pkg-config
+  ];
+
  nativeBuildInputs = [
    glib # for glib-compile-schemas
    meson
    ninja
    pkg-config
    vala
-    wrapGAppsHook3
+    wayland-scanner
+    wrapGAppsHook4
  ];

  buildInputs = [
    glib
-    granite
-    gtk3
-    libcanberra-gtk3
-    libgee
-    libhandy
+    granite7
+    gtk4
+    libadwaita
+    libcanberra
  ];

  passthru = {
@@ -255,6 +255,11 @@ stdenv.mkDerivation (self: {
  # Fails to find `O_LARGEFILE` otherwise.
  env.NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE";

+  # Set minimum macOS version to 10.12 for x86_64-darwin to support clock_gettime()
+  env.SBCL_MACOSX_VERSION_MIN = lib.optionalString (
+    stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64
+  ) "10.12";
+
  buildPhase = ''
    runHook preBuild

@@ -0,0 +1,53 @@
+{
+  lib,
+  brotli,
+  buildPerlPackage,
+  fetchurl,
+  perlPackages,
+  pkg-config,
+}:
+
+buildPerlPackage {
+  pname = "IO-Compress-Brotli";
+  version = "0.019";
+
+  src = fetchurl {
+    url = "mirror://cpan/authors/id/T/TI/TIMLEGGE/IO-Compress-Brotli-0.019.tar.gz";
+    hash = "sha256-N/QN187kSs6iby92Onc+YdTsIjMF3e7KRhJEPL8oj78=";
+  };
+
+  patches = [
+    # Use system brotli in Makefile.PL
+    ./use-system-brotli.patch
+  ];
+
+  postPatch = ''
+    substituteInPlace Makefile.PL \
+      --replace-fail "@LIBS@" "-L${lib.getLib brotli}/lib -lbrotlienc -lbrotlidec -lbrotlicommon"
+  '';
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    brotli
+    perlPackages.FileSlurper
+  ];
+
+  propagatedBuildInputs = with perlPackages; [
+    FileSlurper
+    GetoptLong
+  ];
+
+  env.NIX_CFLAGS_COMPILE = "-I${lib.getDev brotli}/include";
+
+  meta = {
+    description = "Write Brotli buffers/streams";
+    homepage = "https://github.com/timlegge/perl-IO-Compress-Brotli";
+    changelog = "https://github.com/timlegge/perl-IO-Compress-Brotli/blob/main/Changes";
+    license = with lib.licenses; [
+      artistic1
+      gpl1Plus
+    ];
+    maintainers = [ lib.maintainers.anthonyroussel ];
+  };
+}
@@ -0,0 +1,40 @@
+--- a/Makefile.PL
+++ b/Makefile.PL
+@@ -1,6 +1,5 @@
+ use 5.014000;
+ use ExtUtils::MakeMaker;
+-use Alien::cmake3;
+ use File::Spec::Functions qw/catfile/;
+
+ WriteMakefile(
+@@ -17,16 +16,7 @@
+ 		'Getopt::Long'  => '0',
+ 		'Time::HiRes'   => '0',
+ 	},
+-	CONFIGURE_REQUIRES   => {
+-		'Alien::cmake3' => '0',
+-	},
+-	BUILD_REQUIRES   => {
+-		'Alien::cmake3' => '0',
+-	},
+-	INC              => '-Ibrotli/c/include',
+-	MYEXTLIB         => $myextlib,
+-	EXTRALIBS        => ' brotli/libbrotlienc$(LIB_EXT) brotli/libbrotlidec$(LIB_EXT) brotli/libbrotlicommon$(LIB_EXT) ',
+-	clean            => { FILES => "brotli/Makefile $myextlib brotli/CMakeCache.txt brotli/CMakeFiles/* brotli/CTestTestfile.cmake brotli/DartConfiguration.tcl brotli/brotli* brotli/cmake_install.cmake brotli/libbrotlicommon.pc brotli/libbrotlidec.pc brotli/libbrotlienc.pc" },
+	LIBS             => "@LIBS@",
+ 	META_ADD         => {
+ 		dynamic_config => 0,
+ 		resources      => {
+@@ -33,12 +24,3 @@
+ 		},
+ 	}
+ );
+-
+-sub MY::postamble {
+-    my @dirs = Alien::cmake3->bin_dir;
+-    my $cmake = defined $dirs[0] ? catfile($dirs[0] , Alien::cmake3->exe) : Alien::cmake3->exe;
+-'
+-$(MYEXTLIB): brotli/CMakeLists.txt
+-	cd brotli && "' . $cmake . '"' . $cmake_options . ' -DCMAKE_MAKE_PROGRAM=$(MAKE) -DBUILD_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=./installed . && $(MAKE)
+-'
+-}
@@ -6,6 +6,10 @@
  shortenPerlShebang,
  stdenv,
  versionCheckHook,
+  ArchiveZip,
+  CompressRawLzma,
+  IOCompress,
+  IOCompressBrotli,
 }:

 buildPerlPackage rec {
@@ -19,12 +23,19 @@ buildPerlPackage rec {
    hash = "sha256-GPm3HOt7fNMbXRrV5V+ykJAfhww1O6NrD0l/7hA2i28=";
  };

-  nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
-
  postPatch = ''
    patchShebangs exiftool
  '';

+  nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
+
+  propagatedBuildInputs = [
+    ArchiveZip
+    CompressRawLzma
+    IOCompress
+    IOCompressBrotli
+  ];
+
  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
    shortenPerlShebang $out/bin/exiftool
  '';
@@ -2,6 +2,8 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
+  fetchpatch,
+  setuptools,
  aiohttp,
  backoff,
  yarl,
@@ -13,7 +15,7 @@
 buildPythonPackage rec {
  pname = "aiomodernforms";
  version = "0.1.8";
-  format = "setuptools";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "wonderslug";
@@ -22,13 +24,18 @@ buildPythonPackage rec {
    hash = "sha256-Vx51WBjjNPIfLlwMnAuwHnGNljhnjKkU0tWB9M9rjsw=";
  };

-  postPatch = ''
-    substituteInPlace aiomodernforms/modernforms.py --replace-fail \
-      "with async_timeout.timeout(self._request_timeout):" \
-      "async with async_timeout.timeout(self._request_timeout):"
-  '';
+  patches = [
+    # https://github.com/wonderslug/aiomodernforms/pull/274
+    (fetchpatch {
+      name = "replace-async-timeout-with-asyncio.timeout.patch";
+      url = "https://github.com/wonderslug/aiomodernforms/commit/61f1330b2fc244565fd97ae392b9778faa1bab09.patch";
+      hash = "sha256-7sy5/HgPYgVpULgeEu3tFBa2iXIskAqcarf0RndxTpE=";
+    })
+  ];

-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
    aiohttp
    backoff
    yarl
@@ -46,6 +53,8 @@ buildPythonPackage rec {
    "test_empty_response"
  ];

+  __darwinAllowLocalNetworking = true;
+
  pythonImportsCheck = [ "aiomodernforms" ];

  meta = with lib; {
@@ -0,0 +1,90 @@
+{
+  buildPythonPackage,
+  cython,
+  fetchFromGitHub,
+  fetchurl,
+  ffmpeg_7-headless,
+  lib,
+  linkFarm,
+  numpy,
+  pillow,
+  pkg-config,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "av";
+  version = "13.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "PyAV-Org";
+    repo = "PyAV";
+    tag = "v${version}";
+    hash = "sha256-x2a9SC4uRplC6p0cD7fZcepFpRidbr6JJEEOaGSWl60=";
+  };
+
+  build-system = [
+    cython
+    setuptools
+  ];
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ ffmpeg_7-headless ];
+
+  preCheck =
+    let
+      testSamples = linkFarm "pyav-test-samples" (
+        lib.mapAttrs (_: fetchurl) (lib.importTOML ../av/test-samples.toml)
+      );
+    in
+    ''
+      # ensure we import the built version
+      rm -r av
+      ln -s ${testSamples} tests/assets
+    '';
+
+  nativeCheckInputs = [
+    numpy
+    pillow
+    pytestCheckHook
+  ];
+
+  __darwinAllowLocalNetworking = true;
+
+  pythonImportsCheck = [
+    "av"
+    "av.audio"
+    "av.buffer"
+    "av.bytesource"
+    "av.codec"
+    "av.container"
+    "av._core"
+    "av.datasets"
+    "av.descriptor"
+    "av.dictionary"
+    "av.error"
+    "av.filter"
+    "av.format"
+    "av.frame"
+    "av.logging"
+    "av.option"
+    "av.packet"
+    "av.plane"
+    "av.stream"
+    "av.subtitles"
+    "av.utils"
+    "av.video"
+  ];
+
+  meta = {
+    changelog = "https://github.com/PyAV-Org/PyAV/blob/${src.tag}/CHANGELOG.rst";
+    description = "Pythonic bindings for FFmpeg";
+    homepage = "https://github.com/PyAV-Org/PyAV";
+    license = lib.licenses.bsd2;
+    mainProgram = "pyav";
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
@@ -22,14 +22,14 @@

 buildPythonPackage rec {
  pname = "biosppy";
-  version = "2.2.3";
+  version = "2.2.4";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "scientisst";
    repo = "BioSPPy";
    tag = "v${version}";
-    hash = "sha256-R+3K8r+nzrCiZegxur/rf3/gDGhN9bVNMhlK94SHer0=";
+    hash = "sha256-ED25/4WmLbXfEfa4KuUJMN+Fc9hd/AdUqgw8mwQes8Y=";
  };

  build-system = [ setuptools ];
@@ -2,24 +2,24 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
+  setuptools,
  pytestCheckHook,
-  pythonOlder,
 }:

 buildPythonPackage rec {
  pname = "cronsim";
-  version = "2.6";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  version = "2.7";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "cuu508";
    repo = "cronsim";
    tag = version;
-    hash = "sha256-WJ3v2cqAKZkXp1u8xJ0aFuyHPq0gn24DRxpnq5cH/90=";
+    hash = "sha256-9TextQcZAX5Ri6cc+Qd4T+u8XjxriqoTsy/9/G8XDAM=";
  };

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

  pythonImportsCheck = [ "cronsim" ];
@@ -1,14 +1,21 @@
 {
  lib,
  buildPythonPackage,
-  django-taggit,
-  django,
  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  django,
+  pytz,
+
+  # optional-dependencies
+  django-taggit,
+
+  # tests
  pytest-django,
  pytestCheckHook,
-  pythonOlder,
-  pytz,
-  setuptools,
 }:

 buildPythonPackage rec {
@@ -16,8 +23,6 @@ buildPythonPackage rec {
  version = "6.4";
  pyproject = true;

-  disabled = pythonOlder "3.9";
-
  src = fetchFromGitHub {
    owner = "wagtail";
    repo = "django-modelcluster";
@@ -44,10 +49,10 @@ buildPythonPackage rec {

  pythonImportsCheck = [ "modelcluster" ];

-  meta = with lib; {
+  meta = {
    description = "Django extension to allow working with 'clusters' of models as a single unit, independently of the database";
    homepage = "https://github.com/torchbox/django-modelcluster/";
-    changelog = "https://github.com/wagtail/django-modelcluster/blob/v${version}/CHANGELOG.txt";
-    license = licenses.bsd2;
+    changelog = "https://github.com/wagtail/django-modelcluster/blob/${src.tag}/CHANGELOG.txt";
+    license = lib.licenses.bsd2;
  };
 }
@@ -0,0 +1,54 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  django,
+  django-tasks,
+
+  # tests
+  pytest-django,
+  pytestCheckHook,
+  django-modelcluster,
+}:
+
+buildPythonPackage rec {
+  pname = "modelsearch";
+  version = "1.1.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "wagtail";
+    repo = "django-modelsearch";
+    tag = "v${version}";
+    hash = "sha256-tjwVepI9mdrMbTtxfe6yNUrSHWKndGxv2lJ8AfyNcr0=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    django
+    django-modelcluster
+    django-tasks
+  ];
+
+  pythonImportsCheck = [ "modelsearch" ];
+
+  # django.core.exceptions.ImproperlyConfigured: Requested setting INSTALLED_APPS, but settings are not configured.
+  # You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings.
+  doCheck = false;
+
+  meta = {
+    description = "Index Django Models with Elasticsearch or OpenSearch and query them with the ORM";
+    homepage = "https://github.com/wagtail/django-modelsearch";
+    changelog = "https://github.com/wagtail/django-modelsearch/releases/tag/${src.tag}";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
@@ -0,0 +1,75 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  einops,
+  ninja,
+  setuptools,
+  symlinkJoin,
+  torch,
+}:
+
+let
+  inherit (torch) cudaCapabilities cudaPackages cudaSupport;
+  inherit (cudaPackages) backendStdenv;
+in
+buildPythonPackage rec {
+  pname = "flash-attention";
+  version = "2.8.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Dao-AILab";
+    repo = "flash-attention";
+    tag = "v${version}";
+    hash = "sha256-iHxfDh+rGanhymP5F7g8rQcQUlP0oXliVF+y+ur/iJ0=";
+    fetchSubmodules = true;
+  };
+
+  preConfigure = ''
+    export MAX_JOBS="$NIX_BUILD_CORES"
+    export NVCC_THREADS="$NIX_BUILD_CORES"
+  '';
+
+  env = lib.optionalAttrs cudaSupport {
+    FLASH_ATTENTION_SKIP_CUDA_BUILD = "FALSE";
+    CC = "${backendStdenv.cc}/bin/cc";
+    CXX = "${backendStdenv.cc}/bin/c++";
+    TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" cudaCapabilities}";
+  };
+
+  build-system = [
+    ninja
+    setuptools
+    cudaPackages.cuda_nvcc
+  ];
+
+  buildInputs = [
+    cudaPackages.cuda_cccl # <thrust/*>
+    cudaPackages.libcublas # cublas_v2.h
+    cudaPackages.libcurand # curand.h
+    cudaPackages.libcusolver # cusolverDn.h
+    cudaPackages.libcusparse # cusparse.h
+    cudaPackages.cuda_cudart # cuda_runtime.h cuda_runtime_api.h
+  ];
+
+  dependencies = [
+    einops
+    torch
+  ];
+
+  # Requires NVIDIA driver.
+  doCheck = false;
+
+  pythonImportsCheck = [ "flash_attn" ];
+
+  meta = {
+    # Upstream requires either CUDA or ROCm. Couldn't get it to work with ROCm for now.
+    broken = !cudaSupport;
+    description = "Official implementation of FlashAttention and FlashAttention-2";
+    homepage = "https://github.com/Dao-AILab/flash-attention/";
+    changelog = "https://github.com/Dao-AILab/flash-attention/releases/tag/${src.tag}";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ jherland ];
+  };
+}
@@ -20,15 +20,15 @@

 buildPythonPackage rec {
  pname = "iminuit";
-  version = "2.31.3";
+  version = "2.32.0";
  pyproject = true;

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-/7Oust4mxADQr/fit0V/ZM1gmklMRe5Xnv/ugbG8XXg=";
+    hash = "sha256-oys00YZllZvnWta9sd2ARZu5RGbGK0VWMcAFaKzN99I=";
  };

-  nativeBuildInputs = [
+  build-system = [
    cmake
    scikit-build-core
    pybind11
@@ -45,7 +45,7 @@ buildPythonPackage rec {

  meta = with lib; {
    homepage = "https://github.com/scikit-hep/iminuit";
-    changelog = "https://github.com/scikit-hep/iminuit/releases/tag/v{version}";
+    changelog = "https://github.com/scikit-hep/iminuit/releases/tag/v${version}";
    description = "Python interface for the Minuit2 C++ library";
    license = with licenses; [
      mit
@@ -18,14 +18,14 @@

 buildPythonPackage rec {
  pname = "lance-namespace";
-  version = "0.0.20";
+  version = "0.0.21";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "lancedb";
    repo = "lance-namespace";
    tag = "v${version}";
-    hash = "sha256-dacYNbWXlV6+/klb9/rgbG/2YJ5BAw5xeSZbPvDgRb4=";
+    hash = "sha256-KbQ1xXD/+8oOcbhc+dvk68ZF0daWm7In0y0NVsSfp9U=";
  };

  sourceRoot = "${src.name}/python/lance_namespace_urllib3_client";
@@ -30,14 +30,14 @@

 buildPythonPackage rec {
  pname = "lance-namespace";
-  version = "0.0.20";
+  version = "0.0.21";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "lancedb";
    repo = "lance-namespace";
    tag = "v${version}";
-    hash = "sha256-dacYNbWXlV6+/klb9/rgbG/2YJ5BAw5xeSZbPvDgRb4=";
+    hash = "sha256-KbQ1xXD/+8oOcbhc+dvk68ZF0daWm7In0y0NVsSfp9U=";
  };

  sourceRoot = "${src.name}/python/lance_namespace";
@@ -183,16 +183,6 @@ let
      cbfonts-fd
    ]
  );
-  # https://github.com/ManimCommunity/manim/pull/4037
-  av_13_1 = av.overridePythonAttrs rec {
-    version = "13.1.0";
-    src = fetchFromGitHub {
-      owner = "PyAV-Org";
-      repo = "PyAV";
-      tag = "v${version}";
-      hash = "sha256-x2a9SC4uRplC6p0cD7fZcepFpRidbr6JJEEOaGSWl60=";
-    };
-  };
 in
 buildPythonPackage rec {
  pname = "manim";
@@ -216,7 +206,7 @@ buildPythonPackage rec {
  buildInputs = [ cairo ];

  dependencies = [
-    av_13_1
+    av
    beautifulsoup4
    click
    cloup
@@ -278,6 +268,8 @@ buildPythonPackage rec {
  pythonImportsCheck = [ "manim" ];

  meta = {
+    # https://github.com/ManimCommunity/manim/pull/4037
+    broken = lib.versionAtLeast av.version "14";
    description = "Animation engine for explanatory math videos - Community version";
    longDescription = ''
      Manim is an animation engine for explanatory math videos. It's used to
@@ -1,10 +1,9 @@
 {
  stdenv,
  lib,
-  pkgs,
+  pkgsCross,
  buildPythonPackage,
  fetchFromGitHub,
-  fetchgit,
  gitUpdater,
  setuptools-scm,
  pdfium-binaries,
@@ -13,22 +12,9 @@
  pytestCheckHook,
  removeReferencesTo,
  python,
-  replaceVars,
 }:

 let
-  pdfiumVersion = "${pdfium-binaries.version}";
-
-  headers = fetchgit {
-    url = "https://pdfium.googlesource.com/pdfium";
-    # The latest revision on the chromium/${pdfiumVersion} branch
-    rev = "9232d7c94a0007377a8034222f47683fe391d474";
-    hash = "sha256-dI3jTyVYc0EmMLHTiVjGSf3C2noS9Ru5WijEJFtiSFk=";
-    sparseCheckout = [
-      "public"
-    ];
-  };
-
  # They demand their own fork of ctypesgen
  ctypesgen = buildPythonPackage rec {
    pname = "ctypesgen";
@@ -38,34 +24,26 @@ let
    src = fetchFromGitHub {
      owner = "pypdfium2-team";
      repo = "ctypesgen";
-      rev = "848e9fbb1374f7f58a7ebf5e5da5c33292480b30";
-      hash = "sha256-3JA7cW/xaEj/DxMHEypROwrKGo7EwUEcipRqALTvydw=";
+      rev = "3961621c3e057015362db82471e07f3a57822b15";
+      hash = "sha256-0OBY7/Zn12rG20jNYG65lANTRVRIFvE0SgUdYGFpRtU=";
    };

-    patches = [
-      (replaceVars ./fix-cc-detection.patch {
-        cc = "${stdenv.cc.targetPrefix}cc";
-      })
-    ];
-
    build-system = [
      setuptools-scm
    ];
-
-    env.SETUPTOOLS_SCM_PRETEND_VERSION = "${version}";
  };

 in
 buildPythonPackage rec {
  pname = "pypdfium2";
-  version = "4.30.1";
+  version = "5.0.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "pypdfium2-team";
    repo = "pypdfium2";
    tag = version;
-    hash = "sha256-v8f/XruGJYK3H9z4Q1rLg4fEnPHa8tTOlNTBMVxPEgA=";
+    hash = "sha256-to6l8kfi6pYRs+hv+9zdxpSyhKCxX79G/EMdz6OBBaA=";
  };

  build-system = [
@@ -81,43 +59,19 @@ buildPythonPackage rec {
    pdfium-binaries
  ];

-  # Build system insists on fetching from the internet unless "cached" files
-  # are prepared. Even then, some code patching needs to happen to make it not
-  # talk to the internet.
+  preBuild = ''
+    getVersion() {
+      cat ${pdfium-binaries}/VERSION | grep $1 | sed 's/.*=//'
+    }
+    export GIVEN_FULLVER="$(getVersion MAJOR).$(getVersion MINOR).$(getVersion BUILD).$(getVersion PATCH)"
+  '';

-  # The project doesn't seem very open to allow for offline building either,
-  # see: https://github.com/pypdfium2-team/pypdfium2/discussions/274
-  preBuild =
-    let
-      pdfiumLib = lib.makeLibraryPath [ pdfium-binaries ];
-      inputVersionFile = (pkgs.formats.json { }).generate "version.json" {
-        version = lib.strings.toInt pdfiumVersion;
-        source = "generated";
-        flags = [ ];
-        run_lds = [ pdfiumLib ];
-        guard_symbols = false;
-      };
-      bindingsDir = "data/bindings";
-      headersDir = "${bindingsDir}/headers";
-      versionFile = "${bindingsDir}/version.json";
-    in
-    ''
-      # Preseed the headers and version file
-      mkdir -p ${bindingsDir}
-      cp -r ${headers}/public ${headersDir}
-      install -m 644 ${inputVersionFile} ${versionFile}
-
-      # Make generated bindings consider pdfium derivation path when loading dynamic libraries
-      substituteInPlace setupsrc/pypdfium2_setup/emplace.py \
-        --replace-fail 'build_pdfium_bindings(pdfium_ver, flags=flags, guard_symbols=True, run_lds=[])' \
-                       'build_pdfium_bindings(pdfium_ver, flags=flags, guard_symbols=True, run_lds=["${pdfiumLib}"])'
-
-      # Short circuit the version pull from the internet
-      substituteInPlace setupsrc/pypdfium2_setup/packaging_base.py \
-        --replace-fail 'PdfiumVer.to_full(build)._asdict()' \
-                       '{"major": 133, "minor": 0, "build": ${pdfiumVersion}, "patch": 1}'
-    '';
-  env.PDFIUM_PLATFORM = "system:${pdfiumVersion}";
+  env = {
+    PDFIUM_PLATFORM = "system-search:${pdfium-binaries.version}";
+    PDFIUM_HEADERS = "${pdfium-binaries}/include";
+    PDFIUM_BINARY = "${pdfium-binaries}/lib/libpdfium${stdenv.targetPlatform.extensions.sharedLibrary}";
+    CPP = "${stdenv.cc.targetPrefix}cpp";
+  };

  # Remove references to stdenv in comments.
  postInstall = ''
@@ -138,6 +92,7 @@ buildPythonPackage rec {
    updateScript = gitUpdater {
      allowedVersions = "^[.0-9]+$";
    };
+    tests.cross = pkgsCross.aarch64-multiplatform.python3Packages.pypdfium2;
  };

  meta = {
@@ -1,25 +0,0 @@
-diff --git a/src/ctypesgen/__main__.py b/src/ctypesgen/__main__.py
-index 23ee014..2d0cfc1 100644
--- a/src/ctypesgen/__main__.py
-+++ b/src/ctypesgen/__main__.py
-@@ -89,17 +89,9 @@ def main_impl(args, cmd_str):
-         assert _is_relative_to(args.output, args.linkage_anchor)
-     
-     if args.cpp:
-        assert shutil.which(args.cpp[0]), f"Given pre-processor {args.cpp[0]!r} is not available."
-    else:
-        if shutil.which("gcc"):
-            args.cpp = ["gcc", "-E"]
-        elif shutil.which("cpp"):
-            args.cpp = ["cpp"]
-        elif shutil.which("clang"):
-            args.cpp = ["clang", "-E"]
-        else:
-            raise RuntimeError("C pre-processor auto-detection failed: neither gcc nor clang available.")
-    
-+        print("cpp argument ignored for nix build")
-+    args.cpp = ["@cc@", "-E"]
-+ 
-     # Important: must not use +=, this would mutate the original object, which is problematic when default=[] is used and ctypesgen called repeatedly from within python
-     args.compile_libdirs = args.compile_libdirs + args.universal_libdirs
-     args.runtime_libdirs = args.runtime_libdirs + args.universal_libdirs
@@ -3,7 +3,6 @@
  aresponses,
  buildPythonPackage,
  fetchFromGitHub,
-  fetchpatch,
  lib,
  mashumaro,
  orjson,
@@ -16,24 +15,16 @@

 buildPythonPackage rec {
  pname = "pyportainer";
-  version = "1.0.12";
+  version = "1.0.14";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "erwindouna";
    repo = "pyportainer";
    tag = "v${version}";
-    hash = "sha256-goTYZhv/+4o2/SMOqANMnR3u4YxwDJVcvT0pz8MT7M8=";
+    hash = "sha256-5ARTHT5NmRBMOMVRPWAICdScAGUbkebtLyJqUW195Mw=";
  };

-  patches = [
-    (fetchpatch {
-      name = "remove-mkdocs-from-dependencies.patch";
-      url = "https://github.com/erwindouna/pyportainer/commit/8ed65c3870ff368465267e9bf2cda441b7b28994.patch";
-      hash = "sha256-3FE8NngAajIt8lDjG//sDPULq8mZ0f53iVemJ2xJ4MQ=";
-    })
-  ];
-
  build-system = [ poetry-core ];

  dependencies = [
@@ -18,7 +18,7 @@

 buildPythonPackage rec {
  pname = "pysmartthings";
-  version = "3.3.2";
+  version = "3.3.3";
  pyproject = true;

  disabled = pythonOlder "3.12";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
    owner = "andrewsayre";
    repo = "pysmartthings";
    tag = "v${version}";
-    hash = "sha256-8p9lEf+SoU1WRJxavUwUjlIKjQxcPyBsgVLcwv8XFHs=";
+    hash = "sha256-1fvgQE7p5R+Bq1O6wSHpPSIQI7pQRUXF+tXcTNLZ2II=";
  };

  build-system = [ poetry-core ];
@@ -16,14 +16,14 @@

 buildPythonPackage rec {
  pname = "python-open-router";
-  version = "0.3.2";
+  version = "0.3.3";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "joostlek";
    repo = "python-open-router";
    tag = "v${version}";
-    hash = "sha256-SSpSoo82FD1KUwbZpeHpl9I4A50yuJmdTVaHDxLZXso=";
+    hash = "sha256-RFKtt8ViTIEBmahY9H9YhSdVSlxaBEPOxRWPST9GoAM=";
  };

  build-system = [ poetry-core ];
@@ -12,14 +12,14 @@

 buildPythonPackage rec {
  pname = "pyvesync";
-  version = "3.1.4";
+  version = "3.2.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "webdjoe";
    repo = "pyvesync";
    tag = version;
-    hash = "sha256-l+b53B8Bdd/WnM2Oe9srST2T2KXaQfXtfc5+BwNte90=";
+    hash = "sha256-7QtyI5U1NRy0/iujfObdRHkwseetaD2M4f/buj8A9AY=";
  };

  build-system = [ setuptools ];
@@ -12,14 +12,14 @@

 buildPythonPackage rec {
  pname = "reolink-aio";
-  version = "0.16.4";
+  version = "0.16.5";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "starkillerOG";
    repo = "reolink_aio";
    tag = version;
-    hash = "sha256-YRawVisHVDW4hm/oqxVNscC/99v02+mTqvmBwLC4l40=";
+    hash = "sha256-crQl7zNjLijv+e+frjssUSuXMGjdcja4B325lBCkBt8=";
  };

  build-system = [ setuptools ];
@@ -5,6 +5,7 @@
  aioresponses,
  asyncclick,
  buildPythonPackage,
+  fetchpatch,
  fetchPypi,
  firebase-messaging,
  freezegun,
@@ -15,7 +16,6 @@
  pytest-mock,
  pytest-socket,
  pytestCheckHook,
-  pythonOlder,
  pytz,
  typing-extensions,
  websockets,
@@ -26,14 +26,25 @@ buildPythonPackage rec {
  version = "0.9.13";
  pyproject = true;

-  disabled = pythonOlder "3.9";
-
  src = fetchPypi {
    pname = "ring_doorbell";
    inherit version;
    hash = "sha256-M8lHODHdWXLvrDbQMeEgGaQMYCXicHTQta+XjJxSQlM=";
  };

+  patches = [
+    # https://github.com/python-ring-doorbell/python-ring-doorbell/pull/494
+    (fetchpatch {
+      name = "replace-async-timeout-with-asyncio.timeout.patch";
+      url = "https://github.com/python-ring-doorbell/python-ring-doorbell/commit/771243153921ec2cfb5f103b08ed08cccbe2e760.patch";
+      excludes = [
+        ".github/workflows/ci.yml"
+        "uv.lock"
+      ];
+      hash = "sha256-l6CUg3J6FZ0c0v0SSqvndjl4XeBhGFy/uWHPkExCM50=";
+    })
+  ];
+
  pythonRelaxDeps = [ "requests-oauthlib" ];

  build-system = [ hatchling ];
@@ -2,7 +2,10 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
-  isPy27,
+  fetchpatch,
+
+  # build system
+  setuptools,

  # propagates:
  requests,
@@ -25,8 +28,7 @@
 buildPythonPackage rec {
  pname = "samsungtvws";
  version = "2.7.2";
-  format = "setuptools";
-  disabled = isPy27;
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "xchwarze";
@@ -35,7 +37,18 @@ buildPythonPackage rec {
    hash = "sha256-CU59Kg8kSEE71x6wifCKCaVFdaMftodtkrAOpD+qvWY=";
  };

-  propagatedBuildInputs = [
+  patches = [
+    # https://github.com/xchwarze/samsung-tv-ws-api/pull/159
+    (fetchpatch {
+      name = "replace-async-timeout-with-asyncio.timeout.patch";
+      url = "https://github.com/xchwarze/samsung-tv-ws-api/commit/c5b363aababe0e859cf3aa521a658c83c567f876.patch";
+      hash = "sha256-gEtcqmxy2Til0KYLGwCxRThx9fndqdMbYam5WbzDKOo=";
+    })
+  ];
+
+  build-system = [ setuptools ];
+
+  dependencies = [
    requests
    websocket-client
  ];
@@ -14,6 +14,7 @@
  numpy,
  numexpr,
  packaging,
+  pkg-config,
  setuptools,
  sphinx,
  typing-extensions,
@@ -26,7 +27,7 @@
 buildPythonPackage rec {
  pname = "tables";
  version = "3.10.2";
-  format = "setuptools";
+  pyproject = true;

  disabled = pythonOlder "3.8";

@@ -51,6 +52,10 @@ buildPythonPackage rec {
    sphinx
  ];

+  nativeBuildInputs = [
+    pkg-config
+  ];
+
  buildInputs = [
    bzip2
    c-blosc
@@ -77,17 +82,21 @@ buildPythonPackage rec {
    substituteInPlace tables/__init__.py \
      --replace-fail 'find_library("blosc2")' '"${lib.getLib c-blosc}/lib/libblosc${stdenv.hostPlatform.extensions.sharedLibrary}"'  '';

+  env = {
+    HDF5_DIR = lib.getDev hdf5;
+  };
+
  # Regenerate C code with Cython
  preBuild = ''
    make distclean
  '';

-  setupPyBuildFlags = [
-    "--hdf5=${lib.getDev hdf5}"
-    "--lzo=${lib.getDev lzo}"
-    "--bzip2=${lib.getDev bzip2}"
-    "--blosc=${lib.getDev c-blosc}"
-    "--blosc2=${lib.getDev blosc2.c-blosc2}"
+  pypaBuildFlags = [
+    "--config-setting=--build-option=--hdf5=${lib.getDev hdf5}"
+    "--config-setting=--build-option=--lzo=${lib.getDev lzo}"
+    "--config-setting=--build-option=--bzip2=${lib.getDev bzip2}"
+    "--config-setting=--build-option=--blosc=${lib.getDev c-blosc}"
+    "--config-setting=--build-option=--blosc2=${lib.getDev blosc2.c-blosc2}"
  ];

  nativeCheckInputs = [ pytest ];
@@ -4,16 +4,15 @@
  backoff,
  buildPythonPackage,
  fetchFromGitHub,
-  pythonOlder,
+  fetchpatch,
  yarl,
+  setuptools,
 }:

 buildPythonPackage rec {
  pname = "toonapi";
  version = "0.3.0";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.8";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "frenck";
@@ -22,7 +21,18 @@ buildPythonPackage rec {
    hash = "sha256-RaN9ppqJbTik1/vNX0/YLoBawrqjyQWU6+FLTspIxug=";
  };

-  propagatedBuildInputs = [
+  patches = [
+    # https://github.com/frenck/python-toonapi/pull/15
+    (fetchpatch {
+      name = "replace-async-timeout-with-asyncio.timeout.patch";
+      url = "https://github.com/frenck/python-toonapi/commit/a04f1d8bcbcf48889dae49219d2edadbeb2dfa01.patch";
+      hash = "sha256-EMK11M+2OTnIB7oWavpQKNQq0ZLuSxYQlC6On7ob1xU=";
+    })
+  ];
+
+  build-system = [ setuptools ];
+
+  dependencies = [
    aiohttp
    backoff
    yarl
@@ -1,19 +1,26 @@
 {
  lib,
  buildPythonPackage,
-  dj-database-url,
-  django,
-  django-rq,
-  fetchFromGitHub,
+
+  # build-system
  flit-core,
-  freezegun,
-  google-cloud-translate,
+
+  # dependencies
+  django,
  polib,
-  python,
-  pythonOlder,
  typing-extensions,
  wagtail,
  wagtail-modeladmin,
+
+  # optional-dependencies
+  google-cloud-translate,
+
+  # tests
+  dj-database-url,
+  django-rq,
+  fetchFromGitHub,
+  freezegun,
+  python,
 }:

 buildPythonPackage rec {
@@ -21,8 +28,6 @@ buildPythonPackage rec {
  version = "1.12.2";
  pyproject = true;

-  disabled = pythonOlder "3.9";
-
  src = fetchFromGitHub {
    repo = "wagtail-localize";
    owner = "wagtail";
@@ -34,12 +39,16 @@ buildPythonPackage rec {

  dependencies = [
    django
-    wagtail
    polib
    typing-extensions
+    wagtail
    wagtail-modeladmin
  ];

+  optional-dependencies = {
+    google = [ google-cloud-translate ];
+  };
+
  nativeCheckInputs = [
    dj-database-url
    django-rq
@@ -47,21 +56,22 @@ buildPythonPackage rec {
    google-cloud-translate
  ];

-  optional-dependencies = {
-    google = [ google-cloud-translate ];
-  };
-
  checkPhase = ''
+    runHook preCheck
+
    # test_translate_html fails with later Beautifulsoup releases
    rm wagtail_localize/machine_translators/tests/test_dummy_translator.py
+
    ${python.interpreter} testmanage.py test
+
+    runHook postCheck
  '';

-  meta = with lib; {
+  meta = {
    description = "Translation plugin for Wagtail CMS";
    homepage = "https://github.com/wagtail/wagtail-localize";
    changelog = "https://github.com/wagtail/wagtail-localize/blob/${src.tag}/CHANGELOG.md";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ sephi ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ sephi ];
  };
 }
@@ -45,6 +45,9 @@ buildPythonPackage rec {
  checkPhase = ''
    runHook preCheck

+    # AssertionError: 3 != 1 : Found 3 instances of 'error-message' in response (expected 1)
+    rm wagtail_modeladmin/test/tests/test_simple_modeladmin.py
+
    ${python.interpreter} testmanage.py test

    runHook postCheck
--- a/Show More
+++ b/Show More