Merge staging-next into staging

2026-02-03 00:24:47 +00:00
parent 8ee4d1b28d 25a055a335
commit f87d02ce0c
113 changed files with 682 additions and 798 deletions
@@ -79,6 +79,8 @@

 - `lima` has been updated from `1.x` to `2.x`. This major update includes several breaking changes, such as `/tmp/lima` no longer being mounted by default.

+- `minio_legacy_fs` has been removed. If you used that package, migrate your data to be compatible with the newest minio and use the package `minio`.
+
 - `mercure` has been update to `0.21.4` (or later). Version [0.21.0](https://github.com/dunglas/mercure/releases/v0.21.0) and [0.21.2](https://github.com/dunglas/mercure/releases/tag/v0.21.2) introduce breaking changes to the package.

 - `n8n` has been updated to version 2. You can find the breaking changes here: https://docs.n8n.io/2-0-breaking-changes/.
@@ -17,7 +17,12 @@ in
      dataDir = lib.mkOption {
        type = lib.types.str;
        default = "/var/lib/sonarr/.config/NzbDrone";
-        description = "The directory where Sonarr stores its data files.";
+        description = ''
+          The Sonarr home directory used to store all data. If left as the default value
+          this directory will automatically be created before the Sonarr server starts, otherwise
+          you are responsible for ensuring the directory exists with appropriate ownership
+          and permissions.
+        '';
      };

      openFirewall = lib.mkOption {
@@ -35,13 +40,29 @@ in
      user = lib.mkOption {
        type = lib.types.str;
        default = "sonarr";
-        description = "User account under which Sonaar runs.";
+        description = ''
+          User account under which Sonarr runs.";
+
+          ::: {.note}
+          If left as the default value this user will automatically be created
+          on system activation, otherwise you are responsible for
+          ensuring the user exists before the Sonarr service starts.
+          :::
+        '';
      };

      group = lib.mkOption {
        type = lib.types.str;
        default = "sonarr";
-        description = "Group under which Sonaar runs.";
+        description = ''
+          Group account under which Sonarr runs.
+
+          ::: {.note}
+          If left as the default value this group will automatically be created
+          on system activation, otherwise you are responsible for
+          ensuring the group exists before the Sonarr service starts.
+          :::
+        '';
      };

      package = lib.mkPackageOption pkgs "sonarr" { };
@@ -49,10 +70,6 @@ in
  };

  config = lib.mkIf cfg.enable {
-    systemd.tmpfiles.rules = [
-      "d '${cfg.dataDir}' 0700 ${cfg.user} ${cfg.group} - -"
-    ];
-
    systemd.services.sonarr = {
      description = "Sonarr";
      after = [ "network.target" ];
@@ -69,6 +86,9 @@ in
          "-data=${cfg.dataDir}"
        ];
        Restart = "on-failure";
+      }
+      // lib.optionalAttrs (cfg.dataDir == "/var/lib/sonarr/.config/NzbDrone") {
+        StateDirectory = "sonarr";
      };
    };

@@ -16,6 +16,10 @@ in

    package = lib.mkPackageOption pkgs "blocky" { };

+    enableConfigCheck = lib.mkEnableOption "checking the config during build time" // {
+      default = true;
+    };
+
    settings = lib.mkOption {
      type = format.type;
      default = { };
@@ -80,6 +84,14 @@ in
        ];
      };
    };
+    system.checks = lib.mkIf cfg.enableConfigCheck [
+      (pkgs.runCommand "check-blocky-config" { } ''
+        ${lib.getExe cfg.package} --config ${configFile} validate && touch $out
+      '')
+    ];
  };
-  meta.maintainers = with lib.maintainers; [ paepcke ];
+  meta.maintainers = with lib.maintainers; [
+    paepcke
+    kuflierl
+  ];
 }
@@ -57,13 +57,16 @@ in
      automatic-timezoned = {
        description = "Automatically update system timezone based on location";
        requires = [ "automatic-timezoned-geoclue-agent.service" ];
-        after = [ "automatic-timezoned-geoclue-agent.service" ];
+        after = [
+          "automatic-timezoned-geoclue-agent.service"
+          "multi-user.target"
+        ];
        serviceConfig = {
          Type = "exec";
          User = "automatic-timezoned";
          ExecStart = "${cfg.package}/bin/automatic-timezoned";
        };
-        wantedBy = [ "default.target" ];
+        wantedBy = [ "multi-user.target" ];
      };

      automatic-timezoned-geoclue-agent = {
@@ -77,7 +80,6 @@ in
          Restart = "on-failure";
          PrivateTmp = true;
        };
-        wantedBy = [ "default.target" ];
      };

    };
@@ -115,7 +115,7 @@ let
  pkg =
    hostName: cfg:
    cfg.package.combine {
-      inherit (cfg) plugins templates;
+      inherit (cfg) plugins templates extraConfigs;

      pname = p: "${p.pname}-${hostName}";

@@ -252,7 +252,7 @@ let
            else
              null;
          description = ''
-            Location of the dokuwiki acl rules. Mutually exclusive with services.dokuwiki.acl
+            Location of the dokuwiki acl rules.
            Mutually exclusive with services.dokuwiki.acl which is preferred.
            Consult documentation <https://www.dokuwiki.org/acl> for further instructions.
            Example: <https://github.com/splitbrain/dokuwiki/blob/master/conf/acl.auth.php.dist>
@@ -294,7 +294,7 @@ let
          type = types.listOf types.path;
          default = [ ];
          description = ''
-            List of path(s) to respective plugin(s) which are copied from the 'plugin' directory.
+            List of path(s) to respective plugin(s) which are copied into the 'plugin' directory.

            ::: {.note}
            These plugins need to be packaged before use, see example.
@@ -312,7 +312,7 @@ let
                };
                installPhase = "mkdir -p $out; cp -R * $out/";
              };
-            # And then pass this theme to the plugin list like this:
+            # And then pass this plugin to the plugin list like this:
            in [ plugin-icalevents ]
          '';
        };
@@ -321,7 +321,7 @@ let
          type = types.listOf types.path;
          default = [ ];
          description = ''
-            List of path(s) to respective template(s) which are copied from the 'tpl' directory.
+            List of path(s) to respective template(s) which are copied into the 'tpl' directory.

            ::: {.note}
            These templates need to be packaged before use, see example.
@@ -345,6 +345,22 @@ let
          '';
        };

+        extraConfigs = mkOption {
+          type = types.attrsOf types.path;
+          default = { };
+          description = ''
+            Path(s) to additional configuration files that are then linked to the 'conf' directory.
+          '';
+          example = literalExpression ''
+            {
+              "acronyms.local.conf" = pkgs.writeText "acronyms.local.conf" '''
+                r13y  reproducibility
+              ''';
+              "entities.local.conf" = ./dokuwiki-entities;
+            }
+          '';
+        };
+
        poolConfig = mkOption {
          type =
            with types;
@@ -15,15 +15,17 @@
                "printer.lan" = "192.168.178.3,2001:0db8:85a3:08d3:1319:8a2e:0370:7344";
              };
            };
-            upstream = {
+            upstreams.groups = {
              default = [
                "8.8.8.8"
                "1.1.1.1"
              ];
            };
-            port = 53;
-            httpPort = 5000;
-            logLevel = "info";
+            ports = {
+              dns = 53;
+              http = 5000;
+            };
+            log.level = "info";
          };
        };
      };
@@ -30,12 +30,6 @@ let
    r13y  reproducibility
  '';

-  dwWithAcronyms = pkgs.dokuwiki.overrideAttrs (prev: {
-    installPhase = prev.installPhase or "" + ''
-      ln -sf ${acronymsFile} $out/share/dokuwiki/conf/acronyms.local.conf
-    '';
-  });
-
  mkNode =
    webserver:
    { ... }:
