Merge staging-next into staging

2026-07-06 17:13:24 -05:00 · 2026-06-09 18:45:45 +00:00 · 2026-06-09 18:45:45 +00:00 · 2f51ad37d9
commit 2f51ad37d9
parent 9eea37174f 3731caf3d6
137 changed files with 3415 additions and 2322 deletions
--- a/nixos/doc/manual/release-notes/rl-2611.section.md
+++ b/nixos/doc/manual/release-notes/rl-2611.section.md
@ -22,6 +22,8 @@

 - Support for the legacy U‐Boot image format has been removed from the initrd generators, as it is deprecated upstream and no longer used by any platform in Nixpkgs.

+- `services.llama-cpp` is now configured using structured `services.llama-cpp.settings` attribute.
+
 - Python 2 has been removed from the top-level package set, as it is long past end-of-life. The `python2`, `python27`, `python2Full`, `python27Full`, `python2Packages`, and `python27Packages` attributes, along with the legacy `python`, `pythonFull`, and `pythonPackages` aliases, now throw an error directing you to `python3`. The `isPy2` and `isPy27` package flags have been removed accordingly. The only remaining Python 2 interpreter is vendored inside the `resholve` package for its `oil` dependency and is not exposed for general use.

 - `systemd.user.extraConfig` has been removed in favor of the structured [](#opt-systemd.user.settings.Manager) option. Use `systemd.user.settings.Manager` to set any `systemd-user.conf(5)` option directly. For example, replace `systemd.user.extraConfig = "DefaultTimeoutStartSec=60";` with `systemd.user.settings.Manager.DefaultTimeoutStartSec = 60;`.
--- a/nixos/modules/services/misc/llama-cpp.nix
+++ b/nixos/modules/services/misc/llama-cpp.nix
@ -2,188 +2,173 @@
  config,
  lib,
  pkgs,
-  utils,
  ...
 }:
-
 let
  cfg = config.services.llama-cpp;
-
-  modelsPresetFile =
-    if cfg.modelsPreset != null then
-      pkgs.writeText "llama-models.ini" (lib.generators.toINI { } cfg.modelsPreset)
-    else
-      null;
 in
 {
+  imports = [
+    (lib.mkRenamedOptionModule
+      [ "services" "llama-cpp" "host" ]
+      [ "services" "llama-cpp" "settings" "host" ]
+    )
+    (lib.mkRenamedOptionModule
+      [ "services" "llama-cpp" "port" ]
+      [ "services" "llama-cpp" "settings" "port" ]
+    )
+    (lib.mkRenamedOptionModule
+      [ "services" "llama-cpp" "model" ]
+      [ "services" "llama-cpp" "settings" "model" ]
+    )
+    (lib.mkRenamedOptionModule
+      [ "services" "llama-cpp" "modelsDir" ]
+      [ "services" "llama-cpp" "settings" "models-dir" ]
+    )
+    (lib.mkRemovedOptionModule [ "services" "llama-cpp" "modelsPreset" ] ''
+      Using a Nix attribute set for configuring model presets is no longer
+      supported. However, it's possible to use
+      `services.llama-cpp.settings.models-preset` to provide a path to an INI
+      file with desired options.
+    '')
+    (lib.mkRemovedOptionModule [
+      "services"
+      "llama-cpp"
+      "extraFlags"
+    ] "Use `services.llama-cpp.settings` instead")
+  ];

  options = {
-
    services.llama-cpp = {
-      enable = lib.mkEnableOption "LLaMA C++ server";
+      enable = lib.mkEnableOption "llama.cpp HTTP server";

      package = lib.mkPackageOption pkgs "llama-cpp" { };

-      model = lib.mkOption {
-        type = lib.types.nullOr lib.types.path;
-        example = "/models/mistral-instruct-7b/ggml-model-q4_0.gguf";
-        description = "Model path.";
-        default = null;
-      };
-
-      modelsDir = lib.mkOption {
-        type = lib.types.nullOr lib.types.path;
-        example = "/models/";
-        description = "Models directory.";
-        default = null;
-      };
-
-      modelsPreset = lib.mkOption {
-        type = lib.types.nullOr (lib.types.attrsOf lib.types.attrs);
-        default = null;
-        description = ''
-          Models preset configuration as a Nix attribute set.
-          This is converted to an INI file and passed to llama-server via --model-preset.
-          See llama-server documentation for available options.
-        '';
-        example = lib.literalExpression ''
-          {
-            "Qwen3-Coder-Next" = {
-              hf-repo = "unsloth/Qwen3-Coder-Next-GGUF";
-              hf-file = "Qwen3-Coder-Next-UD-Q4_K_XL.gguf";
-              alias = "unsloth/Qwen3-Coder-Next";
-              fit = "on";
-              seed = "3407";
-              temp = "1.0";
-              top-p = "0.95";
-              min-p = "0.01";
-              top-k = "40";
-              jinja = "on";
+      settings = lib.mkOption {
+        type = lib.types.submodule {
+          freeformType = lib.types.attrs;
+          options = {
+            host = lib.mkOption {
+              type = lib.types.str;
+              default = "127.0.0.1";
+              example = "0.0.0.0";
+              description = ''
+                IP address on which the server should listen on.
+              '';
            };
-          }
+
+            port = lib.mkOption {
+              type = lib.types.port;
+              default = 8080;
+              example = 1337;
+              description = ''
+                Port on which the server should listen on.
+              '';
+            };
+          };
+        };
+        default = { };
+        example = {
+          host = "0.0.0.0";
+          port = 1337;
+          model = "/mnt/llms/Foo3.6-27B-UD-Q4_K_XL.gguf";
+          ctx-size = 252144;
+          temp = 0.6;
+          top-k = 20;
+          top-p = 0.95;
+          batch-size = 512;
+          ubatch-size = 256;
+          spec-type = "draft-mtp";
+          spec-draft-n-max = 2;
+          flash-attn = "on";
+        };
+        description = ''
+          Command-line arguments for `llama-server`.
+
+          See <https://github.com/ggml-org/llama.cpp/blob/master/tools/server/README.md>
+          for the full list of options.
        '';
      };

-      extraFlags = lib.mkOption {
-        type = lib.types.listOf lib.types.str;
-        description = "Extra flags passed to llama-cpp-server.";
-        example = [
-          "-c"
-          "4096"
-          "-ngl"
-          "32"
-          "--numa"
-          "numactl"
-        ];
-        default = [ ];
-      };
-
-      host = lib.mkOption {
-        type = lib.types.str;
-        default = "127.0.0.1";
-        example = "0.0.0.0";
-        description = "IP address the LLaMA C++ server listens on.";
-      };
-
-      port = lib.mkOption {
-        type = lib.types.port;
-        default = 8080;
-        description = "Listen port for LLaMA C++ server.";
-      };
-
      openFirewall = lib.mkOption {
        type = lib.types.bool;
        default = false;
-        description = "Open ports in the firewall for LLaMA C++ server.";
+        description = ''
+          Open ports in the firewall for the server.
+        '';
      };
    };
-
  };

  config = lib.mkIf cfg.enable {
    systemd.services.llama-cpp = {
-      description = "LLaMA C++ server";
+      description = "llama.cpp HTTP server";
+      wants = [ "network.target" ];
      after = [ "network.target" ];
      wantedBy = [ "multi-user.target" ];

      serviceConfig = {
-        Type = "idle";
-        KillSignal = "SIGINT";
+        ExecStart = toString [
+          (lib.getExe' cfg.package "llama-server")
+          (lib.cli.toCommandLine (optionName: {
+            option = if builtins.stringLength optionName > 1 then "--${optionName}" else "-${optionName}";
+            sep = " ";
+            explicitBool = false;
+            formatArg = lib.generators.mkValueStringDefault { };
+          }) cfg.settings)
+        ];
+        ExecReload = "${lib.getExe' pkgs.coreutils "kill"} -HUP $MAINPID";
+        Restart = "on-failure";
+        RestartSec = 300;
+
+        DynamicUser = true;
        StateDirectory = "llama-cpp";
        CacheDirectory = "llama-cpp";
        WorkingDirectory = "/var/lib/llama-cpp";
        Environment = [ "LLAMA_CACHE=/var/cache/llama-cpp" ];
-        ExecStart =
-          let
-            args = [
-              "--host"
-              cfg.host
-              "--port"
-              (toString cfg.port)
-            ]
-            ++ lib.optionals (cfg.model != null) [
-              "-m"
-              cfg.model
-            ]
-            ++ lib.optionals (cfg.modelsDir != null) [
-              "--models-dir"
-              cfg.modelsDir
-            ]
-            ++ lib.optionals (cfg.modelsPreset != null) [
-              "--models-preset"
-              modelsPresetFile
-            ]
-            ++ cfg.extraFlags;
-          in
-          "${cfg.package}/bin/llama-server ${utils.escapeSystemdExecArgs args}";
-        Restart = "on-failure";
-        RestartSec = 300;

-        # for GPU acceleration
-        PrivateDevices = false;
-
-        # hardening
-        DynamicUser = true;
-        CapabilityBoundingSet = "";
+        AmbientCapabilities = [ "" ];
+        CapabilityBoundingSet = [ "" ];
+        LockPersonality = true;
+        MemoryDenyWriteExecute = true;
+        NoNewPrivileges = true;
+        PrivateDevices = false; # Required for GPU support.
+        PrivateMounts = true;
+        PrivateTmp = true;
+        PrivateUsers = true;
+        ProcSubset = "pid";
+        ProtectClock = true;
+        ProtectControlGroups = true;
+        ProtectHome = true;
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectProc = "invisible";
+        ProtectSystem = "strict";
+        RemoveIPC = true;
        RestrictAddressFamilies = [
          "AF_INET"
          "AF_INET6"
          "AF_UNIX"
        ];
-        NoNewPrivileges = true;
-        PrivateMounts = true;
-        PrivateTmp = true;
-        PrivateUsers = true;
-        ProtectClock = true;
-        ProtectControlGroups = true;
-        ProtectHome = true;
-        ProtectKernelLogs = true;
-        ProtectKernelModules = true;
-        ProtectKernelTunables = true;
-        ProtectSystem = "strict";
-        MemoryDenyWriteExecute = true;
-        LockPersonality = true;
-        RemoveIPC = true;
        RestrictNamespaces = true;
        RestrictRealtime = true;
        RestrictSUIDSGID = true;
        SystemCallArchitectures = "native";
+        SystemCallErrorNumber = "EPERM";
        SystemCallFilter = [
          "@system-service"
          "~@privileged"
        ];
-        SystemCallErrorNumber = "EPERM";
-        ProtectProc = "invisible";
-        ProtectHostname = true;
-        ProcSubset = "pid";
      };
    };

-    networking.firewall = lib.mkIf cfg.openFirewall {
-      allowedTCPPorts = [ cfg.port ];
-    };
-
+    networking.firewall.allowedTCPPorts = lib.optional cfg.openFirewall cfg.port;
  };

-  meta.maintainers = with lib.maintainers; [ newam ];
+  meta.maintainers = with lib.maintainers; [
+    azahi
+    newam
+  ];
 }
--- a/nixos/modules/services/misc/rmfakecloud.nix
+++ b/nixos/modules/services/misc/rmfakecloud.nix
@ -146,5 +146,5 @@ in
    };
  };

-  meta.maintainers = with lib.maintainers; [ euxane ];
+  meta.maintainers = with lib.maintainers; [ martinetd ];
 }
--- a/nixos/modules/system/boot/loader/limine/limine.nix
+++ b/nixos/modules/system/boot/loader/limine/limine.nix
@ -503,7 +503,9 @@ in

        script = ''
          fwupd_efi=(${config.services.fwupd.package.fwupd-efi}/libexec/fwupd/efi/fwupd*.efi)
-          ${lib.getExe cfg.secureBoot.sbctl} sign -o /run/fwupd-efi/$(basename "$fwupd_efi").signed "$fwupd_efi"
+          for efi in "''${fwupd_efi[@]}"; do
+            ${lib.getExe cfg.secureBoot.sbctl} sign -o "/run/fwupd-efi/$(basename "$efi").signed" "$efi"
+          done
        '';
      };