@@ -53,9 +47,11 @@ let
            };
          };
          "site2.local" = {
-            package = dwWithAcronyms;
            usersFile = "/var/lib/dokuwiki/site2.local/users.auth.php";
            plugins = [ plugin-icalevents ];
+            extraConfigs = {
+              "acronyms.local.conf" = acronymsFile;
+            };
            settings = {
              useacl = true;
              superuser = "admin";
@@ -320,8 +320,8 @@ let
        mktplcRef = {
          name = "vscode-apollo";
          publisher = "apollographql";
-          version = "2.6.4";
-          hash = "sha256-rqNdblzQ9N6kFcwYqdNAA8ziDMFCuduhXZt3lmd/q7Y=";
+          version = "2.6.5";
+          hash = "sha256-WOt0bY/hi9tLJEo0bTAPLQhgM+2A7JPp0pypX4EcYNo=";
        };
        meta = {
          changelog = "https://marketplace.visualstudio.com/items/apollographql.vscode-apollo/changelog";
@@ -1208,8 +1208,8 @@ let
        mktplcRef = {
          name = "databricks";
          publisher = "databricks";
-          version = "2.10.4";
-          hash = "sha256-/nH7y9w3sKKJXJfIyuXHbAVl0BWRafuhF/WIvBnrIXM=";
+          version = "2.10.5";
+          hash = "sha256-BOJP4yJXaVwojFlk12/eitqCdzeqghAzSdxJQZSr6yg=";
        };
        meta = {
          changelog = "https://marketplace.visualstudio.com/items/databricks.databricks/changelog";
@@ -1997,8 +1997,8 @@ let
        mktplcRef = {
          name = "Go";
          publisher = "golang";
-          version = "0.52.1";
-          hash = "sha256-y3IaNkdyWnZCwQ9Zgryn6D2cUT+eyJ4/yXgGSTRGpWw=";
+          version = "0.52.2";
+          hash = "sha256-8g+r4Mv06Bx1W3yAXWVbtz1B/gXPcRdmaV0tPkTP6Gk=";
        };
        meta = {
          changelog = "https://marketplace.visualstudio.com/items/golang.Go/changelog";
@@ -571,13 +571,13 @@
    "vendorHash": "sha256-xIagZvWtlNpz5SQfxbA7r9ojAeS3CW2pwV337ObKOwU="
  },
  "hashicorp_google": {
-    "hash": "sha256-xqj0bA+tKpxJ0Wq0bGzBmpoCyALdgBrPUaw7A5zAxxA=",
+    "hash": "sha256-VJ9RGR7wmX8CkNvntxlbhGuIyrCALMVH+E7zRRbD1bY=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/google",
    "owner": "hashicorp",
    "repo": "terraform-provider-google",
-    "rev": "v7.16.0",
+    "rev": "v7.17.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-6re5ARUiWmpkND7hfjSDm2aOX5vlESp7UrcPJDNIJ+s="
+    "vendorHash": "sha256-u85rqTYpYFeTLGElOVojpsqUMZsopjpmsKwijsyLlz8="
  },
  "hashicorp_google-beta": {
    "hash": "sha256-orMcxMY6btX5qejY+X21JSuoLp9M0JjUiDjrQ2LQjDA=",
@@ -8,23 +8,23 @@
  ps,
 }:

-buildGoModule rec {
+buildGoModule (finalAttrs: {
  pname = "assh";
-  version = "2.16.0";
+  version = "2.17.0";

  src = fetchFromGitHub {
    repo = "advanced-ssh-config";
    owner = "moul";
-    tag = "v${version}";
-    hash = "sha256-rvJJZqVSBdaJ154NV6RaxbymsSsHbKnlJDeR6KHQE7M=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-X5UWQe4c+QudmXKjFKafivO/OvdBNzyutrL+CUK0olg=";
  };

-  vendorHash = "sha256-L2Uo/jsMtxQClF1UDa7NIUbOm7BflvncNsjqGnCsPKo=";
+  vendorHash = "sha256-EA39KqAN9SHPU362j6/j6okvT+eZb2R4unMA0bB+bVg=";

  ldflags = [
    "-s"
    "-w"
-    "-X moul.io/assh/v2/pkg/version.Version=${version}"
+    "-X=moul.io/assh/v2/pkg/version.Version=${finalAttrs.version}"
  ];

  nativeBuildInputs = [ makeWrapper ];
@@ -44,9 +44,9 @@ buildGoModule rec {
  meta = {
    description = "Advanced SSH config - Regex, aliases, gateways, includes and dynamic hosts";
    homepage = "https://github.com/moul/assh";
-    changelog = "https://github.com/moul/assh/releases/tag/v${version}";
+    changelog = "https://github.com/moul/assh/releases/tag/${finalAttrs.src.tag}";
    license = lib.licenses.mit;
    maintainers = [ ];
    platforms = with lib.platforms; linux ++ darwin;
  };
-}
+})
@@ -31,7 +31,7 @@
  libid3tag,
  libopus,
  libuuid,
-  ffmpeg,
+  ffmpeg_7,
  soundtouch,
  portaudio, # given up fighting their portaudio.patch?
  portmidi,
@@ -58,6 +58,9 @@
 # TODO
 # 1. detach sbsms

+let
+  ffmpeg = ffmpeg_7;
+in
 stdenv.mkDerivation (finalAttrs: {
  pname = "audacity";
  version = "3.7.7";
@@ -340,19 +340,19 @@ let
            --replace-fail 'web/' '${webui}/'
        '';

-        nativeBuildInputs = [
-          prev.hatchling
-          prev.pythonRelaxDepsHook
+        build-system = [
+          final.hatchling
        ];

        pythonRemoveDeps = [ "dumb-init" ];

        pythonRelaxDeps = true;

-        propagatedBuildInputs =
+        dependencies =
          with final;
          [
            argon2-cffi
+            cachetools
            channels
            cryptography
            dacite
@@ -5,14 +5,14 @@
  nixosTests,
 }:

-buildGoModule rec {
+buildGoModule (finalAttrs: {
  pname = "blocky";
  version = "0.28.2";

  src = fetchFromGitHub {
    owner = "0xERR0R";
    repo = "blocky";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
    hash = "sha256-GLVyPb2Qyn1jnRz+e74dFzL/AMloKqSe1BUUAGTquWA=";
  };

@@ -25,7 +25,7 @@ buildGoModule rec {
  ldflags = [
    "-s"
    "-w"
-    "-X github.com/0xERR0R/blocky/util.Version=${version}"
+    "-X github.com/0xERR0R/blocky/util.Version=${finalAttrs.version}"
  ];

  passthru.tests = { inherit (nixosTests) blocky; };
@@ -35,7 +35,10 @@ buildGoModule rec {
    homepage = "https://0xerr0r.github.io/blocky";
    changelog = "https://github.com/0xERR0R/blocky/releases";
    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ ratsclub ];
+    maintainers = with lib.maintainers; [
+      ratsclub
+      kuflierl
+    ];
    mainProgram = "blocky";
  };
-}
+})
@@ -32,13 +32,13 @@

 python3Packages.buildPythonApplication rec {
  pname = "bottles-unwrapped";
-  version = "60.1";
+  version = "61.1";

  src = fetchFromGitHub {
    owner = "bottlesdevs";
    repo = "bottles";
    tag = version;
-    hash = "sha256-d9nRT6AvFxnhI/theJtPg79EdmA+9UFS4OWDlkV03sA=";
+    hash = "sha256-LW+os+5DtdUBZWONu2YX4FYMtAYg4BDlKbnVF64T2xI=";
  };

  patches = [
@@ -96,6 +96,7 @@ python3Packages.buildPythonApplication rec {
      urllib3
      certifi
      pefile
+      yara-python
    ]
    ++ [
      cabextract
@@ -16,10 +16,10 @@ index 6ff7c011..c26ea0b9 100644
   '__init__.py',
   'main.py',
 diff --git a/bottles/frontend/views/bottle_details.py b/bottles/frontend/views/bottle_details.py
-index 65667ea9..7ae1eb19 100644
+index f897953c..393572ed 100644
 --- a/bottles/frontend/views/bottle_details.py
 +++ b/bottles/frontend/views/bottle_details.py
-@@ -436,20 +436,19 @@ class BottleView(Adw.PreferencesPage):
+@@ -824,20 +824,17 @@ class BottleView(Adw.PreferencesPage):
             dialog.connect("response", execute)
             dialog.show()
 
@@ -33,7 +33,7 @@ index 65667ea9..7ae1eb19 100644
 -                    ),
 -                )
 -                dialog.add_response("dismiss", _("_Dismiss"))
-                dialog.connect("response", show_chooser)
+-                dialog.connect("response", lambda *args: show_chooser())
 -                dialog.present()
 -            else:
 -                show_chooser()
@@ -48,16 +48,14 @@ index 65667ea9..7ae1eb19 100644
 +            dialog.add_response("dismiss", _("_Dismiss"))
 +            dialog.connect("response", show_chooser)
 +            dialog.present()
-+        else:
-+            show_chooser()
+         else:
+             show_chooser()
 
-     def __backup(self, widget, backup_type):
-         """
 diff --git a/bottles/frontend/views/bottle_preferences.py b/bottles/frontend/views/bottle_preferences.py
-index 288e693b..b8b57618 100644
+index 1e0090f8..983097f2 100644
 --- a/bottles/frontend/views/bottle_preferences.py
 +++ b/bottles/frontend/views/bottle_preferences.py
-@@ -139,7 +139,7 @@ class PreferencesView(Adw.PreferencesPage):
+@@ -148,7 +148,7 @@ class PreferencesView(Adw.PreferencesPage):
         self.queue = details.queue
         self.details = details
 
@@ -67,7 +65,7 @@ index 288e693b..b8b57618 100644
 
         _not_available = _("This feature is unavailable on your system.")
 diff --git a/bottles/frontend/views/list.py b/bottles/frontend/views/list.py
-index 43ab9c22..a283b178 100644
+index 6bd8fc81..0f96ab70 100644
 --- a/bottles/frontend/views/list.py
 +++ b/bottles/frontend/views/list.py
@@ -82,8 +82,6 @@ class BottlesBottleRow(Adw.ActionRow):
@@ -80,10 +78,10 @@ index 43ab9c22..a283b178 100644
         def set_path(_dialog, response):
             if response != Gtk.ResponseType.ACCEPT:
 diff --git a/bottles/frontend/views/new_bottle_dialog.py b/bottles/frontend/views/new_bottle_dialog.py
-index a8b007d4..c6f0a156 100644
+index 9c386862..3ed98f7c 100644
 --- a/bottles/frontend/views/new_bottle_dialog.py
 +++ b/bottles/frontend/views/new_bottle_dialog.py
-@@ -80,7 +80,7 @@ class BottlesNewBottleDialog(Adw.Dialog):
+@@ -86,7 +86,7 @@ class BottlesNewBottleDialog(Adw.Dialog):
         super().__init__(**kwargs)
         # common variables and references
         self.window = GtkUtils.get_parent_window()
@@ -1,12 +1,28 @@
 diff --git a/bottles/backend/utils/terminal.py b/bottles/backend/utils/terminal.py
-index 1f28e093..cca8018a 100644
+index 943cface..1f67822e 100644
 --- a/bottles/backend/utils/terminal.py
 +++ b/bottles/backend/utils/terminal.py
-@@ -138,7 +138,7 @@ class TerminalUtils:
-                 full_cmd = f"{template} {cmd_for_shell}"
-
-         elif term_bin in ["kitty", "foot", "konsole", "gnome-terminal"]:
+@@ -132,21 +132,21 @@ class TerminalUtils:
+                 full_cmd = f"{template} {palette} {cmd_for_shell}"
+ 
+         elif term_bin == "xfce4-terminal":
 -            cmd_for_shell = shlex.quote(f"sh -c {command}")
+            cmd_for_shell = f"sh -c {command}"
+             try:
+                 full_cmd = template % cmd_for_shell
+             except Exception:
+                 full_cmd = f"{template} {cmd_for_shell}"
+ 
+         elif term_bin in ["kitty", "foot", "konsole", "gnome-terminal", "wezterm"]:
+-            cmd_for_shell = shlex.quote(f"sh -c {command}")
+            cmd_for_shell = f"sh -c {command}"
+             try:
+                 full_cmd = template % cmd_for_shell
+             except Exception:
+                 full_cmd = f"{template} {cmd_for_shell}"
+ 
+         else:
+-            cmd_for_shell = shlex.quote(f"bash -c {command}")
 +            cmd_for_shell = f"sh -c {command}"
             try:
                 full_cmd = template % cmd_for_shell
@@ -11,16 +11,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "chess-tui";
-  version = "2.3.0";
+  version = "2.4.0";

  src = fetchFromGitHub {
    owner = "thomas-mauran";
    repo = "chess-tui";
    tag = finalAttrs.version;
-    hash = "sha256-g+rKib+ZoBa2ssYKgS0tg0xngurY1z3DbBZZEn/LJU4=";
+    hash = "sha256-Vv+sO4XeCqv0Fq698ep4wj4A1ajjxqSST3RyKwr/im4=";
  };

-  cargoHash = "sha256-Brj+9AS0ZR/b188jkJa84WRHk0HtiKpMlyMUSLmzBfA=";
+  cargoHash = "sha256-IpGrImZbdckWgUVBpYpEt0XaM7LJxSOMo792mw8AA8A=";

  checkFlags = [
    # assertion failed: result.is_ok()
@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "chirpstack-mqtt-forwarder";
-  version = "4.4.1";
+  version = "4.5.1";

  src = fetchFromGitHub {
    owner = "chirpstack";
    repo = "chirpstack-mqtt-forwarder";
    rev = "v${version}";
-    hash = "sha256-qkktkydg5Xe6q5IFalkxtGjO2zK9mZVMnKOBassiEtk=";
+    hash = "sha256-AFyvXLXGs1jeOJM8tSKBNbTVYr5SRUscqnUlSvU9iuA=";
  };

-  cargoHash = "sha256-rQPmFmra9Gd8XDP9HuTZZru780RmmqWEKX2iuuRkZQw=";
+  cargoHash = "sha256-mRmvKOqfzqUvPexRbd9TRS2lunpne7+wO57bsYZ3dXw=";

  nativeBuildInputs = [ protobuf ];

@@ -9,16 +9,16 @@

 buildGoModule rec {
  pname = "cog";
-  version = "0.0.47";
+  version = "0.0.51";

  src = fetchFromGitHub {
    owner = "grafana";
    repo = "cog";
    tag = "v${version}";
-    hash = "sha256-gbM/PknM8ZC4BJx2OymLSuQO+DndB3f1Wx0zvep9tn0=";
+    hash = "sha256-Z6UegaM4+OXOo6sjfLN1tGVbeYCN9nYKRqDlOpz4NPU=";
  };

-  vendorHash = "sha256-Uf6XwwhWl6dzJJFeDgIoQU0zZ2QFjzEWwv+q9YazTxs=";
+  vendorHash = "sha256-AcBsXkXwXCtmJ5k+YBnQnmFZCrfarhuOygmqFJQ1CZk=";

  subPackages = [ "cmd/cli" ];

@@ -9,16 +9,16 @@

 buildGoModule (finalAttrs: {
  pname = "crush";
-  version = "0.22.1";
+  version = "0.36.0";

  src = fetchFromGitHub {
    owner = "charmbracelet";
    repo = "crush";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-WwakKR+JdlidfxXnKmAPVMxRs/TfNPOg43vQ9HrEqFY=";
+    hash = "sha256-xitCvejiVts9kkvtcVwh/zaeWIzDj0jx9xQMh2h+9Ns=";
  };

-  vendorHash = "sha256-9WROtIp4Tt+9w+L+frLawwoyMCjuk41VIGYEi5oSHDk=";
+  vendorHash = "sha256-8Tw+O57E5aKFO2bKimiXRK9tGnAAQr3qsuP6P9LgBjw=";

  ldflags = [
    "-s"
@@ -51,7 +51,10 @@ buildGoModule (finalAttrs: {
    homepage = "https://github.com/charmbracelet/crush";
    changelog = "https://github.com/charmbracelet/crush/releases/tag/v${finalAttrs.version}";
    license = lib.licenses.fsl11Mit;
-    maintainers = with lib.maintainers; [ x123 ];
+    maintainers = with lib.maintainers; [
+      x123
+      malik
+    ];
    mainProgram = "crush";
  };
 })
@@ -6,13 +6,13 @@

 rustPlatform.buildRustPackage {
  pname = "deploy-rs";
-  version = "0-unstable-2025-12-18";
+  version = "0-unstable-2026-02-02";

  src = fetchFromGitHub {
    owner = "serokell";
    repo = "deploy-rs";
-    rev = "d5eff7f948535b9c723d60cd8239f8f11ddc90fa";
-    hash = "sha256-znKOwPXQnt3o7lDb3hdf19oDo0BLP4MfBOYiWkEHoik=";
+    rev = "77c906c0ba56aabdbc72041bf9111b565cdd6171";
+    hash = "sha256-hwsYgDnby50JNVpTRYlF3UR/Rrpt01OrxVuryF40CFY=";
  };

  cargoHash = "sha256-9O93YTEz+e2oxenE0gwxsbz55clbKo9+37yVOqz7ErE=";
@@ -65,6 +65,7 @@ stdenv.mkDerivation rec {
        localConfig ? null,
        pluginsConfig ? null,
        aclConfig ? null,
+        extraConfigs ? { },
        pname ? (p: "${p.pname}-combined"),
      }:
      let
@@ -76,6 +77,12 @@ stdenv.mkDerivation rec {
              ""
            ]
          );
+
+        configs = {
+          "local.php" = localConfig;
+          "plugins.local.php" = pluginsConfig;
+        }
+        // extraConfigs;
      in
      basePackage.overrideAttrs (prev: {
        pname = if builtins.isFunction pname then pname prev else pname;
@@ -87,8 +94,9 @@ stdenv.mkDerivation rec {
          ${lib.concatMapStringsSep "\n" (
            plugin: "cp -r ${toString plugin} $out/share/dokuwiki/lib/plugins/${plugin.name}"
          ) plugins}
-          ${isNotEmpty localConfig "ln -sf ${localConfig} $out/share/dokuwiki/conf/local.php"}
-          ${isNotEmpty pluginsConfig "ln -sf ${pluginsConfig} $out/share/dokuwiki/conf/plugins.local.php"}
+          ${lib.concatMapAttrsStringSep "\n" (
+            name: path: "${isNotEmpty path "ln -sf ${path} $out/share/dokuwiki/conf/${name}"}"
+          ) configs}
          ${isNotEmpty aclConfig "ln -sf ${aclConfig} $out/share/dokuwiki/acl.auth.php"}
        '';
      });
@@ -3,6 +3,7 @@
  stdenv,
  fetchFromGitHub,
  qt6,
+  wrapGAppsHook3,
  nix-update-script,
 }:
 stdenv.mkDerivation (finalAttrs: {
@@ -16,7 +17,10 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-OMgxhb+9GdLK00nl/df9QiYYewr+YEjdX2KjQWvu1mk=";
  };

-  nativeBuildInputs = [ qt6.wrapQtAppsHook ];
+  nativeBuildInputs = [
+    qt6.wrapQtAppsHook
+    wrapGAppsHook3
+  ];

  buildInputs = [
    qt6.qtbase
@@ -41,6 +45,12 @@ stdenv.mkDerivation (finalAttrs: {
    runHook postInstall
  '';

+  dontWrapGApps = true;
+
+  preFixup = ''
+    qtWrapperArgs+=(''${gappsWrapperArgs[@]})
+  '';
+
  passthru.updateScript = nix-update-script { };

  meta = {
@@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "efm-langserver";
-  version = "0.0.54";
+  version = "0.0.55";

  src = fetchFromGitHub {
    owner = "mattn";
    repo = "efm-langserver";
    rev = "v${version}";
-    sha256 = "sha256-3ZrWc8/4aC5TOoL9vybkMZC9HkIL43TokebFcJYyrcI=";
+    sha256 = "sha256-1hqu8SeNLG66Sk8RH99gsu8dhxPb89R2s8hym6CRwbE=";
  };

-  vendorHash = "sha256-FOAKxKqhrUpfXkoasSd7v3kKAqV11p5ieZaMPni5Hx4=";
+  vendorHash = "sha256-3Rz/9p1moT3rQPY3/lka9HZ16T00+bAWCc950IBTkFE=";
  subPackages = [ "." ];

  meta = {
@@ -6,15 +6,14 @@
  imagemagick,
  libgbm,
  libdrm,
-  flutter332,
-  flutter335,
+  flutter338,
  pulseaudio,
  webkitgtk_4_1,
  copyDesktopItems,
  makeDesktopItem,

  callPackage,
-  vodozemac-wasm ? callPackage ./vodozemac-wasm.nix { flutter = flutter332; },
+  vodozemac-wasm ? callPackage ./vodozemac-wasm.nix { flutter = flutter338; },

  targetFlutterPlatform ? "linux",
 }:
@@ -30,16 +29,16 @@ let
    sha256 = "sha256-lRfymTSfoNUtR5tSUiAptAvrrTwbB8p+SaYQeOevMzA=";
  };
 in
-flutter335.buildFlutterApplication (
+flutter338.buildFlutterApplication (
  rec {
    pname = "fluffychat-${targetFlutterPlatform}";
-    version = "2.3.1";
+    version = "2.4.1";

    src = fetchFromGitHub {
      owner = "krille-chan";
      repo = "fluffychat";
      tag = "v${version}";
-      hash = "sha256-jQdWy/oo8WS6DU7VD4n4smL6P+aoqJvN+Yb2gt3hpyY=";
+      hash = "sha256-8Q+A5IZW6RjmnE+ovI7HYPZCi0oOoj9SU7o0VUPXxsM=";
    };

    inherit pubspecLock;
@@ -51,6 +50,11 @@ flutter335.buildFlutterApplication (

    inherit targetFlutterPlatform;

+    flutterBuildFlags = [
+      # Required since v2.4.0
+      "--enable-experiment=dot-shorthands"
+    ];
+
    meta = {
      description = "Chat with your friends (matrix client)";
      homepage = "https://fluffychat.im/";
@@ -4,31 +4,31 @@
      "dependency": "transitive",
      "description": {
        "name": "_fe_analyzer_shared",
-        "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7",
+        "sha256": "c209688d9f5a5f26b2fb47a188131a6fb9e876ae9e47af3737c0b4f58a93470d",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "67.0.0"
+      "version": "91.0.0"
    },
    "analyzer": {
      "dependency": "transitive",
      "description": {
        "name": "analyzer",
-        "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d",
+        "sha256": "f51c8499b35f9b26820cfe914828a6a98a94efd5cc78b37bb7d03debae3a1d08",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "6.4.1"
+      "version": "8.4.1"
    },
    "animations": {
      "dependency": "direct main",
      "description": {
        "name": "animations",
-        "sha256": "a8031b276f0a7986ac907195f10ca7cd04ecf2a8a566bd6dbe03018a9b02b427",
+        "sha256": "18938cefd7dcc04e1ecac0db78973761a01e4bc2d6bfae0cfa596bfeac9e96ab",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.1.0"
+      "version": "2.1.1"
    },
    "ansicolor": {
      "dependency": "transitive",
@@ -280,16 +280,6 @@
      "source": "hosted",
      "version": "3.0.0"
    },
-    "console": {
-      "dependency": "transitive",
-      "description": {
-        "name": "console",
-        "sha256": "e04e7824384c5b39389acdd6dc7d33f3efe6b232f6f16d7626f194f6a01ad69a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.1.0"
-    },
    "convert": {
      "dependency": "transitive",
      "description": {
@@ -424,11 +414,11 @@
      "dependency": "direct main",
      "description": {
        "name": "device_info_plus",
-        "sha256": "dd0e8e02186b2196c7848c9d394a5fd6e5b57a43a546082c5820b1ec72317e33",
+        "sha256": "4df8babf73058181227e18b08e6ea3520cf5fc5d796888d33b7cb0f33f984b7c",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "12.2.0"
+      "version": "12.3.0"
    },
    "device_info_plus_platform_interface": {
      "dependency": "transitive",
@@ -454,21 +444,11 @@
      "dependency": "direct main",
      "description": {
        "name": "emoji_picker_flutter",
-        "sha256": "9a44c102079891ea5877f78c70f2e3c6e9df7b7fe0a01757d31f1046eeaa016d",
+        "sha256": "984d3e9b9cf3175df9a868ce4a2d9611491e80e5d3b8e2b1e8991a4998972885",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "4.3.0"
-    },
-    "emojis": {
-      "dependency": "direct main",
-      "description": {
-        "name": "emojis",
-        "sha256": "2e4d847c3f1e2670f30dc355909ce6fa7808b4e626c34a4dd503a360995a38bf",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.9.9"
+      "version": "4.4.0"
    },
    "fake_async": {
      "dependency": "transitive",
@@ -504,21 +484,21 @@
      "dependency": "direct main",
      "description": {
        "name": "file_picker",
-        "sha256": "f8f4ea435f791ab1f817b4e338ed958cb3d04ba43d6736ffc39958d950754967",
+        "sha256": "d974b6ba2606371ac71dd94254beefb6fa81185bde0b59bdc1df09885da85fde",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "10.3.6"
+      "version": "10.3.8"
    },
    "file_selector": {
      "dependency": "direct main",
      "description": {
        "name": "file_selector",
-        "sha256": "5f1d15a7f17115038f433d1b0ea57513cc9e29a9d5338d166cb0bef3fa90a7a0",
+        "sha256": "bd15e43e9268db636b53eeaca9f56324d1622af30e5c34d6e267649758c84d9a",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.0.4"
+      "version": "1.1.0"
    },
    "file_selector_android": {
      "dependency": "transitive",
@@ -544,31 +524,31 @@
      "dependency": "transitive",
      "description": {
        "name": "file_selector_linux",
-        "sha256": "54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33",
+        "sha256": "2567f398e06ac72dcf2e98a0c95df2a9edd03c2c2e0cacd4780f20cdf56263a0",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.9.3+2"
+      "version": "0.9.4"
    },
    "file_selector_macos": {
      "dependency": "transitive",
      "description": {
        "name": "file_selector_macos",
-        "sha256": "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc",
+        "sha256": "5e0bbe9c312416f1787a68259ea1505b52f258c587f12920422671807c4d618a",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.9.4+2"
+      "version": "0.9.5"
    },
    "file_selector_platform_interface": {
      "dependency": "transitive",
      "description": {
        "name": "file_selector_platform_interface",
-        "sha256": "a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b",
+        "sha256": "35e0bd61ebcdb91a3505813b055b09b79dfdc7d0aee9c09a7ba59ae4bb13dc85",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.6.2"
+      "version": "2.7.0"
    },
    "file_selector_web": {
      "dependency": "transitive",
@@ -616,21 +596,11 @@
      "dependency": "direct main",
      "description": {
        "name": "flutter_foreground_task",
-        "sha256": "9f1b25a81db95d7119d2c5cffc654048cbdd49d4056183e1beadc1a6a38f3e29",
+        "sha256": "48ea45056155a99fb30b15f14f4039a044d925bc85f381ed0b2d3b00a60b99de",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "9.1.0"
-    },
-    "flutter_highlighter": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_highlighter",
-        "sha256": "93173afd47a9ada53f3176371755e7ea4a1065362763976d06d6adfb4d946e10",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.1"
+      "version": "9.2.0"
    },
    "flutter_linkify": {
      "dependency": "direct main",
@@ -646,11 +616,11 @@
      "dependency": "direct dev",
      "description": {
        "name": "flutter_lints",
-        "sha256": "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1",
+        "sha256": "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.0.2"
+      "version": "6.0.0"
    },
    "flutter_local_notifications": {
      "dependency": "direct main",
@@ -864,11 +834,11 @@
      "dependency": "direct main",
      "description": {
        "name": "flutter_webrtc",
-        "sha256": "16ca9e30d428bae3dd32933e875c9f67c5843d1fa726c37cf1fc479eb9294549",
+        "sha256": "71a38363a5b50603e405c275f30de2eb90f980b0cc94b0e1e9d8b9d6a6b03bf0",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.2.0"
+      "version": "1.2.1"
    },
    "frontend_server_client": {
      "dependency": "transitive",
@@ -966,16 +936,6 @@
      "source": "hosted",
      "version": "0.2.5"
    },
-    "get_it": {
-      "dependency": "transitive",
-      "description": {
-        "name": "get_it",
-        "sha256": "e87cd1d108e472a0580348a543a0c49ed3d70c8a5c809c6d418583e595d0a389",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "8.1.0"
-    },
    "glob": {
      "dependency": "transitive",
      "description": {
@@ -990,11 +950,11 @@
      "dependency": "direct main",
      "description": {
        "name": "go_router",
-        "sha256": "c92d18e1fe994cb06d48aa786c46b142a5633067e8297cff6b5a3ac742620104",
+        "sha256": "eff94d2a6fc79fa8b811dde79c7549808c2346037ee107a1121b4a644c745f2a",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "17.0.0"
+      "version": "17.0.1"
    },
    "gsettings": {
      "dependency": "transitive",
@@ -1026,15 +986,15 @@
      "source": "hosted",
      "version": "0.4.0"
    },
-    "highlighter": {
-      "dependency": "transitive",
+    "highlight": {
+      "dependency": "direct main",
      "description": {
-        "name": "highlighter",
-        "sha256": "92180c72b9da8758e1acf39a45aa305a97dcfe2fdc8f3d1d2947c23f2772bfbc",
+        "name": "highlight",
+        "sha256": "5353a83ffe3e3eca7df0abfb72dcf3fa66cc56b953728e7113ad4ad88497cf21",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.1.1"
+      "version": "0.7.0"
    },
    "html": {
      "dependency": "direct main",
@@ -1090,11 +1050,11 @@
      "dependency": "direct main",
      "description": {
        "name": "image",
-        "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928",
+        "sha256": "492bd52f6c4fbb6ee41f781ff27765ce5f627910e1e0cbecfa3d9add5562604c",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "4.5.4"
+      "version": "4.7.2"
    },
    "image_picker": {
      "dependency": "direct main",
@@ -1306,11 +1266,11 @@
      "dependency": "direct dev",
      "description": {
        "name": "license_checker",
-        "sha256": "eea27638e42bc98fd91a6a8187eb57e5617e2c3c8b313a5d51b14bec7a8685e1",
+        "sha256": "8a35b6946e50811e070ac6fe4717ee431cd1a334e080df2116956b54b0bb0d0f",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.6.0"
+      "version": "1.6.2"
    },
    "linkify": {
      "dependency": "direct main",
@@ -1326,11 +1286,11 @@
      "dependency": "transitive",
      "description": {
        "name": "lints",
-        "sha256": "cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290",
+        "sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.0.0"
+      "version": "6.0.0"
    },
    "lists": {
      "dependency": "transitive",
@@ -1396,21 +1356,21 @@
      "dependency": "direct main",
      "description": {
        "name": "matrix",
-        "sha256": "0660c8f662f53b56eb2c0d7a7019517b735f20218ce35bc20f44de43bc3a9466",
+        "sha256": "fb116ee89f6871441f22f76a988db15cfcfb6dfac97e3e2d654c240080015707",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "4.0.0"
+      "version": "4.1.0"
    },
    "meta": {
      "dependency": "transitive",
      "description": {
        "name": "meta",
-        "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
+        "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.16.0"
+      "version": "1.17.0"
    },
    "mgrs_dart": {
      "dependency": "transitive",
@@ -1432,26 +1392,6 @@
      "source": "hosted",
      "version": "2.0.0"
    },
-    "msix": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "msix",
-        "sha256": "f88033fcb9e0dd8de5b18897cbebbd28ea30596810f4a7c86b12b0c03ace87e5",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.16.12"
-    },
-    "native_imaging": {
-      "dependency": "direct main",
-      "description": {
-        "name": "native_imaging",
-        "sha256": "93573afdcab070011d78a40fc1f69b61967f1f8485d2b81a7a2ee585a85f4c04",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.0"
-    },
    "nested": {
      "dependency": "transitive",
      "description": {
@@ -1516,11 +1456,11 @@
      "dependency": "transitive",
      "description": {
        "name": "pana",
-        "sha256": "3fc3fe8e7a9fd4827fa4d625a423eec95d305b2bc3538a3adf7fd6c49217af97",
+        "sha256": "eb816d35b80d3880335c3f2d139b376e81fd98a9ea273faf39f2c8914c4afba5",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.21.45"
+      "version": "0.23.3"
    },
    "path": {
      "dependency": "direct main",
@@ -2026,11 +1966,11 @@
      "dependency": "direct main",
      "description": {
        "name": "shared_preferences",
-        "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5",
+        "sha256": "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.5.3"
+      "version": "2.5.4"
    },
    "shared_preferences_android": {
      "dependency": "transitive",
@@ -2202,11 +2142,11 @@
      "dependency": "direct main",
      "description": {
        "name": "sqflite_common_ffi",
-        "sha256": "9faa2fedc5385ef238ce772589f7718c24cdddd27419b609bb9c6f703ea27988",
+        "sha256": "8d7b8749a516cbf6e9057f9b480b716ad14fc4f3d3873ca6938919cc626d9025",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.3.6"
+      "version": "2.3.7+1"
    },
    "sqlcipher_flutter_libs": {
      "dependency": "direct main",
@@ -2222,11 +2162,11 @@
      "dependency": "transitive",
      "description": {
        "name": "sqlite3",
-        "sha256": "608b56d594e4c8498c972c8f1507209f9fd74939971b948ddbbfbfd1c9cb3c15",
+        "sha256": "3145bd74dcdb4fd6f5c6dda4d4e4490a8087d7f286a14dee5d37087290f0f8a2",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.7.7"
+      "version": "2.9.4"
    },
    "stack_trace": {
      "dependency": "transitive",
@@ -2298,16 +2238,6 @@
      "source": "hosted",
      "version": "3.3.1"
    },
-    "tar": {
-      "dependency": "transitive",
-      "description": {
-        "name": "tar",
-        "sha256": "22f67e2d77b51050436620b2a5de521c58ca6f0b75af1d9ab3c8cae2eae58fcd",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.5"
-    },
    "term_glyph": {
      "dependency": "transitive",
      "description": {
@@ -2322,31 +2252,31 @@
      "dependency": "transitive",
      "description": {
        "name": "test",
-        "sha256": "65e29d831719be0591f7b3b1a32a3cda258ec98c58c7b25f7b84241bc31215bb",
+        "sha256": "75906bf273541b676716d1ca7627a17e4c4070a3a16272b7a3dc7da3b9f3f6b7",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.26.2"
+      "version": "1.26.3"
    },
    "test_api": {
      "dependency": "transitive",
      "description": {
        "name": "test_api",
-        "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00",
+        "sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.7.6"
+      "version": "0.7.7"
    },
    "test_core": {
      "dependency": "transitive",
      "description": {
        "name": "test_core",
-        "sha256": "80bf5a02b60af04b09e14f6fe68b921aad119493e26e490deaca5993fef1b05a",
+        "sha256": "0cc24b5ff94b38d2ae73e1eb43cc302b77964fbf67abad1e296025b78deb53d0",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.6.11"
+      "version": "0.6.12"
    },
    "timezone": {
      "dependency": "transitive",
@@ -2368,25 +2298,15 @@
      "source": "hosted",
      "version": "2.0.1"
    },
-    "tor_detector_web": {
-      "dependency": "direct main",
-      "description": {
-        "name": "tor_detector_web",
-        "sha256": "c4acbd6c0fecd2cd0e8fe00b1a37332422e041021a42488dfddcb3e7ec809b3f",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.0"
-    },
    "translations_cleaner": {
      "dependency": "direct dev",
      "description": {
        "name": "translations_cleaner",
-        "sha256": "060f4a8cd782e271509719741dd3540fe81ddaad49bd79e1d8fc4598299a6b84",
+        "sha256": "811f42be32f024fdf083903f198d3625f6ee6927601e3a53a29b85b90508b88c",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.0.5"
+      "version": "0.1.0"
    },
    "typed_data": {
      "dependency": "transitive",
@@ -2472,21 +2392,21 @@
      "dependency": "direct main",
      "description": {
        "name": "universal_html",
-        "sha256": "56536254004e24d9d8cfdb7dbbf09b74cf8df96729f38a2f5c238163e3d58971",
+        "sha256": "c0bcae5c733c60f26c7dfc88b10b0fd27cbcc45cb7492311cdaa6067e21c9cd4",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.2.4"
+      "version": "2.3.0"
    },
    "universal_io": {
      "dependency": "transitive",
      "description": {
        "name": "universal_io",
-        "sha256": "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad",
+        "sha256": "f63cbc48103236abf48e345e07a03ce5757ea86285ed313a6a032596ed9301e2",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.2.2"
+      "version": "2.3.1"
    },
    "universal_platform": {
      "dependency": "transitive",
@@ -2880,7 +2800,7 @@
    }
  },
  "sdks": {
-    "dart": ">=3.8.0 <4.0.0",
-    "flutter": ">=3.32.0"
+    "dart": ">=3.10.0 <4.0.0",
+    "flutter": ">=3.35.0"
  }
 }
@@ -20,6 +20,15 @@

 let
  pubSources = fluffychat-web.pubspecLock.dependencySources;
+  pubCache = runCommand "fluffychat-pub-cache" { } ''
+    mkdir -p $out/hosted/pub.dev
+    pushd $out/hosted/pub.dev
+      ${lib.concatMapAttrsStringSep "; " (
+        _: p:
+        "ln -s ${p} ./${if lib.hasPrefix "pub-" p.name then lib.removePrefix "pub-" p.name else p.name}"
+      ) pubSources}
+    popd
+  '';

  # wasm-pack doesn't take 'RUST_SRC_PATH' into consideration
  sysroot = symlinkJoin {
@@ -86,6 +95,10 @@ stdenv.mkDerivation {
  buildPhase = ''
    runHook preBuild

+    export PUB_CACHE=$TMPDIR/pub-cache
+    mkdir -p $PUB_CACHE/hosted
+    ln -s ${pubCache}/hosted/pub.dev $PUB_CACHE/hosted/pub.dev
+
    pushd dart
      dart pub get --offline
    popd
@@ -111,18 +124,6 @@ stdenv.mkDerivation {
  '';

  env = {
-    # Build a pub cache from fluffychat, as dart-vodozemac should be a subset
-    # This is required because dart-vodozemac, as a pub, doesn't have a pubspec.lock
-    # But flutter_rust_bridge_codegen still requires all dependencies of it
-    PUB_CACHE = runCommand "fluffychat-pub-cache" { } ''
-      mkdir -p $out/hosted/pub.dev
-      pushd $out/hosted/pub.dev
-        ${lib.concatMapAttrsStringSep "; " (
-          _: p:
-          "ln -s ${p} ./${if lib.hasPrefix "pub-" p.name then lib.removePrefix "pub-" p.name else p.name}"
-        ) pubSources}
-      popd
-    '';
    RUSTC_BOOTSTRAP = 1; # `-Z build-std=std,panic_abort` requires nightly toolchain
  };

@@ -17,7 +17,7 @@
 }:

 let
-  version = "0.8.8";
+  version = "0.8.9";

 in
 stdenv.mkDerivation {
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
    owner = "fdupoux";
    repo = "fsarchiver";
    rev = version;
-    sha256 = "sha256-bEwNqPQRpjfOVTUog9wsZfS5yQ7Z21pHolPRLlbzHAA=";
+    sha256 = "sha256-eJ+25wfOZ7qYL5zi2kz0+03xg6gnKmLG+xjC7wEJ2HM=";
  };

  nativeBuildInputs = [
@@ -8,7 +8,7 @@

 let
  pname = "gallery-dl";
-  version = "1.31.4";
+  version = "1.31.5";
 in
 python3Packages.buildPythonApplication {
  inherit pname version;
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication {
    owner = "mikf";
    repo = "gallery-dl";
    tag = "v${version}";
-    hash = "sha256-oK1NgLZc+aTD2zr5L0hkWGrpzCqv1TkupvB47r5nZXs=";
+    hash = "sha256-jrTLiZs3LJaFZL40vxWS/1J9HHke9gmV9840AOUtLCU=";
  };

  build-system = [ python3Packages.setuptools ];
@@ -18,16 +18,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "gelly";
-  version = "0.15.1";
+  version = "0.16.0";

  src = fetchFromGitHub {
    owner = "Fingel";
    repo = "gelly";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-7JMtXqqVy7JJs7pkCuJlcfFD0APdTjUwOr/LsyWRHVU=";
+    hash = "sha256-TU2WI927ECSqbvIcQbxSLXLxmos4pxqPuDV7LCOY2bY=";
  };

-  cargoHash = "sha256-SXIYUUTZGKEXS62/Q+SDiz5BB4eE2TEOq346zotFpO4=";
+  cargoHash = "sha256-rgKvfOsP85THalkr412aLOxl6gmFKPpBann1i9BEB20=";

  nativeBuildInputs = [
    pkg-config
@@ -13,24 +13,21 @@
  webkitgtk_4_1,
  versionCheckHook,
  nix-update-script,
+  gitMinimal,
 }:

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "gg";
-  version = "0.29.0";
+  version = "0.37.2";

  src = fetchFromGitHub {
    owner = "gulbanana";
    repo = "gg";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-RFNROdPfJksxK5tOP1LOlV/di8AyeJbxwaIoWaZEaVU=";
+    hash = "sha256-xs8UmHKtu+fzNrw77JAifkxDOAx1w/UUKK/4rhWjf2I=";
  };

-  cargoRoot = "src-tauri";
-
-  buildAndTestSubdir = "src-tauri";
-
-  cargoHash = "sha256-AdatJNDqIoRHfaf81iFhOs2JGLIxy7agFJj96bFPj00=";
+  cargoHash = "sha256-iEWdN6xVXrZiAcsung9LrsTsJdx3cnlr6x3NMrKSi+k=";

  npmDeps = fetchNpmDeps {
    inherit (finalAttrs)
@@ -39,14 +36,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
      src
      patches
      ;
-    hash = "sha256-ehXGLpCCN+BNqtwjEatcfR0kQHj5WOofTDR5mLSVW0U=";
+    hash = "sha256-jAzIaLRACIDjsn8bHTr3erBoC/02jz8xhyHpFxwH+Y4=";
  };

-  patches = [
-    # Remove after https://github.com/gulbanana/gg/pull/68 is released
-    ./update-tauri-npm-to-match-cargo.patch
-  ];
-
  nativeBuildInputs = [
    cargo-tauri.hook
    nodejs
@@ -64,6 +56,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
    webkitgtk_4_1
  ];

+  nativeCheckInputs = [
+    # Failing tests: Could not execute the git process, found in the OS path 'git'
+    gitMinimal
+  ];
+  checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [
+    # Attempted to create a NULL object.
+    "--skip=web::tests::integration_test"
+  ];
+
  env.OPENSSL_NO_VENDOR = true;

  postInstall = lib.optionals stdenv.hostPlatform.isDarwin ''
@@ -1,81 +0,0 @@
-From 627de4bd148229a1feb327262b9f0b2a75077ed3 Mon Sep 17 00:00:00 2001
-From: Mitchell Skaggs <skaggsm333@gmail.com>
-Date: Mon, 1 Sep 2025 19:02:19 -0500
-Subject: [PATCH] update `@tauri-apps/api` and `@tauri-apps/plugin-shell` to
- match Cargo versions
-
-In Tauri *CLI* versions >=2.8.0, the build fails if NPM and Cargo versions
-are not aligned. This is not a new requirement, this merely verifies an
-existing requirement. The CLI version in Nixpkgs was updated and now
-detects this already-existing error.
-
-This pulls the NPM versions up to match the existing Cargo versions
-without touching any other dependencies.
---
- package-lock.json | 18 +++++++++---------
- package.json      |  4 ++--
- 2 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/package-lock.json b/package-lock.json
-index 3affe19..ebe27e7 100644
--- a/package-lock.json
-+++ b/package-lock.json
-@@ -9,8 +9,8 @@
-       "version": "0.29.0",
-       "dependencies": {
-         "@catppuccin/palette": "^1.0.3",
-        "@tauri-apps/api": "^2.0.0-beta.0",
-        "@tauri-apps/plugin-shell": "^2.0.0-beta.0",
-+        "@tauri-apps/api": "^2.4.1",
-+        "@tauri-apps/plugin-shell": "2.2.1",
-         "feather-icons": "^4.29.1",
-         "modern-normalize": "^2.0.0"
-       },
-@@ -793,9 +793,9 @@
-       }
-     },
-     "node_modules/@tauri-apps/api": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.1.1.tgz",
-      "integrity": "sha512-fzUfFFKo4lknXGJq8qrCidkUcKcH2UHhfaaCNt4GzgzGaW2iS26uFOg4tS3H4P8D6ZEeUxtiD5z0nwFF0UN30A==",
-+      "version": "2.4.1",
-+      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.4.1.tgz",
-+      "integrity": "sha512-5sYwZCSJb6PBGbBL4kt7CnE5HHbBqwH+ovmOW6ZVju3nX4E3JX6tt2kRklFEH7xMOIwR0btRkZktuLhKvyEQYg==",
-       "license": "Apache-2.0 OR MIT",
-       "funding": {
-         "type": "opencollective",
-@@ -1002,9 +1002,9 @@
-       }
-     },
-     "node_modules/@tauri-apps/plugin-shell": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.0.1.tgz",
-      "integrity": "sha512-akU1b77sw3qHiynrK0s930y8zKmcdrSD60htjH+mFZqv5WaakZA/XxHR3/sF1nNv9Mgmt/Shls37HwnOr00aSw==",
-+      "version": "2.2.1",
-+      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.2.1.tgz",
-+      "integrity": "sha512-G1GFYyWe/KlCsymuLiNImUgC8zGY0tI0Y3p8JgBCWduR5IEXlIJS+JuG1qtveitwYXlfJrsExt3enhv5l2/yhA==",
-       "license": "MIT OR Apache-2.0",
-       "dependencies": {
-         "@tauri-apps/api": "^2.0.0"
-@@ -2054,4 +2054,4 @@
-       "license": "ISC"
-     }
-   }
-}
-\ No newline at end of file
-+}
-diff --git a/package.json b/package.json
-index 6000620..9d61871 100644
--- a/package.json
-+++ b/package.json
-@@ -14,8 +14,8 @@
-   },
-   "dependencies": {
-     "@catppuccin/palette": "^1.0.3",
-    "@tauri-apps/api": "^2.0.0-beta.0",
-    "@tauri-apps/plugin-shell": "^2.0.0-beta.0",
-+    "@tauri-apps/api": "^2.4.1",
-+    "@tauri-apps/plugin-shell": "2.2.1",
-     "feather-icons": "^4.29.1",
-     "modern-normalize": "^2.0.0"
-   },
@@ -8,13 +8,13 @@

 buildGoModule rec {
  pname = "ghorg";
-  version = "1.11.7";
+  version = "1.11.8";

  src = fetchFromGitHub {
    owner = "gabrie30";
    repo = "ghorg";
    rev = "v${version}";
-    sha256 = "sha256-3aFEpSyKICJ6jWZAMprE4nV6OxMFVvM82bmKSV87Sng=";
+    sha256 = "sha256-Co6TR60RfY24y/FZkdBQUvXtE19Il0KASbkDSe/e3Bw=";
  };

  doCheck = false;
@@ -14,14 +14,14 @@

 python3Packages.buildPythonApplication rec {
  pname = "git-cola";
-  version = "4.17.0";
+  version = "4.17.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "git-cola";
    repo = "git-cola";
    tag = "v${version}";
-    hash = "sha256-no4yvAjrg6q7L3PrMHSLrbm21myL9rXnKvOYjXrY1lw=";
+    hash = "sha256-aBVtyPgkmSYCDlPcmJKFKqUwKMbxVVy8AVsKBdPNkXI=";
  };

  build-system = with python3Packages; [
@@ -9,14 +9,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "git-machete";
-  version = "3.38.1";
+  version = "3.39.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "virtuslab";
    repo = "git-machete";
    tag = "v${version}";
-    hash = "sha256-m/GstZAxBi4Q8GRv2GRrJNzChV1Rzw1vNuNP0Ao+GIY=";
+    hash = "sha256-A523zHMckOLAQJzYBWoFSxummR8tuaMbGTy3bz4aHs8=";
  };

  build-system = with python3.pkgs; [ setuptools ];
@@ -8,11 +8,11 @@

 stdenv.mkDerivation rec {
  pname = "gp2c";
-  version = "0.0.14";
+  version = "0.0.14pl1";

  src = fetchurl {
    url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${pname}-${version}.tar.gz";
-    hash = "sha256-r2ESzAKUBFfiOdpEM9Gg2Npg7u8p98xyL2TNSsALezA=";
+    hash = "sha256-JFzgIP14Ytwoifhmzu8VI6SVPxm/Hl3D20SYi14HJrw=";
  };

  buildInputs = [
@@ -1,12 +1,17 @@
 {
+  lib,
  stdenvNoCC,
  fetchFromGitHub,
-  theme,
-  lib,
+  theme ? "black",
 }:

+assert lib.asserts.assertOneOf "theme" theme [
+  "black"
+  "white"
+];
+
 stdenvNoCC.mkDerivation (finalAttrs: {
-  pname = "gruppled-cursors";
+  pname = "gruppled-${theme}-cursors";
  version = "1.0.0";

  src = fetchFromGitHub {
@@ -17,12 +22,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
  };

  installPhase = ''
-    mkdir -p $out/share/icons/${theme}
-    cp -r ${theme}/{cursors,index.theme} $out/share/icons/${theme}
+    mkdir -p $out/share/icons/gruppled_${theme}
+    cp -r gruppled_${theme}/{cursors,index.theme} $out/share/icons/gruppled_${theme}
  '';

  meta = {
-    description = "Gruppled Cursors theme";
+    description = "Gruppled ${lib.toSentenceCase theme} Cursors theme";
    homepage = "https://github.com/nim65s/gruppled-cursors";
    license = lib.licenses.gpl2Only;
    maintainers = with lib.maintainers; [ nim65s ];
@@ -1,12 +1,17 @@
 {
+  lib,
  stdenvNoCC,
  fetchFromGitHub,
-  theme,
-  lib,
+  theme ? "black",
 }:

+assert lib.asserts.assertOneOf "theme" theme [
+  "black"
+  "white"
+];
+
 stdenvNoCC.mkDerivation (finalAttrs: {
-  pname = "gruppled-lite-cursors";
+  pname = "gruppled-${theme}-lite-cursors";
  version = "1.0.0";

  src = fetchFromGitHub {
@@ -17,12 +22,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
  };

  installPhase = ''
-    mkdir -p $out/share/icons/${theme}
-    cp -r ${theme}/{cursors,index.theme} $out/share/icons/${theme}
+    mkdir -p $out/share/icons/gruppled_${theme}_lite
+    cp -r gruppled_${theme}_lite/{cursors,index.theme} $out/share/icons/gruppled_${theme}_lite
  '';

  meta = {
-    description = "Gruppled Lite Cursors theme";
+    description = "Gruppled ${lib.toSentenceCase theme} Lite Cursors theme";
    homepage = "https://github.com/nim65s/gruppled-lite-cursors";
    license = lib.licenses.gpl2Only;
    maintainers = with lib.maintainers; [ nim65s ];
@@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "gtree";
-  version = "1.13.2";
+  version = "1.13.3";

  src = fetchFromGitHub {
    owner = "ddddddO";
    repo = "gtree";
    rev = "v${version}";
-    hash = "sha256-CTAUyFkIKk2WnZWVtIG6tZfjNT445DBDgeh5gTb4q6k=";
+    hash = "sha256-K7LFnMCx28Abj4U9glFtQWJDHPHPRrGPsP0TiCr5NKc=";
  };

-  vendorHash = "sha256-LWsJWh7LYkB5IWJaNJsy+K2xYNiw4mGy/YGT42at5C0=";
+  vendorHash = "sha256-A/O8w56RsiS8VHzq4NpIn8dAt12sNpfl/Jf9KziZ12I=";

  subPackages = [
    "cmd/gtree"
@@ -8,10 +8,10 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "halo";
-  version = "2.22.11";
+  version = "2.22.12";
  src = fetchurl {
    url = "https://github.com/halo-dev/halo/releases/download/v${finalAttrs.version}/halo-${finalAttrs.version}.jar";
-    hash = "sha256-22Fp1OMLBU/d6zCZ3zpT4FisTc9OPEC2POfEtLJhHxA=";
+    hash = "sha256-26MwshinUmDRY/JYRGxjyujHuFWGJGX2YTK4OxuNNcA=";
  };

  nativeBuildInputs = [
@@ -8,13 +8,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "hcxdumptool";
-  version = "7.0.1";
+  version = "7.1.0";

  src = fetchFromGitHub {
    owner = "ZerBea";
    repo = "hcxdumptool";
    tag = finalAttrs.version;
-    hash = "sha256-ABbhhojg4PJlK7xwPW8m7ExQym6hrZmKBsqxnGrjA8A=";
+    hash = "sha256-54gKvOcmNxMND1iXJCgwtwT+PYntukVKtdT4dLwOOpI=";
  };

  buildInputs = [
@@ -10,13 +10,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "hcxtools";
-  version = "7.0.1";
+  version = "7.1.0";

  src = fetchFromGitHub {
    owner = "ZerBea";
    repo = "hcxtools";
    rev = finalAttrs.version;
-    sha256 = "sha256-WV5+1PQF999qSIMrIYApmIx6C+ovbKOtJDFglzxzSB4=";
+    sha256 = "sha256-wfLeHL9xqHAkWPodrz7+dDcLcylwVrS6Kes5meV4UDM=";
  };

  nativeBuildInputs = [ pkg-config ];
@@ -1,7 +1,7 @@
 {
  lib,
  stdenv,
-  fetchFromGitHub,
+  fetchurl,
  cmake,
  extra-cmake-modules,
  fftw,
@@ -11,15 +11,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "krita-plugin-gmic";
-  version = "3.2.4.1";
+  version = "3.6.4.1";

-  src = fetchFromGitHub {
-    owner = "amyspark";
-    repo = "gmic";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-SYE8kGvN7iD5OqiEEZpB/eRle67PrB5DojMC79qAQtg=";
+  src = fetchurl {
+    url = "https://files.kde.org/krita/build/dependencies/gmic-${finalAttrs.version}.tar.gz";
+    hash = "sha256-prbGkwFWC+LqK1WDqOwZvX5Q5LQal3dFUXzpILwF+v4=";
  };
-  sourceRoot = "${finalAttrs.src.name}/gmic-qt";
+  sourceRoot = "gmic-v${finalAttrs.version}/gmic-qt";
  dontWrapQtApps = true;

  postPatch = ''
@@ -49,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  meta = {
-    homepage = "https://github.com/amyspark/gmic";
+    homepage = "https://krita.org";
    description = "GMic plugin for Krita";
    license = lib.licenses.cecill21;
    maintainers = with lib.maintainers; [ lelgenio ];
@@ -10,7 +10,7 @@
  krita-unwrapped,
 }:
 symlinkJoin {
-  name = lib.replaceStrings [ "-unwrapped" ] [ "" ] krita-unwrapped.name;
+  pname = "krita";
  inherit (krita-unwrapped)
    version
    buildInputs
@@ -6,13 +6,13 @@

 buildGoModule rec {
  pname = "kubefirst";
-  version = "2.10.3";
+  version = "2.10.4";

  src = fetchFromGitHub {
    owner = "konstructio";
    repo = "kubefirst";
    tag = "v${version}";
-    hash = "sha256-fYoW32WukwyMtXC6LZ9nyBAvvPbk3z5TkdYXhb+Mz9k=";
+    hash = "sha256-9uecbFdixMRAqFJyyDFwtGBylYXSxiqs+Suj/W2gEHA=";
  };

  vendorHash = "sha256-1u34cuPUY/5fYd073UhRUu/5/1nhPadTI06+3o+uE7w=";
@@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "kubernetes-polaris";
-  version = "10.1.3";
+  version = "10.1.4";

  src = fetchFromGitHub {
    owner = "FairwindsOps";
    repo = "polaris";
    rev = version;
-    sha256 = "sha256-TGdfyjAARYBf2JVQuq+6J1b7W2QSbnl1USSbGdGs59k=";
+    sha256 = "sha256-OwKW8a7bka6YYI8xIRaxcNvrFOjuf+0jG3CSQGVCRPM=";
  };

-  vendorHash = "sha256-3crserX1lwgEsz1a/MeyYMbb6Sf3JoFRBaEu9pEHX1I=";
+  vendorHash = "sha256-gqMeXzPqQ0RBtjx+fS0+b7KhfJh1Ss0mC3djzOR84dU=";

  nativeBuildInputs = [ installShellFiles ];

@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
    homepage = "https://github.com/pantoniou/libfyaml";
    changelog = "https://github.com/pantoniou/libfyaml/releases/tag/v${finalAttrs.version}";
    license = lib.licenses.mit;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ ilkecan ];
    pkgConfigModules = [ "libfyaml" ];
    platforms = lib.platforms.all;
  };
@@ -10,13 +10,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "libnss-mysql";
-  version = "1.7.1";
+  version = "1.7.2";

  src = fetchFromGitHub {
    owner = "saknopper";
    repo = "libnss-mysql";
    rev = "v${finalAttrs.version}";
-    sha256 = "1fhsswa3h2nkhjkyjxxqnj07rlx6bmfvd8j521snimx2jba8h0d6";
+    sha256 = "sha256-/oeUe94NfOzKrHhiIEW0cMXP5pAqPHulRO82JwPrv5I=";
  };

  nativeBuildInputs = [
@@ -6,11 +6,11 @@

 stdenvNoCC.mkDerivation rec {
  pname = "lxgw-neoxihei";
-  version = "1.239";
+  version = "1.240";

  src = fetchurl {
    url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
-    hash = "sha256-x8ZhP+umMjSESZjf0R2vIbszcs6IUlEVIZKAQD20DxY=";
+    hash = "sha256-q+gTBC5/CjRY3sjub5qku/K+Xdm4DElKydnKeLpXmJw=";
  };

  dontUnpack = true;
@@ -8,16 +8,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "makima";
-  version = "0.10.2";
+  version = "0.10.3";

  src = fetchFromGitHub {
    owner = "cyber-sushi";
    repo = "makima";
    rev = "v${version}";
-    hash = "sha256-qvIzoYGU0WZdEPlJ3AR3uqOt2br73Vp8+ZU2xkX2si0=";
+    hash = "sha256-/+m6nWvZg5q3rPAu80xXImISmLzTpXiugu1m3M8QupQ=";
  };

-  cargoHash = "sha256-8814sRjYlnWAdOOLjj0VAuDr+Hlr1xTcvqx4Ul6XhR4=";
+  cargoHash = "sha256-vq680vbpvJRUV3waSMgiWm8oiu9m1JGTXzBco6lEvKc=";

  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ udev ];
@@ -8,13 +8,13 @@

 buildGoModule (finalAttrs: {
  pname = "matrix-alertmanager-receiver";
-  version = "2026.1.21";
+  version = "2026.1.31";

  src = fetchFromGitHub {
    owner = "metio";
    repo = "matrix-alertmanager-receiver";
    tag = finalAttrs.version;
-    hash = "sha256-nnv2Qc1txcUTDx47e2pJiXyOfklYqjs4VCg5Gj9UrPk=";
+    hash = "sha256-HnMTsrSp6mF2KzvqmX2sUA6viABXk5JWgngb3VzE2IE=";
  };

  vendorHash = "sha256-c94sQa1zKmt+mVC2yRm6rhBXh8Jr+r1PFcrlDPEE/04=";
@@ -8,16 +8,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "mdwatch";
-  version = "0.1.16";
+  version = "0.1.17";

  src = fetchFromGitHub {
    owner = "santoshxshrestha";
    repo = "mdwatch";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-3iqursj/d4z24SW+7qChe5BUMLhXeJOAsT6PhQG+NMU=";
+    hash = "sha256-y0biB09WQPgnNhxUmLpGNbCuuNjgjnB4vwsJrSWn+Lo=";
  };

-  cargoHash = "sha256-7WpmvCNPOWk1F7tmB4U/EyjauFZOdkixCTO1lKTphrM=";
+  cargoHash = "sha256-bc1hbTzGSun5nXonMJHA6LFPcl1fFR1nUx9+GCjQ5UY=";

  updateScript = nix-update-script { };

@@ -0,0 +1,61 @@
+{
+  lib,
+  cmake,
+  fetchFromGitHub,
+  simdutf,
+  gtest,
+  nix-update-script,
+  stdenv,
+  testers,
+  validatePkgConfig,
+  static ? stdenv.hostPlatform.isStatic,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "merve";
+  version = "1.0.1";
+
+  src = fetchFromGitHub {
+    owner = "nodejs";
+    repo = "merve";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-IqUpvnrbnsXlI//xRLbcseMFVLQrwdDCyW1oud3+Ekk=";
+  };
+
+  doCheck = true;
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_SHARED_LIBS" (!static))
+    (lib.cmakeBool "MERVE_TESTING" finalAttrs.finalPackage.doCheck)
+    (lib.cmakeBool "MERVE_USE_SIMDUTF" true)
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    validatePkgConfig
+  ];
+  buildInputs = [
+    simdutf
+  ];
+  checkInputs = [
+    gtest
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { };
+
+    tests.pkg-config = testers.hasPkgConfigModules {
+      package = finalAttrs.finalPackage;
+      versionCheck = true;
+    };
+  };
+
+  meta = {
+    description = "Lexer to extract named exports via analysis from CommonJS modules";
+    homepage = "https://github.com/nodejs/merve";
+    changelog = "https://github.com/nodejs/merve/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ aduh95 ];
+    platforms = lib.platforms.all;
+    pkgConfigModules = [ "merve" ];
+  };
+})
@@ -6,12 +6,12 @@
 }:

 stdenv.mkDerivation (finalAttrs: {
-  version = "12.05";
+  version = "12.09";
  pname = "monkeys-audio";

  src = fetchzip {
    url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";
-    hash = "sha256-QmowAu/v1jqDa3MvhGlviGFZQbk7ADROLPV/R7IpsHE=";
+    hash = "sha256-ACygfj+VV3cUvrnoU4cjvMFsTWnKOpzzfj+oMJbF5+I=";
    stripRoot = false;
  };

@@ -7,7 +7,7 @@

 buildNimPackage (finalAttrs: {
  pname = "mosdepth";
-  version = "0.3.11";
+  version = "0.3.12";

  requiredNimVersion = 1;

@@ -15,7 +15,7 @@ buildNimPackage (finalAttrs: {
    owner = "brentp";
    repo = "mosdepth";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-EzzDuzPAyNkL2tFWre86U+kx3SvLPbWto2/vfLdwHGI=";
+    hash = "sha256-6iKUTnukAAqMWDpmxmFZiHB5v5ztyaTOHzb0F/jIigM=";
  };

  lockFile = ./lock.json;
@@ -17,13 +17,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "naja";
-  version = "0.3.5";
+  version = "0.3.6";

  src = fetchFromGitHub {
    owner = "najaeda";
    repo = "naja";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-VD1ObfP6EbGUsqo0D4DLwBS1svLSsxhJB1iskybt/YI=";
+    hash = "sha256-PzUMm0YfBFjeWeUzEYGZO/RwkpOU8tZw5WfdniL0XsU=";
    fetchSubmodules = true;
  };

@@ -7,16 +7,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "neocmakelsp";
-  version = "0.9.1";
+  version = "0.10.0";

  src = fetchFromGitHub {
    owner = "Decodetalkers";
    repo = "neocmakelsp";
    rev = "v${version}";
-    hash = "sha256-4KgkI3wHBee4CAC5rQUV2YTckXfNz6nEZW9PvRygPKM=";
+    hash = "sha256-dviHzaBqsE3NKRf4AeQme/oOcu5GyKjGJBui4ZjjDv8=";
  };

-  cargoHash = "sha256-cVl/UqD/8LhTCiy7ttIDcxfJQrKxGhzdLfh/disX+4c=";
+  cargoHash = "sha256-FE2DF/DnBKwW01N2wwurQ6F4qIFHMaoGZ1kb8vq86K8=";

  nativeBuildInputs = [
    installShellFiles
@@ -31,11 +31,11 @@
 }:
 let
  pname = "nextcloud-talk-desktop";
-  version = "2.0.5"; # Ensure both hashes (Linux and Darwin) are updated!
+  version = "2.0.6"; # Ensure both hashes (Linux and Darwin) are updated!

  hashes = {
-    linux = "sha256-aKNrIbv6kaLoLmTZVgwncqzF4o/5C/hFXef3QqM7oBk=";
-    darwin = "sha256-Nli2z8eyAq5W3ALwHiH6+Ightk3Jf0gaWtwabOJS4gw=";
+    linux = "sha256-eEYNfVnM+qCYnirHdBG6oqBQzDio39J7tmh4BSTAF9g=";
+    darwin = "sha256-2A4Jjz0XoXxTdKq6xP0xhlBneysAkBHMbqfgaftJGFQ=";
  };

  # Only x86_64-linux is supported with Darwin support being universal
@@ -0,0 +1,40 @@
+{
+  mkDerivation,
+  attoparsec,
+  base,
+  fetchgit,
+  filepath,
+  hercules-ci-optparse-applicative,
+  hpack,
+  lib,
+  nix-derivation,
+  process,
+  relude,
+  unix,
+}:
+mkDerivation rec {
+  pname = "nix-run";
+  version = "0.1.0.0-alpha.2";
+  src = fetchgit {
+    url = "https://tangled.org/weethet.bsky.social/nix-run";
+    tag = version;
+    hash = "sha256-vnYD3N32H6eEPLis8eNlglXVY+guP5DDKCf2z7CLzwA=";
+  };
+  isLibrary = false;
+  isExecutable = true;
+  libraryToolDepends = [ hpack ];
+  executableHaskellDepends = [
+    attoparsec
+    base
+    filepath
+    hercules-ci-optparse-applicative
+    nix-derivation
+    process
+    relude
+    unix
+  ];
+  prePatch = "hpack";
+  homepage = "https://tangled.org/@weethet.bsky.social/nix-run";
+  license = lib.licenses.bsd3;
+  mainProgram = "nix-run";
+}
@@ -0,0 +1,7 @@
+{ lib, haskellPackages }:
+(haskellPackages.callPackage ./nix-run.nix { }).overrideAttrs (old: {
+  meta = old.meta // {
+    description = "A non-experimental replacement for nix run";
+    maintainers = [ lib.maintainers.WeetHet ];
+  };
+})
@@ -7,13 +7,13 @@

 stdenvNoCC.mkDerivation {
  pname = "nu_scripts";
-  version = "0-unstable-2026-01-23";
+  version = "0-unstable-2026-01-29";

  src = fetchFromGitHub {
    owner = "nushell";
    repo = "nu_scripts";
-    rev = "e65d76cd14979937ee378d56fc21f4e72f21cecc";
-    hash = "sha256-LPwe0DS7rNFY6MUcfCCqMYJjPkhHQyBmy4M+KjrNz34=";
+    rev = "049b00e54e0dc878bc9a37ee0e05c6ba18789c2f";
+    hash = "sha256-zHLVDV7RsQMMgYP7ysWF83Q+7PoP4E+pOguzixWf9iA=";
  };

  installPhase = ''
@@ -13,26 +13,23 @@
  libgit2,
  withDefaultFeatures ? true,
  additionalFeatures ? (p: p),
-  testers,
-  nushell,
  nix-update-script,
  curlMinimal,
+  versionCheckHook,
+  writableTmpDirAsHomeHook,
 }:

-let
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "nushell";
  # NOTE: when updating this to a new non-patch version, please also try to
  # update the plugins. Plugins only work if they are compiled for the same
  # major/minor version.
  version = "0.110.0";
-in
-rustPlatform.buildRustPackage {
-  pname = "nushell";
-  inherit version;

  src = fetchFromGitHub {
    owner = "nushell";
    repo = "nushell";
-    tag = version;
+    tag = finalAttrs.version;
    hash = "sha256-iytTJZ70kg2Huwj/BSwDX4h9DVDTlJR2gEHAB2pGn/k=";
  };

@@ -61,37 +58,47 @@ rustPlatform.buildRustPackage {
    export NU_TEST_LOCALE_OVERRIDE="en_US.UTF-8"
  '';

-  checkPhase = ''
-    runHook preCheck
-    (
+  checkPhase =
+    let
      # The skipped tests all fail in the sandbox because in the nushell test playground,
      # the tmp $HOME is not set, so nu falls back to looking up the passwd dir of the build
      # user (/var/empty). The assertions however do respect the set $HOME.
-      set -x
-      HOME=$(mktemp -d) cargo test -j $NIX_BUILD_CORES --offline -- \
-        --test-threads=$NIX_BUILD_CORES \
-        --skip=repl::test_config_path::test_default_config_path \
-        --skip=repl::test_config_path::test_xdg_config_bad \
-        --skip=repl::test_config_path::test_xdg_config_empty ${lib.optionalString stdenv.hostPlatform.isDarwin ''
-          \
-                  --skip=plugins::config::some \
-                  --skip=plugins::stress_internals::test_exit_early_local_socket \
-                  --skip=plugins::stress_internals::test_failing_local_socket_fallback \
-                  --skip=plugins::stress_internals::test_local_socket
-        ''}
-    )
-    runHook postCheck
-  '';
+      skippedTests = [
+        "repl::test_config_path::test_default_config_path"
+        "repl::test_config_path::test_xdg_config_bad"
+        "repl::test_config_path::test_xdg_config_empty"
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [
+        "plugins::config::some"
+        "plugins::stress_internals::test_exit_early_local_socket"
+        "plugins::stress_internals::test_failing_local_socket_fallback"
+        "plugins::stress_internals::test_local_socket"

+        # Error:   × I/O error: Operation not permitted (os error 1)
+        "shell::environment::env::path_is_a_list_in_repl"
+      ];
+
+      skippedTestsStr = lib.concatStringsSep " " (lib.map (testId: "--skip=${testId}") skippedTests);
+    in
+    ''
+      runHook preCheck
+
+      cargo test -j $NIX_BUILD_CORES --offline -- \
+        --test-threads=$NIX_BUILD_CORES ${skippedTestsStr}
+
+      runHook postCheck
+    '';
+
+  nativeCheckInputs = [
+    versionCheckHook
+    writableTmpDirAsHomeHook
+  ];
  checkInputs =
    lib.optionals stdenv.hostPlatform.isDarwin [ curlMinimal ]
    ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl ];

  passthru = {
    shellPath = "/bin/nu";
-    tests.version = testers.testVersion {
-      package = nushell;
-    };
    updateScript = nix-update-script { };
  };

@@ -106,4 +113,4 @@ rustPlatform.buildRustPackage {
    ];
    mainProgram = "nu";
  };
-}
+})
@@ -15,14 +15,14 @@

 python3Packages.buildPythonApplication rec {
  pname = "nwg-displays";
-  version = "0.3.26";
+  version = "0.3.27";
  format = "setuptools";

  src = fetchFromGitHub {
    owner = "nwg-piotr";
    repo = "nwg-displays";
    tag = "v${version}";
-    hash = "sha256-UeALCkmDAXb/gu+Mp3xnHmUPOvYHk3LzegO2CbIh4ak=";
+    hash = "sha256-fAnLOgzNrM9eR1ErD1TWp7OrZDRX3fJcsxsujFL8WtQ=";
  };

  nativeBuildInputs = [
@@ -25,14 +25,14 @@ in

 py.pkgs.buildPythonApplication rec {
  pname = "oci-cli";
-  version = "3.72.1";
+  version = "3.73.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "oracle";
    repo = "oci-cli";
    tag = "v${version}";
-    hash = "sha256-OzHVViCEAQJN7lqw6JbTn1PMncrQBQz6T1m7yYEXEQc=";
+    hash = "sha256-kjqJldzPjuXYJoA1DU4Dn6Xd3BhLSlmn+OttTG1efSE=";
  };

  nativeBuildInputs = [ installShellFiles ];
@@ -12,26 +12,15 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "pam_p11";
-  version = "0.3.1";
+  version = "0.6.1";

  src = fetchFromGitHub {
    owner = "OpenSC";
    repo = "pam_p11";
    rev = "pam_p11-${finalAttrs.version}";
-    sha256 = "1caidy18rq5zk82d51x8vwidmkhwmanf3qm25x1yrdlbhxv6m7lk";
+    hash = "sha256-BYpZM+j0F5qtbkNdAk2qAczGTBlXe87FLBzKwp7fw7U=";
  };

-  patches = [
-    # fix with openssl 3.x
-    # https://github.com/OpenSC/pam_p11/pull/22
-    (fetchpatch {
-      name = "OpenSC-pam_p11-pull-22.patch";
-      url = "https://github.com/OpenSC/pam_p11/compare/cd4eba2e921e1c2f93cde71922a76af99376246c...debd4f7acfaf998cfe4002e0be5c35ad9a9591b5.patch";
-      excludes = [ ".github/build.sh" ];
-      hash = "sha256-bm/agnBgvrr8L8yoGK4gzBqOGgsNWf9NIgcNJG7proE=";
-    })
-  ];
-
  nativeBuildInputs = [
    autoreconfHook
    pkg-config
@@ -7,13 +7,13 @@

 buildGoModule rec {
  pname = "parlay";
-  version = "0.10.0";
+  version = "0.10.1";

  src = fetchFromGitHub {
    owner = "snyk";
    repo = "parlay";
    rev = "v${version}";
-    hash = "sha256-hyAvVd3P/ya7iSVsq3jbwe4qzJeWeA/hwAs2VTSIuAI=";
+    hash = "sha256-x/piB2rjluIcqlSn+nwWd4J2Nu6Z/RtL54SPq23pZV0=";
  };

  vendorHash = "sha256-X/cgNdsUG0Ics/DCk1HOdzez9Ewwm1odFL1EiyFv1Sw=";
@@ -12,14 +12,14 @@

 python3Packages.buildPythonApplication rec {
  pname = "pdfarranger";
-  version = "1.12.1";
+  version = "1.13.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "pdfarranger";
    repo = "pdfarranger";
    tag = version;
-    hash = "sha256-of1itPubf6LBJ4rSh1bca3yoNTiz5Qt9ar9XDe4nhxI=";
+    hash = "sha256-lZuzFGRk19opLJ2pnh8s/VwdzDLtGwTchFh0ZuLezU4=";
  };

  nativeBuildInputs = [ wrapGAppsHook3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext ];
@@ -8,18 +8,18 @@

 buildGoModule rec {
  pname = "pinniped";
-  version = "0.43.0";
+  version = "0.44.0";

  src = fetchFromGitHub {
    owner = "vmware-tanzu";
    repo = "pinniped";
    rev = "v${version}";
-    sha256 = "sha256-3MDYjoN9P48hOfg8UoRhR8EpjVFcJh8EbqcDfP9mqdY=";
+    sha256 = "sha256-eReGKJRfn2MPJQjSSYf32WeElNw52egJxJF4aCkdHlg=";
  };

  subPackages = "cmd/pinniped";

-  vendorHash = "sha256-08HMyQ5tAexVv67idM8hIzZlxDWjQRYKKasXxm5PjtE=";
+  vendorHash = "sha256-zRc5kNsduZqMvBexwKfXppXxADE0egFh6KQ0qqByKZc=";

  ldflags = [
    "-s"
@@ -10,14 +10,14 @@
 }:
 python3Packages.buildPythonApplication rec {
  pname = "pixelflasher";
-  version = "8.9.1.0";
+  version = "8.14.1.0";
  pyproject = false;

  src = fetchFromGitHub {
    owner = "badabing2005";
    repo = "PixelFlasher";
    tag = "v${version}";
-    hash = "sha256-/B0AZesAwB94y4o+5+f0L0vnbgVaUaCP4gEcDCViH/c=";
+    hash = "sha256-AQf7y+SRxbd16TX+bObrRr8ked5vUKy8B/V5O2IsY7w=";
  };

  desktopItems = [
@@ -9,6 +9,7 @@
  lib,
  libdrm,
  libedit,
+  libgbm,
  libpulseaudio,
  libva,
  libxkbcommon,
@@ -36,8 +37,8 @@
 }:
 let
  pname = "plex-desktop";
-  version = "1.109.0";
-  rev = "85";
+  version = "1.112.0";
+  rev = "87";
  meta = {
    homepage = "https://plex.tv/";
    description = "Streaming media player for Plex";
@@ -66,7 +67,7 @@ let

    src = fetchurl {
      url = "https://api.snapcraft.io/api/v1/snaps/download/qc6MFRM433ZhI1XjVzErdHivhSOhlpf0_${rev}.snap";
-      hash = "sha512-BSnA84purHv6qIVELp+AJI2m6erTngnupbuoCZTaje6LCd2+5+U+7gqWdahmO1mxJEGvuBwzetdDrp1Ibz5a6A==";
+      hash = "sha512-xDBnqPkYIpSsUe+X6oalecNz1bsX0O3pXUTI9GBZLAsT+4U4qdovn2ILPh4APJaqwNEswoIYepkjTSmm9pOI9A==";
    };

    nativeBuildInputs = [
@@ -79,6 +80,7 @@ let
      elfutils
      ffmpeg_6-headless
      libedit
+      libgbm
      libpulseaudio
      libva
      libxkbcommon
@@ -8,16 +8,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "precious";
-  version = "0.10.1";
+  version = "0.10.2";

  src = fetchFromGitHub {
    owner = "houseabsolute";
    repo = "precious";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-xM4NqcT1NGR3tkLOPt59lfFpjRnohU+tTTk9Ijkf97o=";
+    hash = "sha256-Yst+Z64WdgAfCbtt8R7ATzvUEY772ndtptyvFf/UkAk=";
  };

-  cargoHash = "sha256-tp0kvG5G7mW0czfZ43AbT7Lcv1sMnO5Zc+t2d5w4aqA=";
+  cargoHash = "sha256-DRR1EQIbJWDzBAZIXhUk0oQ24SvPwamWh5tsUkeBdqs=";

  nativeInstallCheckInputs = [ versionCheckHook ];
  doInstallCheck = true;
@@ -10,13 +10,13 @@ let
 in
 buildGoModule (finalAttrs: {
  pname = "process-compose";
-  version = "1.87.0";
+  version = "1.90.0";

  src = fetchFromGitHub {
    owner = "F1bonacc1";
    repo = "process-compose";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-uW4W6rK2ke1hvw1UgWgLZ+Vczoae1TOstGgbkhTPomo=";
+    hash = "sha256-P1SBKAS3nNgiUg2NEUPU6DOY3qpYkg2fSzHQSrAt7N4=";

    # populate values that require us to use git. By doing this in postFetch we
    # can delete .git afterwards and maintain better reproducibility of the src.
@@ -5,17 +5,17 @@
 }:

 let
-  version = "1.9.0";
+  version = "1.10.0";
  src = fetchFromGitHub {
    owner = "tynany";
    repo = "frr_exporter";
    rev = "v${version}";
-    hash = "sha256-oW+i1xSvBWXBMoml0/hk0rlaDEHazb8mcurgifpR5m4=";
+    hash = "sha256-Q8OrFmj54Tvn283ZbFc+R/g3cJw5ypAvV+Qbf/6BsmM=";
  };
 in
 buildGoModule {
  pname = "prometheus-frr-exporter";
-  vendorHash = "sha256-T7zurp9Eh1OFuCwyYm3F+cfLi4xdXZyhme9++jxsrzQ=";
+  vendorHash = "sha256-Z4miOR9gmZlYR/VAbMY6SLZJrzBEpuJbnrIJ3ObaZ/Y=";
  inherit src version;

  ldflags = [
@@ -11,16 +11,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "proto";
-  version = "0.54.2";
+  version = "0.55.0";

  src = fetchFromGitHub {
    owner = "moonrepo";
    repo = "proto";
    rev = "v${version}";
-    hash = "sha256-W20u0QmFp2s+P9gnunudLV8N1LyB+6UnIRBKDePXT8E=";
+    hash = "sha256-/8oSTdjFCTitU0u08hEN+sktsCcETgulTVVuIt4+ozs=";
  };

-  cargoHash = "sha256-cryJkz6K8RsDp3Mcc/2YmP9imxkBM30v7fvf61pL4uA=";
+  cargoHash = "sha256-aF3ccfp1jX8xN3FEi2znExxLh0x24u/024LHdRCPSWQ=";

  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
    libiconv
@@ -9,13 +9,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "qalculate-qt";
-  version = "5.9.0";
+  version = "5.9.0.1";

  src = fetchFromGitHub {
    owner = "qalculate";
    repo = "qalculate-qt";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-/8Ipz+K0IEuZwvjNlvI01kGqxHOAQ8Il+XW2QYXQH8A=";
+    hash = "sha256-Y/hAbdU/h5fRLmGESvgam2CeBInhD9ekZ1tiOFMbaZE=";
  };

  nativeBuildInputs = with qt6; [
@@ -17,7 +17,7 @@

 buildGoModule rec {
  pname = "rclone";
-  version = "1.72.1";
+  version = "1.73.0";

  outputs = [
    "out"
@@ -28,10 +28,10 @@ buildGoModule rec {
    owner = "rclone";
    repo = "rclone";
    tag = "v${version}";
-    hash = "sha256-CyMGcyFkYbKYvv2pc2M1K6ikAI0tPO/Tc1DEf0O/Fsw=";
+    hash = "sha256-g/ofD/KsUOXVTOveHKddPN9PP5bx7HWFPct1IhJDZYE=";
  };

-  vendorHash = "sha256-tNeL43WGWeX88vXJwQzxubUPIyejl3PPHXLc8oNeno4=";
+  vendorHash = "sha256-LomeLlk0d/HTL0NKmbd083u7BHsy4FmAah9IzvmtO2s=";

  subPackages = [ "." ];

@@ -8,14 +8,14 @@

 rustPlatform.buildRustPackage rec {
  pname = "reshape";
-  version = "0.7.0";
+  version = "0.8.0";

  src = fetchCrate {
    inherit pname version;
-    hash = "sha256-wv2gKyXCEH+tnZkUUAisMbuseth3dsFiJujH8VO1ii4=";
+    hash = "sha256-viS//3ZFqogI0BbZ0rypo5zpQUgqKiLgK585iw3BMgM=";
  };

-  cargoHash = "sha256-lK54SEayI015f2AQ6h4zadgkECLp4jCeJO7enBG0LeM=";
+  cargoHash = "sha256-NLVNOgwc3C1QgEfiNkxV+KslMQeYW4YPt5vFyS01/Kg=";

  nativeCheckInputs = [
    postgresqlTestHook
@@ -13,16 +13,16 @@

 buildGoModule rec {
  pname = "runme";
-  version = "3.16.4";
+  version = "3.16.5";

  src = fetchFromGitHub {
    owner = "runmedev";
    repo = "runme";
    rev = "v${version}";
-    hash = "sha256-2uJl7lfYS3b4SgiXLYmf6UcNnYDQMaVkfkhlLDqCukE=";
+    hash = "sha256-FtZSwD9kGFaE43iJcei2K4tzPzXku9R9OnEeub/jYlg=";
  };

-  vendorHash = "sha256-msRPjX3oYRLRwK4j7WDtERYh+6b67QQEw/EDS3+bY8k=";
+  vendorHash = "sha256-5x8KEd0foUZ68dS+SeXvaDzfwHVKuKTKCxlhXivTsB0=";

  nativeBuildInputs = [
    installShellFiles
@@ -1,22 +0,0 @@
-diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c
-index ed5096b32d..adb6a91c7e 100644
--- a/squashfs-tools/unsquashfs.c
-+++ b/squashfs-tools/unsquashfs.c
-@@ -146,7 +146,7 @@
- 
- #define MAX_LINE 16384
- 
-void sigwinch_handler()
-+void sigwinch_handler(int _signal)
- {
- 	struct winsize winsize;
- 
-@@ -160,7 +160,7 @@
- }
- 
- 
-void sigalrm_handler()
-+void sigalrm_handler(int _signal)
- {
- 	rotate = (rotate + 1) % 4;
- }
@@ -14,21 +14,16 @@
 let
  drv = stdenv.mkDerivation (finalAttrs: {
    pname = "sasquatch";
-    version = "4.5.1-5";
+    version = "4.5.1-6";

    src = fetchFromGitHub {
      owner = "onekey-sec";
      repo = "sasquatch";
      rev = "sasquatch-v${finalAttrs.version}";
-      hash = "sha256-4Mltt0yFt4oh9hsrHL8/ch5n7nZYiXIJ1UgLktPvlKQ=";
+      hash = "sha256-qwbrpm7df35fHLbCJvGkmYY7cb6twt9dGBK+yXlQviU=";
    };

-    patches = [
-      # Fix build for GCC 15/C23 by adding parameters to unsquashfs signal
-      # handlers instead of relying on an empty parameter list.
-      ./gcc15-fix-prototypes.patch
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch;
+    patches = lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch;

    strictDeps = true;
    nativeBuildInputs = [ which ];
@@ -6,11 +6,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "shaarli";
-  version = "0.16.0";
+  version = "0.16.1";

  src = fetchurl {
    url = "https://github.com/shaarli/Shaarli/releases/download/v${finalAttrs.version}/shaarli-v${finalAttrs.version}-full.tar.gz";
-    sha256 = "sha256-e/iZ+SPMt6HphEbLY2hM7pnvXHxsCOYZoXyGpA5FMtg=";
+    sha256 = "sha256-SK9J8w8cekxiWBhz/Zp5pOfHgndfEEN5/Kcf6lXJBmA=";
  };

  outputs = [
@@ -10,14 +10,14 @@

 python3Packages.buildPythonApplication rec {
  pname = "snakemake";
-  version = "9.16.0";
+  version = "9.16.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "snakemake";
    repo = "snakemake";
    tag = "v${version}";
-    hash = "sha256-Sj9YnPmj7Fn1+8sIO7IYnuj6vDwxUnn+JDg+DbbgbSI=";
+    hash = "sha256-8pxl1GE30kM3wbbsgDnH1TKfVjQ6ZpFJ3980L7/Balk=";
  };

  postPatch = ''
@@ -9,13 +9,13 @@

 buildGoModule rec {
  pname = "spacectl";
-  version = "1.18.0";
+  version = "1.18.1";

  src = fetchFromGitHub {
    owner = "spacelift-io";
    repo = "spacectl";
    rev = "v${version}";
-    hash = "sha256-DimKF1NNhScskVre70l2QKlJKLtAMuuyEpp5yyZzCk4=";
+    hash = "sha256-gVDeHA1u0crhnNYYlVz5OoAgoI2voFLj33DDg84rD54=";
  };

  vendorHash = "sha256-f/09XZiaYNUZzKM0jITFdUmKt8UQy90K4PGhC6ZupCk=";
@@ -8,16 +8,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "stu";
-  version = "0.7.5";
+  version = "0.7.6";

  src = fetchFromGitHub {
    owner = "lusingander";
    repo = "stu";
    rev = "v${version}";
-    hash = "sha256-zjfIBYFlEG6OQ+vWOJhVuek30uG1R28wJpUhRIMcYks=";
+    hash = "sha256-DLZQq/pLvRQizjTWbGHqDkOW1iKDICun54Ku1i+kOB0=";
  };

-  cargoHash = "sha256-CrliGsShW6wDkCpOVlK9m24BXr3lyxtU12GAdD/2dWE=";
+  cargoHash = "sha256-nbHSrILQT4541cPGUpqKmTLKnXnXYCAHBjkC4vIbT9g=";

  passthru.tests.version = testers.testVersion { package = stu; };

@@ -21,7 +21,7 @@ lib.throwIf (enableDragAndDrop && !hasDndSupport)
  python3Packages.buildPythonApplication
  (finalAttrs: {
    pname = "tuifimanager";
-    version = "5.1.5";
+    version = "5.2.5";

    pyproject = true;

@@ -29,7 +29,7 @@ lib.throwIf (enableDragAndDrop && !hasDndSupport)
      owner = "GiorgosXou";
      repo = "TUIFIManager";
      tag = "v.${finalAttrs.version}";
-      hash = "sha256-5ShrmjEFKGdmaGBFjMnIfcM6p8AZd13uIEFwDVAkU/8=";
+      hash = "sha256-in9gACM8AxodecQZX0QzY+hdADd7SIcDyXMfTt8LPJk=";
    };

    build-system = with python3Packages; [
@@ -7,16 +7,16 @@

 buildGoModule rec {
  pname = "unpoller";
-  version = "2.23.0";
+  version = "2.32.0";

  src = fetchFromGitHub {
    owner = "unpoller";
    repo = "unpoller";
    rev = "v${version}";
-    hash = "sha256-pbihZS+Jq+YLMFvYxK2usCrzYWTuMbAGOyDkkWPxT9Q=";
+    hash = "sha256-SEfTgLQoU8jtzFqQtj5vIei/sWHveNWvWnSfmVi7dKE=";
  };

-  vendorHash = "sha256-r/j66dXi2xsFmAHNieuUuRNX2bosVdnrjcXnmr8c/3M=";
+  vendorHash = "sha256-oOeCNizROwGS+OabpbSNq8dHOIA7U96a4lcF7ilkmb4=";

  ldflags = [
    "-w"
@@ -89,6 +89,14 @@ python3Packages.buildPythonApplication rec {
      --replace-fail "{VARIETY_PATH}" "variety"
  '';

+  postInstall = ''
+    mkdir -p $out/share/applications
+    intltool-merge --desktop-style po variety.desktop.in $out/share/applications/variety.desktop
+
+    mkdir -p $out/share/icons/hicolor/scalable/apps
+    cp variety/data/icons/scalable/apps/variety.svg $out/share/icons/hicolor/scalable/apps/variety.svg
+  '';
+
  pythonImportsCheck = [ "variety" ];

  meta = {
@@ -10,17 +10,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "veryl";
-  version = "0.17.2";
+  version = "0.18.0";

  src = fetchFromGitHub {
    owner = "veryl-lang";
    repo = "veryl";
    rev = "v${version}";
-    hash = "sha256-ydyW+H3j7DcLS0DcoKLbymY0fAhZhp6ZR3SX1LKGRU0=";
+    hash = "sha256-dqVEl/sClzhLiX5ung4au6dXUkeMbKPdoSDRV0evT3w=";
    fetchSubmodules = true;
  };

-  cargoHash = "sha256-E9oUWrTg+Gkf6OigWJjkljfD4SChtjLUQW1ku6yRdy4=";
+  cargoHash = "sha256-0RFzZwaF8hVVBBBC7l9Ql9mN99cxI2tiWlo7eNX/Tho=";

  nativeBuildInputs = [
    pkg-config
@@ -31,13 +31,13 @@ in

 stdenv.mkDerivation (finalAttrs: {
  pname = "wl-mirror";
-  version = "0.18.3";
+  version = "0.18.4";

  src = fetchFromGitHub {
    owner = "Ferdi265";
    repo = "wl-mirror";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-xj+CZPHeMAisOMB8mYSIc2jAa5iQD5pM+Stccq4gnak=";
+    hash = "sha256-vT4Z4iR3lIsK3gQyrbSGcK9PE/Uwa8cCFLuBI36xCTw=";
  };

  strictDeps = true;
@@ -1,52 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  rustPlatform,
-  pkg-config,
-  openssl,
-  curl,
-  libiconv,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "wrangler";
-  version = "1.21.0";
-
-  src = fetchFromGitHub {
-    owner = "cloudflare";
-    repo = "wrangler";
-    rev = "v${version}";
-    sha256 = "sha256-GfuU+g4tPU3TorzymEa9q8n4uKYsG0ZTz8rJirGOLfQ=";
-  };
-
-  cargoHash = "sha256-MJFXcmRzvzDJ8cd0WdcNiHr3Wxgp/hKO1xKRfmbxRLA=";
-
-  nativeBuildInputs = [ pkg-config ];
-
-  buildInputs = [
-    openssl
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    curl
-    libiconv
-  ];
-
-  env.OPENSSL_NO_VENDOR = 1;
-
-  # tries to use "/homeless-shelter" and fails
-  doCheck = false;
-
-  meta = {
-    description = "CLI tool designed for folks who are interested in using Cloudflare Workers";
-    mainProgram = "wrangler";
-    homepage = "https://github.com/cloudflare/wrangler";
-    knownVulnerabilities = [
-      "CVE-2026-0933: Malicious backdoor via a command injection allowing unauthorized remote code execution"
-    ];
-    license = with lib.licenses; [
-      asl20 # or
-      mit
-    ];
-  };
-}
@@ -14,7 +14,7 @@ let
      outputHash,
    }:
    stdenv.mkDerivation {
-      name = "tex-gyre-${variant}-${version}";
+      pname = "tex-gyre-${variant}";
      inherit version;

      src = fetchzip {
@@ -10,14 +10,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "coqpit-config";
-  version = "0.2.3";
+  version = "0.2.4";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "idiap";
    repo = "coqui-ai-coqpit";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-WXzKXFnSGgt3aHY5yqPgNKd3ukJD7wZVNGddj981cDY=";
+    hash = "sha256-lverGecVRwhpdtX5463O6+CMJGye8VXj3JJZ+VhKcn8=";
  };

  build-system = [ hatchling ];
@@ -8,14 +8,14 @@

 buildPythonPackage rec {
  pname = "dbt-protos";
-  version = "1.0.424";
+  version = "1.0.428";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "dbt-labs";
    repo = "proto-python-public";
    tag = "v${version}";
-    hash = "sha256-h9NxxMxUnV7P5sEwbwyDA13SEcpyC+gcUlxCjUCV2o4=";
+    hash = "sha256-cpfU/CfwqQwNysUX1rwOSi6G/rEeeNVeeeuLmksM+Iw=";
  };

  build-system = [
@@ -81,14 +81,14 @@ let
 in
 buildPythonPackage rec {
  pname = "gradio";
-  version = "6.4.0";
+  version = "6.5.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "gradio-app";
    repo = "gradio";
    tag = "gradio@${version}";
-    hash = "sha256-XHFhPoYSYmiEqTkknkqikfzdr3RRIagKWFlMgYWHYZ0=";
+    hash = "sha256-pIcliKcb1eVVMk0ARzWcZGXc6pmI8mGVAvCJZ0JHXUw=";
  };

  pnpmDeps = fetchPnpmDeps {
@@ -36,7 +36,7 @@ let
  inherit (torch) cudaCapabilities cudaPackages cudaSupport;
  inherit (cudaPackages) backendStdenv;
 in
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "mmcv";
  version = "2.2.0";
  pyproject = true;
@@ -44,7 +44,7 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "open-mmlab";
    repo = "mmcv";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
    hash = "sha256-NNF9sLJWV1q6uBE73LUW4UWwYm4TBMTBJjJkFArBmsc=";
  };

@@ -57,7 +57,7 @@ buildPythonPackage rec {
    ''
      substituteInPlace setup.py \
        --replace-fail "cpu_use = 4" "cpu_use = $NIX_BUILD_CORES" \
-        --replace-fail "return locals()['__version__']" "return '${version}'"
+        --replace-fail "return locals()['__version__']" "return '${finalAttrs.version}'"
    '';

  nativeBuildInputs = [
@@ -93,17 +93,16 @@ buildPythonPackage rec {
    # torch
  ];

-  env.CUDA_HOME = lib.optionalString cudaSupport (lib.getDev cudaPackages.cuda_nvcc);
-
-  preConfigure = ''
-    export MMCV_WITH_OPS=1
-  ''
-  + lib.optionalString cudaSupport ''
-    export CC=${lib.getExe' backendStdenv.cc "cc"}
-    export CXX=${lib.getExe' backendStdenv.cc "c++"}
-    export TORCH_CUDA_ARCH_LIST="${lib.concatStringsSep ";" cudaCapabilities}"
-    export FORCE_CUDA=1
-  '';
+  env = {
+    CUDA_HOME = lib.optionalString cudaSupport (lib.getDev cudaPackages.cuda_nvcc);
+    MMCV_WITH_OPS = 1;
+  }
+  // lib.optionalAttrs cudaSupport {
+    CC = lib.getExe' backendStdenv.cc "cc";
+    CXX = lib.getExe' backendStdenv.cc "c++";
+    TORCH_CUDA_ARCH_LIST = lib.concatStringsSep ";" cudaCapabilities;
+    FORCE_CUDA = 1;
+  };

  pythonImportsCheck = [ "mmcv" ];

@@ -141,13 +140,17 @@ buildPythonPackage rec {
    "test_ycbcr2rgb"
    "test_ycbcr2bgr"
    "test_tensor2imgs"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
+    # Fatal Python error: Segmentation fault
+    "test_transform"
  ];

  meta = {
    description = "Foundational Library for Computer Vision Research";
    homepage = "https://github.com/open-mmlab/mmcv";
-    changelog = "https://github.com/open-mmlab/mmcv/releases/tag/v${version}";
+    changelog = "https://github.com/open-mmlab/mmcv/releases/tag/${finalAttrs.src.tag}";
    license = with lib.licenses; [ asl20 ];
    maintainers = with lib.maintainers; [ rxiao ];
  };
-}
+})
@@ -10,14 +10,14 @@

 buildPythonPackage rec {
  pname = "plexapi";
-  version = "4.17.2";
+  version = "4.18.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "pkkid";
    repo = "python-plexapi";
    tag = version;
-    hash = "sha256-GLuTNfK8FmTx6PuvhBheYgK7ZurxvmaY1Sqxo0QKRXM=";
+    hash = "sha256-x9Vvs/t22sEGhjSLTwCjiWOscX64/EwcHDDvPSbnQQE=";
  };

  build-system = [ setuptools ];
@@ -23,7 +23,7 @@
 }:

 let
-  version = "2025.7";
+  version = "2025.7.post1";
 in
 buildPythonPackage {
  inherit version;
@@ -34,7 +34,7 @@ buildPythonPackage {
    owner = "cnr-isti-vclab";
    repo = "pymeshlab";
    tag = "v${version}";
-    hash = "sha256-LCR2/AyX9uVX4xhZareUL6YlpUsCFiGDMBB5nFp+H6k=";
+    hash = "sha256-TfnPdnq1rBx+spRw966jwyKxgXSlISLmacXQbvKU+OI=";
  };

  patches = [
@@ -11,19 +11,19 @@
 buildPythonPackage rec {
  pname = "pyoxigraph";
  pyproject = true;
-  version = "0.5.3";
+  version = "0.5.4";

  src = fetchFromGitHub {
    owner = "oxigraph";
    repo = "oxigraph";
    tag = "v${version}";
    fetchSubmodules = true;
-    hash = "sha256-hIB4/6D7AogEpNYyB95nDotspUyaiOW8X6KuVgyjj5Y=";
+    hash = "sha256-WAwgZNEaemf0QN1cG+6nhz4PlGFXkiBaqZb6VxH3gUw=";
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit pname version src;
-    hash = "sha256-EhJQgYeeSln1bLLH3nEUFJ7q+PWA/DHAswh4ei4bHWY=";
+    hash = "sha256-OeUXHTcHK7GHB+qV7fq5+0DbGR/PLx05Cp7aSyW0iFE=";
  };

  buildAndTestSubdir = "python";
@@ -27,7 +27,7 @@

 buildPythonPackage rec {
  pname = "pypdf";
-  version = "6.6.0";
+  version = "6.6.2";
  pyproject = true;

  src = fetchFromGitHub {
@@ -36,7 +36,7 @@ buildPythonPackage rec {
    tag = version;
    # fetch sample files used in tests
    fetchSubmodules = true;
-    hash = "sha256-C1ZFqqLFtxWOuLUT7KFSfWIE6a9xDPCFtOakzYP4NMY=";
+    hash = "sha256-5XgxfVtSh4Q8FksGp7dXk+RCGQi0oqg0jpdn9K/gFq8=";
  };

  outputs = [
@@ -8,14 +8,14 @@

 buildPythonPackage rec {
  pname = "python-iso639";
-  version = "2025.11.16";
+  version = "2026.1.31";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "jacksonllee";
    repo = "iso639";
    tag = "v${version}";
-    hash = "sha256-noNB0DimbdEpk/VGJw7/jsl/JLK0f9xh+b8KqwQ2gYo=";
+    hash = "sha256-mavTbjf57EYUMil3DBOmTZl8WwRW7sjxddb4WuK+YlI=";
  };

  build-system = [ setuptools ];
--- a/Show More
+++ b/Show More