--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@ -16,9 +16,9 @@ let
      inherit tiling_wm;
    };
  stableVersion = {
-    version = "2025.3.4.7"; # "Android Studio Panda 4 | 2025.3.4 Patch 1"
-    sha256Hash = "sha256-qujzMvEkr9I8pJXcdwkVpFbadIDI+FngFTWtQvy0ygY=";
-    url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2025.3.4.7/android-studio-panda4-patch1-linux.tar.gz";
+    version = "2026.1.1.8"; # "Android Studio Quail 1 | 2026.1.1"
+    sha256Hash = "sha256-DB+kujz6vQfkipDgCl+i6iqCzVhwgz2tpbApDIF9g9M=";
+    url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.1.8/android-studio-quail1-linux.tar.gz";
  };
  betaVersion = {
    version = "2026.1.1.7"; # "Android Studio Quail 1 | 2026.1.1 RC 2"
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -7071,6 +7071,20 @@ final: prev: {
    meta.hydraPlatforms = [ ];
  };

+  guh-nvim = buildVimPlugin {
+    pname = "guh.nvim";
+    version = "2026-06-09";
+    src = fetchFromGitHub {
+      owner = "justinmk";
+      repo = "guh.nvim";
+      rev = "e8d8df780eb13da78a992fdc387bbc5f1401dd6f";
+      hash = "sha256-vkBP9TvNbUsChtntdgFkHaT01R84HfUAjGXk+SbZUng=";
+    };
+    meta.homepage = "https://github.com/justinmk/guh.nvim/";
+    meta.license = getLicenseFromSpdxId "MIT";
+    meta.hydraPlatforms = [ ];
+  };
+
  guihua-lua = buildVimPlugin {
    pname = "guihua.lua";
    version = "0.1-unstable-2026-05-26";
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@ -4154,6 +4154,8 @@ assertNoAdditions {
      };

      nvimSkipModules = [
+        # Example seeds and edits a database during require.
+        "sqlite.examples.bookmarks"
        # Require "sql.utils" ?
        "sqlite.tbl.cache"
      ];
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -503,6 +503,7 @@ https://github.com/ellisonleao/gruvbox.nvim/,,
 https://github.com/nvimdev/guard-collection/,,
 https://github.com/nvimdev/guard.nvim/,,
 https://github.com/nmac427/guess-indent.nvim/,,
+https://github.com/justinmk/guh.nvim/,main,
 https://github.com/ray-x/guihua.lua/,,
 https://github.com/sjl/gundo.vim/,,
 https://github.com/junegunn/gv.vim/,,
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@ -35,17 +35,17 @@ let

  hash =
    {
-      x86_64-linux = "sha256-t26YN3E5XaSJ7gki8nm06hVh4ZvXDEU77M749ZrqfAo=";
-      x86_64-darwin = "sha256-jOnwhiDJmU+EqU30wg1+frqDDxJgfngETx414i2YTIg=";
-      aarch64-linux = "sha256-8sYanI12qDMPgVG7S0QKLEkU0i/SICkJ5wz/OwhP+i4=";
-      aarch64-darwin = "sha256-oXeZZWAvpUn5KItEOR8yX9iQ0Fp6EzXGux0jvYbZqtU=";
-      armv7l-linux = "sha256-16cUu1C389edf0aHxXxTLJwjxmpHxM8mv1YFnPDLgP4=";
+      x86_64-linux = "sha256-L975R3F779LgaFTL4B6ZtImPd1LyXhImnDgCPmO5PI8=";
+      x86_64-darwin = "sha256-Sygw/VkIiyV+iABylgFpTiHs0f5dS6NYPWSm5BNh9tQ=";
+      aarch64-linux = "sha256-jcFC668WKAjlYju33RI6poAKnhm3fL1hO16alUwjwv4=";
+      aarch64-darwin = "sha256-AY6WeDzGEH5zXRosN1H/osxC3e5j0Hs9s2Ys2xe1UxI=";
+      armv7l-linux = "sha256-LqofnnZid/I0lVTyhC7yHD+Fxz4dSBxKJ8n+lp2uucQ=";
    }
    .${system} or throwSystem;

  # Please backport all compatible updates to the stable release.
  # This is important for the extension ecosystem.
-  version = "1.122.1";
+  version = "1.123.0";

  # The update server (update.code.visualstudio.com) expects the version path
  # segment in X.Y.Z form, so we normalize X.Y to X.Y.0 (e.g. "1.110" → "1.110.0").
@ -53,7 +53,7 @@ let
  downloadVersion = lib.versions.pad 3 version;

  # This is used for VS Code - Remote SSH test
-  rev = "8761a5560cfd65fdd19ce7e2bd18dab5c0a4d84e";
+  rev = "6a44c352bd24569c417e530095901b649960f9f8";
 in
 buildVscode {
  pname = "vscode" + lib.optionalString isInsiders "-insiders";
@ -86,7 +86,7 @@ buildVscode {
    src = fetchurl {
      name = "vscode-server-${rev}.tar.gz";
      url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
-      hash = "sha256-7n8KvIYEDYO8qqJjfbuUsgUwCxq9FJ6i/EuDBd1HQDk=";
+      hash = "sha256-i034bIsaPlxlVFNY5cKf/ftWPy17SFokbFUMa+zeLng=";
    };
    stdenv = stdenvNoCC;
  };
--- a/pkgs/applications/emulators/cdemu/analyzer.nix
+++ b/pkgs/applications/emulators/cdemu/analyzer.nix
@ -1,54 +0,0 @@
-{
-  cmake,
-  pkg-config,
-  callPackage,
-  gobject-introspection,
-  wrapGAppsHook3,
-  python3Packages,
-  libxml2,
-  gnuplot,
-  adwaita-icon-theme,
-  gdk-pixbuf,
-  intltool,
-  libmirage,
-}:
-python3Packages.buildPythonApplication {
-
-  inherit
-    (callPackage ./common-drv-attrs.nix {
-      version = "3.2.6";
-      pname = "image-analyzer";
-      hash = "sha256-7I8RUgd+k3cEzskJGbziv1f0/eo5QQXn62wGh/Y5ozc=";
-    })
-    pname
-    version
-    src
-    meta
-    ;
-
-  buildInputs = [
-    libxml2
-    gnuplot
-    libmirage
-    adwaita-icon-theme
-    gdk-pixbuf
-  ];
-  propagatedBuildInputs = with python3Packages; [
-    pygobject3
-    matplotlib
-  ];
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    wrapGAppsHook3
-    intltool
-    gobject-introspection
-  ];
-
-  pyproject = false;
-  dontWrapGApps = true;
-  preFixup = ''
-    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
-  '';
-
-}
--- a/pkgs/applications/emulators/cdemu/client.nix
+++ b/pkgs/applications/emulators/cdemu/client.nix
@ -1,42 +0,0 @@
-{
-  callPackage,
-  python3Packages,
-  cmake,
-  pkg-config,
-  intltool,
-  wrapGAppsNoGuiHook,
-  gobject-introspection,
-}:
-python3Packages.buildPythonApplication {
-
-  inherit
-    (callPackage ./common-drv-attrs.nix {
-      version = "3.2.5";
-      pname = "cdemu-client";
-      hash = "sha256-py2F61v8vO0BCM18GCflAiD48deZjbMM6wqoCDZsOd8=";
-    })
-    pname
-    version
-    src
-    meta
-    ;
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    intltool
-    wrapGAppsNoGuiHook
-    gobject-introspection
-  ];
-  propagatedBuildInputs = with python3Packages; [
-    dbus-python
-    pygobject3
-  ];
-
-  pyproject = false;
-  dontWrapGApps = true;
-  preFixup = ''
-    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
-  '';
-
-}
--- a/pkgs/applications/emulators/cdemu/common-drv-attrs.nix
+++ b/pkgs/applications/emulators/cdemu/common-drv-attrs.nix
@ -1,33 +0,0 @@
-{
-  lib,
-  fetchurl,
-  pname,
-  version,
-  hash,
-}:
-
-{
-  inherit pname version;
-  src = fetchurl {
-    url = "mirror://sourceforge/cdemu/${pname}-${version}.tar.xz";
-    inherit hash;
-  };
-  meta = {
-    description = "Suite of tools for emulating optical drives and discs";
-    longDescription = ''
-      CDEmu consists of:
-
-      - a kernel module implementing a virtual drive-controller
-      - libmirage which is a software library for interpreting optical disc images
-      - a daemon which emulates the functionality of an optical drive+disc
-      - textmode and GTK clients for controlling the emulator
-      - an image analyzer to view the structure of image files
-
-      Optical media emulated by CDemu can be mounted within Linux. Automounting is also allowed.
-    '';
-    homepage = "https://cdemu.sourceforge.io/";
-    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ bendlas ];
-  };
-}
--- a/pkgs/applications/emulators/cdemu/daemon.nix
+++ b/pkgs/applications/emulators/cdemu/daemon.nix
@ -1,59 +0,0 @@
-{
-  stdenv,
-  callPackage,
-  cmake,
-  pkg-config,
-  glib,
-  libao,
-  intltool,
-  libmirage,
-  coreutils,
-}:
-
-let
-  inherit
-    (callPackage ./common-drv-attrs.nix {
-      version = "3.2.7";
-      pname = "cdemu-daemon";
-      hash = "sha256-EKh2G6RA9Yq46BpTAqN2s6TpLJb8gwDuEpGiwdGcelc=";
-    })
-    pname
-    version
-    src
-    meta
-    ;
-in
-stdenv.mkDerivation {
-  inherit pname version src;
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    intltool
-  ];
-  buildInputs = [
-    glib
-    libao
-    libmirage
-  ];
-  postInstall = ''
-    mkdir -p $out/share/dbus-1/services
-    cp -R ../service-example $out/share/cdemu
-    substitute \
-      $out/share/cdemu/net.sf.cdemu.CDEmuDaemon.service \
-      $out/share/dbus-1/services/net.sf.cdemu.CDEmuDaemon.service \
-      --replace /bin/true ${coreutils}/bin/true
-  '';
-
-  meta = {
-    inherit (meta)
-      description
-      license
-      longDescription
-      maintainers
-      platforms
-      ;
-    homepage = "https://cdemu.sourceforge.io/about/daemon/";
-    mainProgram = "cdemu-daemon";
-  };
-}
--- a/pkgs/applications/emulators/cdemu/gui.nix
+++ b/pkgs/applications/emulators/cdemu/gui.nix
@ -1,49 +0,0 @@
-{
-  callPackage,
-  cmake,
-  pkg-config,
-  wrapGAppsHook3,
-  gobject-introspection,
-  python3Packages,
-  libnotify,
-  intltool,
-  adwaita-icon-theme,
-  gdk-pixbuf,
-  libappindicator-gtk3,
-}:
-python3Packages.buildPythonApplication {
-
-  inherit
-    (callPackage ./common-drv-attrs.nix {
-      version = "3.2.6";
-      pname = "gcdemu";
-      hash = "sha256-w4vzKoSotL5Cjfr4Cu4YhNSWXJqS+n/vySrwvbhR1zA=";
-    })
-    pname
-    version
-    src
-    meta
-    ;
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    wrapGAppsHook3
-    intltool
-    gobject-introspection
-  ];
-  buildInputs = [
-    libnotify
-    adwaita-icon-theme
-    gdk-pixbuf
-    libappindicator-gtk3
-  ];
-  propagatedBuildInputs = with python3Packages; [ pygobject3 ];
-
-  pyproject = false;
-  dontWrapGApps = true;
-  preFixup = ''
-    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
-  '';
-
-}
--- a/pkgs/applications/emulators/cdemu/libmirage.nix
+++ b/pkgs/applications/emulators/cdemu/libmirage.nix
@ -1,73 +0,0 @@
-{
-  stdenv,
-  callPackage,
-  cmake,
-  pkg-config,
-  gobject-introspection,
-  vala,
-  glib,
-  libsndfile,
-  zlib,
-  bzip2,
-  xz,
-  libsamplerate,
-  intltool,
-  pcre,
-  util-linux,
-  libselinux,
-  libsepol,
-}:
-
-let
-  inherit
-    (callPackage ./common-drv-attrs.nix {
-      version = "3.2.10";
-      pname = "libmirage";
-      hash = "sha256-+T5Gu3VcprCkSJcq/kTySRnNI7nc+GbRtctLkzPhgK4=";
-    })
-    pname
-    version
-    src
-    meta
-    ;
-in
-stdenv.mkDerivation {
-  inherit pname version src;
-
-  env = {
-    PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0";
-    PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0";
-  };
-
-  buildInputs = [
-    glib
-    libsndfile
-    zlib
-    bzip2
-    xz
-    libsamplerate
-  ];
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    intltool
-    gobject-introspection
-    vala
-  ];
-  propagatedBuildInputs = [
-    pcre
-    util-linux
-    libselinux
-    libsepol
-  ];
-
-  meta = {
-    inherit (meta)
-      maintainers
-      license
-      platforms
-      ;
-    description = "CD-ROM image access library";
-    homepage = "https://cdemu.sourceforge.io/about/libmirage/";
-  };
-}
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@ -1,10 +1,10 @@
 {
  "chromium": {
-    "version": "149.0.7827.53",
+    "version": "149.0.7827.102",
    "chromedriver": {
-      "version": "149.0.7827.53",
-      "hash_darwin": "sha256-JzeQy8O9gcoV195sQrfUV1TclUyAI4lzOcE5+BmgKrM=",
-      "hash_darwin_aarch64": "sha256-nEkMVGUVYP0q9UECGT0ibc2vzjVRIO69dFrYOB05lqg="
+      "version": "149.0.7827.103",
+      "hash_darwin": "sha256-3ws6RyF5SwjRcdo4IY+MzqcaZ6214dCVV3YB4YL+h6k=",
+      "hash_darwin_aarch64": "sha256-S8/dGAlipcYXzZIEJEGAnvsu3ilqjnBb8IdXUxGrp2o="
    },
    "deps": {
      "depot_tools": {
@ -21,8 +21,8 @@
    "DEPS": {
      "src": {
        "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "9d2c8156a72129edca4785abb98866fad60ea338",
-        "hash": "sha256-RPFeHTWAeJUzbWU7QyRPmT3sqf3bAEuJ7/IJ3TP40pA=",
+        "rev": "112f665d98a2fe84b156c74fbea2aed742f16c15",
+        "hash": "sha256-75PYsss5Qob493WCc28XHncjFIlvUr2HQx79w5UmK/k=",
        "recompress": true
      },
      "src/third_party/clang-format/script": {
@ -92,8 +92,8 @@
      },
      "src/third_party/angle": {
        "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "ded782bca9d5f165d1c4a70124cdc5384043a8b3",
-        "hash": "sha256-7+Hhx/V554hO3zzGuIZswkaRVDElz7ost7vbnf2wyZc="
+        "rev": "4b8c7f0f321952bba4f81056b4aa57d0d6428642",
+        "hash": "sha256-ADG0WfkeFRq4NF0m+s3a/N5+u3q4ApExuWUnV3m5uAI="
      },
      "src/third_party/angle/third_party/glmark2/src": {
        "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@ -132,8 +132,8 @@
      },
      "src/third_party/dawn": {
        "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "1815a06195d9c74ac737a96f87c05111926e04f8",
-        "hash": "sha256-71KbW0w60VB67+HM48WpOo18hrVId4/4QBDl+xl5pgo="
+        "rev": "c1179de12ec3ed8feb91e922f12a90ae33f4a8cf",
+        "hash": "sha256-VFEBqbSsn/3jqRGJgTM/r5DEtfhvTOIfS9fGIKzYo9I="
      },
      "src/third_party/dawn/third_party/glfw3/src": {
        "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@ -552,8 +552,8 @@
      },
      "src/third_party/libyuv": {
        "url": "https://chromium.googlesource.com/libyuv/libyuv.git",
-        "rev": "a7849e8a5e9c996bef2332efae897e7301055a20",
-        "hash": "sha256-ftOTwWULKNplqjQQ9oM9t+PU3S6/ySDOBoE5E/HWuHg="
+        "rev": "644251f252a84bf8ce91ff0aca86a9b16b069ab8",
+        "hash": "sha256-DsoOY8bg0sPOF8tF67Gk7fRqdQzG1hc9fVMlZVjKWU4="
      },
      "src/third_party/lss": {
        "url": "https://chromium.googlesource.com/linux-syscall-support.git",
@ -607,8 +607,8 @@
      },
      "src/third_party/perfetto": {
        "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
-        "rev": "846203c4b3b25f834a0bebc101fa8e1b8f9d0ca9",
-        "hash": "sha256-YOgOau9vNrOOqyUf6WylI/oQ2drCxoW7jnrHt7fAfQM="
+        "rev": "97c58a94bb6495c4e202467fb1c55eaa22b5670f",
+        "hash": "sha256-qtClkWAluLDRZn7yrHLU7qp9szP+/WsiG5JZZzRKd38="
      },
      "src/third_party/protobuf-javascript/src": {
        "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
@ -652,8 +652,8 @@
      },
      "src/third_party/skia": {
        "url": "https://skia.googlesource.com/skia.git",
-        "rev": "53348aa333da02b77c4b5797e2de722f5abde7d0",
-        "hash": "sha256-Qh0ytA45zP67VQE417iUtjPcJmJmDzcu4BAatyh6p0w="
+        "rev": "92a56ebeef43061f4878aa869aa1f2160265c24c",
+        "hash": "sha256-QEY9Wy2guRuS4CXeXHUhUNigCJWWndnNCbWQmaSYJ/A="
      },
      "src/third_party/smhasher/src": {
        "url": "https://chromium.googlesource.com/external/smhasher.git",
@ -787,8 +787,8 @@
      },
      "src/third_party/webrtc": {
        "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "5a7e0ff57a52e12f834d64c57d040d1105ea17f2",
-        "hash": "sha256-V1accCSU6LV5Ixhd+HBOvqZ7GxT57ALsvaF8ABLIXxM="
+        "rev": "e8b4d4c5952a8fb7b35c2a6cba4e8c3de2ea2e1e",
+        "hash": "sha256-94U9URlFGLYe94KCFU0giY9bBbrHNDCBr9GEwbRbOK4="
      },
      "src/third_party/wuffs/src": {
        "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@ -817,8 +817,8 @@
      },
      "src/v8": {
        "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "5a39b146dd810a52812202fae891281d5dc4db7d",
-        "hash": "sha256-UbX88nE4VyWUm4PvFTOy3mC04MzSdgC006ZpQrEY8cQ="
+        "rev": "16ef80c1f5d3cfade812bd1743952a4cfd480a31",
+        "hash": "sha256-GI0NWA0XYGocxZp3+lPen6BkwaG7X3EDaEWM9rejgkI="
      }
    }
  },
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
@ -9,10 +9,10 @@

 buildMozillaMach rec {
  pname = "firefox";
-  version = "151.0.3";
+  version = "151.0.4";
  src = fetchurl {
    url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "511723e5cf042abb66cbeda89b78d42de8d1b53544565670173f3e69c2a7ceefc76468c90576221418bfc9b122151ec117978caa4823cfb9b80797f3064bd895";
+    sha512 = "7df6099411843764321e1480b058530193bf134f590b97aadf053603c356c34599f42d6b83d739c2d6440a78cd81dd0b19fd2ddc2a59746d6bbe7e39f00b7e04";
  };

  meta = {
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@ -5,26 +5,30 @@
  fetchFromGitHub,
  installShellFiles,
  testers,
+  writableTmpDirAsHomeHook,
 }:

 buildGoModule (finalAttrs: {
  pname = "kubernetes-helm";
-  version = "3.20.2";
+  version = "4.2.0";

  src = fetchFromGitHub {
    owner = "helm";
    repo = "helm";
    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-YF5djCmCoPdLlEa/cksQgGtscEmIsQTiRqYZNyFjsEY=";
+    hash = "sha256-Wyihzf7KpnVuIdp5lmjhB7uLAGgtmI0TXYl29uaVC5Y=";
  };
-  vendorHash = "sha256-kqx23LekpuZJFisVZUoXBY9vHh9zviKyaW5NSa4ecxM=";
+
+  vendorHash = "sha256-QTDC0v0BPE3FoK9AAq1n2jWxOE9gB9OsoY2wnpcCDUQ=";

  subPackages = [ "cmd/helm" ];
  ldflags = [
    "-w"
    "-s"
-    "-X helm.sh/helm/v3/internal/version.version=v${finalAttrs.version}"
-    "-X helm.sh/helm/v3/internal/version.gitCommit=${finalAttrs.src.rev}"
+    "-X helm.sh/helm/v4/internal/version.version=v${finalAttrs.version}"
+    "-X helm.sh/helm/v4/internal/version.metadata="
+    "-X helm.sh/helm/v4/internal/version.gitCommit=${finalAttrs.src.rev}"
+    "-X helm.sh/helm/v4/internal/version.gitTreeState=clean"
  ];

  preBuild = ''
@ -33,10 +37,14 @@ buildGoModule (finalAttrs: {
    K8S_MODULES_MAJOR_VER="$(($(cut -d. -f1 <<<"$K8S_MODULES_VER") + 1))"
    K8S_MODULES_MINOR_VER="$(cut -d. -f2 <<<"$K8S_MODULES_VER")"
    old_ldflags="''${ldflags}"
-    ldflags="''${ldflags} -X helm.sh/helm/v3/pkg/lint/rules.k8sVersionMajor=''${K8S_MODULES_MAJOR_VER}"
-    ldflags="''${ldflags} -X helm.sh/helm/v3/pkg/lint/rules.k8sVersionMinor=''${K8S_MODULES_MINOR_VER}"
-    ldflags="''${ldflags} -X helm.sh/helm/v3/pkg/chartutil.k8sVersionMajor=''${K8S_MODULES_MAJOR_VER}"
-    ldflags="''${ldflags} -X helm.sh/helm/v3/pkg/chartutil.k8sVersionMinor=''${K8S_MODULES_MINOR_VER}"
+    ldflags="''${ldflags} -X helm.sh/helm/v4/pkg/chart/v2/lint/rules.k8sVersionMajor=''${K8S_MODULES_MAJOR_VER}"
+    ldflags="''${ldflags} -X helm.sh/helm/v4/pkg/chart/v2/lint/rules.k8sVersionMinor=''${K8S_MODULES_MINOR_VER}"
+    ldflags="''${ldflags} -X helm.sh/helm/v4/pkg/internal/v3/lint/rules.k8sVersionMajor=''${K8S_MODULES_MAJOR_VER}"
+    ldflags="''${ldflags} -X helm.sh/helm/v4/pkg/internal/v3/lint/rules.k8sVersionMinor=''${K8S_MODULES_MINOR_VER}"
+    ldflags="''${ldflags} -X helm.sh/helm/v4/pkg/chart/common/util.k8sVersionMajor=''${K8S_MODULES_MAJOR_VER}"
+    ldflags="''${ldflags} -X helm.sh/helm/v4/pkg/chart/common/util.k8sVersionMinor=''${K8S_MODULES_MINOR_VER}"
+    ldflags="''${ldflags} -X helm.sh/helm/v4/internal/version.kubeClientVersionMajor=''${K8S_MODULES_MAJOR_VER}"
+    ldflags="''${ldflags} -X helm.sh/helm/v4/internal/version.kubeClientVersionMinor=''${K8S_MODULES_MINOR_VER}"
  '';

  overrideModAttrs = _: {
@ -50,15 +58,17 @@ buildGoModule (finalAttrs: {
    # restore ldflags for tests
    ldflags="''${old_ldflags}"

+    patchShebangs pkg/cmd/testdata/helmhome/helm/plugins/exitwith/exitwith.sh
+
    # skipping version tests because they require dot git directory
-    substituteInPlace cmd/helm/version_test.go \
+    substituteInPlace pkg/cmd/version_test.go \
      --replace-fail "TestVersion" "SkipVersion"
    # skipping plugin tests
-    substituteInPlace cmd/helm/plugin_test.go \
+    substituteInPlace pkg/cmd/plugin_test.go \
      --replace-fail "TestPluginDynamicCompletion" "SkipPluginDynamicCompletion" \
-      --replace-fail "TestLoadPlugins" "SkipLoadPlugins"
+      --replace-fail "TestLoadCLIPlugins" "SkipLoadCLIPlugins"
    substituteInPlace cmd/helm/helm_test.go \
-      --replace-fail "TestPluginExitCode" "SkipPluginExitCode"
+      --replace-fail "TestCliPluginExitCode" "TestCliPluginExitCode"
  ''
  + lib.optionalString stdenv.hostPlatform.isDarwin ''
    # skipping as test fails in sandbox
@ -76,6 +86,7 @@ buildGoModule (finalAttrs: {
  '';

  nativeBuildInputs = [ installShellFiles ];
+  nativeCheckInputs = [ writableTmpDirAsHomeHook ];
  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
    $out/bin/helm completion bash > helm.bash
    $out/bin/helm completion zsh > helm.zsh
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "helm-diff";
-  version = "3.15.7";
+  version = "3.15.8";

  src = fetchFromGitHub {
    owner = "databus23";
    repo = "helm-diff";
    rev = "v${version}";
-    hash = "sha256-RCtWxK1Ex1U+emtulXeAT9Jz9bGIiq/yEsZ+JxqmK3g=";
+    hash = "sha256-rH5EgSrL6yBmLd8m5QhEe3VTv8NVmyO5AC++7QQw/wI=";
  };

-  vendorHash = "sha256-suNOXXmwDo3rxICijnEvwYNqN50lukm1kI0tJgqs3ko=";
+  vendorHash = "sha256-wBGHhjVNqA7SAueg9xowqxcCda8HzggepmOprsKPnjo=";

  ldflags = [
    "-s"
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
@ -13,13 +13,13 @@

 stdenv.mkDerivation rec {
  pname = "helm-secrets";
-  version = "4.6.10";
+  version = "4.7.6";

  src = fetchFromGitHub {
    owner = "jkroepke";
    repo = "helm-secrets";
    rev = "v${version}";
-    hash = "sha256-hno6+kik+U9XA7Mr9OnuuVidfc/xoqWRjMbBMI6M3QA=";
+    hash = "sha256-gCsXnZCvQqc5PIQGheOdzZ1YSUNDhbMvJIROMGA65Jg=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@ -420,18 +420,18 @@ in

  docker_29 =
    let
-      version = "29.5.2";
+      version = "29.5.3";
    in
    callPackage dockerGen {
      inherit version;
      cliRev = "v${version}";
-      cliHash = "sha256-kHgDZVr6mAyCtZ6bSG9FWV0GhWDfXLXzHYFrmjFzO9w=";
+      cliHash = "sha256-ZYfBWNVp7w8ZKdRA6bmDVQV4UEp+t8lWehInvtfysxM=";
      mobyRev = "docker-v${version}";
-      mobyHash = "sha256-lux7tTyF6vm5wuIXs+z3Ygd2v4JjgHbRvOXNA4kjNtg=";
+      mobyHash = "sha256-D+XjHsKUFgMBCQsFI825JIGHEQmDt3NQCwpTdu6XSc8=";
      runcRev = "v1.3.5";
      runcHash = "sha256-Swphxbu/OLkUrfRjLMZIVGwYb7AN0xHdyxm0ysAVam0=";
-      containerdRev = "v2.2.3";
-      containerdHash = "sha256-jaOLZf246kmvBHHrwgvqrhxuh+n1HE6NDqckZK4tvnM=";
+      containerdRev = "v2.2.4";
+      containerdHash = "sha256-F0lw7zh4V9JlFQGkE4RNT1VLX8WWLgZAAvbP12jnRMw=";
      tiniRev = "369448a167e8b3da4ca5bca0b3307500c3371828";
      tiniHash = "sha256-jCBNfoJAjmcTJBx08kHs+FmbaU82CbQcf0IVjd56Nuw=";
    };
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@ -1333,6 +1333,42 @@ let
      ];
    };

+    ubuntu2604x86_64 = {
+      name = "ubuntu-26.04-resolute-amd64";
+      fullName = "Ubuntu 26.04 Resolute (amd64)";
+      packagesLists = [
+        (fetchurl {
+          url = "https://snapshot.ubuntu.com/ubuntu/20260515T222303Z/dists/resolute/main/binary-amd64/Packages.xz";
+          hash = "sha256-7ZrEHLJj767MWgagdC3FZXDi+1/5TE8uSy+9zd1zzyQ=";
+        })
+        (fetchurl {
+          url = "https://snapshot.ubuntu.com/ubuntu/20260515T222303Z/dists/resolute/universe/binary-amd64/Packages.xz";
+          hash = "sha256-FYe+htZtOFQjJSFeDhCfdb1pXI8k15Os4nYgOKatWB4=";
+        })
+        (fetchurl {
+          url = "https://snapshot.ubuntu.com/ubuntu/20260515T222303Z/dists/resolute-updates/main/binary-amd64/Packages.xz";
+          hash = "sha256-xaUdPgtH3jCgTJXYUbksMHvzt6jj6YfdzSAb+91tQNw=";
+        })
+        (fetchurl {
+          url = "https://snapshot.ubuntu.com/ubuntu/20260515T222303Z/dists/resolute-updates/universe/binary-amd64/Packages.xz";
+          hash = "sha256-gXEKlgpgyrcnIhYwz1vxypFNX50EMbwhmidbDvUruKc=";
+        })
+        (fetchurl {
+          url = "https://snapshot.ubuntu.com/ubuntu/20260515T222303Z/dists/resolute-security/main/binary-amd64/Packages.xz";
+          hash = "sha256-tzAvbwp+/6snpL8TtbtTx2kEL2f+XfGAwDCl/r6ka6Y=";
+        })
+        (fetchurl {
+          url = "https://snapshot.ubuntu.com/ubuntu/20260515T222303Z/dists/resolute-security/universe/binary-amd64/Packages.xz";
+          hash = "sha256-gXEKlgpgyrcnIhYwz1vxypFNX50EMbwhmidbDvUruKc=";
+        })
+      ];
+      urlPrefix = "https://snapshot.ubuntu.com/ubuntu/20260515T222303Z";
+      packages = commonDebPackages ++ [
+        "diffutils"
+        "libc-bin"
+      ];
+    };
+
    debian11i386 = {
      name = "debian-11.11-bullseye-i386";
      fullName = "Debian 11.11 Bullseye (i386)";
--- a/pkgs/build-support/vm/test.nix
+++ b/pkgs/build-support/vm/test.nix
@ -83,4 +83,5 @@ in
  testUbuntu2204i386Image = makeImageTestScript diskImages.ubuntu2204i386;
  testUbuntu2204x86_64Image = makeImageTestScript diskImages.ubuntu2204x86_64;
  testUbuntu2404x86_64Image = makeImageTestScript diskImages.ubuntu2404x86_64;
+  testUbuntu2604x86_64Image = makeImageTestScript diskImages.ubuntu2604x86_64;
 }
--- a/pkgs/by-name/ai/aiken/package.nix
+++ b/pkgs/by-name/ai/aiken/package.nix
@ -8,16 +8,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "aiken";
-  version = "1.1.21";
+  version = "1.1.22";

  src = fetchFromGitHub {
    owner = "aiken-lang";
    repo = "aiken";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-8Oq6Bem4mREHXsBC0FwBnU2MVmTh8b7KtJ/KrPDMqLU=";
+    hash = "sha256-mq/NwfSjqykYwyKq63jDs7u21uWxzAtwDKbZ9Fn3i90=";
  };

-  cargoHash = "sha256-5TplKj7q8G1XX6o4d8Vlgf5eGXB8fpnvkl7TwVcuTw0=";
+  cargoHash = "sha256-WzaprYYTFLaM6TKzUG6JadQNLBHjgoM3FwRUfMTmiHA=";

  buildInputs = [ openssl ];

--- a/pkgs/by-name/an/angle/package.nix
+++ b/pkgs/by-name/an/angle/package.nix
@ -17,6 +17,7 @@
  pciutils,
  libGL,
  apple-sdk_15,
+  fixDarwinDylibNames,
  xcbuild,
 }:
 let
@ -68,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
    llvmPackages.bintools
  ]
  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    fixDarwinDylibNames
    xcbuild
  ];

@ -100,6 +102,8 @@ stdenv.mkDerivation (finalAttrs: {
    "treat_warnings_as_errors=false"
  ];

+  env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-headerpad_max_install_names";
+
  patches = [
    # https://issues.chromium.org/issues/432275627
    # https://chromium-review.googlesource.com/c/chromium/src/+/6761936/2/build/config/compiler/BUILD.gn
@ -146,7 +150,7 @@ stdenv.mkDerivation (finalAttrs: {

    mkdir -p $out/lib/pkgconfig

-    cat > $out/lib/pkgconfig/angle.pc <<EOF
+    cat > $out/lib/pkgconfig/angle.pc <<'EOF'
    prefix=${placeholder "out"}
    exec_prefix=''${prefix}
    libdir=''${prefix}/lib
@ -175,6 +179,13 @@ stdenv.mkDerivation (finalAttrs: {
    runHook postInstall
  '';

+  postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    install_name_tool \
+        -change ./libGLESv2.dylib \
+        $out/lib/libGLESv2.dylib \
+        $out/lib/libGLESv1_CM.dylib
+  '';
+
  meta = {
    description = "Conformant OpenGL ES implementation for Windows, Mac, Linux, iOS and Android";
    longDescription = ''
--- a/pkgs/by-name/an/anyrun/package.nix
+++ b/pkgs/by-name/an/anyrun/package.nix
@ -17,16 +17,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "anyrun";
-  version = "25.12.0";
+  version = "26.6.1";

  src = fetchFromGitHub {
    owner = "anyrun-org";
    repo = "anyrun";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-KEEJLERvo04AsPo/SWHFJUmHaGGOVjUoGwA9e8GVIQQ=";
+    hash = "sha256-+Fx+JfSboBk8KKVgmaMKDKvMe9c3WC+7RKYjnpvMVpg=";
  };

-  cargoHash = "sha256-IDrDgmksDdKw5JYY/kw+CCEIDJ6S2KARxUDSul713pw=";
+  cargoHash = "sha256-NHWKgLvILeXVLyKxfm/uWxb2mwb1wM6Utw9vPlUPYaI=";

  strictDeps = true;
  enableParallelBuilding = true;
--- a/pkgs/by-name/an/anytype/package.nix
+++ b/pkgs/by-name/an/anytype/package.nix
@ -87,7 +87,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {

    dontFixup = true;

-    #TODO: update it in update script
    outputHash = "sha256-6IHFidjVDDzUOCRXVwjvzcLGKV6dWWS7k2jwrOuJ748=";
    outputHashMode = "recursive";
  };
--- a/pkgs/by-name/an/anytype/update.sh
+++ b/pkgs/by-name/an/anytype/update.sh
@ -57,5 +57,6 @@ tantivy_go_version=${tantivy_go_version//v}

 nix-update tantivy-go --version "$tantivy_go_version" --generate-lockfile
 nix-update anytype-heart --version "$middleware_version"
-update-source-version anytype --ignore-same-version --source-key=locales --rev="$locales_rev"
+update-source-version anytype --source-key=locales --rev="$locales_rev" --ignore-same-version
 nix-update anytype --version "$anytype_version"
+update-source-version anytype --source-key=node_modules --ignore-same-version --ignore-same-hash
--- a/pkgs/by-name/as/astro-language-server/package.nix
+++ b/pkgs/by-name/as/astro-language-server/package.nix
@ -2,32 +2,45 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  pnpm_10,
+  pnpm_11,
+  nodejs-slim_22,
  fetchPnpmDeps,
  pnpmConfigHook,
  nodejs,
  nix-update-script,
+  fetchpatch2,
 }:
+let
+  # pnpm 11's bundled Node.js 24 has a libuv/kqueue bug on macOS, workaround copied from openclaw package
+  pnpm = pnpm_11.override { nodejs-slim = nodejs-slim_22; };
+
+in
 stdenv.mkDerivation (finalAttrs: {
  pname = "astro-language-server";
-  version = "2.16.7";
+  version = "2.16.10";

  src = fetchFromGitHub {
    owner = "withastro";
    repo = "astro";
    tag = "@astrojs/language-server@${finalAttrs.version}";
-    hash = "sha256-0UkbHGOvMJxY4RXVLx9T8oh2cnuwziEuwUfFrls4Wc0=";
+    hash = "sha256-ZzLLGfbY6Rtjzqw+MMCHthvalo3B8lf/qxFJNJ/2LdQ=";
  };

+  patches = [
+    # remove on next release
+    (fetchpatch2 {
+      name = "fix-supply-chain-verification-fail.patch";
+      url = "https://github.com/withastro/astro/commit/272ca6173b40cfa37299c27b513f495f386d4009.patch?full_index=1";
+      includes = [ "pnpm-workspace.yaml" ];
+      hash = "sha256-jPYFiyBlIoqpbIcT/hPa+VlF1IX+QCP8CVFQGarzlEs=";
+    })
+  ];
+
  # https://pnpm.io/filtering#--filter-package_name-1
  pnpmWorkspaces = [
    "@astrojs/language-server..."
    "@astrojs/ts-plugin"
  ];
-  prePnpmInstall = ''
-    pnpm config set dedupe-peer-dependents false
-    pnpm approve-builds @emmetio/css-parser
-  '';

  pnpmDeps = fetchPnpmDeps {
    inherit (finalAttrs)
@ -35,17 +48,18 @@ stdenv.mkDerivation (finalAttrs: {
      version
      src
      pnpmWorkspaces
-      prePnpmInstall
+      patches
      ;
-    pnpm = pnpm_10;
-    fetcherVersion = 3;
-    hash = "sha256-1kdXt0Wc/ON//hwBYozRSMAyKQqEfSMfOI7XJyd9MBc=";
+    inherit pnpm;
+    # pnpm 11 stores state in a SQLite binary, fetcherVersion = 4 dumps it to a deterministic SQL text file
+    fetcherVersion = 4;
+    hash = "sha256-dqqvN8FMLjEbTtgQRkkURD7clMJ/OL9Mbk6icc4KU60=";
  };

  nativeBuildInputs = [
    nodejs
    pnpmConfigHook
-    pnpm_10
+    pnpm
  ];

  buildInputs = [ nodejs ];
@ -70,6 +84,9 @@ stdenv.mkDerivation (finalAttrs: {
    pushd $out/lib/node_modules/astro-language-server/node_modules
    rm -rf {./,.pnpm/node_modules/}astro-{scripts,benchmark} .pnpm/node_modules/@astrojs/ts-plugin
    popd
+    # pnpm creates symlinks for optional platform-specific packages (e.g. @biomejs/cli-darwin-arm64)
+    # that are not installed by the --prod --filter install, leaving dangling symlinks
+    find $out -xtype l -delete
    ln -s $out/lib/node_modules/astro-language-server/packages/language-tools/language-server/bin/nodeServer.js $out/bin/astro-ls

    runHook postInstall
--- a/pkgs/by-name/ay/ayatana-indicator-display/package.nix
+++ b/pkgs/by-name/ay/ayatana-indicator-display/package.nix
@ -39,6 +39,14 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-rsZjEfAiz1HC5XMjPume1Y6miNAv1kmPFP4J/+NKlsA=";
  };

+  patches = [
+    # This should be dropped once the issue is fixed upstream.
+    # https://github.com/AyatanaIndicators/ayatana-indicator-display/pull/108
+    ./patches/0001-service.cpp-Mark-create_phone_menu-as-static.patch
+    ./patches/0002-cppcheck-Workaround-undefined-function-like-macro-fo.patch
+    ./patches/0003-Fix-cppcheck-warning-has-no-initializer.patch
+  ];
+
  postPatch = ''
    # Replace systemd prefix in pkg-config query, use GNUInstallDirs location for /etc
    substituteInPlace data/CMakeLists.txt \
--- a/pkgs/by-name/ay/ayatana-indicator-display/patches/0001-service.cpp-Mark-create_phone_menu-as-static.patch
+++ b/pkgs/by-name/ay/ayatana-indicator-display/patches/0001-service.cpp-Mark-create_phone_menu-as-static.patch
@ -0,0 +1,26 @@
+From 5a1ce0ea5fd630efc7d85d681dacb562c356c3a3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= <jbicha@ubuntu.com>
+Date: Sun, 29 Mar 2026 21:49:07 -0700
+Subject: [PATCH 1/3] service.cpp: Mark create_phone_menu as static
+
+to satisfy cppcheck
+---
+ src/service.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/service.cpp b/src/service.cpp
+index d6b4ed7..ced370c 100644
+--- a/src/service.cpp
+++ b/src/service.cpp
+@@ -1058,7 +1058,7 @@ private:
+     static_cast<Impl*>(gself)->update_phone_header();
+   }
+ 
+-  GMenuModel* create_phone_menu()
+  static GMenuModel* create_phone_menu()
+   {
+     GMenu* menu;
+     GMenu* section;
+-- 
+2.43.0
+
--- a/pkgs/by-name/ay/ayatana-indicator-display/patches/0002-cppcheck-Workaround-undefined-function-like-macro-fo.patch
+++ b/pkgs/by-name/ay/ayatana-indicator-display/patches/0002-cppcheck-Workaround-undefined-function-like-macro-fo.patch
@ -0,0 +1,49 @@
+From 3f30df763c2b0ac84b1c754faaedc69107539508 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= <jbicha@ubuntu.com>
+Date: Sun, 29 Mar 2026 17:02:56 -0700
+Subject: [PATCH 2/3] cppcheck: Workaround undefined function-like macro for
+ GLIB_CHECK_VERSION
+
+Copy a snippet from gtk.cfg.
+
+I didn't include gtk.cfg directly because its config triggers
+additional failures, so only copy the one line that we need
+
+https://github.com/danmar/cppcheck/commit/8c762adcdd9e
+
+https://bugs.debian.org/1125642
+
+Closes: #106
+---
+ tests/CMakeLists.txt | 2 +-
+ tests/ayatana.cfg    | 5 +++++
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+ create mode 100644 tests/ayatana.cfg
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index bdc074f..97d6be0 100644
+--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
+@@ -28,7 +28,7 @@ endif()
+ 
+ add_compile_options(${CXX_WARNING_ARGS})
+ 
+-add_test(cppcheck cppcheck --enable=all -USCHEMA_DIR --check-level=exhaustive --error-exitcode=2 --inline-suppr --library=qt -I${CMAKE_SOURCE_DIR} -i${CMAKE_SOURCE_DIR}/tests/utils/qmain.cpp -i${CMAKE_SOURCE_DIR}/tests/gmock ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests --suppress=missingIncludeSystem --suppress=uninitDerivedMemberVar --suppress=unmatchedSuppression --suppress=constParameter --suppress=constParameterCallback --suppress=unusedFunction --suppress=uselessOverride)
+add_test(cppcheck cppcheck --enable=all -USCHEMA_DIR --check-level=exhaustive --error-exitcode=2 --inline-suppr --library=qt --library=${CMAKE_SOURCE_DIR}/tests/ayatana.cfg -I${CMAKE_SOURCE_DIR} -i${CMAKE_SOURCE_DIR}/tests/utils/qmain.cpp -i${CMAKE_SOURCE_DIR}/tests/gmock ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests --suppress=missingIncludeSystem --suppress=uninitDerivedMemberVar --suppress=unmatchedSuppression --suppress=constParameter --suppress=constParameterCallback --suppress=unusedFunction --suppress=uselessOverride)
+ 
+ add_subdirectory (unit)
+ 
+diff --git a/tests/ayatana.cfg b/tests/ayatana.cfg
+new file mode 100644
+index 0000000..035020a
+--- /dev/null
+++ b/tests/ayatana.cfg
+@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<def format="2">
+  <!-- cppcheck override copied from gtk.cfg -->
+  <define name="GLIB_CHECK_VERSION(major, minor, micro)" value="1"/>
+</def>
+-- 
+2.43.0
+
--- a/pkgs/by-name/ay/ayatana-indicator-display/patches/0003-Fix-cppcheck-warning-has-no-initializer.patch
+++ b/pkgs/by-name/ay/ayatana-indicator-display/patches/0003-Fix-cppcheck-warning-has-no-initializer.patch
@ -0,0 +1,30 @@
+From 172bf8a7d8e232d31a85ef61d21ee54b6c2eab7c Mon Sep 17 00:00:00 2001
+From: fliiiix <hi@l33t.name>
+Date: Tue, 9 Jun 2026 15:33:29 +0200
+Subject: [PATCH 3/3] Fix cppcheck warning has no initializer
+
+cppcheck 2.21.0
+---
+ src/service.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/service.cpp b/src/service.cpp
+index ced370c..251df5b 100644
+--- a/src/service.cpp
+++ b/src/service.cpp
+@@ -50,9 +50,9 @@ extern "C"
+ 
+     typedef struct
+     {
+-       guint nTempLow;
+-       guint nTempHigh;
+-       const gchar *sName;
+       guint nTempLow{};
+       guint nTempHigh{};
+       const gchar *sName = nullptr;
+     } TempProfile;
+ 
+     TempProfile m_lTempProfiles[] =
+-- 
+2.43.0
+
--- a/pkgs/by-name/az/az-pim-cli/package.nix
+++ b/pkgs/by-name/az/az-pim-cli/package.nix
@ -10,13 +10,13 @@
 }:
 buildGoModule (finalAttrs: {
  pname = "az-pim-cli";
-  version = "1.14.0";
+  version = "1.15.0";

  src = fetchFromGitHub {
    owner = "netr0m";
    repo = "az-pim-cli";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-2WhinTxFCNLgw2TejoulhGXJwnUHP/CyC/Gwedv/8Xw=";
+    hash = "sha256-Pqc8pWicVORcoTXg7oT8SX1BwDRSjLHuqyyBZ6q7eio=";
  };

  patches = [
--- a/pkgs/by-name/bo/borgmatic/package.nix
+++ b/pkgs/by-name/bo/borgmatic/package.nix
@ -13,13 +13,16 @@
  testers,
  nixosTests,
 }:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication (finalAttrs: {
  pname = "borgmatic";
  version = "2.1.5";
  pyproject = true;

+  strictDeps = true;
+  __structuredAttrs = true;
+
  src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
    hash = "sha256-T0+E6opyfr7zxfP44OlNuhqsdQyi7OdIXiE5r310LaU=";
  };

@ -33,7 +36,7 @@ python3Packages.buildPythonApplication rec {
      pytest-cov-stub
      pytest-timeout
    ]
-    ++ optional-dependencies.apprise;
+    ++ finalAttrs.passthru.optional-dependencies.apprise;

  # - test_borgmatic_version_matches_news_version
  #   NEWS file not available on the pypi source
@ -48,7 +51,7 @@ python3Packages.buildPythonApplication rec {

  nativeBuildInputs = [ installShellFiles ];

-  propagatedBuildInputs = with python3Packages; [
+  dependencies = with python3Packages; [
    borgbackup
    colorama
    jsonschema
@ -98,4 +101,4 @@ python3Packages.buildPythonApplication rec {
      x123
    ];
  };
-}
+})
--- a/pkgs/by-name/cd/cdemu-client/package.nix
+++ b/pkgs/by-name/cd/cdemu-client/package.nix
@ -0,0 +1,73 @@
+{
+  python3Packages,
+  cmake,
+  pkg-config,
+  intltool,
+  wrapGAppsNoGuiHook,
+  gobject-introspection,
+  fetchurl,
+  lib,
+  writeScript,
+}:
+python3Packages.buildPythonApplication (finalAttrs: {
+  pname = "cdemu-client";
+  version = "3.3.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/cdemu/cdemu-client-${finalAttrs.version}.tar.xz";
+    hash = "sha256-WiKm00ZKUDeHX6RII4+JKruAzUyWzZWyI0iZeDqksnA=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    intltool
+    wrapGAppsNoGuiHook
+    gobject-introspection
+  ];
+
+  propagatedBuildInputs = with python3Packages; [
+    dbus-python
+    pygobject3
+  ];
+
+  pyproject = false;
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
+  passthru = {
+    updateScript = writeScript "update-cdemu-client" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p curl pcre2 common-updater-scripts
+
+      set -eu -o pipefail
+
+      # Fetch the latest version from the SourceForge RSS feed for cdemu-client
+      newVersion="$(curl -s "https://sourceforge.net/projects/cdemu/rss?path=/cdemu-client" | pcre2grep -o1 'cdemu-client-([0-9.]+)\.tar\.xz' | head -n 1)"
+
+      update-source-version cdemu-client "$newVersion"
+    '';
+  };
+
+  meta = {
+    description = "Suite of tools for emulating optical drives and discs";
+    longDescription = ''
+      CDEmu consists of:
+
+      - a kernel module implementing a virtual drive-controller
+      - libmirage which is a software library for interpreting optical disc images
+      - a daemon which emulates the functionality of an optical drive+disc
+      - textmode and GTK clients for controlling the emulator
+      - an image analyzer to view the structure of image files
+
+      Optical media emulated by CDemu can be mounted within Linux. Automounting is also allowed.
+    '';
+    homepage = "https://cdemu.sourceforge.io/";
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ bendlas ];
+  };
+})
--- a/pkgs/by-name/cd/cdemu-daemon/package.nix
+++ b/pkgs/by-name/cd/cdemu-daemon/package.nix
@ -0,0 +1,78 @@
+{
+  stdenv,
+  cmake,
+  pkg-config,
+  glib,
+  libao,
+  intltool,
+  libmirage,
+  coreutils,
+  fetchurl,
+  lib,
+  writeScript,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "cdemu-daemon";
+  version = "3.3.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/cdemu/cdemu-daemon-${finalAttrs.version}.tar.xz";
+    hash = "sha256-AYHjiOAQdu685gc6p0j2QNtCmTYTWix1kzWQZYvGPWU=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    intltool
+  ];
+
+  buildInputs = [
+    glib
+    libao
+    libmirage
+  ];
+
+  postInstall = ''
+    mkdir -p $out/share/dbus-1/services
+    cp -R ../service-example $out/share/cdemu
+    substitute \
+      $out/share/cdemu/net.sf.cdemu.CDEmuDaemon.service \
+      $out/share/dbus-1/services/net.sf.cdemu.CDEmuDaemon.service \
+      --replace /bin/true ${coreutils}/bin/true
+  '';
+
+  passthru = {
+    updateScript = writeScript "update-cdemu-daemon" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p curl pcre2 common-updater-scripts
+
+      set -eu -o pipefail
+
+      # Fetch the latest version from the SourceForge RSS feed for cdemu-daemon
+      newVersion="$(curl -s "https://sourceforge.net/projects/cdemu/rss?path=/cdemu-daemon" | pcre2grep -o1 'cdemu-daemon-([0-9.]+)\.tar\.xz' | head -n 1)"
+
+      update-source-version cdemu-daemon "$newVersion"
+    '';
+  };
+
+  meta = {
+    description = "Suite of tools for emulating optical drives and discs";
+    longDescription = ''
+      CDEmu consists of:
+
+      - a kernel module implementing a virtual drive-controller
+      - libmirage which is a software library for interpreting optical disc images
+      - a daemon which emulates the functionality of an optical drive+disc
+      - textmode and GTK clients for controlling the emulator
+      - an image analyzer to view the structure of image files
+
+      Optical media emulated by CDemu can be mounted within Linux. Automounting is also allowed.
+    '';
+    homepage = "https://cdemu.sourceforge.io/about/daemon/";
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ bendlas ];
+    mainProgram = "cdemu-daemon";
+  };
+})
--- a/pkgs/applications/emulators/cdemu/vhba.nix
+++ b/pkgs/applications/emulators/cdemu/vhba.nix
@ -4,6 +4,7 @@
  fetchurl,
  kernel,
  kernelModuleMakeFlags,
+  writeScript,
 }:

 stdenv.mkDerivation (finalAttrs: {
@ -21,6 +22,20 @@ stdenv.mkDerivation (finalAttrs: {
  ];
  nativeBuildInputs = kernel.moduleBuildDependencies;

+  passthru = {
+    updateScript = writeScript "update-vhba-module" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p curl pcre2 common-updater-scripts
+
+      set -eu -o pipefail
+
+      # Fetch the latest version from the SourceForge RSS feed for vhba-module
+      newVersion="$(curl -s "https://sourceforge.net/projects/cdemu/rss?path=/vhba-module" | pcre2grep -o1 'vhba-module-([0-9.]+)\.tar\.xz' | head -n 1)"
+
+      update-source-version linuxPackages.vhba "$newVersion"
+    '';
+  };
+
  meta = {
    description = "Provides a Virtual (SCSI) HBA";
    homepage = "https://cdemu.sourceforge.io/about/vhba/";
--- a/pkgs/by-name/cp/cppcheck/package.nix
+++ b/pkgs/by-name/cp/cppcheck/package.nix
@ -21,7 +21,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "cppcheck";
-  version = "2.18.3";
+  version = "2.21.0";

  outputs = [
    "out"
@ -29,10 +29,10 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  src = fetchFromGitHub {
-    owner = "danmar";
+    owner = "cppcheck-opensource";
    repo = "cppcheck";
    tag = finalAttrs.version;
-    hash = "sha256-c32dNM1tNN+Nqv5GmKHnAhWx8r9RTcv3FQ/+ROGurkw=";
+    hash = "sha256-y7P25ThLC54IwuMIc4UGt9bz1HoafB0/b2rus28GcGo=";
  };

  nativeBuildInputs = [
@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: {
    '';
    homepage = "http://cppcheck.sourceforge.net";
    license = lib.licenses.gpl3Plus;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ l33tname ];
    platforms = lib.platforms.unix;
  };
 })
--- a/pkgs/by-name/db/dbeaver-bin/package.nix
+++ b/pkgs/by-name/db/dbeaver-bin/package.nix
@ -19,7 +19,7 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "dbeaver-bin";
-  version = "26.0.5";
+  version = "26.1.0";

  src =
    let
@ -32,10 +32,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
        aarch64-darwin = "macos-aarch64.dmg";
      };
      hash = selectSystem {
-        x86_64-linux = "sha256-urgvGZNM7V5zmts+3Zv7nDtyBuyyAHjc9HDUP2CXx50=";
-        aarch64-linux = "sha256-Ye6NH8tBmSbDS3sJjTzvc9C+qyU3DA0HL0csFUzD1pc=";
-        x86_64-darwin = "sha256-iMyHZUNHzSpc2DrKSsduMx13hUY1SdHQTANR3Yj256A=";
-        aarch64-darwin = "sha256-F60zrgx2cS6HCmSznUapSgmuIxLI1Ma8WHrmawDzEUk=";
+        x86_64-linux = "sha256-zAkHddh5xm9SHMV6OcJpl2A3+lS4GMJDbZ/+zg/5PzE=";
+        aarch64-linux = "sha256-0Tv45N+nZ2lRgn/Lo5HpPjuGigI0X2CJIIV96UO0bs8=";
+        x86_64-darwin = "sha256-INfXvR9FJZcruC8KeRtc0SIHUUHc0p3jjDNk4eBk7Lo=";
+        aarch64-darwin = "sha256-s+NQ5hp3NiQpJ/b3mp7Fdjh5rEmf1UnSz/Ai5Z43qEg=";
      };
    in
    fetchurl {
--- a/pkgs/by-name/de/deno/package.nix
+++ b/pkgs/by-name/de/deno/package.nix
@ -33,17 +33,17 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "deno";
-  version = "2.8.0";
+  version = "2.8.2";

  src = fetchFromGitHub {
    owner = "denoland";
    repo = "deno";
    tag = "v${finalAttrs.version}";
    fetchSubmodules = true; # required for tests
-    hash = "sha256-gcDQ2nkiLtnOJCneiHAWwvYxHUwQ/2n2lsmWAMgf/yc=";
+    hash = "sha256-WtACDLrC1c7KxkoQgYrNavykkm8+tZmF46UU1YrLwVs=";
  };

-  cargoHash = "sha256-1vHgkLWqwTt3tO4qSkfqwCj5KMfKCT3kscChf2FrkH8=";
+  cargoHash = "sha256-Og+owcfHfdFJ08Xtiye2IEvKWd2Q/7f7QzQ/898IOcQ=";

  patches = [
    ./patches/0002-tests-replace-hardcoded-paths.patch
--- a/pkgs/by-name/de/deno/rusty-v8/default.nix
+++ b/pkgs/by-name/de/deno/rusty-v8/default.nix
@ -70,14 +70,14 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "rusty-v8";
-  version = "149.0.0";
+  version = "149.2.0";

  src = fetchFromGitHub {
    owner = "denoland";
    repo = "rusty_v8";
    tag = "v${finalAttrs.version}";
    fetchSubmodules = true;
-    hash = "sha256-OdVz8d8hkBhXZnX9vKV51rlHAYN2PbVycmqrDWNLV5M=";
+    hash = "sha256-OAwfrSU1bu80+qcseUHtScVLZCTe9mY3NEfq0+hmVMg=";
  };

  patches = [
@ -89,7 +89,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    ./librusty_v8-darwin-fix-__rust_no_alloc_shim_is_unstable_v2.patch
  ];

-  cargoHash = "sha256-uj1B3lkgbZG5emJgfsilJXdHbqg0JNAywaSVLe/LbWk=";
+  cargoHash = "sha256-dkuvWJaDPmsU25f3UGifWl2GvYku6+7Htk9tm5JVpLU=";

  nativeBuildInputs = [
    llvmPackages.clang
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
@ -6,17 +6,24 @@
  pkg-config,
  kdePackages,
  fcitx5,
-  lua,
+  lua5_3,
  gettext,
 }:
-stdenv.mkDerivation rec {
+
+let
+  lua = lua5_3;
+in
+
+stdenv.mkDerivation (finalAttrs: {
  pname = "fcitx5-lua";
  version = "5.0.16";

+  __structuredAttrs = true;
+
  src = fetchFromGitHub {
    owner = "fcitx";
-    repo = pname;
-    rev = version;
+    repo = "fcitx5-lua";
+    tag = finalAttrs.version;
    hash = "sha256-df0BjORGT+zx/8kg/nGPDa9MBAXpPtdfx8S5O+E31wE=";
  };

@ -43,4 +50,4 @@ stdenv.mkDerivation rec {
    maintainers = with lib.maintainers; [ poscat ];
    platforms = lib.platforms.linux;
  };
-}
+})
--- a/pkgs/by-name/fl/flood/package.nix
+++ b/pkgs/by-name/fl/flood/package.nix
@ -3,7 +3,7 @@
  buildNpmPackage,
  fetchFromGitHub,
  nixosTests,
-  pnpm_9,
+  pnpm_10,
  fetchPnpmDeps,
  pnpmConfigHook,
  nix-update-script,
@ -19,7 +19,7 @@ buildNpmPackage (finalAttrs: {
    hash = "sha256-gSjkpAGkvgRRh8WDpL/F7fS8KDxHRJUuWVqHGcFEGAc=";
  };

-  nativeBuildInputs = [ pnpm_9 ];
+  nativeBuildInputs = [ pnpm_10 ];
  npmConfigHook = pnpmConfigHook;
  npmDeps = finalAttrs.pnpmDeps;
  dontNpmPrune = true;
@ -29,9 +29,9 @@ buildNpmPackage (finalAttrs: {
      version
      src
      ;
-    pnpm = pnpm_9;
-    fetcherVersion = 3;
-    hash = "sha256-Los6faQJ4it0fVqtRvPvYmyANK4qBcwHxmZBacR7Q6E=";
+    pnpm = pnpm_10;
+    fetcherVersion = 4;
+    hash = "sha256-yNRC5sCBn002gxUfHMUvh3DZeVYOokfz4MTvqXR2MzI=";
  };

  passthru = {
--- a/pkgs/by-name/fo/foks-server/package.nix
+++ b/pkgs/by-name/fo/foks-server/package.nix
@ -0,0 +1,63 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  foks,
+  pcsclite,
+  pkg-config,
+  stdenv,
+  buildPackages,
+}:
+let
+  templFoks = buildPackages.templ.overrideAttrs (old: {
+    pname = "templ-foks";
+    version = "0.3.833";
+    src = old.src.override {
+      hash = "sha256-4K1MpsM3OuamXRYOllDsxxgpMRseFGviC4RJzNA7Cu8=";
+    };
+    vendorHash = "sha256-OPADot7Lkn9IBjFCfbrqs3es3F6QnWNjSOHxONjG4MM=";
+  });
+in
+buildGoModule (finalAttrs: {
+  pname = "foks-server";
+  version = "0.1.7";
+
+  src = fetchFromGitHub {
+    owner = "foks-proj";
+    repo = "go-foks";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-UZ4BZ2/S44hnG+uLHtWR/qqQtr6tbbQbQOgIrN4ciT0=";
+  };
+
+  vendorHash = "sha256-+ysHa5KNhoxtoXPgOWC9ZDJKYqF+84s7oyxRib2S6a8=";
+
+  postPatch = ''
+    cd ./server/web/templates
+    templ generate
+    cd -
+  '';
+  postInstall = ''
+    ln -s $out/bin/{foks-server,git-remote-foks}
+  '';
+
+  subPackages = [ "server/foks-server" ];
+  excludedPackages = [ "server" ];
+
+  buildInputs = lib.optionals (stdenv.hostPlatform.isLinux) [ pcsclite ];
+  nativeBuildInputs = [
+    pkg-config
+    templFoks
+    foks
+  ];
+  __structuredAttrs = true;
+
+  meta = {
+    description = "Federated key management and distribution system";
+    homepage = "https://foks.pub";
+    downloadPage = "https://github.com/foks-proj/go-foks";
+    changelog = "https://github.com/foks-proj/go-foks/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ poptart ];
+    mainProgram = "foks";
+  };
+})
--- a/pkgs/by-name/fo/foks/package.nix
+++ b/pkgs/by-name/fo/foks/package.nix
@ -0,0 +1,62 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  pcsclite,
+  pkg-config,
+  stdenv,
+  templ,
+  buildPackages,
+}:
+let
+  templFoks = buildPackages.templ.overrideAttrs (old: {
+    pname = "templ-foks";
+    version = "0.3.833";
+    src = old.src.override {
+      hash = "sha256-4K1MpsM3OuamXRYOllDsxxgpMRseFGviC4RJzNA7Cu8=";
+    };
+    vendorHash = "sha256-OPADot7Lkn9IBjFCfbrqs3es3F6QnWNjSOHxONjG4MM=";
+  });
+in
+buildGoModule (finalAttrs: {
+  pname = "foks";
+  version = "0.1.7";
+
+  src = fetchFromGitHub {
+    owner = "foks-proj";
+    repo = "go-foks";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-UZ4BZ2/S44hnG+uLHtWR/qqQtr6tbbQbQOgIrN4ciT0=";
+  };
+
+  vendorHash = "sha256-+ysHa5KNhoxtoXPgOWC9ZDJKYqF+84s7oyxRib2S6a8=";
+
+  postPatch = ''
+    cd ./server/web/templates
+    ${templFoks}/bin/templ generate
+    cd -
+  '';
+  postInstall = ''
+    ln -s $out/bin/{foks,git-remote-foks}
+  '';
+
+  subPackages = [ "client/foks" ];
+  excludedPackages = [ "server" ];
+
+  buildInputs = lib.optionals (stdenv.hostPlatform.isLinux) [ pcsclite ];
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  __structuredAttrs = true;
+
+  meta = {
+    description = "Federated key management and distribution system";
+    homepage = "https://foks.pub";
+    downloadPage = "https://github.com/foks-proj/go-foks";
+    changelog = "https://github.com/foks-proj/go-foks/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ poptart ];
+    mainProgram = "foks";
+  };
+})
--- a/pkgs/by-name/fr/frida-tools/package.nix
+++ b/pkgs/by-name/fr/frida-tools/package.nix
@ -6,13 +6,13 @@

 python3Packages.buildPythonApplication (finalAttrs: {
  pname = "frida-tools";
-  version = "14.6.1";
+  version = "14.9.0";
  pyproject = true;

  src = fetchPypi {
    inherit (finalAttrs) version;
    pname = "frida_tools";
-    hash = "sha256-EwpoRBHT6NyR1sHV4oEXqu5R/Wcud4n3DWxEkeZXdzM=";
+    hash = "sha256-9S/PtdcyFV/9c3pNrmhpqBg8hXtGkqtUyoX1SzXHxtE=";
  };

  build-system = with python3Packages; [
@ -35,7 +35,10 @@ python3Packages.buildPythonApplication (finalAttrs: {
  meta = {
    description = "Dynamic instrumentation toolkit for developers, reverse-engineers, and security researchers (client tools)";
    homepage = "https://www.frida.re/";
-    maintainers = with lib.maintainers; [ s1341 ];
+    maintainers = with lib.maintainers; [
+      s1341
+      eyjhb
+    ];
    license = with lib.licenses; [
      lgpl2Plus
      wxWindowsException31
--- a/pkgs/by-name/gc/gcdemu/package.nix
+++ b/pkgs/by-name/gc/gcdemu/package.nix
@ -0,0 +1,84 @@
+{
+  cmake,
+  pkg-config,
+  wrapGAppsHook3,
+  gobject-introspection,
+  python3Packages,
+  libnotify,
+  intltool,
+  adwaita-icon-theme,
+  gdk-pixbuf,
+  libappindicator-gtk3,
+  fetchurl,
+  lib,
+  writeScript,
+}:
+
+python3Packages.buildPythonApplication (finalAttrs: {
+  pname = "gcdemu";
+  version = "3.3.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/cdemu/gcdemu-${finalAttrs.version}.tar.xz";
+    hash = "sha256-C9d4Rv47kQhs2kbTCwAUcdm+dcljA8IVkwhLJHJpUS0=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    wrapGAppsHook3
+    intltool
+    gobject-introspection
+  ];
+
+  buildInputs = [
+    libnotify
+    adwaita-icon-theme
+    gdk-pixbuf
+    libappindicator-gtk3
+  ];
+
+  propagatedBuildInputs = with python3Packages; [
+    pygobject3
+  ];
+
+  pyproject = false;
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
+  passthru = {
+    updateScript = writeScript "update-gcdemu" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p curl pcre2 common-updater-scripts
+
+      set -eu -o pipefail
+
+      # Fetch the latest version from the SourceForge RSS feed for gcdemu
+      newVersion="$(curl -s "https://sourceforge.net/projects/cdemu/rss?path=/gcdemu" | pcre2grep -o1 'gcdemu-([0-9.]+)\.tar\.xz' | head -n 1)"
+
+      update-source-version gcdemu "$newVersion"
+    '';
+  };
+
+  meta = {
+    description = "Suite of tools for emulating optical drives and discs";
+    longDescription = ''
+      CDEmu consists of:
+
+      - a kernel module implementing a virtual drive-controller
+      - libmirage which is a software library for interpreting optical disc images
+      - a daemon which emulates the functionality of an optical drive+disc
+      - textmode and GTK clients for controlling the emulator
+      - an image analyzer to view the structure of image files
+
+      Optical media emulated by CDemu can be mounted within Linux. Automounting is also allowed.
+    '';
+    homepage = "https://cdemu.sourceforge.io/";
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ bendlas ];
+  };
+})
--- a/pkgs/by-name/gh/ghostty/package.nix
+++ b/pkgs/by-name/gh/ghostty/package.nix
@ -174,6 +174,7 @@ stdenv.mkDerivation (finalAttrs: {
      features, or native UIs. Ghostty provides all three.
    '';
    homepage = "https://ghostty.org/";
+    donationPage = "https://ghostty.org/docs/sponsor";
    downloadPage = "https://ghostty.org/download";
    changelog = "https://ghostty.org/docs/install/release-notes/${
      builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version
--- a/pkgs/by-name/hs/hstr/package.nix
+++ b/pkgs/by-name/hs/hstr/package.nix
@ -11,13 +11,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "hstr";
-  version = "3.1";
+  version = "3.2";

  src = fetchFromGitHub {
    owner = "dvorka";
    repo = "hstr";
-    rev = finalAttrs.version;
-    hash = "sha256-OuLy1aiEwUJDGy3+UXYF1Vx1nNXic46WIZEM1xrIPfA=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-c+YUpry96OGJ7nmBw180W2r0z4EBd2Cl3SyOQrNxP+o=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/hy/hyprshell/package.nix
+++ b/pkgs/by-name/hy/hyprshell/package.nix
@ -13,16 +13,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "hyprshell";
-  version = "4.10.6";
+  version = "4.10.7";

  src = fetchFromGitHub {
    owner = "H3rmt";
    repo = "hyprshell";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-ud3tZngQzl6eupFCSvpcEdNuOA/g7bmkWWO+3h7V1mg=";
+    hash = "sha256-1Hr9X7MdYkcibCxRl4zlQOxGu/HDyjBeDTUMJi4B23E=";
  };

-  cargoHash = "sha256-gPZZWz6ihBgpcnLvzwE4b4AvNph5Euaomm220n/0GA8=";
+  cargoHash = "sha256-p2oo2rUOILRv5Ifapacz+CvJQhCjxnKTe3X2kTvLr9g=";

  nativeBuildInputs = [
    wrapGAppsHook4
--- a/pkgs/by-name/ig/igir/package.nix
+++ b/pkgs/by-name/ig/igir/package.nix
@ -18,16 +18,16 @@

 buildNpmPackage rec {
  pname = "igir";
-  version = "5.0.2";
+  version = "5.1.0";

  src = fetchFromGitHub {
    owner = "emmercm";
    repo = "igir";
    rev = "v${version}";
-    hash = "sha256-vMas5QGpk3bwn4VkdRtYga8cgf6G+dVr3jJCGeyb5mQ=";
+    hash = "sha256-OgWf4xhgYsk9vQSbwrLdjbDElXrhI7r+4CaxZ7yRs7E=";
  };

-  npmDepsHash = "sha256-QhvGc8HLY61LptHdPZbOTjr5jDvUZ4dML+MV7KrqU/0=";
+  npmDepsHash = "sha256-r/1ImMfTFuRHvcH3713sDFNq7LJvgjt8a1rE8JtuaUk=";

  # I have no clue why I have to do this
  postPatch = ''
--- a/pkgs/by-name/im/image-analyzer/package.nix
+++ b/pkgs/by-name/im/image-analyzer/package.nix
@ -0,0 +1,86 @@
+{
+  cmake,
+  pkg-config,
+  gobject-introspection,
+  wrapGAppsHook3,
+  python3Packages,
+  libxml2,
+  gnuplot,
+  adwaita-icon-theme,
+  gdk-pixbuf,
+  intltool,
+  libmirage,
+  fetchurl,
+  lib,
+  writeScript,
+}:
+python3Packages.buildPythonApplication (finalAttrs: {
+  pname = "image-analyzer";
+  version = "3.3.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/cdemu/image-analyzer-${finalAttrs.version}.tar.xz";
+    hash = "sha256-N2aufwYEBVx7z2Vo7Qi4DP2MsDXXr5LrQdeNYOtNGnU=";
+  };
+
+  buildInputs = [
+    libxml2
+    gnuplot
+    libmirage
+    adwaita-icon-theme
+    gdk-pixbuf
+  ];
+
+  propagatedBuildInputs = with python3Packages; [
+    pygobject3
+    matplotlib
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    wrapGAppsHook3
+    intltool
+    gobject-introspection
+  ];
+
+  pyproject = false;
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
+  passthru = {
+    updateScript = writeScript "update-image-analyzer" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p curl pcre2 common-updater-scripts
+
+      set -eu -o pipefail
+
+      # Fetch the latest version from the SourceForge RSS feed for image-analyzer
+      newVersion="$(curl -s "https://sourceforge.net/projects/cdemu/rss?path=/image-analyzer" | pcre2grep -o1 'image-analyzer-([0-9.]+)\.tar\.xz' | head -n 1)"
+
+      update-source-version image-analyzer "$newVersion"
+    '';
+  };
+
+  meta = {
+    description = "Suite of tools for emulating optical drives and discs";
+    longDescription = ''
+      CDEmu consists of:
+
+      - a kernel module implementing a virtual drive-controller
+      - libmirage which is a software library for interpreting optical disc images
+      - a daemon which emulates the functionality of an optical drive+disc
+      - textmode and GTK clients for controlling the emulator
+      - an image analyzer to view the structure of image files
+
+      Optical media emulated by CDemu can be mounted within Linux. Automounting is also allowed.
+    '';
+    homepage = "https://cdemu.sourceforge.io/";
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ bendlas ];
+  };
+})
--- a/pkgs/by-name/je/jellyfin-tui/package.nix
+++ b/pkgs/by-name/je/jellyfin-tui/package.nix
@ -13,16 +13,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "jellyfin-tui";
-  version = "1.4.2";
+  version = "1.5.0";

  src = fetchFromGitHub {
    owner = "dhonus";
    repo = "jellyfin-tui";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-GumYBQkdTNR+sfEY0l5xHjtFM9Z9sn/2H+yVzC0MEe4=";
+    hash = "sha256-BeZyJQ04S2Vnqx3sTFe6a0s56KckIzOIfOVz+bkhBoY=";
  };

-  cargoHash = "sha256-1FUmCACPm9TaURMLXrNODnVtx8FQ6FeAkwF2ucgezhk=";
+  cargoHash = "sha256-MP6wso9YlxJdN8WPuU149C5Hn3KeL+CekpPyN21ioA0=";

  nativeBuildInputs = [ pkg-config ];
  buildInputs = [
--- a/pkgs/by-name/ka/kazumi/git-hashes.json
+++ b/pkgs/by-name/ka/kazumi/git-hashes.json
@ -1,14 +1,15 @@
 {
  "audio_service_mpris": "sha256-IVv1ioBpiK0VbnOFqnc9NbNn3Z+l9VN2clpCQjckBRo=",
+  "audio_service_win": "sha256-OZq2waTr0WLJ6uki/VLdUBdDdui25PvXnMNFohs7gjs=",
  "desktop_webview_window": "sha256-KWON5aTPlVVrLidmnfpV+syWPYEngChOvkN7miIFjvE=",
-  "media_kit": "sha256-R9fHCJxkPa1kp1yn69LMgyF+QJ7k84AOm8Aa9qcKNIc=",
-  "media_kit_libs_android_video": "sha256-R9fHCJxkPa1kp1yn69LMgyF+QJ7k84AOm8Aa9qcKNIc=",
-  "media_kit_libs_ios_video": "sha256-R9fHCJxkPa1kp1yn69LMgyF+QJ7k84AOm8Aa9qcKNIc=",
-  "media_kit_libs_linux": "sha256-R9fHCJxkPa1kp1yn69LMgyF+QJ7k84AOm8Aa9qcKNIc=",
-  "media_kit_libs_macos_video": "sha256-R9fHCJxkPa1kp1yn69LMgyF+QJ7k84AOm8Aa9qcKNIc=",
-  "media_kit_libs_ohos": "sha256-R9fHCJxkPa1kp1yn69LMgyF+QJ7k84AOm8Aa9qcKNIc=",
-  "media_kit_libs_video": "sha256-R9fHCJxkPa1kp1yn69LMgyF+QJ7k84AOm8Aa9qcKNIc=",
-  "media_kit_libs_windows_video": "sha256-R9fHCJxkPa1kp1yn69LMgyF+QJ7k84AOm8Aa9qcKNIc=",
-  "media_kit_video": "sha256-R9fHCJxkPa1kp1yn69LMgyF+QJ7k84AOm8Aa9qcKNIc=",
-  "webview_windows": "sha256-5iNB/h6TzMOTxp98flg7jt2XZn0bFU6wSvYjjUXt3bk="
+  "media_kit": "sha256-Hdraxdr2rVGnKGYq7+IidQCN2YHYgytoaVfqZnlhPu4=",
+  "media_kit_libs_android_video": "sha256-Hdraxdr2rVGnKGYq7+IidQCN2YHYgytoaVfqZnlhPu4=",
+  "media_kit_libs_ios_video": "sha256-Hdraxdr2rVGnKGYq7+IidQCN2YHYgytoaVfqZnlhPu4=",
+  "media_kit_libs_linux": "sha256-Hdraxdr2rVGnKGYq7+IidQCN2YHYgytoaVfqZnlhPu4=",
+  "media_kit_libs_macos_video": "sha256-Hdraxdr2rVGnKGYq7+IidQCN2YHYgytoaVfqZnlhPu4=",
+  "media_kit_libs_ohos": "sha256-Hdraxdr2rVGnKGYq7+IidQCN2YHYgytoaVfqZnlhPu4=",
+  "media_kit_libs_video": "sha256-Hdraxdr2rVGnKGYq7+IidQCN2YHYgytoaVfqZnlhPu4=",
+  "media_kit_libs_windows_video": "sha256-Hdraxdr2rVGnKGYq7+IidQCN2YHYgytoaVfqZnlhPu4=",
+  "media_kit_video": "sha256-Hdraxdr2rVGnKGYq7+IidQCN2YHYgytoaVfqZnlhPu4=",
+  "webview_windows": "sha256-afBTwbam9YA0xvIYMtiJe+CKi8GWit1HqDR3J72r2o0="
 }
--- a/pkgs/by-name/ka/kazumi/package.nix
+++ b/pkgs/by-name/ka/kazumi/package.nix
@ -1,7 +1,7 @@
 {
  lib,
  stdenv,
-  flutter338,
+  flutter,
  fetchFromGitHub,
  autoPatchelfHook,
  alsa-lib,
@ -18,16 +18,16 @@
 }:

 let
-  version = "2.1.1";
+  version = "2.1.3";

  src = fetchFromGitHub {
    owner = "Predidit";
    repo = "Kazumi";
    tag = version;
-    hash = "sha256-zXqSc89swNQ/zYLyqBOShJScqWFlsKC6+qHwHl5Pd1Y=";
+    hash = "sha256-GpHLqqvjfgLRICIHO7YPLdzrQWHexJlg0ilqCJkkOfw=";
  };
 in
-flutter338.buildFlutterApplication {
+flutter.buildFlutterApplication {
  pname = "kazumi";
  inherit version src;

@ -98,6 +98,13 @@ flutter338.buildFlutterApplication {
    webkitgtk_4_1
  ];

+  # patch onReorderItem to onReorder for nixpkgs Flutter compatibility
+  postPatch = ''
+    substituteInPlace \
+      lib/pages/plugin_editor/plugin_view_page.dart \
+      --replace-fail "onReorderItem:" "onReorder:"
+  '';
+
  postInstall = ''
    ln -snf ${mpv-unwrapped}/lib/libmpv.so.2 $out/app/$pname/lib/libmpv.so.2
    install -Dm 0644 assets/linux/io.github.Predidit.Kazumi.desktop -t $out/share/applications/
--- a/pkgs/by-name/ka/kazumi/pubspec.lock.json
+++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json
@ -4,21 +4,21 @@
      "dependency": "transitive",
      "description": {
        "name": "_fe_analyzer_shared",
-        "sha256": "5b7468c326d2f8a4f630056404ca0d291ade42918f4a3c6233618e724f39da8e",
+        "sha256": "3b19a47f6ea7c2632760777c78174f47f6aec1e05f0cd611380d4593b8af1dbc",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "92.0.0"
+      "version": "96.0.0"
    },
    "analyzer": {
      "dependency": "transitive",
      "description": {
        "name": "analyzer",
-        "sha256": "70e4b1ef8003c64793a9e268a551a82869a8a96f39deb73dea28084b0e8bf75e",
+        "sha256": "0c516bc4ad36a1a75759e54d5047cb9d15cded4459df01aa35a0b5ec7db2c2a0",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "9.0.0"
+      "version": "10.2.0"
    },
    "ansicolor": {
      "dependency": "transitive",
@ -64,11 +64,11 @@
      "dependency": "transitive",
      "description": {
        "name": "async",
-        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
+        "sha256": "e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.13.0"
+      "version": "2.13.1"
    },
    "audio_service": {
      "dependency": "direct main",
@ -114,12 +114,13 @@
    "audio_service_win": {
      "dependency": "direct main",
      "description": {
-        "name": "audio_service_win",
-        "sha256": "8e8cd6a576901e4386dc22a8ca6d959317bf41c74b2bc4c6c5466826d0e529e8",
-        "url": "https://pub.dev"
+        "path": ".",
+        "ref": "8ad650c6eb487208b9861d44755c8e58db061c88",
+        "resolved-ref": "8ad650c6eb487208b9861d44755c8e58db061c88",
+        "url": "https://github.com/Predidit/audio_service_win.git"
      },
-      "source": "hosted",
-      "version": "0.0.2"
+      "source": "git",
+      "version": "0.0.3"
    },
    "audio_session": {
      "dependency": "direct main",
@ -165,11 +166,11 @@
      "dependency": "transitive",
      "description": {
        "name": "build",
-        "sha256": "aadd943f4f8cc946882c954c187e6115a84c98c81ad1d9c6cbf0895a8c85da9c",
+        "sha256": "a156715e7cd728130c592f30552575908aae5b100005fbc1f0fb16b3c03a3d10",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "4.0.5"
+      "version": "4.0.6"
    },
    "build_config": {
      "dependency": "transitive",
@ -195,11 +196,11 @@
      "dependency": "direct dev",
      "description": {
        "name": "build_runner",
-        "sha256": "521daf8d189deb79ba474e43a696b41c49fb3987818dbacf3308f1e03673a75e",
+        "sha256": "1523ce62448ebac2c15a8ba5fbad8acac169788658a7dd2a1c2d9c2a9318b9a6",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.13.1"
+      "version": "2.15.0"
    },
    "built_collection": {
      "dependency": "transitive",
@ -215,11 +216,11 @@
      "dependency": "transitive",
      "description": {
        "name": "built_value",
-        "sha256": "6ae8a6435a8c6520c7077b107e77f1fb4ba7009633259a4d49a8afd8e7efc5e9",
+        "sha256": "34e4067d30ce212937df995f03b69992eea683539ceeac7f679a1f1eba055b56",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "8.12.4"
+      "version": "8.12.6"
    },
    "cached_network_image": {
      "dependency": "direct main",
@ -321,16 +322,6 @@
      "source": "hosted",
      "version": "1.0.0"
    },
-    "code_builder": {
-      "dependency": "transitive",
-      "description": {
-        "name": "code_builder",
-        "sha256": "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.11.1"
-    },
    "collection": {
      "dependency": "transitive",
      "description": {
@ -355,11 +346,11 @@
      "dependency": "transitive",
      "description": {
        "name": "connectivity_plus_platform_interface",
-        "sha256": "42657c1715d48b167930d5f34d00222ac100475f73d10162ddf43e714932f204",
+        "sha256": "3c09627c536d22fd24691a905cdd8b14520de69da52c7a97499c8be5284a32ed",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.0.1"
+      "version": "2.1.0"
    },
    "console": {
      "dependency": "transitive",
@ -402,7 +393,7 @@
      "version": "0.3.5+2"
    },
    "crypto": {
-      "dependency": "transitive",
+      "dependency": "direct main",
      "description": {
        "name": "crypto",
        "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf",
@ -425,21 +416,21 @@
      "dependency": "direct main",
      "description": {
        "name": "cupertino_icons",
-        "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6",
+        "sha256": "41e005c33bd814be4d3096aff55b1908d419fde52ca656c8c47719ec745873cd",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.0.8"
+      "version": "1.0.9"
    },
    "dart_style": {
      "dependency": "transitive",
      "description": {
        "name": "dart_style",
-        "sha256": "a9c30492da18ff84efe2422ba2d319a89942d93e58eb0b73d32abe822ef54b7b",
+        "sha256": "29f7ecc274a86d32920b1d9cfc7502fa87220da41ec60b55f329559d5732e2b2",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.1.3"
+      "version": "3.1.7"
    },
    "dbus": {
      "dependency": "transitive",
@ -619,7 +610,7 @@
      "version": "0.0.0"
    },
    "flutter_cache_manager": {
-      "dependency": "transitive",
+      "dependency": "direct main",
      "description": {
        "name": "flutter_cache_manager",
        "sha256": "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386",
@ -642,11 +633,11 @@
      "dependency": "direct main",
      "description": {
        "name": "flutter_foreground_task",
-        "sha256": "1903697944a31f596622e51a6af55e3a9dfb27762f9763ab2841184098c6b0ba",
+        "sha256": "fc5c01a5e1b8f7bb51d0c737714f0c50440dbdf1aeddc5f8cbba313aa6fd4856",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "9.2.1"
+      "version": "9.2.2"
    },
    "flutter_inappwebview_android": {
      "dependency": "direct main",
@ -758,11 +749,11 @@
      "dependency": "transitive",
      "description": {
        "name": "flutter_plugin_android_lifecycle",
-        "sha256": "ee8068e0e1cd16c4a82714119918efdeed33b3ba7772c54b5d094ab53f9b7fd1",
+        "sha256": "38d1c268de9097ff59cf0e844ac38759fc78f76836d37edad06fa21e182055a0",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.0.33"
+      "version": "2.0.34"
    },
    "flutter_rating_bar": {
      "dependency": "direct main",
@ -778,11 +769,11 @@
      "dependency": "direct main",
      "description": {
        "name": "flutter_svg",
-        "sha256": "1ded017b39c8e15c8948ea855070a5ff8ff8b3d5e83f3446e02d6bb12add7ad9",
+        "sha256": "35882981abcbfb8c15b286f0cd690ff25bac12d95eff3e25ee207f37d4c42e7f",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.2.4"
+      "version": "2.3.0"
    },
    "flutter_test": {
      "dependency": "direct dev",
@ -794,11 +785,11 @@
      "dependency": "direct main",
      "description": {
        "name": "flutter_volume_controller",
-        "sha256": "22edb0993ad03ecbc8d1164daeb5b39d798d409625db692675a86889403b1532",
+        "sha256": "27b95004d8abd7c6b24a63e555d721ef5f958fbe54551246567b72321494c6c8",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.3.4"
+      "version": "2.0.0"
    },
    "flutter_web_plugins": {
      "dependency": "transitive",
@ -860,21 +851,21 @@
      "dependency": "direct dev",
      "description": {
        "name": "hive_ce_generator",
-        "sha256": "fd629eefef44f3efb92dec5c422ab4c395153def0e651ed0f9bb3c8a4d4f783b",
+        "sha256": "c9a7cda57823ffec35846c051637ddcd105eafa253e7395d9c8c0ed5e87fbb72",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.11.0"
+      "version": "1.11.1"
    },
    "hooks": {
      "dependency": "transitive",
      "description": {
        "name": "hooks",
-        "sha256": "e79ed1e8e1929bc6ecb6ec85f0cb519c887aa5b423705ded0d0f2d9226def388",
+        "sha256": "025f060e86d2d4c3c47b56e33caf7f93bf9283340f26d23424ebcfccf34f621e",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.0.2"
+      "version": "1.0.3"
    },
    "html": {
      "dependency": "direct main",
@ -917,7 +908,7 @@
      "version": "4.1.2"
    },
    "image": {
-      "dependency": "transitive",
+      "dependency": "direct main",
      "description": {
        "name": "image",
        "sha256": "f9881ff4998044947ec38d098bc7c8316ae1186fa786eddffdb867b9bc94dfce",
@ -930,21 +921,21 @@
      "dependency": "direct main",
      "description": {
        "name": "image_picker",
-        "sha256": "784210112be18ea55f69d7076e2c656a4e24949fa9e76429fe53af0c0f4fa320",
+        "sha256": "91c025426c2881c551100bce834e201c835a170151545f58d17da5180ca7d9ac",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.2.1"
+      "version": "1.2.2"
    },
    "image_picker_android": {
      "dependency": "transitive",
      "description": {
        "name": "image_picker_android",
-        "sha256": "66810af8e99b2657ee98e5c6f02064f69bb63f7a70e343937f70946c5f8c6622",
+        "sha256": "d5b3e1774af29c9ab00103afb0d4614070f924d2e0057ac867ec98800114793f",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.8.13+16"
+      "version": "0.8.13+17"
    },
    "image_picker_for_web": {
      "dependency": "transitive",
@ -1036,6 +1027,26 @@
      "source": "hosted",
      "version": "0.6.1"
    },
+    "jni": {
+      "dependency": "transitive",
+      "description": {
+        "name": "jni",
+        "sha256": "c2230682d5bc2362c1c9e8d3c7f406d9cbba23ab3f2e203a025dd47e0fb2e68f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
+    },
+    "jni_flutter": {
+      "dependency": "transitive",
+      "description": {
+        "name": "jni_flutter",
+        "sha256": "8b59e590786050b1cd866677dddaf76b1ade5e7bc751abe04b86e84d379d3ba6",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.1"
+    },
    "js": {
      "dependency": "transitive",
      "description": {
@ -1050,11 +1061,11 @@
      "dependency": "transitive",
      "description": {
        "name": "json_annotation",
-        "sha256": "cb09e7dac6210041fad964ed7fbee004f14258b4eca4040f72d1234062ace4c8",
+        "sha256": "2a743920d81b7910627f68ee2c9ac1fc0bfee32b9fc3403587d7c6791ca12f80",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "4.11.0"
+      "version": "4.12.0"
    },
    "leak_tracker": {
      "dependency": "transitive",
@ -1140,8 +1151,8 @@
      "dependency": "direct main",
      "description": {
        "path": "media_kit",
-        "ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
-        "resolved-ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
+        "ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
+        "resolved-ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
        "url": "https://github.com/Predidit/media-kit.git"
      },
      "source": "git",
@ -1151,8 +1162,8 @@
      "dependency": "direct overridden",
      "description": {
        "path": "libs/android/media_kit_libs_android_video",
-        "ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
-        "resolved-ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
+        "ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
+        "resolved-ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
        "url": "https://github.com/Predidit/media-kit.git"
      },
      "source": "git",
@ -1162,8 +1173,8 @@
      "dependency": "direct overridden",
      "description": {
        "path": "libs/ios/media_kit_libs_ios_video",
-        "ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
-        "resolved-ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
+        "ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
+        "resolved-ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
        "url": "https://github.com/Predidit/media-kit.git"
      },
      "source": "git",
@ -1173,8 +1184,8 @@
      "dependency": "direct overridden",
      "description": {
        "path": "libs/linux/media_kit_libs_linux",
-        "ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
-        "resolved-ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
+        "ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
+        "resolved-ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
        "url": "https://github.com/Predidit/media-kit.git"
      },
      "source": "git",
@ -1184,8 +1195,8 @@
      "dependency": "direct overridden",
      "description": {
        "path": "libs/macos/media_kit_libs_macos_video",
-        "ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
-        "resolved-ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
+        "ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
+        "resolved-ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
        "url": "https://github.com/Predidit/media-kit.git"
      },
      "source": "git",
@ -1195,8 +1206,8 @@
      "dependency": "direct overridden",
      "description": {
        "path": "libs/ohos/media_kit_libs_ohos",
-        "ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
-        "resolved-ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
+        "ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
+        "resolved-ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
        "url": "https://github.com/Predidit/media-kit.git"
      },
      "source": "git",
@ -1206,8 +1217,8 @@
      "dependency": "direct main",
      "description": {
        "path": "libs/universal/media_kit_libs_video",
-        "ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
-        "resolved-ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
+        "ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
+        "resolved-ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
        "url": "https://github.com/Predidit/media-kit.git"
      },
      "source": "git",
@ -1217,8 +1228,8 @@
      "dependency": "direct overridden",
      "description": {
        "path": "libs/windows/media_kit_libs_windows_video",
-        "ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
-        "resolved-ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
+        "ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
+        "resolved-ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
        "url": "https://github.com/Predidit/media-kit.git"
      },
      "source": "git",
@ -1228,8 +1239,8 @@
      "dependency": "direct main",
      "description": {
        "path": "media_kit_video",
-        "ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
-        "resolved-ref": "21aacaf9600c4bd00f2a3c57310363bc0cc9597f",
+        "ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
+        "resolved-ref": "13b332ad3fd4cd5d84c64670eceda48a6d54504e",
        "url": "https://github.com/Predidit/media-kit.git"
      },
      "source": "git",
@ -1249,11 +1260,11 @@
      "dependency": "transitive",
      "description": {
        "name": "meta",
-        "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394",
+        "sha256": "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.17.0"
+      "version": "1.18.0"
    },
    "mime": {
      "dependency": "transitive",
@ -1279,11 +1290,11 @@
      "dependency": "direct dev",
      "description": {
        "name": "mobx_codegen",
-        "sha256": "406051a76157fb0a562700110bd2bedd85c959b1cd2d3df740c706bc07539c33",
+        "sha256": "6529bcae074838004b58ad01fbe4966be182a176aacfb723686985986ebac19f",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.7.6"
+      "version": "2.7.7"
    },
    "modular_core": {
      "dependency": "transitive",
@ -1439,11 +1450,11 @@
      "dependency": "transitive",
      "description": {
        "name": "path_provider_android",
-        "sha256": "f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e",
+        "sha256": "69cbd515a62b94d32a7944f086b2f82b4ac40a1d45bebfc00813a430ab2dabcd",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.2.22"
+      "version": "2.3.1"
    },
    "path_provider_foundation": {
      "dependency": "transitive",
@ -1585,6 +1596,16 @@
      "source": "hosted",
      "version": "3.2.2"
    },
+    "record_use": {
+      "dependency": "transitive",
+      "description": {
+        "name": "record_use",
+        "sha256": "2551bd8eecfe95d14ae75f6021ad0248be5c27f138c2ec12fcb52b500b3ba1ed",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.6.0"
+    },
    "result_dart": {
      "dependency": "transitive",
      "description": {
@ -1619,51 +1640,51 @@
      "dependency": "direct main",
      "description": {
        "name": "saver_gallery",
-        "sha256": "1d942bd7f4fedc162d9a751e156ebac592e4b81fc2e757af82de9077f3437003",
+        "sha256": "3f983d4be63aff52523c3e097a9b00ce9ab8444f9a982c878cde9d0359f4681d",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "4.1.0"
+      "version": "4.1.1"
    },
    "screen_brightness_android": {
      "dependency": "direct main",
      "description": {
        "name": "screen_brightness_android",
-        "sha256": "d34f5321abd03bc3474f4c381f53d189117eba0b039eac1916aa92cca5fd0a96",
+        "sha256": "2df5e0488a22a73271a43d92dbcd80643df6910cf69690faacaf9929ae9ade3b",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.1.3"
+      "version": "2.1.4"
    },
    "screen_brightness_ios": {
      "dependency": "direct main",
      "description": {
        "name": "screen_brightness_ios",
-        "sha256": "2493953340ecfe8f4f13f61db50ce72533a55b0bbd58ba1402893feecf3727f5",
+        "sha256": "0792d8f98852558f831b4b75241c46047b884598b3f4d982b37dc2dd43e2b2e1",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.3"
    },
    "screen_brightness_ohos": {
      "dependency": "direct main",
      "description": {
        "name": "screen_brightness_ohos",
-        "sha256": "a93a263dcd39b5c56e589eb495bcd001ce65cdd96ff12ab1350683559d5c5bb7",
+        "sha256": "33f495741d5aa53104d3f5875dcb4b6a119f29ef595be17129ee03a5b78e76a9",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.3"
    },
    "screen_brightness_platform_interface": {
      "dependency": "direct main",
      "description": {
        "name": "screen_brightness_platform_interface",
-        "sha256": "737bd47b57746bc4291cab1b8a5843ee881af499514881b0247ec77447ee769c",
+        "sha256": "59d50850d6735d677780fc7359c8e997d0ff6df91c8465161c9e617a7b0a11d8",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.1.0"
+      "version": "2.1.1"
    },
    "screen_retriever": {
      "dependency": "transitive",
@ -1729,21 +1750,21 @@
      "dependency": "transitive",
      "description": {
        "name": "shared_preferences",
-        "sha256": "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64",
+        "sha256": "c3025c5534b01739267eb7d76959bbc25a6d10f6988e1c2a3036940133dd10bf",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.5.4"
+      "version": "2.5.5"
    },
    "shared_preferences_android": {
      "dependency": "transitive",
      "description": {
        "name": "shared_preferences_android",
-        "sha256": "8374d6200ab33ac99031a852eba4c8eb2170c4bf20778b3e2c9eccb45384fb41",
+        "sha256": "e8d4762b1e2e8578fc4d0fd548cebf24afd24f49719c08974df92834565e2c53",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.4.21"
+      "version": "2.4.23"
    },
    "shared_preferences_foundation": {
      "dependency": "transitive",
@ -1769,11 +1790,11 @@
      "dependency": "transitive",
      "description": {
        "name": "shared_preferences_platform_interface",
-        "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80",
+        "sha256": "649dc798a33931919ea356c4305c2d1f81619ea6e92244070b520187b5140ef9",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.2"
    },
    "shared_preferences_web": {
      "dependency": "transitive",
@ -1845,21 +1866,21 @@
      "dependency": "transitive",
      "description": {
        "name": "source_gen",
-        "sha256": "732792cfd197d2161a65bb029606a46e0a18ff30ef9e141a7a82172b05ea8ecd",
+        "sha256": "ec37cc0e6694374cbef59ed79685572c870a54ede6fa30a3e420feb3adffea02",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "4.2.2"
+      "version": "4.2.3"
    },
    "source_helper": {
      "dependency": "transitive",
      "description": {
        "name": "source_helper",
-        "sha256": "1d3b229b2934034fb2e691fbb3d53e0f75a4af7b1407f88425ed8f209bcb1b8f",
+        "sha256": "4227d54ceefd0bb8ca4c8fcb96e1719dc53f1ee1b6e2ca9d7a6069da160e4eae",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.3.11"
+      "version": "1.3.12"
    },
    "source_span": {
      "dependency": "transitive",
@ -1875,11 +1896,11 @@
      "dependency": "transitive",
      "description": {
        "name": "sqflite",
-        "sha256": "e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03",
+        "sha256": "564cfed0746fe53140c23b70b308e045c3b31f17778f2f326ccb7d804ea0250a",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.4.2"
+      "version": "2.4.2+1"
    },
    "sqflite_android": {
      "dependency": "transitive",
@ -1895,11 +1916,11 @@
      "dependency": "transitive",
      "description": {
        "name": "sqflite_common",
-        "sha256": "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6",
+        "sha256": "1581ffbf7a0e333b380d6a30737d78516b826cb35beb7fb0bf8a3ea0c678b465",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.5.6"
+      "version": "2.5.8"
    },
    "sqflite_darwin": {
      "dependency": "transitive",
@ -1965,11 +1986,11 @@
      "dependency": "direct main",
      "description": {
        "name": "synchronized",
-        "sha256": "c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0",
+        "sha256": "63896c27e81b28f8cb4e69ead0d3e8f03f1d1e5fc531a3e579cabed6a2c7c9e5",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.4.0"
+      "version": "3.4.0+1"
    },
    "term_glyph": {
      "dependency": "transitive",
@ -1985,11 +2006,11 @@
      "dependency": "transitive",
      "description": {
        "name": "test_api",
-        "sha256": "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a",
+        "sha256": "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.7.10"
+      "version": "0.7.11"
    },
    "tray_manager": {
      "dependency": "direct main",
@ -2065,11 +2086,11 @@
      "dependency": "transitive",
      "description": {
        "name": "url_launcher_android",
-        "sha256": "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611",
+        "sha256": "3bb000251e55d4a209aa0e2e563309dc9bb2befea2295fd0cec1f51760aac572",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "6.3.28"
+      "version": "6.3.29"
    },
    "url_launcher_ios": {
      "dependency": "transitive",
@ -2115,11 +2136,11 @@
      "dependency": "transitive",
      "description": {
        "name": "url_launcher_web",
-        "sha256": "d0412fcf4c6b31ecfdb7762359b7206ffba3bbffd396c6d9f9c4616ece476c1f",
+        "sha256": "85c81589622fbc87c1c683aaea164d3604a7777495a79d91e39ffcdec39ddb34",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.4.2"
+      "version": "2.4.3"
    },
    "url_launcher_windows": {
      "dependency": "transitive",
@ -2145,11 +2166,11 @@
      "dependency": "transitive",
      "description": {
        "name": "vector_graphics",
-        "sha256": "7076216a10d5c390315fbe536a30f1254c341e7543e6c4c8a815e591307772b1",
+        "sha256": "2306c03da2ba81724afeb589c351ebbc0aa7d86005925be8f8735856dbe5e42d",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.1.20"
+      "version": "1.2.2"
    },
    "vector_graphics_codec": {
      "dependency": "transitive",
@ -2165,11 +2186,11 @@
      "dependency": "transitive",
      "description": {
        "name": "vector_graphics_compiler",
-        "sha256": "5a88dd14c0954a5398af544651c7fb51b457a2a556949bfb25369b210ef73a74",
+        "sha256": "b9b3f391857781aa96acacef96066f2f49b4cd03cf9fce3ca4d8da2ef5ea129e",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.2.0"
+      "version": "1.2.3"
    },
    "vector_math": {
      "dependency": "transitive",
@ -2195,11 +2216,11 @@
      "dependency": "transitive",
      "description": {
        "name": "vm_service",
-        "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
+        "sha256": "0016aef94fc66495ac78af5859181e3f3bf2026bd8eecc72b9565601e19ab360",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "15.0.2"
+      "version": "15.2.0"
    },
    "wakelock_plus": {
      "dependency": "transitive",
@ -2225,11 +2246,11 @@
      "dependency": "transitive",
      "description": {
        "name": "wakelock_plus_platform_interface",
-        "sha256": "24b84143787220a403491c2e5de0877fbbb87baf3f0b18a2a988973863db4b03",
+        "sha256": "b13f99e992e7ae6a152e16c5559d3c07ff445b13330192662494e614ca3e7d7b",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.4.0"
+      "version": "1.5.1"
    },
    "watcher": {
      "dependency": "transitive",
@ -2285,8 +2306,8 @@
      "dependency": "direct main",
      "description": {
        "path": ".",
-        "ref": "d9bbeabe51562e727850fe3f60407cf0f6239a8e",
-        "resolved-ref": "d9bbeabe51562e727850fe3f60407cf0f6239a8e",
+        "ref": "8e3578e6032c93f1723f58db930d480b7828d796",
+        "resolved-ref": "8e3578e6032c93f1723f58db930d480b7828d796",
        "url": "https://github.com/Predidit/flutter-webview-windows.git"
      },
      "source": "git",
@ -2374,7 +2395,7 @@
    }
  },
  "sdks": {
-    "dart": ">=3.10.3 <4.0.0",
-    "flutter": ">=3.41.9"
+    "dart": ">=3.11.0 <4.0.0",
+    "flutter": ">=3.44.0"
  }
 }
--- a/pkgs/by-name/ki/kiro/package.nix
+++ b/pkgs/by-name/ki/kiro/package.nix
@ -14,7 +14,7 @@ in
  inherit useVSCodeRipgrep;
  commandLineArgs = extraCommandLineArgs;

-  version = "0.12.263";
+  version = "0.12.301";
  pname = "kiro";

  # You can find the current VSCode version in the About dialog:
--- a/pkgs/by-name/ki/kiro/sources.json
+++ b/pkgs/by-name/ki/kiro/sources.json
@ -1,14 +1,14 @@
 {
  "x86_64-linux": {
-    "url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.12.263/tar/kiro-ide-0.12.263-stable-linux-x64.tar.gz",
-    "hash": "sha256-PDm8lib9dA5kPxyaVzbrmmJwBb6Brdb2zIMH1u4MJeM="
+    "url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.12.301/tar/kiro-ide-0.12.301-stable-linux-x64.tar.gz",
+    "hash": "sha256-TSsezw9e4qwehiw1ZRkGIcNgsm9bfORqNZN+wBeoxZM="
  },
  "x86_64-darwin": {
-    "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.12.263/kiro-ide-0.12.263-stable-darwin-x64.dmg",
-    "hash": "sha256-8a390Ka49Pd2Z6A00V0crGnA8CizrMQmvi2kdGG+Koc="
+    "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.12.301/kiro-ide-0.12.301-stable-darwin-x64.dmg",
+    "hash": "sha256-t/UxzyVzx0+zlC6T2Rs3cmWObRYNdmhKoIobYGa+Yq4="
  },
  "aarch64-darwin": {
-    "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.12.263/kiro-ide-0.12.263-stable-darwin-arm64.dmg",
-    "hash": "sha256-b1gxq72GL1br0XGhDe9vNJBSVNKm/AeNbJ8Jmwa7FUE="
+    "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.12.301/kiro-ide-0.12.301-stable-darwin-arm64.dmg",
+    "hash": "sha256-Ofi+JB7aLSVYFnP3bUnkGGg900/pUu8bpEbnYfW1sDI="
  }
 }
--- a/pkgs/by-name/ki/kitty/package.nix
+++ b/pkgs/by-name/ki/kitty/package.nix
@ -50,21 +50,21 @@
 with python3Packages;
 buildPythonApplication rec {
  pname = "kitty";
-  version = "0.47.1";
+  version = "0.47.2";
  pyproject = false;

  src = fetchFromGitHub {
    owner = "kovidgoyal";
    repo = "kitty";
    tag = "v${version}";
-    hash = "sha256-/FOeJiC9SNE/k7SzXl5nmwdfKiFlKa0C0IuIph4cRxQ=";
+    hash = "sha256-hRQ/1EMBt04Er1OfLg1W9fIma3NZBHZklW1N4DmFBpM=";
  };

  goModules =
    (buildGo126Module {
      pname = "kitty-go-modules";
      inherit src version;
-      vendorHash = "sha256-SuLcY8M+F9HijinaNr6jmsGlJ00o5LJN+Y04cfjyQ/c=";
+      vendorHash = "sha256-zZZDrWzl2q/o4f52diE0YDV/MdYfsdKWWjQ0ej2bBTM=";
    }).goModules;

  buildInputs = [
@ -152,6 +152,7 @@ buildPythonApplication rec {
  env = {
    CGO_ENABLED = 0;
    GOFLAGS = "-trimpath";
+    GOTOOLCHAIN = "local";
  };

  configurePhase = ''
--- a/pkgs/by-name/li/libmirage/package.nix
+++ b/pkgs/by-name/li/libmirage/package.nix
@ -0,0 +1,82 @@
+{
+  stdenv,
+  cmake,
+  pkg-config,
+  gobject-introspection,
+  vala,
+  glib,
+  libsndfile,
+  zlib,
+  bzip2,
+  xz,
+  libsamplerate,
+  intltool,
+  pcre,
+  util-linux,
+  libselinux,
+  libsepol,
+  fetchurl,
+  lib,
+  writeScript,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libmirage";
+  version = "3.3.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/cdemu/libmirage-${finalAttrs.version}.tar.xz";
+    hash = "sha256-mstOGdmKJXRUrQA5F1DZGqVuY+f25Q5ZpdOXPx4MZRI=";
+  };
+
+  env = {
+    PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0";
+    PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0";
+  };
+
+  buildInputs = [
+    glib
+    libsndfile
+    zlib
+    bzip2
+    xz
+    libsamplerate
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    intltool
+    gobject-introspection
+    vala
+  ];
+
+  propagatedBuildInputs = [
+    pcre
+    util-linux
+    libselinux
+    libsepol
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-libmirage" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p curl pcre2 common-updater-scripts
+
+      set -eu -o pipefail
+
+      # Fetch the latest version from the SourceForge RSS feed for libmirage
+      newVersion="$(curl -s "https://sourceforge.net/projects/cdemu/rss?path=/libmirage" | pcre2grep -o1 'libmirage-([0-9.]+)\.tar\.xz' | head -n 1)"
+
+      update-source-version libmirage "$newVersion"
+    '';
+  };
+
+  meta = {
+    maintainers = with lib.maintainers; [ bendlas ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    description = "CD-ROM image access library";
+    homepage = "https://cdemu.sourceforge.io/about/libmirage/";
+  };
+})
--- a/pkgs/by-name/me/meshtastic-web/package.nix
+++ b/pkgs/by-name/me/meshtastic-web/package.nix
@ -2,7 +2,7 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  pnpm_9,
+  pnpm_10,
  fetchPnpmDeps,
  pnpmConfigHook,
  nodejs,
@ -29,19 +29,19 @@ stdenv.mkDerivation (finalAttrs: {
  pnpmWorkspaces = [ "*" ];
  pnpmRoot = "packages/web";
  pnpmDeps = fetchPnpmDeps {
-    pnpm = pnpm_9;
+    pnpm = pnpm_10;
+    fetcherVersion = 4;
    inherit (finalAttrs)
      pname
      version
      src
      pnpmWorkspaces
      ;
-    fetcherVersion = 3;
-    hash = "sha256-yUdPrZAnCsxIiF++SxTm1VuVAEKIzTsp2qd/WcCPOcQ=";
+    hash = "sha256-0o/g5FVzSGX9xtQ8DZGjakwOnPXvlA95tdD/VNymB1M=";
  };

  nativeBuildInputs = [
-    pnpm_9
+    pnpm_10
    pnpmConfigHook
    nodejs
  ];
--- a/pkgs/by-name/mi/mixing-station/package.nix
+++ b/pkgs/by-name/mi/mixing-station/package.nix
@ -22,13 +22,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "mixing-station";
-  version = "2.9.1";
+  version = "2.9.3";

  src = fetchzip {
    url = "https://mixingstation.app/backend/api/web/download/archive/mixing-station-pc/update/${finalAttrs.version}";
    name = "mixing-station-${finalAttrs.version}.zip";
    extension = "zip";
-    hash = "sha256-tyoagT21lIT0kIL9RZT1qQ7Aa7E3WAfmdsqvqc7iEGU=";
+    hash = "sha256-efY+zvX2cN+yFm1xxpvsZAiMhtNW/S9g2hgLnYUYd4I=";
    stripRoot = false;
  };

--- a/pkgs/by-name/mo/moonfire-nvr/package.nix
+++ b/pkgs/by-name/mo/moonfire-nvr/package.nix
@ -1,6 +1,6 @@
 {
  lib,
-  stdenv,
+  callPackage,
  rustPlatform,
  fetchFromGitHub,
  pkg-config,
@ -8,54 +8,26 @@
  sqlite,
  testers,
  moonfire-nvr,
-  nodejs,
-  pnpm_9,
-  fetchPnpmDeps,
-  pnpmConfigHook,
+  nix-update,
+  writeShellApplication,
 }:

-let
+rustPlatform.buildRustPackage (finalAttrs: {
  pname = "moonfire-nvr";
-  version = "0.7.20";
+  version = "0.7.31";
+
  src = fetchFromGitHub {
    owner = "scottlamb";
    repo = "moonfire-nvr";
-    tag = "v${version}";
-    hash = "sha256-0EaGqZUmYGxLHcJAhlbG2wZMDiVv8U1bcTQqMx0aTo0=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-QgsaiWcXeU4y7z9mcqUAl4mQ/M4p38yRjOB/4MKlpVA=";
  };
-  ui = stdenv.mkDerivation (finalAttrs: {
-    inherit version src;
-    pname = "${pname}-ui";
-    sourceRoot = "${src.name}/ui";
-    nativeBuildInputs = [
-      nodejs
-      pnpmConfigHook
-      pnpm_9
-    ];
-    pnpmDeps = fetchPnpmDeps {
-      inherit (finalAttrs) pname version src;
-      pnpm = pnpm_9;
-      sourceRoot = "${finalAttrs.src.name}/ui";
-      fetcherVersion = 3;
-      hash = "sha256-1bkuou8jfWqdev4ZlpqvC4BRrFj//LK6ImVvSeMUEuM=";
-    };
-    installPhase = ''
-      runHook preInstall

-      cp -r public $out
+  sourceRoot = "${finalAttrs.src.name}/server";

-      runHook postInstall
-    '';
-  });
-in
-rustPlatform.buildRustPackage {
-  inherit pname version src;
+  cargoHash = "sha256-TDFe5pD+8eSwvw0h9GLM+JfODlSBU1CO8fw4FVjy8xk=";

-  sourceRoot = "${src.name}/server";
-
-  cargoHash = "sha256-+L4XofUFvhJDPGv4fAGYXFNpuNd01k/P63LH2tXXHE0=";
-
-  env.VERSION = "v${version}";
+  env.VERSION = "v${finalAttrs.version}";

  nativeBuildInputs = [
    pkg-config
@ -68,26 +40,40 @@ rustPlatform.buildRustPackage {

  postInstall = ''
    mkdir -p $out/lib
-    ln -s ${ui} $out/lib/ui
+    ln -s ${moonfire-nvr.ui} $out/lib/ui
  '';

  doCheck = false;

  passthru = {
-    inherit ui;
+    ui = callPackage ./ui.nix { };
    tests.version = testers.testVersion {
      package = moonfire-nvr;
      command = "moonfire-nvr --version";
-      version = "Version: v${version}";
+      version = "Version: v${finalAttrs.version}";
    };
+    updateScript = lib.getExe (writeShellApplication {
+      name = "update-moonfire-nvr";
+
+      runtimeInputs = [
+        nix-update
+      ];
+
+      text = ''
+        set -euo pipefail
+
+        nix-update moonfire-nvr
+        nix-update moonfire-nvr.ui --version=skip
+      '';
+    });
  };

  meta = {
    description = "Moonfire NVR, a security camera network video recorder";
    homepage = "https://github.com/scottlamb/moonfire-nvr";
-    changelog = "https://github.com/scottlamb/moonfire-nvr/releases/tag/v${version}";
+    changelog = "https://github.com/scottlamb/moonfire-nvr/releases/tag/${finalAttrs.src.tag}";
    license = lib.licenses.gpl3Only;
    maintainers = [ ];
    mainProgram = "moonfire-nvr";
  };
-}
+})
--- a/pkgs/by-name/mo/moonfire-nvr/ui.nix
+++ b/pkgs/by-name/mo/moonfire-nvr/ui.nix
@ -0,0 +1,41 @@
+{
+  stdenv,
+  moonfire-nvr,
+  nodejs,
+  pnpmConfigHook,
+  pnpm_10,
+  fetchPnpmDeps,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "moonfire-nvr-ui";
+  inherit (moonfire-nvr) version src;
+
+  sourceRoot = "${finalAttrs.src.name}/ui";
+
+  nativeBuildInputs = [
+    nodejs
+    pnpmConfigHook
+    pnpm_10
+  ];
+
+  pnpmDeps = fetchPnpmDeps {
+    inherit (finalAttrs) pname version src;
+    pnpm = pnpm_10;
+    sourceRoot = "${finalAttrs.src.name}/ui";
+    fetcherVersion = 4;
+    hash = "sha256-U/SHOVlx0kj1hfl09KcPg3CQZX9HZE5SghVEThWL1RA=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    cp -r public $out
+
+    runHook postInstall
+  '';
+
+  meta = moonfire-nvr.meta // {
+    description = "Moonfire UI";
+  };
+})
--- a/pkgs/by-name/mp/mpy-utils/package.nix
+++ b/pkgs/by-name/mp/mpy-utils/package.nix
@ -1,30 +1,47 @@
 {
-  stdenv,
  lib,
  python3Packages,
  fetchPypi,
+  fetchpatch2,
 }:

 python3Packages.buildPythonApplication (finalAttrs: {
  pname = "mpy-utils";
  version = "0.1.13";
-  format = "setuptools";
+  pyproject = true;

  src = fetchPypi {
    inherit (finalAttrs) pname version;
    hash = "sha256-die8hseaidhs9X7mfFvV8C8zn0uyw08gcHNqmjl+2Z4=";
  };

-  propagatedBuildInputs = with python3Packages; [
-    fusepy
+  patches = [
+    # https://github.com/nickzoic/mpy-utils/pull/20
+    (fetchpatch2 {
+      name = "use-mfusepy.patch";
+      url = "https://github.com/nickzoic/mpy-utils/commit/1513b4dc1096bd8861792cd13abafd2342fb5510.patch?full_index=1";
+      hash = "sha256-ZgSEP+4yJf/0itApSmVh/hSqW10Ty+/kOjxg+XJsnn4=";
+    })
+  ];
+
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [
+    mfusepy
    pyserial
  ];

+  # Skip mpy_utils.replfuseops: importing it loads libfuse via ctypes, which
+  # requires macFUSE on Darwin and is not available in the build sandbox.
+  pythonImportsCheck = [
+    "mpy_utils"
+    "mpy_utils.replcontrol"
+  ];
+
  meta = {
    description = "MicroPython development utility programs";
    homepage = "https://github.com/nickzoic/mpy-utils";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ aciceri ];
-    broken = stdenv.hostPlatform.isDarwin;
  };
 })
--- a/pkgs/by-name/mu/musescore/package.nix
+++ b/pkgs/by-name/mu/musescore/package.nix
@ -13,6 +13,7 @@
  # buildInputs
  alsa-lib,
  alsa-plugins,
+  ffmpeg,
  flac,
  freetype,
  kdePackages,
@ -181,6 +182,15 @@ stdenv.mkDerivation (finalAttrs: {
    kdePackages'.qtwayland
  ];

+  # Put the default, `$prefix/lib` directory to look for ffmpeg shared objects,
+  # Nixpkgs' provided ffmpeg, for both MacOS & Linux. Note that upstream uses
+  # the /usr/lib/x86_64-linux-gnu location for any Linux (e.g aarch64 too).
+  preConfigure = ''
+    substituteInPlace src/framework/media/internal/ffmpegutils.cpp \
+      --replace-fail "/usr/lib/x86_64-linux-gnu" "${lib.getLib ffmpeg}/lib" \
+      --replace-fail "/opt/homebrew/lib" "${lib.getLib ffmpeg}/lib" \
+  '';
+
  strictDeps = true;
  __structuredAttrs = true;

--- a/pkgs/by-name/mu/music-assistant-desktop/package.nix
+++ b/pkgs/by-name/mu/music-assistant-desktop/package.nix
@ -30,13 +30,13 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "music-assistant-desktop";
-  version = "0.3.7";
+  version = "0.3.9";

  src = fetchFromGitHub {
    owner = "music-assistant";
    repo = "desktop-app";
    tag = finalAttrs.version;
-    hash = "sha256-QhKc5GBUnI1ae6+XK14YRWEpWuVtL6s90sSuWKLwNpk=";
+    hash = "sha256-fogNPPdbU8ikTxxaGDYsqR6GCcAsc2fS4qapVDkesAQ=";
  };

  # hide update feature
@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
  cargoRoot = "src-tauri";
  buildAndTestSubdir = finalAttrs.cargoRoot;

-  cargoHash = "sha256-rd0kvUTAi4fOh3hxCY1cmkkLWsxNPxVmPVzB9uEv/8c=";
+  cargoHash = "sha256-xi6Clo8iHg3YFVcWNMFrN2422MZm2BhB9m/etFlyb/4=";

  yarnOfflineCache = fetchYarnDeps {
    yarnLock = finalAttrs.src + "/yarn.lock";
--- a/pkgs/by-name/of/offlineimap/package.nix
+++ b/pkgs/by-name/of/offlineimap/package.nix
@ -14,14 +14,14 @@

 python3.pkgs.buildPythonApplication (finalAttrs: {
  pname = "offlineimap";
-  version = "8.0.2";
+  version = "8.0.3";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "OfflineIMAP";
    repo = "offlineimap3";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-mysvqltO4x2dD8V+FAGOnDw5lQ8bgDwXFK9n15fbUdI=";
+    hash = "sha256-JWWv3zpiKzQmG8FRFb9h+TnCyR+f7LY3SBgYlcZA+1A=";
  };

  postPatch = ''
--- a/pkgs/by-name/on/onnxruntime/package.nix
+++ b/pkgs/by-name/on/onnxruntime/package.nix
@ -3,7 +3,7 @@
  config,
  stdenv,
  fetchFromGitHub,
-  abseil-cpp_202508,
+  abseil-cpp,
  buildPackages,
  cmake,
  cpuinfo,
@ -138,8 +138,6 @@ effectiveStdenv.mkDerivation (finalAttrs: {
    substituteInPlace cmake/libonnxruntime.pc.cmake.in \
      --replace-fail '$'{prefix}/@CMAKE_INSTALL_ @CMAKE_INSTALL_
    echo "find_package(cudnn_frontend REQUIRED)" > cmake/external/cudnn_frontend.cmake
-  ''
-  + ''
    substituteInPlace onnxruntime/core/platform/posix/env.cc --replace-fail \
      "return PathString{};" \
      "return PathString(\"$out/lib/\");"
@ -275,7 +273,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
    (lib.cmakeBool "ABSL_ENABLE_INSTALL" true)
    (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)
    (lib.cmakeBool "FETCHCONTENT_QUIET" false)
-    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ABSEIL_CPP" "${abseil-cpp_202508.src}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ABSEIL_CPP" "${abseil-cpp.src}")
    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_DLPACK" "${dlpack-src}")
    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_FLATBUFFERS" "${flatbuffers_23.src}")
    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MP11" "${mp11-src}")
@ -289,7 +287,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
    (lib.cmakeBool "onnxruntime_BUILD_UNIT_TESTS" finalAttrs.doCheck)
    (lib.cmakeBool "onnxruntime_USE_FULL_PROTOBUF" withFullProtobuf)
    (lib.cmakeBool "onnxruntime_USE_CUDA" cudaSupport)
-    (lib.cmakeBool "onnxruntime_USE_NCCL" (cudaSupport && ncclSupport))
+    (lib.cmakeBool "onnxruntime_USE_NCCL" ncclSupport)
    (lib.cmakeBool "onnxruntime_USE_MIGRAPHX" rocmSupport)
    (lib.cmakeBool "onnxruntime_USE_COREML" coremlSupport)
    (lib.cmakeBool "onnxruntime_ENABLE_LTO" (!cudaSupport || cudaPackages.cudaOlder "12.8"))
--- a/pkgs/by-name/ox/oxidized/Gemfile
+++ b/pkgs/by-name/ox/oxidized/Gemfile
@ -1,6 +1,6 @@
 source 'https://rubygems.org'

-gem 'oxidized', '0.36.0'
+gem 'oxidized', '0.37.0'
 gem 'oxidized-web', '0.18.1'
 gem 'oxidized-script', '0.7.0'
 gem 'psych', '~> 5.0'
--- a/pkgs/by-name/ox/oxidized/Gemfile.lock
+++ b/pkgs/by-name/ox/oxidized/Gemfile.lock
@ -30,7 +30,7 @@ GEM
    net-ssh (7.3.2)
    net-telnet (0.2.0)
    nio4r (2.7.5)
-    oxidized (0.36.0)
+    oxidized (0.37.0)
      asetus (~> 0.4)
      bcrypt_pbkdf (~> 1.0)
      ed25519 (~> 1.2)
@ -103,7 +103,7 @@ PLATFORMS

 DEPENDENCIES
  net-scp (~> 4.1)
-  oxidized (= 0.36.0)
+  oxidized (= 0.37.0)
  oxidized-script (= 0.7.0)
  oxidized-web (= 0.18.1)
  psych (~> 5.0)
--- a/pkgs/by-name/ox/oxidized/gemset.nix
+++ b/pkgs/by-name/ox/oxidized/gemset.nix
@ -241,10 +241,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0g2a60bwpjidwkksai6l2ndnq3qbvqj33jv53c800m7m4hgr5r0n";
+      sha256 = "0apg5psqdkc0h71qpgiq52qnifr41g57agvgyxiq10335gh6c2v0";
      type = "gem";
    };
-    version = "0.36.0";
+    version = "0.37.0";
  };
  oxidized-script = {
    dependencies = [
--- a/pkgs/by-name/pf/pfetch/package.nix
+++ b/pkgs/by-name/pf/pfetch/package.nix
@ -8,13 +8,13 @@

 stdenvNoCC.mkDerivation rec {
  pname = "pfetch";
-  version = "1.10.0";
+  version = "1.11.0";

  src = fetchFromGitHub {
    owner = "Un1q32";
    repo = "pfetch";
    tag = version;
-    hash = "sha256-0EI5D33lVm/lJ0m47wDBE5fGmx/7tDRAC/AE58nJ2ao=";
+    hash = "sha256-QxHbk27A45awUqLGS/HZmOLOi0sQ1DVfwCFhyOlSCKk=";
  };

  dontBuild = true;
--- a/pkgs/by-name/pi/piped/package.nix
+++ b/pkgs/by-name/pi/piped/package.nix
@ -1,14 +1,14 @@
 {
  lib,
  buildNpmPackage,
-  pnpm_9,
+  pnpm_10,
  fetchPnpmDeps,
  pnpmConfigHook,
  fetchFromGitHub,
  unstableGitUpdater,
 }:
 let
-  pnpm = pnpm_9;
+  pnpm = pnpm_10;
 in
 buildNpmPackage rec {
  pname = "piped";
@ -21,7 +21,7 @@ buildNpmPackage rec {
    hash = "sha256-o3TwE0s5rim+0VKR+oW9Rv3/eQRf2dgRQK4xjZ9pqCE=";
  };

-  nativeBuildInputs = [ pnpm_9 ];
+  nativeBuildInputs = [ pnpm ];
  npmConfigHook = pnpmConfigHook;

  installPhase = ''
@ -36,10 +36,10 @@ buildNpmPackage rec {
      pname
      version
      src
+      pnpm
      ;
-    pnpm = pnpm_9;
-    fetcherVersion = 3;
-    hash = "sha256-IB/suR1I1hNip1qpIcUCP0YyUEDV2EwE5F2WXW8OhmU=";
+    fetcherVersion = 4;
+    hash = "sha256-o5NKMMIVPkKiPx++ALcZ+3oN80DMQHPwQqGT4f4q5P8=";
  };

  passthru.updateScript = unstableGitUpdater { };
--- a/pkgs/by-name/pi/pizauth/package.nix
+++ b/pkgs/by-name/pi/pizauth/package.nix
@ -8,16 +8,25 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "pizauth";
-  version = "1.0.11";
+  version = "1.1.0";

  src = fetchFromGitHub {
    owner = "ltratt";
    repo = "pizauth";
    tag = "pizauth-${finalAttrs.version}";
-    hash = "sha256-e9YBeYMC9tfxZoXZi/QBW3FO5V6BAe7RSvVWs7rv0PI=";
+    hash = "sha256-VL58v/mBwFwDmF4Xg43bzitcBCsPsEwEaLKqV5X9rpg=";
  };

-  cargoHash = "sha256-9cDVbDCb8vY6KxreyiMX3gp13bXZpxTQOwYbk6TEVpc=";
+  cargoHash = "sha256-pxzPcieUXE3VOyGNDaeDHUQPayRDZXpW57VWMejlZ4k=";
+
+  buildFeatures = lib.optionals stdenv.hostPlatform.isLinux [
+    "systemd"
+  ];
+
+  preConfigure = ''
+    substituteInPlace lib/systemd/user/pizauth.service \
+      --replace-fail /usr/bin/ ''${!outputBin}/bin/
+  '';

  postInstall = ''
    make PREFIX=$out install ${lib.optionalString stdenv.hostPlatform.isLinux "install-systemd"}
--- a/pkgs/by-name/pr/prettier/package.nix
+++ b/pkgs/by-name/pr/prettier/package.nix
@ -6,7 +6,7 @@
  makeBinaryWrapper,
  nodejs,
  pnpmConfigHook,
-  pnpm_9,
+  pnpm_10,
  stdenv,
  versionCheckHook,
  yarn-berry,
@ -87,7 +87,7 @@ let
    nativeBuildInputs = [
      nodejs
      pnpmConfigHook
-      pnpm_9
+      pnpm_10
    ];

    patches = [
@ -102,9 +102,9 @@ let
        patches
        ;

-      pnpm = pnpm_9;
+      pnpm = pnpm_10;
      fetcherVersion = 3;
-      hash = "sha256-WPsVL05rVku2YSbfjHX4/BoFM+qvIm4sZip7pISg0vA=";
+      hash = "sha256-S9d89o5GNUGLoc9SBe58qKmbPEdGj3PEnQN+eADG4SU=";
    };

    buildPhase = ''
--- a/pkgs/by-name/py/pyprland/package.nix
+++ b/pkgs/by-name/py/pyprland/package.nix
@ -7,14 +7,14 @@

 python3Packages.buildPythonApplication (finalAttrs: {
  pname = "pyprland";
-  version = "3.4.0";
+  version = "3.4.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "hyprland-community";
    repo = "pyprland";
    tag = finalAttrs.version;
-    hash = "sha256-e2BTHGmZrxRXC+Eu2TpNcEJB1txZDOi0gs/CsjZu9eY=";
+    hash = "sha256-Bu2UumLJay3Fvd2aXhqWGbxApCVSdJKo51NLy1AC/+0=";
  };

  build-system = [ python3Packages.hatchling ];
--- a/pkgs/by-name/ra/radicle-desktop/package.nix
+++ b/pkgs/by-name/ra/radicle-desktop/package.nix
@ -26,13 +26,13 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "radicle-desktop";
-  version = "0.11.0";
+  version = "0.12.0";

  src = fetchFromRadicle {
    seed = "seed.radicle.dev";
    repo = "z4D5UCArafTzTQpDZNQRuqswh3ury";
    tag = "releases/${finalAttrs.version}";
-    hash = "sha256-LKV69Yr06KI46GNl+Xk3sb9sn9Yr6A3i0+WuPsbvW7g=";
+    hash = "sha256-lbLBtLOBLf+w2Oq56JwXtouDykNrRZyrMxYX9131lf8=";
    leaveDotGit = true;
    postFetch = ''
      git -C $out rev-parse --short HEAD > $out/.git_head
--- a/pkgs/by-name/ri/river/package.nix
+++ b/pkgs/by-name/ri/river/package.nix
@ -89,6 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
  meta = {
    description = "Non-monolithic Wayland compositor";
    homepage = "https://codeberg.org/river/river";
+    donationPage = "https://codeberg.org/river/river#donate";
    longDescription = ''
      River is a non-monolithic Wayland compositor.
      Unlike other Wayland compositors, river does not combine the compositor and window manager into one program.
--- a/pkgs/by-name/rm/rmfakecloud/package.nix
+++ b/pkgs/by-name/rm/rmfakecloud/package.nix
@ -70,7 +70,6 @@ buildGoModule rec {
    homepage = "https://ddvk.github.io/rmfakecloud/";
    license = lib.licenses.agpl3Only;
    maintainers = with lib.maintainers; [
-      euxane
      martinetd
    ];
    mainProgram = "rmfakecloud";
--- a/pkgs/by-name/rq/rquickshare/fix-pnpm-lock-file-tauri-minor-version-mismatch.patch
+++ b/pkgs/by-name/rq/rquickshare/fix-pnpm-lock-file-tauri-minor-version-mismatch.patch
--- a/pkgs/by-name/rq/rquickshare/package.nix
+++ b/pkgs/by-name/rq/rquickshare/package.nix
@ -9,7 +9,7 @@
  nodejs,
  openssl,
  pkg-config,
-  pnpm_9,
+  pnpm_10,
  fetchPnpmDeps,
  pnpmConfigHook,
  protobuf,
@ -18,6 +18,10 @@
  webkitgtk_4_1,
  wrapGAppsHook4,
 }:
+let
+  # upstream still uses pnpm 8 though
+  pnpm = pnpm_10;
+in
 rustPlatform.buildRustPackage rec {
  pname = "rquickshare";
  version = "0.11.5";
@ -31,7 +35,7 @@ rustPlatform.buildRustPackage rec {

  patches = [
    ./fix-pnpm-outdated-lockfile.patch
-    ./fix-pnpm-lock-file-tauri-minor-verison-mismatch.patch
+    ./fix-pnpm-lock-file-tauri-minor-version-mismatch.patch
  ];

  # from https://github.com/NixOS/nixpkgs/blob/04e40bca2a68d7ca85f1c47f00598abb062a8b12/pkgs/by-name/ca/cargo-tauri/test-app.nix#L23-L26
@ -47,20 +51,19 @@ rustPlatform.buildRustPackage rec {
      version
      src
      patches
+      pnpm
      ;
-    pnpm = pnpm_9;
    postPatch = "cd ${pnpmRoot}";
-    fetcherVersion = 3;
-    hash = "sha256-ESm7YVVbsfjpgYeNf3aVhJawpWhbeNdo0u7cBzLmEMw=";
+    fetcherVersion = 4;
+    hash = "sha256-uugI9ztwHPYn7WdXfo3XlBxjhVczGnpWvTb3IEMJUqg=";
  };

  cargoRoot = "app/main/src-tauri";
  buildAndTestSubdir = cargoRoot;
  cargoPatches = [
-    ./remove-duplicate-versions-of-sys-metrics.patch
    ./remove-code-signing-darwin.patch
  ];
-  cargoHash = "sha256-XfN+/oC3lttDquLfoyJWBaFfdjW/wyODCIiZZksypLM=";
+  cargoHash = "sha256-9LFMWr/TQZ0nolQykrsGR2aqrSWIXoPZRLYO4mjTmpg=";

  nativeBuildInputs = [
    cargo-tauri.hook
@ -68,7 +71,7 @@ rustPlatform.buildRustPackage rec {
    # Setup pnpm
    nodejs
    pnpmConfigHook
-    pnpm_9
+    pnpm

    protobuf
  ]
--- a/pkgs/by-name/rq/rquickshare/remove-duplicate-versions-of-sys-metrics.patch
+++ b/pkgs/by-name/rq/rquickshare/remove-duplicate-versions-of-sys-metrics.patch
@ -1,114 +0,0 @@
-diff --git a/app/legacy/src-tauri/Cargo.lock b/app/legacy/src-tauri/Cargo.lock
-index 14872dc..341fcc8 100644
--- a/app/legacy/src-tauri/Cargo.lock
-+++ b/app/legacy/src-tauri/Cargo.lock
-@@ -4296,7 +4296,7 @@ dependencies = [
-  "rand 0.9.0",
-  "serde",
-  "sha2",
- "sys_metrics 0.2.7 (git+https://github.com/Martichou/sys_metrics)",
-+ "sys_metrics",
-  "tokio",
-  "tokio-util",
-  "tracing-subscriber",
-@@ -4316,7 +4316,7 @@ dependencies = [
-  "rqs_lib",
-  "serde",
-  "serde_json",
- "sys_metrics 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "sys_metrics",
-  "tauri",
-  "tauri-build",
-  "tauri-plugin-autostart",
-@@ -4920,21 +4920,6 @@ dependencies = [
-  "libc",
- ]
- 
-[[package]]
-name = "sys_metrics"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9b266b80f59f86e2e1e0a4938e316e32c3730d94a749f236305152279f77484"
-dependencies = [
- "core-foundation-sys",
- "glob",
- "io-kit-sys",
- "lazy_static",
- "libc",
- "mach",
- "serde",
-]
-
- [[package]]
- name = "sys_metrics"
- version = "0.2.7"
-diff --git a/app/legacy/src-tauri/Cargo.toml b/app/legacy/src-tauri/Cargo.toml
-index fb735b2..cfd1349 100644
--- a/app/legacy/src-tauri/Cargo.toml
-+++ b/app/legacy/src-tauri/Cargo.toml
-@@ -20,7 +20,7 @@ notify-rust = "4.10"
- rqs_lib = { path = "../../../core_lib", features = ["experimental"] }
- serde = { version = "1.0", features = ["derive"] }
- serde_json = "1.0"
-sys_metrics = "0.2"
-+sys_metrics = { git = "https://github.com/Martichou/sys_metrics" }
- tauri = { version = "1.8", features = ["api-all", "reqwest-native-tls-vendored", "devtools", "system-tray"] }
- tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
- tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
-diff --git a/app/main/src-tauri/Cargo.lock b/app/main/src-tauri/Cargo.lock
-index 5580ef5..4327d4c 100644
--- a/app/main/src-tauri/Cargo.lock
-+++ b/app/main/src-tauri/Cargo.lock
-@@ -4247,7 +4247,7 @@ dependencies = [
-  "rand 0.9.0",
-  "serde",
-  "sha2",
- "sys_metrics 0.2.7 (git+https://github.com/Martichou/sys_metrics)",
-+ "sys_metrics",
-  "tokio",
-  "tokio-util",
-  "tracing-subscriber",
-@@ -4267,7 +4267,7 @@ dependencies = [
-  "rqs_lib",
-  "serde",
-  "serde_json",
- "sys_metrics 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "sys_metrics",
-  "tauri",
-  "tauri-build",
-  "tauri-plugin-autostart",
-@@ -4932,21 +4932,6 @@ dependencies = [
-  "syn 2.0.95",
- ]
- 
-[[package]]
-name = "sys_metrics"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9b266b80f59f86e2e1e0a4938e316e32c3730d94a749f236305152279f77484"
-dependencies = [
- "core-foundation-sys",
- "glob",
- "io-kit-sys",
- "lazy_static",
- "libc",
- "mach",
- "serde",
-]
-
- [[package]]
- name = "sys_metrics"
- version = "0.2.7"
-diff --git a/app/main/src-tauri/Cargo.toml b/app/main/src-tauri/Cargo.toml
-index 8864112..7707922 100644
--- a/app/main/src-tauri/Cargo.toml
-+++ b/app/main/src-tauri/Cargo.toml
-@@ -20,7 +20,7 @@ notify-rust = "4.10"
- rqs_lib = { path = "../../../core_lib", features = ["experimental"] }
- serde = { version = "1.0", features = ["derive"] }
- serde_json = "1.0"
-sys_metrics = "0.2"
-+sys_metrics = { git = "https://github.com/Martichou/sys_metrics" }
- tauri = { version = "2.2", features = [ "devtools", "tray-icon", "native-tls-vendored", "image-png"] }
- tauri-plugin-autostart = "2.2"
- tauri-plugin-process = "2.2"
--- a/pkgs/by-name/ru/rura/package.nix
+++ b/pkgs/by-name/ru/rura/package.nix
@ -8,17 +8,17 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "rura";
-  version = "1.3.0";
+  version = "1.5.0";
  __structuredAttrs = true;

  src = fetchFromGitHub {
    owner = "tlipinski";
    repo = "rura";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-cwL3Dw1qPYcKFzy0CV/XI7jZWHZZoZumdbB2kK+9jdc=";
+    hash = "sha256-AL8qrO6QlHD+cLMEjgfH/4cLqxsRapp9nxJ/eMe0uic=";
  };

-  cargoHash = "sha256-T/7v1WxTfsilw5i592EoRWxpkaL4bnluXmCModO1WQg=";
+  cargoHash = "sha256-t/ylPVTi0AAumiixU5oaFgldtKkwYvuETjaxCwzveDk=";

  passthru = {
    updateScript = nix-update-script { };
--- a/pkgs/by-name/sc/scanservjs/package.nix
+++ b/pkgs/by-name/sc/scanservjs/package.nix
@ -8,16 +8,16 @@

 buildNpmPackage (finalAttrs: {
  pname = "scanservjs";
-  version = "3.0.4";
+  version = "3.1.0";

  src = fetchFromGitHub {
    owner = "sbs20";
    repo = "scanservjs";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-qCJyQO/hSDF4NOupV7sepwvpNyjSElnqT71LJuIKe+A=";
+    hash = "sha256-VfFahIyn2MIW4E0sMCpqdduP7F0U7t4a5c1fwpQl7Dc=";
  };

-  npmDepsHash = "sha256-HIWT09G8gqSFt9CIjsjJaDRnj2GO0G6JOGeI0p4/1vw=";
+  npmDepsHash = "sha256-VB4z7PCOUzhSbSbxLj/47oppMdTvd2lT7WZKDqd+jfo=";

  patches = [
    ./nix-compatibility.patch
--- a/pkgs/by-name/se/senpai/package.nix
+++ b/pkgs/by-name/se/senpai/package.nix
@ -5,25 +5,30 @@
  installShellFiles,
  scdoc,
  nix-update-script,
+  versionCheckHook,
 }:

 buildGoModule (finalAttrs: {
  pname = "senpai";
-  version = "0.4.1";
+  version = "0.5.0";

  src = fetchFromSourcehut {
    owner = "~delthas";
    repo = "senpai";
    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-lwfhRnaHGOIp6NyugPEu6P+3WXkVgQEWaz7DUfHiJrQ=";
+    sha256 = "sha256-VjXgKdy4IpBhAP6uw/NtlexPki7nJzQi/HuY/+5lE/o=";
  };

-  vendorHash = "sha256-6glslBPjJr0TmrAkDGbOQ4sDzvODlavVeTugs6RXsCU=";
+  vendorHash = "sha256-4Ax9YVa9z1Unk3Z2iy9ZEqKjNmdgK0aF4GrD9ucXtjk=";

  subPackages = [
    "cmd/senpai"
  ];

+  ldflags = [
+    "-X git.sr.ht/~delthas/senpai.version=${finalAttrs.version}"
+  ];
+
  nativeBuildInputs = [
    scdoc
    installShellFiles
@ -39,6 +44,9 @@ buildGoModule (finalAttrs: {
    install -D -m 444 res/icon.svg $out/share/icons/hicolor/scalable/apps/senpai.svg
  '';

+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
  passthru.updateScript = nix-update-script { };

  meta = {
--- a/pkgs/by-name/sh/shellhub-agent/package.nix
+++ b/pkgs/by-name/sh/shellhub-agent/package.nix
@ -12,18 +12,18 @@

 buildGoModule (finalAttrs: {
  pname = "shellhub-agent";
-  version = "0.24.2";
+  version = "0.25.0";

  src = fetchFromGitHub {
    owner = "shellhub-io";
    repo = "shellhub";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-5lQSiN6XnZmtpIVU/FbsCzoAKGbDEe1stCiEOcUfI08=";
+    hash = "sha256-9hA3Sxz0SwkpyYJsIrnT/7B2S1px6f+GgT6yvM3VZ8Q=";
  };

  modRoot = "./agent";

-  vendorHash = "sha256-hGUTF2USDxzb1VYVGX+BcOxFC2hSbpBJsWebjPD80Yc=";
+  vendorHash = "sha256-Cm/xApEJR94qtXFD5ASU8oPG/VwWbeq91B7Znn/dQdY=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/si/sioyek/package.nix
+++ b/pkgs/by-name/si/sioyek/package.nix
@ -15,13 +15,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "sioyek";
-  version = "2.0.0-unstable-2026-04-08";
+  version = "2.0.0-unstable-2026-06-06";

  src = fetchFromGitHub {
    owner = "ahrm";
    repo = "sioyek";
-    rev = "a0650b5a71c15692c4797fec2908cc55c5aafd12";
-    hash = "sha256-9g1JhZEqBz6x2gv690efXaV7TNggyRvOq1xn8phubEY=";
+    rev = "96a5b0aebbacffdd9c8ddefd6efd3413828d0f37";
+    hash = "sha256-kCblPkBZETNmkX1RCQRR/zLBbAMhlB2svNCSltSeNlg=";
  };

  buildInputs = [
--- a/pkgs/by-name/sk/sketchybar-app-font/package.nix
+++ b/pkgs/by-name/sk/sketchybar-app-font/package.nix
@ -1,7 +1,7 @@
 {
  fetchFromGitHub,
  lib,
-  pnpm_9,
+  pnpm_11,
  fetchPnpmDeps,
  pnpmConfigHook,
  stdenvNoCC,
@ -21,15 +21,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {

  pnpmDeps = fetchPnpmDeps {
    inherit (finalAttrs) pname version src;
-    pnpm = pnpm_9;
-    fetcherVersion = 3;
-    hash = "sha256-/nYH3ZgfNv9krvH/ZjCJ2F3aanLZzlkNwOizgTRtqXE=";
+    pnpm = pnpm_11;
+    fetcherVersion = 4;
+    hash = "sha256-zFheFcVSCZWDrThn5PnxhJscRhLG/psSI8Q8g48nXNU=";
  };

  nativeBuildInputs = [
    nodejs
    pnpmConfigHook
-    pnpm_9
+    pnpm_11
  ];

  buildPhase = ''
--- a/pkgs/by-name/sl/slade-unstable/package.nix
+++ b/pkgs/by-name/sl/slade-unstable/package.nix
@ -22,13 +22,13 @@

 stdenv.mkDerivation {
  pname = "slade";
-  version = "3.2.12-unstable-2026-05-08";
+  version = "3.2.12-unstable-2026-06-08";

  src = fetchFromGitHub {
    owner = "sirjuddington";
    repo = "SLADE";
-    rev = "6711fee0014ba0d3fc78c3d0dbfc2ff8785198a3";
-    hash = "sha256-eBQlU4JoZbevL4NrT3eeqwirtqz9gZBllJKJ/i821MI=";
+    rev = "46fc51ac57f4fe54caf036b3d1e9b028a120be27";
+    hash = "sha256-mSddQstwZYkTzeA9fHswfuIUaoQlqXT+zTXWp20jgDc=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ta/taler-wallet-core/package.nix
+++ b/pkgs/by-name/ta/taler-wallet-core/package.nix
@ -8,7 +8,7 @@
  srcOnly,
  removeReferencesTo,
  nodejs-slim_24,
-  pnpm_9,
+  pnpm_11,
  fetchPnpmDeps,
  pnpmConfigHook,
  python3,
@ -20,7 +20,7 @@ let
  nodeSources = (srcOnly nodejs-slim_24).overrideAttrs {
    outputChecks = { };
  };
-  pnpm' = pnpm_9.override { nodejs-slim = nodejs-slim_24; };
+  pnpm' = pnpm_11.override { nodejs-slim = nodejs-slim_24; };
  esbuild' = esbuild.override {
    buildGoModule =
      args:
@ -57,8 +57,8 @@ stdenv.mkDerivation (finalAttrs: {
  pnpmDeps = fetchPnpmDeps {
    inherit (finalAttrs) pname version src;
    pnpm = pnpm';
-    fetcherVersion = 3;
-    hash = "sha256-W5C2JVFbEccf4b+ppeEJ68au/2Tqfsry7ri6Qi1M50k=";
+    fetcherVersion = 4;
+    hash = "sha256-ZoxAZ5f3Szz2goGOE5yn/aCZ5fuhDt1owZ/o1kvX7d0=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ta/taze/package.nix
+++ b/pkgs/by-name/ta/taze/package.nix
@ -3,7 +3,7 @@
  stdenv,
  fetchFromGitHub,
  nodejs,
-  pnpm_9,
+  pnpm_11,
  fetchPnpmDeps,
  pnpmConfigHook,
  npmHooks,
@ -23,15 +23,15 @@ stdenv.mkDerivation (finalAttrs: {

  pnpmDeps = fetchPnpmDeps {
    inherit (finalAttrs) pname version src;
-    pnpm = pnpm_9;
-    fetcherVersion = 3;
-    hash = "sha256-c2jBLdxQuIw028xo9cGhLykxARlOjK/R4e63U2UsXCQ=";
+    pnpm = pnpm_11;
+    fetcherVersion = 4;
+    hash = "sha256-6J7yNwtekfMfsqeXWpNeqw4cak7z03494nYlBHRMZH0=";
  };

  nativeBuildInputs = [
    nodejs
    pnpmConfigHook
-    pnpm_9
+    pnpm_11
    npmHooks.npmInstallHook
  ];

--- a/pkgs/by-name/ti/tile38/package.nix
+++ b/pkgs/by-name/ti/tile38/package.nix
@ -6,16 +6,16 @@

 buildGoModule (finalAttrs: {
  pname = "tile38";
-  version = "1.37.0";
+  version = "1.38.0";

  src = fetchFromGitHub {
    owner = "tidwall";
    repo = "tile38";
    tag = finalAttrs.version;
-    hash = "sha256-5dnLeXqEo89m2LFAbDw/NelSJpxGFYWQlIcw8PY2/RA=";
+    hash = "sha256-jmUvsSOA16tGp1nAam8ae3cqHU6K2Lfiukfj16N3Hy0=";
  };

-  vendorHash = "sha256-mi4Cz3nb/5qbC9sp2o5FptBDh2AdxTOk3hWBpVr9K3s=";
+  vendorHash = "sha256-zSH5/AQFS73YJpy7kVxHXTF4kPuaxVl4aNdKUq1aqDM=";

  subPackages = [
    "cmd/tile38-cli"
--- a/pkgs/by-name/to/tor-browser/package.nix
+++ b/pkgs/by-name/to/tor-browser/package.nix
@ -340,6 +340,7 @@ stdenv.mkDerivation rec {
    description = "Privacy-focused browser routing traffic through the Tor network";
    mainProgram = "tor-browser";
    homepage = "https://www.torproject.org/";
+    donationPage = "https://donate.torproject.org/";
    changelog = "https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/raw/maint-${lib.versions.majorMinor version}/projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt";
    platforms = lib.attrNames sources;
    maintainers = with lib.maintainers; [
--- a/pkgs/by-name/to/tor/package.nix
+++ b/pkgs/by-name/to/tor/package.nix
@ -134,6 +134,7 @@ stdenv.mkDerivation (finalAttrs: {

  meta = {
    homepage = "https://www.torproject.org/";
+    donationPage = "https://donate.torproject.org/";
    description = "Anonymizing overlay network";
    longDescription = ''
      Tor helps improve your privacy by bouncing your communications around a
--- a/pkgs/by-name/wa/warp-terminal/package.nix
+++ b/pkgs/by-name/wa/warp-terminal/package.nix
@ -4,7 +4,7 @@
  stdenv,
  fetchurl,
  autoPatchelfHook,
-  undmg,
+  _7zz,
  zstd,
  alsa-lib,
  curl,
@ -107,7 +107,8 @@ let

    sourceRoot = ".";

-    nativeBuildInputs = [ undmg ];
+    # Warp.dmg is APFS formatted, which is unsupported by undmg
+    nativeBuildInputs = [ _7zz ];

    installPhase = ''
      runHook preInstall
--- a/pkgs/by-name/wa/warp-terminal/versions.json
+++ b/pkgs/by-name/wa/warp-terminal/versions.json
@ -1,14 +1,14 @@
 {
  "darwin": {
-    "hash": "sha256-Mff9jfrWQJ2YovS+yW7/NhwGDGASIvUFEAaH04YF6rw=",
-    "version": "0.2026.04.15.08.45.stable_04"
+    "hash": "sha256-vJE22Nn9GXfNZcdvwH74X28nhLrxESoAX8XtxzDSBmI=",
+    "version": "0.2026.06.03.09.49.stable_01"
  },
  "linux_x86_64": {
-    "hash": "sha256-tGhC+pjPQTTd5XTKwQJ/ctnLcQY6lvvI6zRjXByon5g=",
-    "version": "0.2026.04.15.08.45.stable_04"
+    "hash": "sha256-dVBJ9L+e8B4WlVuMPWb0nDRdDkx8+eydbiAiJUm/OQg=",
+    "version": "0.2026.06.03.09.49.stable_01"
  },
  "linux_aarch64": {
-    "hash": "sha256-U7gctUpWhJP2hfF62I7wh/cdE9ixVEVnKd6B1dOoLfc=",
-    "version": "0.2026.04.15.08.45.stable_04"
+    "hash": "sha256-llYMjRqZAlpbhzQTjndW7cgcEnGvdtcaP8bPmrP8HVo=",
+    "version": "0.2026.06.03.09.49.stable_01"
  }
 }
--- a/pkgs/by-name/wa/watchlog/package.nix
+++ b/pkgs/by-name/wa/watchlog/package.nix
@ -6,16 +6,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "watchlog";
-  version = "1.259.0";
+  version = "1.261.0";

  src = fetchFromGitLab {
    owner = "kevincox";
    repo = "watchlog";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-MjuQ1k38ZS1d6kJitEH9DTCUWzvUNhm3mto/QAWxE5k=";
+    hash = "sha256-Nv7J7/hg4t2f8ZBK7RCur6mbd+2Vn52QIz53ZFck96I=";
  };

-  cargoHash = "sha256-Mukw9DLIaPI0/CQws7AQwHmGmX/T4KuoX/2KTAUZXx4=";
+  cargoHash = "sha256-672wSQ/bnwpT5USFtg4P7kZyn8ONOrHbZ4eRkNc6KBA=";

  meta = {
    description = "Easier monitoring of live logs";
--- a/Show more
+++ b/Show more