Merge master into staging-next

2025-08-16 18:05:04 +00:00
parent 708e923a31 a05a770b95
commit 2bdc906674
78 changed files with 514 additions and 443 deletions
@@ -385,8 +385,9 @@ runTests {
    expected = 255;
  };

-  testFromHexStringSecondExample = {
-    expr = fromHexString (builtins.hashString "sha256" "test");
+  # Highest supported integer value in Nix.
+  testFromHexStringMaximum = {
+    expr = fromHexString "7fffffffffffffff";
    expected = 9223372036854775807;
  };

@@ -395,6 +396,30 @@ runTests {
    expected = 15;
  };

+  # FIXME: This might be bad and should potentially be deprecated.
+  testFromHexStringQuestionableMixedCase = {
+    expr = fromHexString "eEeEe";
+    expected = 978670;
+  };
+
+  # FIXME: This is probably bad and should potentially be deprecated.
+  testFromHexStringQuestionableUnderscore = {
+    expr = fromHexString "F_f";
+    expected = 255;
+  };
+
+  # FIXME: This is definitely bad and should be deprecated.
+  testFromHexStringBadComment = {
+    expr = fromHexString "0 # oops";
+    expected = 0;
+  };
+
+  # FIXME: Oh my god.
+  testFromHexStringAwfulInjection = {
+    expr = fromHexString "1\nwhoops = {}";
+    expected = 1;
+  };
+
  testToBaseDigits = {
    expr = toBaseDigits 2 6;
    expected = [
@@ -1114,7 +1114,7 @@ in
    fromHexString "FF"
    => 255

-    fromHexString (builtins.hashString "sha256" "test")
+    fromHexString "0x7fffffffffffffff"
    => 9223372036854775807
    ```
  */
@@ -22904,6 +22904,12 @@
    githubId = 17243347;
    name = "Sebastian Sellmeier";
  };
+  secona = {
+    email = "secona00+nixpkgs@gmail.com";
+    github = "secona";
+    githubId = 77039267;
+    name = "Vito Secona";
+  };
  sedlund = {
    email = "scott+nixpkgs@teraton.com";
    github = "sedlund";
@@ -161,6 +161,8 @@ let
  configFile =
    (if cfg.validateConfigFile then pkgs.writers.writeNginxConfig else pkgs.writeText) "nginx.conf"
      ''
+        ${cfg.prependConfig}
+
        pid /run/nginx/nginx.pid;
        error_log ${cfg.logError};
        daemon off;
@@ -831,6 +833,18 @@ in
        '';
      };

+      prependConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Configuration lines prepended to the generated Nginx
+          configuration file. Can for example be used to load modules.
+          {option}`prependConfig` can be specified more than once
+          and its value will be concatenated (contrary to {option}`config`
+          which can be set only once).
+        '';
+      };
+
      appendConfig = mkOption {
        type = types.lines;
        default = "";
@@ -32,12 +32,12 @@

 stdenv.mkDerivation rec {
  pname = "bitwig-studio-unwrapped";
-  version = "5.3.11";
+  version = "5.3.13";

  src = fetchurl {
    name = "bitwig-studio-${version}.deb";
    url = "https://www.bitwig.com/dl/Bitwig%20Studio/${version}/installer_linux/";
-    hash = "sha256-8u8ljljHKGV6m2421vxYSiDTb1iyNLgP3DlLIEKuzXo=";
+    hash = "sha256-tx+Dz9fTm4DIobwLa055ZOCMG+tU7vQl11NFnEKMAno=";
  };

  nativeBuildInputs = [
@@ -10,11 +10,11 @@
 buildMozillaMach rec {
  pname = "firefox-beta";
  binaryName = pname;
-  version = "142.0b8";
+  version = "142.0b9";
  applicationName = "Firefox Beta";
  src = fetchurl {
    url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "048325c583dc3c6716be3fcb9d793448ab6e2b18b7b5f7d6aafa76cbc9e790489f7cd59644ded4b7e7929e19021e04b21e5d11c298057bb60fe018a791494ce8";
+    sha512 = "5a350ce0907977aa5d803801f6d00a4b91f2f2f29994a5951c48ee39f7b3b87843e992950890e59fb7a897e0912461d5661361c89e0deb59da226d1aac7d95ef";
  };

  meta = {
@@ -10,13 +10,13 @@
 buildMozillaMach rec {
  pname = "firefox-devedition";
  binaryName = pname;
-  version = "142.0b8";
+  version = "142.0b9";
  applicationName = "Firefox Developer Edition";
  requireSigning = false;
  branding = "browser/branding/aurora";
  src = fetchurl {
    url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "a5a89cdbfe3e05e6d329011476d571625094546e0eb2bea4f4ce426fd8d6ce23ce51ce19fd0a4d44ea7cb134d3f6c1510dcc1403d6aab5981862845a250c9dae";
+    sha512 = "1223065e5c614be9b72f3306daebc98e032d993797bab4d8e646523dfcd9aa554f442b302a32e6281ebb41fcbed49f63097a58fef2a612ae8ff0371f670bad3c";
  };

  # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but
@@ -6,27 +6,31 @@

 python3Packages.buildPythonApplication rec {
  pname = "bmaptool";
-  version = "3.8.0";
-  format = "setuptools";
+  version = "3.9.0";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "yoctoproject";
    repo = "bmaptool";
    rev = "v${version}";
-    hash = "sha256-YPY3sNuZ/TASNBPH94iqG6AuBRq5KjioKiuxAcu94+I=";
+    hash = "sha256-9KSBv420HJvK5fUg7paFJqA2MCw36BfaeAG4NME/co8=";
  };

-  propagatedBuildInputs = with python3Packages; [ six ];
+  build-system = [
+    python3Packages.hatchling
+  ];
+
+  dependencies = with python3Packages; [ six ];

  # tests fail only on hydra.
  doCheck = false;

-  meta = with lib; {
+  meta = {
    description = "BMAP Tools";
    homepage = "https://github.com/yoctoproject/bmaptool";
-    license = licenses.gpl2Only;
-    maintainers = [ maintainers.dezgeg ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ dezgeg ];
+    platforms = lib.platforms.linux;
    mainProgram = "bmaptool";
  };
 }
@@ -16,7 +16,7 @@ items:
      description: "<html>Every part of GNOME has been designed to make it simple and easy to use. It provides a focused working environment that helps you get things done. GNOME is a popular choice and well tested on NixOS.<br/>
                    <br/>
                    Learn more at <a href=\"https://www.gnome.org/\">gnome.org</a></html>"
-      screenshot: "images/gnome.png"
+      screenshot: "images/gnome.jpg"

    - id: plasma6
      packages: [ plasma6 ]
@@ -24,7 +24,7 @@ items:
      description: "<html>Plasma is made to stay out of the way as it helps you get things done. But under its light and intuitive surface, it's a highly customizable. So you're free to choose ways of usage right as you need them and when you need them. Plasma is a popular choice and well tested on NixOS.<br/>
                    <br/>
                    Learn more at <a href=\"https://kde.org/plasma-desktop/\">kde.org/plasma-desktop</a></html>"
-      screenshot: "images/plasma6.png"
+      screenshot: "images/plasma6.jpg"

    - id: xfce
      packages: [ xfce ]
@@ -32,7 +32,7 @@ items:
      description: "<html>Xfce is a lightweight desktop environment. It aims to be fast and low on system resources, while still being visually appealing and user friendly.<br/>
                    <br/>
                    Learn more at <a href=\"https://www.xfce.org/\">xfce.org</a></html>"
-      screenshot: "images/xfce.png"
+      screenshot: "images/xfce.jpg"

    - id: pantheon
      packages: [ pantheon ]
@@ -40,7 +40,7 @@ items:
      description: "<html>Pantheon is the default desktop of Elementary OS. It provides a productive and intuitive user experience while also being visually appealing.<br/>
                    <br/>
                    Learn more at <a href=\"https://elementary.io/docs/learning-the-basics\">elementary.io/docs/learning-the-basics</a></html>"
-      screenshot: "images/pantheon.png"
+      screenshot: "images/pantheon.jpg"

    - id: cinnamon
      packages: [ cinnamon ]
@@ -48,7 +48,7 @@ items:
      description: "<html>Cinnamon is a desktop which provides advanced innovative features and a traditional user experience. The emphasis is put on making users feel at home and providing them with an easy to use and comfortable desktop experience.<br/>
                    <br/>
                    Learn more at <a href=\"https://projects.linuxmint.com/cinnamon/\">projects.linuxmint.com/cinnamon</a></html>"
-      screenshot: "images/cinnamon.png"
+      screenshot: "images/cinnamon.jpg"

    - id: mate
      packages: [ mate ]
@@ -56,7 +56,7 @@ items:
      description: "<html>The MATE Desktop Environment is the continuation of GNOME 2. It provides an intuitive and attractive desktop environment.<br/>
                    <br/>
                    Learn more at <a href=\"https://mate-desktop.org/\">mate-desktop.org</a></html>"
-      screenshot: "images/mate.png"
+      screenshot: "images/mate.jpg"

    - id: enlightenment
      packages: [ enlightenment ]
@@ -64,7 +64,7 @@ items:
      description: "<html>Enlightenment is a Window Manager, Compositor and Minimal Desktop. Enlightenment is classed as a desktop shell as it provides everything you need to operate your desktop or laptop, but it is not a full application suite.<br/>
                    <br/>
                    Learn more at <a href=\"https://www.enlightenment.org/\">enlightenment.org</a></html>"
-      screenshot: "images/enlightenment.png"
+      screenshot: "images/enlightenment.jpg"

    - id: lxqt
      packages: [ lxqt ]
@@ -72,7 +72,7 @@ items:
      description: "<html>LXQt is a lightweight Qt desktop environment. It will not get in your way. It will not hang or slow down your system. It is focused on being a classic desktop with a modern look and feel.<br/>
                    <br/>
                    Learn more at <a href=\"https://lxqt-project.org/\">lxqt-project.org</a></html>"
-      screenshot: "images/lxqt.png"
+      screenshot: "images/lxqt.jpg"

    # Lumina is not yet stable enough, once it is, simply uncommenting the lines below is all that's needed to enable it as an option
    #- id: lumina
@@ -80,7 +80,7 @@ items:
    #  name: Lumina
    #  description: "<html>Lumina is designed to have a small footprint, giving your system the best performance possible. It is built to flow seamlessly between computer tasks and offers several integrated utilities in one convenient package.<br/>
    #                - Learn more at <a href=\"https://lumina-desktop.org/\">lumina-desktop.org</a></html>"
-    #  screenshot: "images/lumina.png"
+    #  screenshot: "images/lumina.jpg"

    - id: budgie
      packages: [ budgie ]
@@ -88,7 +88,7 @@ items:
      description: "<html>The Budgie Desktop is a feature-rich, modern desktop designed to keep out the way of the user.<br/>
                    <br/>
                    Learn more at <a href=\"https://docs.buddiesofbudgie.org/\">buddiesofbudgie.org</a></html>"
-      screenshot: "images/budgie.png"
+      screenshot: "images/budgie.jpg"

    - id: deepin
      packages: [ deepin ]
@@ -96,10 +96,10 @@ items:
      description: "<html>The Deepin Desktop Environment is an elegant, easy to use and reliable desktop environment.<br/>
                    <br/>
                    Learn more at <a href=\"https://www.deepin.org/\">deepin.org</a></html>"
-      screenshot: "images/deepin.png"
+      screenshot: "images/deepin.jpg"

    - id: ""
      packages: []
      name: "No desktop"
-      screenshot: "images/nodesktop.png"
+      screenshot: "images/nodesktop.jpg"
      description: "A minimal system without a graphical user interface will be installed. This is great for servers or custom setups with window managers. The configuration can be changed after installation."
@@ -0,0 +1,44 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  stdenvNoCC,
+  pkg-config,
+  openssl,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "cargo-plumbing";
+  version = "0.0.3";
+
+  src = fetchFromGitHub {
+    owner = "crate-ci";
+    repo = "cargo-plumbing";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-x8xH7XH91FtOn5knVL7mkcDTGvXtVVL70HIi8V9z54o=";
+  };
+
+  cargoHash = "sha256-16rY8uk9ViEaYIqiZHHU1UApAdNXAETqgFzUWNto6po=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ openssl ];
+
+  passthru.updateScript = nix-update-script { };
+
+  doCheck = !stdenvNoCC.hostPlatform.isDarwin;
+
+  meta = {
+    description = "Proposed plumbing commands for cargo";
+    homepage = "https://github.com/crate-ci/cargo-plumbing";
+    changelog = "https://github.com/crate-ci/cargo-plumbing/blob/v${finalAttrs.version}/CHANGELOG.md";
+    license = with lib.licenses; [
+      asl20 # or
+      mit
+    ];
+    maintainers = with lib.maintainers; [
+      secona
+    ];
+  };
+})
@@ -10,10 +10,10 @@

 let
  pname = "chatzone-desktop";
-  version = "5.3.2";
+  version = "5.4.1";
  src = fetchurl {
-    url = "https://cdn1.ozone.ru/s3/chatzone-clients/ci/5.3.2/787/chatzone-desktop-linux-5.3.2.AppImage";
-    hash = "sha256-+GzrLNFhdzB+mOmSOiZP+W9sCSF2Mfdxu6Xkgmz1Fuo=";
+    url = "https://cdn1.ozone.ru/s3/chatzone-clients/ci/5.4.1/872/chatzone-desktop-linux-5.4.1.AppImage";
+    hash = "sha256-ONr8rIP7oXtafACkW4fDHfYew83F4R8un+hGdVI75iA=";
  };
  appimageContents = appimageTools.extract { inherit pname version src; };
 in
@@ -14,18 +14,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "codex";
-  version = "0.21.0";
+  version = "0.22.0";

  src = fetchFromGitHub {
    owner = "openai";
    repo = "codex";
    tag = "rust-v${finalAttrs.version}";
-    hash = "sha256-9hwDAkrMW0llcYJdkrUCSdh3guRcUCmx8MDkHLyY6v0=";
+    hash = "sha256-JTwtydW8LLBH/55+8a/BbqlZtkXsFKbT8dGoDEAjk1c=";
  };

  sourceRoot = "${finalAttrs.src.name}/codex-rs";

-  cargoHash = "sha256-ykG3howLyA4kA7cjP8Gx+usRcgQoVHW0ECQzTUigG8A=";
+  cargoHash = "sha256-3PljlyPfDsnjGmR/0iM7Fu1TnyDj31pKVcOU/izsL30=";

  nativeBuildInputs = [
    installShellFiles
@@ -50,27 +50,27 @@ rustPlatform.buildRustPackage (finalAttrs: {
  checkFlags = [
    # Wants to access /bin/zsh
    "--skip=shell::tests::test_run_with_profile_escaping_and_execution"
+    # Wants to access unix sockets
+    "--skip=allow_unix_socketpair_recvfrom"
    # Fails with 'stream ended unexpectedly: InternalAgentDied'
    "--skip=includes_base_instructions_override_in_request"
-    # Fails with 'stream ended unexpectedly: InternalAgentDied'
    "--skip=includes_user_instructions_message_in_request"
-    # Fails with 'stream ended unexpectedly: InternalAgentDied'
    "--skip=originator_config_override_is_used"
-    # Fails with 'called `Result::unwrap()` on an `Err` value: NotPresent'
-    "--skip=azure_overrides_assign_properties_used_for_responses_url"
-    # Fails with 'stream ended unexpectedly: InternalAgentDied'
    "--skip=prefixes_context_and_instructions_once_and_consistently_across_requests"
    # Fails with 'called `Result::unwrap()` on an `Err` value: NotPresent'
+    "--skip=azure_overrides_assign_properties_used_for_responses_url"
    "--skip=env_var_overrides_loaded_auth"
    # Version 0.0.0 hardcoded
    "--skip=test_conversation_create_and_send_message_ok"
-    # Version 0.0.0 hardcoded
    "--skip=test_send_message_session_not_found"
-    # Version 0.0.0 hardcoded
    "--skip=test_send_message_success"
    # Assertion fails
    "--skip=diff_render::tests::ui_snapshot_add_details"
    "--skip=diff_render::tests::ui_snapshot_update_details_with_rename"
+    # Attempted to creat a NULL object
+    "--skip=test_apply_patch_tool"
+    # Needs access to python3. However, adding python3 to nativeCHeckInputs doesn't resolve the issue
+    "--skip=python_multiprocessing_lock_works_under_sandbox"
  ];

  postInstall = lib.optionalString installShellCompletions ''
@@ -1,12 +1,12 @@
 {
  lib,
  stdenv,
-  buildGo124Module,
+  buildGo125Module,
  fetchFromGitHub,
  fetchNpmDeps,
  cacert,
  git,
-  go_1_24,
+  go_1_25,
  gokrazy,
  enumer,
  mockgen,
@@ -17,13 +17,13 @@
 }:

 let
-  version = "0.207.2";
+  version = "0.207.3";

  src = fetchFromGitHub {
    owner = "evcc-io";
    repo = "evcc";
    tag = version;
-    hash = "sha256-bBW2HU2TijUC6pn3gH23JTTGy5BWSm+V6BBsiYqi6U0=";
+    hash = "sha256-BXfYtz8aZt8NmBAe5/oViDG7k0y4dc08C9frV4NkVgw=";
  };

  vendorHash = "sha256-VITdJ23xrO346EOlNe5uoOKcsQ76x+Yb7Vhl0/H+WTI=";
@@ -33,7 +33,7 @@ let
    maintainers = with maintainers; [ hexa ];
  };

-  decorate = buildGo124Module {
+  decorate = buildGo125Module {
    pname = "evcc-decorate";
    inherit version src vendorHash;

@@ -46,7 +46,7 @@ let
  };
 in

-buildGo124Module rec {
+buildGo125Module rec {
  pname = "evcc";
  inherit version src vendorHash;

@@ -64,7 +64,7 @@ buildGo124Module rec {
    nativeBuildInputs = [
      decorate
      enumer
-      go_1_24
+      go_1_25
      gokrazy
      git
      cacert
@@ -29,13 +29,13 @@ let
 in
 buildDotnetModule (finalAttrs: {
  pname = "famistudio";
-  version = "4.4.1";
+  version = "4.4.2";

  src = fetchFromGitHub {
    owner = "BleuBleu";
    repo = "FamiStudio";
    tag = finalAttrs.version;
-    hash = "sha256-2QDolO0eF5nYmxS376nG41LOJVB0LQOrcC7FeVQknfE=";
+    hash = "sha256-A4tC1khtCLTfacdEq5z8ulRzhoItNgBe438TAaPdyLA=";
  };

  postPatch =
@@ -59,13 +59,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "fastfetch";
-  version = "2.49.0";
+  version = "2.50.2";

  src = fetchFromGitHub {
    owner = "fastfetch-cli";
    repo = "fastfetch";
    tag = finalAttrs.version;
-    hash = "sha256-M1/VThHWRB6MbmPpHcgaM3j07kmuj0RnjblKo54RatY=";
+    hash = "sha256-dY8JAv5UnsJLPbhb/1JxvDxdHT0gusqkvOlOxsDS6p4=";
  };

  outputs = [
@@ -270,6 +270,7 @@ stdenv.mkDerivation (finalAttrs: {
    maintainers = with lib.maintainers; [
      luftmensch-luftmensch
      khaneliman
+      defelo
    ];
    platforms = lib.platforms.all;
    mainProgram = "fastfetch";
@@ -8,11 +8,11 @@

 let
  pname = "fiddler-everywhere";
-  version = "7.1.0";
+  version = "7.2.0";

  src = fetchurl {
    url = "https://downloads.getfiddler.com/linux/fiddler-everywhere-${version}.AppImage";
-    hash = "sha256-rgo2WGIk8s+xjh4oJ/YXw/SGc4sKnfIvZoFWAklT70Y=";
+    hash = "sha256-Sv8xlyAas3NCRY5ZL1fOXuAG8PjP3ovm7Q7wWRq1jmU=";
  };

  appimageContents = appimageTools.extract {
@@ -8,7 +8,7 @@

 let
  pname = "gallery-dl";
-  version = "1.30.2";
+  version = "1.30.3";
 in
 python3Packages.buildPythonApplication {
  inherit pname version;
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication {
    owner = "mikf";
    repo = "gallery-dl";
    tag = "v${version}";
-    hash = "sha256-/z4ozgukl54/GdZbf3aF+JxPsp5Fh/2/JzsYHdDcT5c=";
+    hash = "sha256-zkyPn18ER6Xlyo4ITC8TDk9vVHubbyfJHKxQF4JodHY=";
  };

  build-system = [ python3Packages.setuptools ];
@@ -57,6 +57,7 @@ python3Packages.buildPythonApplication {
    mainProgram = "gallery-dl";
    maintainers = with lib.maintainers; [
      dawidsowa
+      donteatoreo
      lucasew
    ];
  };
@@ -1,25 +1,25 @@
 {
  "name": "GridTracker2",
-  "version": "2.250507.0",
+  "version": "2.250809.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "GridTracker2",
-      "version": "2.250507.0",
+      "version": "2.250809.0",
      "hasInstallScript": true,
      "dependencies": {
        "@electron-toolkit/preload": "3.0.1",
        "@electron-toolkit/utils": "3.0.0",
        "@electron/remote": "2.1.2",
        "electron-log": "5.2.0",
-        "electron-updater": "6.6.3",
+        "electron-updater": "6.6.5",
        "mqtt": "5.10.1"
      },
      "devDependencies": {
        "@electron-toolkit/eslint-config": "1.0.2",
        "@electron-toolkit/eslint-config-prettier": "2.0.0",
-        "electron": "35.2.2",
+        "electron": "35.7.0",
        "electron-builder": "26.0.12",
        "eslint": "8.57.0",
        "eslint_d": "14.0.4",
@@ -27,9 +27,9 @@
      }
    },
    "node_modules/@babel/runtime": {
-      "version": "7.27.4",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.4.tgz",
-      "integrity": "sha512-t3yaEOuGu9NlIZ+hIeGbBjFtZT7j2cb2tg0fuaJKeGotchRjjLfrBA9Kwf8quhpP1EUuxModQg04q/mBwyg8uA==",
+      "version": "7.28.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.2.tgz",
+      "integrity": "sha512-KHp2IflsnGywDjBWDkR9iEqiWSpc8GIi0lgTT3mOElT0PP1tG26P4tmFI2YvAdzgq9RGyoHZQEIEdZy6Ec5xCA==",
      "license": "MIT",
      "engines": {
        "node": ">=6.9.0"
@@ -114,17 +114,6 @@
        "node": ">=10.12.0"
      }
    },
-    "node_modules/@electron/asar/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
    "node_modules/@electron/asar/node_modules/minimatch": {
      "version": "3.1.2",
      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -238,6 +227,16 @@
        "node": ">=12.13.0"
      }
    },
+    "node_modules/@electron/node-gyp/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
    "node_modules/@electron/node-gyp/node_modules/glob": {
      "version": "8.1.0",
      "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
@@ -520,10 +519,20 @@
        "node": ">=16.4"
      }
    },
+    "node_modules/@electron/universal/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
    "node_modules/@electron/universal/node_modules/fs-extra": {
-      "version": "11.3.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz",
-      "integrity": "sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==",
+      "version": "11.3.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.1.tgz",
+      "integrity": "sha512-eXvGGwZ5CL17ZSwHWd3bbgk7UUpF6IFHtP57NYYakPvHOs8GDgDe5KJI36jIJzDkJ6eJjuzRA8eBQb6SkKue0g==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -597,9 +606,9 @@
      }
    },
    "node_modules/@electron/windows-sign/node_modules/fs-extra": {
-      "version": "11.3.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz",
-      "integrity": "sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==",
+      "version": "11.3.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.1.tgz",
+      "integrity": "sha512-eXvGGwZ5CL17ZSwHWd3bbgk7UUpF6IFHtP57NYYakPvHOs8GDgDe5KJI36jIJzDkJ6eJjuzRA8eBQb6SkKue0g==",
      "dev": true,
      "license": "MIT",
      "optional": true,
@@ -670,9 +679,9 @@
      }
    },
    "node_modules/@eslint/config-array": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz",
-      "integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==",
+      "version": "0.21.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz",
+      "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==",
      "dev": true,
      "license": "Apache-2.0",
      "dependencies": {
@@ -684,17 +693,6 @@
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
      }
    },
-    "node_modules/@eslint/config-array/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
    "node_modules/@eslint/config-array/node_modules/minimatch": {
      "version": "3.1.2",
      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -709,9 +707,9 @@
      }
    },
    "node_modules/@eslint/config-helpers": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.2.tgz",
-      "integrity": "sha512-+GPzk8PlG0sPpzdU5ZvIRMPidzAnZDl/s9L+y13iodqvb8leL53bTannOrQ/Im7UkpsmFU5Ily5U60LWixnmLg==",
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.1.tgz",
+      "integrity": "sha512-xR93k9WhrDYpXHORXpxVL5oHj3Era7wo6k/Wd8/IsQNnZUTzkGS29lyn3nAT05v6ltUuTFVCCYDEGfy2Or/sPA==",
      "dev": true,
      "license": "Apache-2.0",
      "engines": {
@@ -719,9 +717,9 @@
      }
    },
    "node_modules/@eslint/core": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.14.0.tgz",
-      "integrity": "sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==",
+      "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.2.tgz",
+      "integrity": "sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg==",
      "dev": true,
      "license": "Apache-2.0",
      "dependencies": {
@@ -755,17 +753,6 @@
        "url": "https://opencollective.com/eslint"
      }
    },
-    "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
    "node_modules/@eslint/eslintrc/node_modules/minimatch": {
      "version": "3.1.2",
      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -800,13 +787,13 @@
      }
    },
    "node_modules/@eslint/plugin-kit": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.1.tgz",
-      "integrity": "sha512-0J+zgWxHN+xXONWIyPWKFMgVuJoZuGiIFu8yxk7RJjxkzpGmyja5wRFqZIVtjDVOQpV+Rw0iOAjYPE2eQyjr0w==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.5.tgz",
+      "integrity": "sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w==",
      "dev": true,
      "license": "Apache-2.0",
      "dependencies": {
-        "@eslint/core": "^0.14.0",
+        "@eslint/core": "^0.15.2",
        "levn": "^0.4.1"
      },
      "engines": {
@@ -874,17 +861,6 @@
        "node": ">=10.10.0"
      }
    },
-    "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
    "node_modules/@humanwhocodes/config-array/node_modules/minimatch": {
      "version": "3.1.2",
      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -934,6 +910,29 @@
        "url": "https://github.com/sponsors/nzakas"
      }
    },
+    "node_modules/@isaacs/balanced-match": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz",
+      "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/@isaacs/brace-expansion": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
+      "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@isaacs/balanced-match": "^4.0.1"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
    "node_modules/@isaacs/cliui": {
      "version": "8.0.2",
      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
@@ -1207,9 +1206,9 @@
      }
    },
    "node_modules/@pkgr/core": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.5.tgz",
-      "integrity": "sha512-YRx7tFgLkrpFkDAzVSV5sUJydmf2ZDrW+O3IbQ1JyeMW7B0FiWroFJTnR4/fD9CsusnAn4qRUcbb5jFnZSd6uw==",
+      "version": "0.2.9",
+      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.9.tgz",
+      "integrity": "sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -1276,9 +1275,9 @@
      }
    },
    "node_modules/@types/estree": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
-      "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
      "dev": true,
      "license": "MIT"
    },
@@ -1322,9 +1321,9 @@
      "license": "MIT"
    },
    "node_modules/@types/node": {
-      "version": "22.15.29",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.29.tgz",
-      "integrity": "sha512-LNdjOkUDlU1RZb8e1kOIUpN1qQUlzGkEtbVNo53vbrwDg5om6oduhm4SiUaPW5ASTXhAiP0jInWG8Qx9fVlOeQ==",
+      "version": "22.17.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.17.1.tgz",
+      "integrity": "sha512-y3tBaz+rjspDTylNjAX37jEC3TETEFGNJL6uQDxwF9/8GLLIjW1rvVHlynyuUKMnMr1Roq8jOv3vkopBjC4/VA==",
      "license": "MIT",
      "dependencies": {
        "undici-types": "~6.21.0"
@@ -1343,9 +1342,9 @@
      }
    },
    "node_modules/@types/readable-stream": {
-      "version": "4.0.20",
-      "resolved": "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-4.0.20.tgz",
-      "integrity": "sha512-eLgbR5KwUh8+6pngBDxS32MymdCsCHnGtwHTrC0GDorbc7NbcnkZAWptDLgZiRk9VRas+B6TyRgPDucq4zRs8g==",
+      "version": "4.0.21",
+      "resolved": "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-4.0.21.tgz",
+      "integrity": "sha512-19eKVv9tugr03IgfXlA9UVUVRbW6IuqRO5B92Dl4a6pT7K8uaGrNS0GkxiZD0BOk6PLuXl5FhWl//eX/pzYdTQ==",
      "license": "MIT",
      "dependencies": {
        "@types/node": "*"
@@ -1431,9 +1430,9 @@
      }
    },
    "node_modules/acorn": {
-      "version": "8.14.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
-      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+      "version": "8.15.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
      "dev": true,
      "license": "MIT",
      "bin": {
@@ -1454,9 +1453,9 @@
      }
    },
    "node_modules/agent-base": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
-      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
+      "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -1740,9 +1739,9 @@
      "license": "MIT"
    },
    "node_modules/bl": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-6.1.0.tgz",
-      "integrity": "sha512-ClDyJGQkc8ZtzdAAbAwBmhMSpwN/sC9HA8jxdYm6nVUbCfZbe2mgza4qh7AuEYyEPB/c4Kznf9s66bnsKMQDjw==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-6.1.1.tgz",
+      "integrity": "sha512-yYc8UIHrd1ZTLgNBIE7JjMzUPZH+dec3q7nWkrSHEbtvkQ3h6WKC63W9K5jthcL5EXFyMuWYq+2pq5WMSIgFHw==",
      "license": "MIT",
      "dependencies": {
        "@types/readable-stream": "^4.0.0",
@@ -1784,13 +1783,14 @@
      "optional": true
    },
    "node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "balanced-match": "^1.0.0"
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
      }
    },
    "node_modules/buffer": {
@@ -1941,6 +1941,16 @@
        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
      }
    },
+    "node_modules/cacache/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
    "node_modules/cacache/node_modules/glob": {
      "version": "8.1.0",
      "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
@@ -2283,6 +2293,16 @@
        "typescript": "^5.4.3"
      }
    },
+    "node_modules/config-file-ts/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
    "node_modules/config-file-ts/node_modules/glob": {
      "version": "10.4.5",
      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
@@ -2520,17 +2540,6 @@
        "p-limit": "^3.1.0 "
      }
    },
-    "node_modules/dir-compare/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
    "node_modules/dir-compare/node_modules/minimatch": {
      "version": "3.1.2",
      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -2641,9 +2650,9 @@
      }
    },
    "node_modules/dotenv": {
-      "version": "16.5.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.5.0.tgz",
-      "integrity": "sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==",
+      "version": "16.6.1",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz",
+      "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==",
      "dev": true,
      "license": "BSD-2-Clause",
      "engines": {
@@ -2708,9 +2717,9 @@
      }
    },
    "node_modules/electron": {
-      "version": "35.2.2",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-35.2.2.tgz",
-      "integrity": "sha512-jZnCOtIgrt28esWP5z/PKndj/vPQ/Zt+cvNRlb/qOGnK/AjW1mASwPMtQ099NlSodf69RR3JrhnZCYbTWeDR4g==",
+      "version": "35.7.0",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-35.7.0.tgz",
+      "integrity": "sha512-ZnbVqFK40pr83Jzw6IQ9pQT+obCG0DepSMKtOEe8WP2TgZbjvCOO4GzrR+a7Ze62JMRmtNOHsS4hFss6qjtSrQ==",
      "hasInstallScript": true,
      "license": "MIT",
      "dependencies": {
@@ -2867,9 +2876,9 @@
      }
    },
    "node_modules/electron-updater": {
-      "version": "6.6.3",
-      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.6.3.tgz",
-      "integrity": "sha512-i448/SwMtqxy5wqAcXScnWjiFxZp+hmWA2jZCmojcdfodEGhi/DWTdRP01mE3lCILb8hmdE28SBaHf1oQW3+kw==",
+      "version": "6.6.5",
+      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.6.5.tgz",
+      "integrity": "sha512-jnk38WfByl2Pb0cje02xls/pJkvkq3AQZI7usDCLriU23adkerLTkRrugbCPuUxUOa79nY1g/rokHPWHZFBKyA==",
      "license": "MIT",
      "dependencies": {
        "builder-util-runtime": "9.3.2",
@@ -2999,9 +3008,9 @@
      }
    },
    "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
+      "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==",
      "license": "MIT",
      "dependencies": {
        "once": "^1.4.0"
@@ -3201,9 +3210,9 @@
      }
    },
    "node_modules/eslint_d/node_modules/@eslint/js": {
-      "version": "9.28.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.28.0.tgz",
-      "integrity": "sha512-fnqSjGWd/CoIp4EXIxWVK/sHA6DOHN4+8Ix2cX5ycOY7LG0UY8nHCU5pIp2eaE1Mc7Qd8kHspYNzYXT2ojPLzg==",
+      "version": "9.33.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.33.0.tgz",
+      "integrity": "sha512-5K1/mKhWaMfreBGJTwval43JJmkip0RmM+3+IuqupeSKNC/Th2Kc7ucaq5ovTSra/OOKB9c58CGSz3QMVbWt0A==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -3213,32 +3222,21 @@
        "url": "https://eslint.org/donate"
      }
    },
-    "node_modules/eslint_d/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
    "node_modules/eslint_d/node_modules/eslint": {
-      "version": "9.28.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.28.0.tgz",
-      "integrity": "sha512-ocgh41VhRlf9+fVpe7QKzwLj9c92fDiqOj8Y3Sd4/ZmVA4Btx4PlUYPq4pp9JDyupkf1upbEXecxL2mwNV7jPQ==",
+      "version": "9.33.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.33.0.tgz",
+      "integrity": "sha512-TS9bTNIryDzStCpJN93aC5VRSW3uTx9sClUn4B87pwiCaJh220otoI0X8mJKr+VcPtniMdN8GKjlwgWGUv5ZKA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.2.0",
        "@eslint-community/regexpp": "^4.12.1",
-        "@eslint/config-array": "^0.20.0",
-        "@eslint/config-helpers": "^0.2.1",
-        "@eslint/core": "^0.14.0",
+        "@eslint/config-array": "^0.21.0",
+        "@eslint/config-helpers": "^0.3.1",
+        "@eslint/core": "^0.15.2",
        "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.28.0",
-        "@eslint/plugin-kit": "^0.3.1",
+        "@eslint/js": "9.33.0",
+        "@eslint/plugin-kit": "^0.3.5",
        "@humanfs/node": "^0.16.6",
        "@humanwhocodes/module-importer": "^1.0.1",
        "@humanwhocodes/retry": "^0.4.2",
@@ -3249,9 +3247,9 @@
        "cross-spawn": "^7.0.6",
        "debug": "^4.3.2",
        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^8.3.0",
-        "eslint-visitor-keys": "^4.2.0",
-        "espree": "^10.3.0",
+        "eslint-scope": "^8.4.0",
+        "eslint-visitor-keys": "^4.2.1",
+        "espree": "^10.4.0",
        "esquery": "^1.5.0",
        "esutils": "^2.0.2",
        "fast-deep-equal": "^3.1.3",
@@ -3286,9 +3284,9 @@
      }
    },
    "node_modules/eslint_d/node_modules/eslint-scope": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz",
-      "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz",
+      "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==",
      "dev": true,
      "license": "BSD-2-Clause",
      "dependencies": {
@@ -3303,9 +3301,9 @@
      }
    },
    "node_modules/eslint_d/node_modules/eslint-visitor-keys": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
      "dev": true,
      "license": "Apache-2.0",
      "engines": {
@@ -3316,15 +3314,15 @@
      }
    },
    "node_modules/eslint_d/node_modules/espree": {
-      "version": "10.3.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
-      "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
+      "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==",
      "dev": true,
      "license": "BSD-2-Clause",
      "dependencies": {
-        "acorn": "^8.14.0",
+        "acorn": "^8.15.0",
        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^4.2.0"
+        "eslint-visitor-keys": "^4.2.1"
      },
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3400,9 +3398,9 @@
      }
    },
    "node_modules/eslint-config-prettier": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz",
-      "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==",
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.2.tgz",
+      "integrity": "sha512-iI1f+D2ViGn+uvv5HuHVUamg8ll4tN+JRHGc6IJi4TP9Kl976C57fzPXgseXNs8v0iA8aSJpHsTWjDb9QJamGQ==",
      "dev": true,
      "license": "MIT",
      "bin": {
@@ -3413,9 +3411,9 @@
      }
    },
    "node_modules/eslint-plugin-prettier": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.4.1.tgz",
-      "integrity": "sha512-9dF+KuU/Ilkq27A8idRP7N2DH8iUR6qXcjF3FR2wETY21PZdBrIjwCau8oboyGj9b7etWmTGEeM8e7oOed6ZWg==",
+      "version": "5.5.4",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.4.tgz",
+      "integrity": "sha512-swNtI95SToIz05YINMA6Ox5R057IMAmWZ26GqPxusAp1TZzj+IdY9tXNWWD3vkF/wEqydCONcwjTFpxybBqZsg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -3473,17 +3471,6 @@
        "url": "https://opencollective.com/eslint"
      }
    },
-    "node_modules/eslint/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
    "node_modules/eslint/node_modules/minimatch": {
      "version": "3.1.2",
      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -3700,6 +3687,16 @@
        "minimatch": "^5.0.1"
      }
    },
+    "node_modules/filelist/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
    "node_modules/filelist/node_modules/minimatch": {
      "version": "5.1.6",
      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
@@ -3783,15 +3780,16 @@
      }
    },
    "node_modules/form-data": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
-      "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
+      "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "asynckit": "^0.4.0",
        "combined-stream": "^1.0.8",
        "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
        "mime-types": "^2.1.12"
      },
      "engines": {
@@ -3941,17 +3939,6 @@
        "node": ">=10.13.0"
      }
    },
-    "node_modules/glob/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
    "node_modules/glob/node_modules/minimatch": {
      "version": "3.1.2",
      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -4481,16 +4468,15 @@
      }
    },
    "node_modules/jake": {
-      "version": "10.9.2",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
-      "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
+      "version": "10.9.4",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.4.tgz",
+      "integrity": "sha512-wpHYzhxiVQL+IV05BLE2Xn34zW1S223hvjtqk0+gsPrwd/8JNLXJgZZM/iPFsYc1xyphF+6M6EvdE5E9MBGkDA==",
      "dev": true,
      "license": "Apache-2.0",
      "dependencies": {
-        "async": "^3.2.3",
-        "chalk": "^4.0.2",
+        "async": "^3.2.6",
        "filelist": "^1.0.4",
-        "minimatch": "^3.1.2"
+        "picocolors": "^1.1.1"
      },
      "bin": {
        "jake": "bin/cli.js"
@@ -4499,30 +4485,6 @@
        "node": ">=10"
      }
    },
-    "node_modules/jake/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/jake/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
    "node_modules/js-sdsl": {
      "version": "4.3.0",
      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz",
@@ -4871,13 +4833,13 @@
      }
    },
    "node_modules/minimatch": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz",
-      "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==",
+      "version": "10.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.3.tgz",
+      "integrity": "sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==",
      "dev": true,
      "license": "ISC",
      "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "@isaacs/brace-expansion": "^5.0.0"
      },
      "engines": {
        "node": "20 || >=22"
@@ -5438,6 +5400,13 @@
      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
      "license": "MIT"
    },
+    "node_modules/picocolors": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true,
+      "license": "ISC"
+    },
    "node_modules/plist": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz",
@@ -5578,9 +5547,9 @@
      }
    },
    "node_modules/pump": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
-      "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.3.tgz",
+      "integrity": "sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==",
      "license": "MIT",
      "dependencies": {
        "end-of-stream": "^1.1.0",
@@ -6017,9 +5986,9 @@
      }
    },
    "node_modules/socks": {
-      "version": "2.8.4",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.4.tgz",
-      "integrity": "sha512-D3YaD0aRxR3mEcqnidIs7ReYJFVzWdd6fXJYUM8ixcQcJRGTka/b3saV0KflYhyVJXKhb947GndU35SxYNResQ==",
+      "version": "2.8.6",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.6.tgz",
+      "integrity": "sha512-pe4Y2yzru68lXCb38aAqRf5gvN8YdjP1lok5o0J7BOHljkyCGKVz7H3vpVIXKD27rj2giOJ7DwVyk/GWrPHDWA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -6225,13 +6194,13 @@
      }
    },
    "node_modules/synckit": {
-      "version": "0.11.8",
-      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.8.tgz",
-      "integrity": "sha512-+XZ+r1XGIJGeQk3VvXhT6xx/VpbHsRzsTkGgF6E5RX9TTXD0118l87puaEBZ566FhqblC6U0d4XnubznJDm30A==",
+      "version": "0.11.11",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.11.tgz",
+      "integrity": "sha512-MeQTA1r0litLUf0Rp/iisCaL8761lKAZHaimlbGK4j0HysC4PLfqygQj9srcs0m2RdtDYnF8UuYyKpbjHYp7Jw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@pkgr/core": "^0.2.4"
+        "@pkgr/core": "^0.2.9"
      },
      "engines": {
        "node": "^14.18.0 || >=16.0.0"
@@ -6395,9 +6364,9 @@
      "license": "MIT"
    },
    "node_modules/tmp": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
-      "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.5.tgz",
+      "integrity": "sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -6463,9 +6432,9 @@
      "license": "MIT"
    },
    "node_modules/typescript": {
-      "version": "5.8.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
-      "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
+      "version": "5.9.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz",
+      "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==",
      "dev": true,
      "license": "Apache-2.0",
      "bin": {
@@ -6670,9 +6639,9 @@
      "license": "ISC"
    },
    "node_modules/ws": {
-      "version": "8.18.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.2.tgz",
-      "integrity": "sha512-DMricUmwGZUVr++AEAe2uiVM7UoO9MAVZMDu05UQOaUII0lp+zOzLLU4Xqh/JvTqklB1T4uELaaPBKyjE1r4fQ==",
+      "version": "8.18.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
+      "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
      "license": "MIT",
      "engines": {
        "node": ">=10.0.0"
@@ -18,7 +18,7 @@
  xorg,
 }:
 let
-  version = "2.250507.0";
+  version = "2.250809.0";
  electron = electron_35;
 in
 buildNpmPackage (finalAttrs: {
@@ -29,10 +29,10 @@ buildNpmPackage (finalAttrs: {
    owner = "gridtracker.org";
    repo = "gridtracker2";
    tag = "v${version}";
-    hash = "sha256-8JFEVGy3Wz94FUK8V+JF+HHKBngT3VvwDBh+O2Bin6E=";
+    hash = "sha256-JvV0APwbANjPX/IN3ZV8ccsKBLixntQ2ZAzjWtN7/L4=";
  };

-  npmDepsHash = "sha256-ioocL1/k3aDmgVwxS09PFbMmteNrGncQz2yz7HUPX90=";
+  npmDepsHash = "sha256-on3v+kBOUEVsEX/HwJhtzPn8AlXNa+EcbolMl0F7ZXI=";

  nativeBuildInputs = [
    makeBinaryWrapper
@@ -7,13 +7,13 @@
 }:
 stdenv.mkDerivation rec {
  pname = "grml-zsh-config";
-  version = "0.19.23";
+  version = "0.19.24";

  src = fetchFromGitHub {
    owner = "grml";
    repo = "grml-etc-core";
    rev = "v${version}";
-    sha256 = "sha256-kaVDX+f2WeRjrpyW5pKkamNIKemdUq+1AU+8W+0vAx8=";
+    sha256 = "sha256-DUkj/5LD85h3J+PIVAfsGY0fkktAgWn93Y3hnRrn/wk=";
  };

  strictDeps = true;
@@ -1,7 +1,7 @@
 import ./generic.nix {
-  hash = "sha256-zwefzCmj4K1GJRbherOS28swLoGbHnUxbF9bmLOh738=";
-  version = "6.0.4";
-  vendorHash = "sha256-4of741V2ztxkyI2r5UVEL5ON/9kaDTygosLxyTw6ShQ=";
+  hash = "sha256-B29HLuw48j7/Er7p/sHen7ohbbACsAjzPr9Nn8eZNR0=";
+  version = "6.0.5";
+  vendorHash = "sha256-KOJqPvp+w7G505ZMJ1weRD2SATmfq1aeyCqmbJ6WMAY=";
  patches = [
    # qemu 9.1 compat, remove when added to LTS
    ./572afb06f66f83ca95efa1b9386fceeaa1c9e11b.patch
@@ -2,7 +2,7 @@
  lib,
  buildGoModule,
  fetchFromGitHub,
-  gitUpdater,
+  nix-update-script,
  installShellFiles,
  stdenv,
  testers,
@@ -11,16 +11,16 @@

 buildGoModule rec {
  pname = "kopia";
-  version = "0.20.1";
+  version = "0.21.1";

  src = fetchFromGitHub {
    owner = "kopia";
    repo = "kopia";
    tag = "v${version}";
-    hash = "sha256-hKtrHv7MQjA/AQ/frjP2tPT6zqVPPGnBxYuhWtUgIl0=";
+    hash = "sha256-0i8bKah3a7MrgzATysgFCsmDZxK9qH+4hmBMW+GR9/4=";
  };

-  vendorHash = "sha256-npNSNlS8gvbxtB4KeaiSsCUzxwJ0kwvnzDda/CZRVmM=";
+  vendorHash = "sha256-x5WIwYvQtbR72jqdD+O4Wg+4/qs24aqNeBuron/0ztk=";

  subPackages = [ "." ];

@@ -38,7 +38,7 @@ buildGoModule rec {
  '';

  passthru = {
-    updateScript = gitUpdater { rev-prefix = "v"; };
+    updateScript = nix-update-script { };
    tests = {
      kopia-version = testers.testVersion {
        package = kopia;
@@ -46,11 +46,16 @@ buildGoModule rec {
    };
  };

-  meta = with lib; {
+  meta = {
    homepage = "https://kopia.io";
+    changelog = "https://github.com/kopia/kopia/releases/tag/v${version}";
    description = "Cross-platform backup tool with fast, incremental backups, client-side end-to-end encryption, compression and data deduplication";
    mainProgram = "kopia";
-    license = licenses.asl20;
-    maintainers = [ maintainers.bbigras ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      bbigras
+      blenderfreaky
+      nadir-ishiguro
+    ];
  };
 }
@@ -34,11 +34,11 @@

 stdenv.mkDerivation rec {
  pname = "lighttpd";
-  version = "1.4.79";
+  version = "1.4.80";

  src = fetchurl {
    url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz";
-    sha256 = "sha256-OymmJbOtiHAtH+pPX0K7fYdIjy5O/Jd9fxhTKcpghL0=";
+    sha256 = "sha256-zF8Pceiy7mutVF0ekd/D+VRxbJF057NSwhR63UTyW/M=";
  };

  separateDebugInfo = true;
@@ -42,20 +42,19 @@ in
 # as bootloader for various platforms and corresponding binary and helper files.
 stdenv.mkDerivation (finalAttrs: {
  pname = "limine";
-  version = "9.5.4";
+  version = "9.6.1";

  # We don't use the Git source but the release tarball, as the source has a
  # `./bootstrap` script performing network access to download resources.
  # Packaging that in Nix is very cumbersome.
  src = fetchurl {
    url = "https://github.com/limine-bootloader/limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
-    hash = "sha256-X0dStbsBJyFDUG25G4PUZInp+yVG3+p3bfhwQL280ig=";
+    hash = "sha256-/GAeZx2ShtC+VoqNO/SB8H4kLLgdLAc/RAGVxF6Imbc=";
  };

  enableParallelBuilding = true;

  nativeBuildInputs = [
-    llvmPackages.clang-unwrapped
    llvmPackages.libllvm
    llvmPackages.lld
  ]
@@ -79,13 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
    ++ lib.optionals pxeSupport' [ "--enable-bios-pxe" ]
    ++ lib.concatMap uefiFlags (
      if targets == [ ] then [ stdenv.hostPlatform.parsed.cpu.name ] else targets
-    )
-    ++ [
-      "TOOLCHAIN_FOR_TARGET=llvm"
-      # `clang` on `PATH` has to be unwrapped, but *a* wrapped clang
-      # still needs to be available
-      "CC=${lib.getExe stdenv.cc}"
-    ];
+    );

  passthru.tests = nixosTests.limine;

@@ -6,7 +6,7 @@
  lib,
  libgit2,
  libgpg-error,
-  luajit,
+  lua5_4,
  makeWrapper,
  nix,
  openssl,
@@ -17,18 +17,18 @@
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "lux-cli";

-  version = "0.13.3";
+  version = "0.15.1";

  src = fetchFromGitHub {
    owner = "nvim-neorocks";
    repo = "lux";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-RmdxqpmqOs/1a9KmakWAHJUkiQ6I2t4VROiSocRnx84=";
+    hash = "sha256-1u0zDGUytuMhqe7NOJeXd1DKch8P7FT02MYgMkX3eMc=";
  };

  buildAndTestSubdir = "lux-cli";

-  cargoHash = "sha256-vin86rAmUbHJJuhChZi3ndj57wTCv945sVF6+by6Dlc=";
+  cargoHash = "sha256-C84VZfpMua1RrFhTFhWfY2xZAPDtNllkAbdHljlYdZs=";

  nativeInstallCheckInputs = [
    versionCheckHook
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    gpgme
    libgit2
    libgpg-error
-    luajit
+    lua5_4
    openssl
  ];

@@ -61,7 +61,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
  cargoTestFlags = "--lib"; # Disable impure integration tests

  nativeCheckInputs = [
-    luajit
+    lua5_4
    nix
  ];

@@ -17,19 +17,18 @@
  pkg-config,
  systemd,

-  fetchpatch,
  nix-update-script,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "lxc";
-  version = "6.0.4";
+  version = "6.0.5";

  src = fetchFromGitHub {
    owner = "lxc";
    repo = "lxc";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-zmL568PprrpIWTVCkScXHEzTZ+NduSH4r8ETnz4NY64=";
+    hash = "sha256-bnvKSs7w1cq3vP2BzX4kfDrGUIFhU4Fnu5pM81jPVQ8=";
  };

  nativeBuildInputs = [
@@ -58,13 +57,6 @@ stdenv.mkDerivation (finalAttrs: {
    # Fix hardcoded path of lxc-user-nic
    # This is needed to use unprivileged containers
    ./user-nic.diff
-
-    # Fixes https://github.com/zabbly/incus/issues/81
-    (fetchpatch {
-      name = "4536.patch";
-      url = "https://patch-diff.githubusercontent.com/raw/lxc/lxc/pull/4536.patch";
-      hash = "sha256-yEqK9deO2MhfPROPfBw44Z752Mc5bR8DBKl1KrGC+5c=";
-    })
  ];

  mesonFlags = [
@@ -17,13 +17,13 @@

 stdenv.mkDerivation rec {
  pname = "lxcfs";
-  version = "6.0.4";
+  version = "6.0.5";

  src = fetchFromGitHub {
    owner = "lxc";
    repo = "lxcfs";
    tag = "v${version}";
-    hash = "sha256-jmadClC/3nHfNL+F/gC5NM6u03OE9flEVtPU28nylw4=";
+    hash = "sha256-mRTM06QyWcB4XOi0w2qvyDABGuu1SPJX0gjlBktDOac=";
  };

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

 buildGoModule (finalAttrs: {
  pname = "mirrorbits";
-  version = "0.6";
+  version = "0.6.1";

  src = fetchFromGitHub {
    owner = "etix";
    repo = "mirrorbits";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-99eOfVSlGIEzNm+0gI/y0+UPd+dnZiGzaHlkqUNtO1U=";
+    hash = "sha256-PqPE/PgIyQylbYoABC/saxLF83XjgRAS0QimragJ8P8=";
  };

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

 stdenv.mkDerivation (finalAttrs: {
  pname = "ncdu";
-  version = "2.8.2";
+  version = "2.9";

  src = fetchurl {
    url = "https://dev.yorhel.nl/download/ncdu-${finalAttrs.version}.tar.gz";
-    hash = "sha256-Ai+nZdNaeXl6zcgMgxcH30PJo7pg0a4+bqTMG3osAT0=";
+    hash = "sha256-dfCsO85PwBLoGYtyUY21F56QMHmFjvzgi5EtXcxwlNM=";
  };

  nativeBuildInputs = [
@@ -12,9 +12,14 @@
  libX11,
  libXcursor,
  libXxf86vm,
-  netbird-ui,
  versionCheckHook,
+  netbird-management,
+  netbird-relay,
+  netbird-signal,
+  netbird-ui,
+  netbird-upload,
  componentName ? "client",
+  needsUpdateScript ? componentName == "client",
 }:
 let
  /*
@@ -59,7 +64,6 @@ let
      license = lib.licenses.agpl3Only;
    };
  };
-  isUI = componentName == "ui";
  component = availableComponents.${componentName};
 in
 buildGoModule (finalAttrs: {
@@ -75,9 +79,9 @@ buildGoModule (finalAttrs: {

  vendorHash = "sha256-uVVm+iDGP2eZ5GVXWJrWZQ7LpHdZccRIiHPIFs6oAPo=";

-  nativeBuildInputs = [ installShellFiles ] ++ lib.optional isUI pkg-config;
+  nativeBuildInputs = [ installShellFiles ] ++ lib.optional (componentName == "ui") pkg-config;

-  buildInputs = lib.optionals (stdenv.hostPlatform.isLinux && isUI) [
+  buildInputs = lib.optionals (stdenv.hostPlatform.isLinux && componentName == "ui") [
    gtk3
    libayatana-appindicator
    libX11
@@ -122,7 +126,7 @@ buildGoModule (finalAttrs: {
            --zsh <($out/bin/${component.binaryName} completion zsh)
        ''
    # assemble & adjust netbird.desktop files for the GUI
-    + lib.optionalString (stdenv.hostPlatform.isLinux && isUI) ''
+    + lib.optionalString (stdenv.hostPlatform.isLinux && componentName == "ui") ''
      install -Dm644 "$src/client/ui/assets/netbird-systemtray-connected.png" "$out/share/pixmaps/netbird.png"
      install -Dm644 "$src/client/ui/build/netbird.desktop" "$out/share/applications/netbird.desktop"

@@ -130,18 +134,26 @@ buildGoModule (finalAttrs: {
        --replace-fail "Exec=/usr/bin/netbird-ui" "Exec=$out/bin/${component.binaryName}"
    '';

-  nativeInstallCheckInputs = [
+  nativeInstallCheckInputs = lib.lists.optionals (component ? versionCheckProgramArg) [
    versionCheckHook
  ];
  versionCheckProgram = "${placeholder "out"}/bin/${component.binaryName}";
  versionCheckProgramArg = component.versionCheckProgramArg or "version";
-  doInstallCheck = component ? versionCheckProgramArg;

  passthru = {
-    tests = {
+    tests = lib.attrsets.optionalAttrs (componentName == "client") {
      nixos = nixosTests.netbird;
-      withUI = netbird-ui;
+      inherit
+        # make sure child packages are built by `ofborg`
+        netbird-management
+        netbird-relay
+        netbird-signal
+        netbird-ui
+        netbird-upload
+        ;
    };
+  }
+  // lib.attrsets.optionalAttrs needsUpdateScript {
    updateScript = nix-update-script { };
  };

@@ -10,16 +10,16 @@

 php.buildComposerProject2 (finalAttrs: {
  pname = "phpunit";
-  version = "12.3.0";
+  version = "12.3.5";

  src = fetchFromGitHub {
    owner = "sebastianbergmann";
    repo = "phpunit";
    tag = finalAttrs.version;
-    hash = "sha256-t1BABpCkWqnjIE25HNzh/oWE5uYRUtm824t3dPtWq8w=";
+    hash = "sha256-dWTV7TgVSRuqbKIlW7U4NeKL/7DnHplyQkTeVU+ECos=";
  };

-  vendorHash = "sha256-nXVaLzbUDqrmWW+uvuHkUBBC0Spp8UxX40ifTbUq8MA=";
+  vendorHash = "sha256-b5fj5HmaqG6WM7b/nvT1xig3RReL9XSYAiCoE9LiyAc=";

  passthru = {
    updateScript = nix-update-script { };
@@ -8,6 +8,7 @@
  nix-update-script,
  pkg-config,
  qt6,
+  wrapGAppsHook4,
  testers,
  util-linux,
  xz,
@@ -46,6 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
    cmake
    pkg-config
    qt6.wrapQtAppsHook
+    wrapGAppsHook4
    util-linux
  ];

@@ -80,6 +82,10 @@ stdenv.mkDerivation (finalAttrs: {
    "--unset QT_QPA_PLATFORMTHEME"
    "--unset QT_STYLE_OVERRIDE"
  ];
+  dontWrapGApps = true;
+  preFixup = ''
+    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';

  passthru = {
    tests.version = testers.testVersion {
@@ -15,14 +15,14 @@

 python3Packages.buildPythonApplication rec {
  pname = "sshuttle";
-  version = "1.3.1";
+  version = "1.3.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "sshuttle";
    repo = "sshuttle";
    tag = "v${version}";
-    hash = "sha256-/ThWsPtFuUo41+Xw23UigZup1fq6/SAzDpxIaT0Vhvg=";
+    hash = "sha256-Rvhh99DO/4J1p0JZJauOnvQZKtZBvxu+7hNnNgsXn2w=";
  };

  build-system = [ python3Packages.hatchling ];
@@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "trufflehog";
-  version = "3.90.4";
+  version = "3.90.5";

  src = fetchFromGitHub {
    owner = "trufflesecurity";
    repo = "trufflehog";
    tag = "v${version}";
-    hash = "sha256-RdCmHPSxkxofCc6rxBoRtUpAxfbNeThfcM3O4P411EU=";
+    hash = "sha256-F45ORd/r7LlBsfA/QMtsHMOZKYhJULqZ4edwUoNt6Co=";
  };

-  vendorHash = "sha256-MwiFnX00bL1zWRorgWoE5xFtQkwheEufIpp7rDh/4lg=";
+  vendorHash = "sha256-Kgobfg0TA2ocZhT/LfuGpMRTdFc9hOJM6uRf99cYkKA=";

  nativeBuildInputs = [ makeWrapper ];

@@ -8,38 +8,38 @@
  "fetchurlAttrSet": {
    "docker-credential-up": {
      "aarch64-darwin": {
-        "hash": "sha256-ifzc5of2hpZGjbwwkf4iSCgOv5cMoXMxOIZjqfxIwIA=",
-        "url": "https://cli.upbound.io/stable/v0.39.1/bundle/docker-credential-up/darwin_arm64.tar.gz"
+        "hash": "sha256-IDF8VsXux30yPRf6tn0ZVzUjYWOH8M9RxkuCJeiQI9s=",
+        "url": "https://cli.upbound.io/stable/v0.40.1/bundle/docker-credential-up/darwin_arm64.tar.gz"
      },
      "aarch64-linux": {
-        "hash": "sha256-Qmtrk4DIMsUiIy2L6oWRC11Xvr6TlXuqOxpkh36LXoY=",
-        "url": "https://cli.upbound.io/stable/v0.39.1/bundle/docker-credential-up/linux_arm64.tar.gz"
+        "hash": "sha256-25NSIXdbXa6RYiAgfRo9GIAP79uvbKMopQsO+nFcDLQ=",
+        "url": "https://cli.upbound.io/stable/v0.40.1/bundle/docker-credential-up/linux_arm64.tar.gz"
      },
      "x86_64-darwin": {
-        "hash": "sha256-rgTp3NPi4aeiRdIbIeXAYkb3HqD3lEkDX8ZhcFlTEZ0=",
-        "url": "https://cli.upbound.io/stable/v0.39.1/bundle/docker-credential-up/darwin_amd64.tar.gz"
+        "hash": "sha256-z469M2QsNPXhES06tPJUrHVvgp2UomBLBeWKMujX+AI=",
+        "url": "https://cli.upbound.io/stable/v0.40.1/bundle/docker-credential-up/darwin_amd64.tar.gz"
      },
      "x86_64-linux": {
-        "hash": "sha256-mD/TfgFKbBC2OcZF5OZ3ve8l9kHNROnb1jq5XUmvZ7w=",
-        "url": "https://cli.upbound.io/stable/v0.39.1/bundle/docker-credential-up/linux_amd64.tar.gz"
+        "hash": "sha256-EAHYUYUWwXOWIuZCQnvp1quu3c2CsaO9nWcqBpNGMi0=",
+        "url": "https://cli.upbound.io/stable/v0.40.1/bundle/docker-credential-up/linux_amd64.tar.gz"
      }
    },
    "up": {
      "aarch64-darwin": {
-        "hash": "sha256-jlcAEKJBU8W8SujMTq4+Y3WMDm7FT2GYZQ4725yZQN0=",
-        "url": "https://cli.upbound.io/stable/v0.39.1/bundle/up/darwin_arm64.tar.gz"
+        "hash": "sha256-euLretQd2QML9t9F/vEhopJRA0gWgfuIPA7vdAFQsOE=",
+        "url": "https://cli.upbound.io/stable/v0.40.1/bundle/up/darwin_arm64.tar.gz"
      },
      "aarch64-linux": {
-        "hash": "sha256-mJoURxoG5PUi7Jntt6Htyut2aB1FOq9vNYxvrBNQEYk=",
-        "url": "https://cli.upbound.io/stable/v0.39.1/bundle/up/linux_arm64.tar.gz"
+        "hash": "sha256-Td0OBK37mRBUgXBAV+ayBfMDn+/ycLS5WTaW42SMzOc=",
+        "url": "https://cli.upbound.io/stable/v0.40.1/bundle/up/linux_arm64.tar.gz"
      },
      "x86_64-darwin": {
-        "hash": "sha256-l1APkZL0yYJPcfJ6qzOn/5U/mohfPDXlQ+S+ApSKPJU=",
-        "url": "https://cli.upbound.io/stable/v0.39.1/bundle/up/darwin_amd64.tar.gz"
+        "hash": "sha256-l5ApNOnc+j9z/ghW+reo+S60UHBaJdJGhS46tu59ZLM=",
+        "url": "https://cli.upbound.io/stable/v0.40.1/bundle/up/darwin_amd64.tar.gz"
      },
      "x86_64-linux": {
-        "hash": "sha256-4upXd7g5XDwtMwSbsuZSwOVNkHXjNiB4P9TNXGTqcJc=",
-        "url": "https://cli.upbound.io/stable/v0.39.1/bundle/up/linux_amd64.tar.gz"
+        "hash": "sha256-XXuotsGjY6nKDXbobBOa0Yaw4qRSX3hF89DZ/m8wfmg=",
+        "url": "https://cli.upbound.io/stable/v0.40.1/bundle/up/linux_amd64.tar.gz"
      }
    }
  },
@@ -49,5 +49,5 @@
    "x86_64-darwin",
    "x86_64-linux"
  ],
-  "version": "0.39.1"
+  "version": "0.40.1"
 }
@@ -2,26 +2,34 @@
  lib,
  rustPlatform,
  fetchFromGitHub,
-  makeWrapper,
+  makeBinaryWrapper,
  wofi,
  versionCheckHook,
  nix-update-script,
+  yq,
 }:

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "wofi-power-menu";
-  version = "0.3.0";
+  version = "0.3.1";

  src = fetchFromGitHub {
    owner = "szaffarano";
    repo = "wofi-power-menu";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-/MoMgOrpM0KHIyxqOJmC5N5NddOVVfTs5fDt1/yiBtQ=";
+    hash = "sha256-3m4zTmjYn1WGdW5dY4tzYxOxdw0spwYxZFRhdBwWf2I=";
  };

-  cargoHash = "sha256-PWPMBYmB1lyCJFhodNSCicYJy29vEUx6k9ScQTPbZdg=";
+  postPatch = ''
+    tomlq -ti '.package.version = "0.3.1"' Cargo.toml
+  '';

-  nativeBuildInputs = [ makeWrapper ];
+  cargoHash = "sha256-5txhSjCXlGqTmeG9EO1AUbt4syrTD62g4LtfO6nhAes=";
+
+  nativeBuildInputs = [
+    makeBinaryWrapper
+    yq # for `tomlq`
+  ];

  postInstall = ''
    wrapProgram $out/bin/wofi-power-menu \
@@ -35,14 +35,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "xfce4-screensaver";
-  version = "4.20.0";
+  version = "4.20.1";

  src = fetchFromGitLab {
    domain = "gitlab.xfce.org";
    owner = "apps";
    repo = "xfce4-screensaver";
    tag = "xfce4-screensaver-${finalAttrs.version}";
-    hash = "sha256-Pt7Rl+WlR2D4KC6GTXjQhs3yirrUgUG5XkKXnyaJZbo=";
+    hash = "sha256-FdO6fZTKBPjncjBBe2rK5DSfVLHTRFpo9NtgZ5nFgRU=";
  };

  strictDeps = true;
@@ -23,9 +23,9 @@
 mkXfceDerivation {
  category = "xfce";
  pname = "libxfce4ui";
-  version = "4.20.1";
+  version = "4.20.2";

-  sha256 = "sha256-CY9KCCbKBAuoYAJtPHlQj04dUuCZAovnyJsBgjzzQkI=";
+  sha256 = "sha256-NsTrJ2271v8vMMyiEef+4Rs0KBOkSkKPjfoJdgQU0ds=";

  nativeBuildInputs = [
    perl
@@ -23,9 +23,9 @@
 mkXfceDerivation {
  category = "xfce";
  pname = "libxfce4windowing";
-  version = "4.20.3";
+  version = "4.20.4";

-  sha256 = "sha256-l58cTz28UPSVfoIpjBCoSwcqdUJfG9e4UlhVYPyEeAs=";
+  sha256 = "sha256-8iLkljuGyJ4giVN5yuOFuTZsrdr8U3avTS/1aRSpaxc=";

  nativeBuildInputs = [
    python3
@@ -1,7 +1,6 @@
 {
  lib,
  mkXfceDerivation,
-  fetchpatch,
  polkit,
  exo,
  libxfce4util,
@@ -19,25 +18,9 @@
 mkXfceDerivation {
  category = "xfce";
  pname = "xfce4-session";
-  version = "4.20.2";
+  version = "4.20.3";

-  sha256 = "sha256-wd+8W9Z0dH7bqILBUNG9YxpRf8TnRJ/7b3QviM1HVnY=";
-
-  patches = [
-    # Use syntax compatible with most sh shells
-    # The `**` syntax is a bash extension
-    (fetchpatch {
-      url = "https://gitlab.xfce.org/xfce/xfce4-session/-/commit/53d6e20a29948ae7aa179447cef0704786b77f8b.patch";
-      hash = "sha256-c8IU1VOcEYdZJy8Eq2wqSL5tTXt7gKfGOs7jxb8npOE=";
-    })
-
-    # wayland: start a D-Bus session only if there isn't one already
-    # https://gitlab.xfce.org/xfce/xfce4-session/-/issues/218
-    (fetchpatch {
-      url = "https://gitlab.xfce.org/xfce/xfce4-session/-/commit/f6e2805b8a7742172f399d78618313bcb28bf095.patch";
-      hash = "sha256-EViVialDbdLH2SGUtcroo5iGc+B4HVJajV7PMl5q6vs=";
-    })
-  ];
+  sha256 = "sha256-HfVspmAkjuGgoI87VHNHFGZP17ZA0b31llY93gUtWxs=";

  buildInputs = [
    exo
@@ -27,9 +27,9 @@
 mkXfceDerivation {
  category = "xfce";
  pname = "xfce4-settings";
-  version = "4.20.1";
+  version = "4.20.2";

-  sha256 = "sha256-9BFO1cN0etDHJzkGHl5GKL2qzJTlpaP/qfvfz6KWaMI=";
+  sha256 = "sha256-hx1ilXPcwWWDwNR/k2b+9vR5aCv9UlPR0d42OE6JxEk=";

  nativeBuildInputs = [
    wayland-scanner
@@ -56,14 +56,17 @@ rustPlatform.buildRustPackage rec {
    LUX_SKIP_IMPURE_TESTS = 1; # Disable impure unit tests
  };

-  postBuild = ''
+  buildPhase = ''
+    runHook preBuild
    cargo xtask-${luaFeature} dist
+    mkdir -p $out
+    runHook postBuild
  '';

  installPhase = ''
    runHook preInstall
-    install -D -v target/dist/${luaVersionDir}/* -t $out/${luaVersionDir}
-    install -D -v target/dist/lib/pkgconfig/* -t $out/lib/pkgconfig
+    cp -r target/dist/share $out
+    cp -r target/dist/lib $out
    runHook postInstall
  '';

@@ -16,14 +16,14 @@

 buildPythonPackage rec {
  pname = "aiodhcpwatcher";
-  version = "1.2.0";
+  version = "1.2.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "bdraco";
    repo = "aiodhcpwatcher";
    rev = "v${version}";
-    hash = "sha256-Jyaxqs3vckXmqUNhYFA912abDhtZ9UBgGnm+qw/N9Ws=";
+    hash = "sha256-+BF3sBam8O9I4tY7QqnA4iNcJFsK9+imS8pY3N/v1HY=";
  };

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

 buildPythonPackage rec {
  pname = "airos";
-  version = "0.2.7";
+  version = "0.2.11";
  pyproject = true;

  disabled = pythonOlder "3.13";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "CoMPaTech";
    repo = "python-airos";
    tag = "v${version}";
-    hash = "sha256-c/YVjNEy1nI6ClYk8BgLai+zRCwiblTFSJ5Rxx3UaeU=";
+    hash = "sha256-rPgrnLMcqUDd1+WL6uwb5Umu3a844B301l+O/GEyCGA=";
  };

  build-system = [ setuptools ];
@@ -4,6 +4,7 @@
  aioresponses,
  buildPythonPackage,
  fetchFromGitHub,
+  isodate,
  lib,
  pytest-asyncio,
  pytestCheckHook,
@@ -13,14 +14,14 @@

 buildPythonPackage rec {
  pname = "cookidoo-api";
-  version = "0.13.0";
+  version = "0.14.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "miaucl";
    repo = "cookidoo-api";
    tag = version;
-    hash = "sha256-QFOGue5VzM1mrgw+WWBvb5dreDUlmBoYv/vEzQta+LA=";
+    hash = "sha256-EWAD33ZF1k76FujQdgBaIzx06zmqh0CfdpknWrs0YLU=";
  };

  build-system = [ setuptools ];
@@ -28,6 +29,7 @@ buildPythonPackage rec {
  dependencies = [
    aiofiles
    aiohttp
+    isodate
  ];

  pythonImportsCheck = [ "cookidoo_api" ];
@@ -6,7 +6,6 @@
  pytestCheckHook,
  numpy,
  pillow,
-  pillow-jpls,
  pydicom,
  pylibjpeg,
  pylibjpeg-libjpeg,
@@ -25,7 +24,7 @@ let
 in
 buildPythonPackage rec {
  pname = "highdicom";
-  version = "0.25.1";
+  version = "0.26.1";
  pyproject = true;

  disabled = pythonOlder "3.10";
@@ -34,7 +33,7 @@ buildPythonPackage rec {
    owner = "MGHComputationalPathology";
    repo = "highdicom";
    tag = "v${version}";
-    hash = "sha256-AwKaqCqPjLyNwXomV/pxijpsTQajekBO/rgLQJpuYww=";
+    hash = "sha256-zaa0daGMQHktYkG56JA2a7s5UZSv8AbinO5roe9rWQc=";
  };

  build-system = [
@@ -44,7 +43,6 @@ buildPythonPackage rec {
  dependencies = [
    numpy
    pillow
-    pillow-jpls
    pydicom
    typing-extensions
  ];
@@ -70,6 +68,7 @@ buildPythonPackage rec {

  disabledTests = [
    # require pyjpegls
+    "test_construction_10"
    "test_jpegls_monochrome"
    "test_jpegls_rgb"
    "test_jpeglsnearlossless_monochrome"
@@ -98,11 +97,11 @@ buildPythonPackage rec {
  # updates the wrong fetcher
  passthru.skipBulkUpdate = true;

-  meta = with lib; {
+  meta = {
    description = "High-level DICOM abstractions for Python";
    homepage = "https://highdicom.readthedocs.io";
    changelog = "https://github.com/ImagingDataCommons/highdicom/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ bcdarwin ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ bcdarwin ];
  };
 }
@@ -22,13 +22,13 @@

 buildPythonPackage rec {
  pname = "oslo-db";
-  version = "17.3.0";
+  version = "17.4.0";
  pyproject = true;

  src = fetchPypi {
    pname = "oslo_db";
    inherit version;
-    hash = "sha256-IzDiHVDqwVi8xVzmzR2XwZfVrFj5/TkmMRAJ2SKh1v0=";
+    hash = "sha256-FLYvWMQWMwy7GIpTKbFNlQF2Ye+K6h1yoP+STuz5EKk=";
  };

  build-system = [
@@ -4,20 +4,21 @@
  fetchFromGitHub,
  poetry-core,
  aiohttp,
+  aiomqtt,
  freenub,
  mashumaro,
 }:

 buildPythonPackage rec {
  pname = "python-snoo";
-  version = "0.7.0";
+  version = "0.8.3";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "Lash-L";
    repo = "python-snoo";
    tag = "v${version}";
-    hash = "sha256-AHCQeajCUCDjLmlbSrVmp2C9NB2naXsYAe6mCbWQfmQ=";
+    hash = "sha256-V+abmzQhzbRY+aJDThV+qXExNLKiahwxVR8WnXEP1vc=";
  };

  postPatch = ''
@@ -29,6 +30,7 @@ buildPythonPackage rec {

  dependencies = [
    aiohttp
+    aiomqtt
    freenub
    mashumaro
  ];
@@ -30,6 +30,8 @@ buildPythonPackage rec {
    hash = "sha256-P/6BbUsyda7iG4/90Isua+TXWQzYixifczy8aZbWN4Y=";
  };

+  pythonRelaxDeps = [ "packaging" ];
+
  outputs = [
    "out"
    "man"
@@ -9,14 +9,14 @@

 buildPythonPackage rec {
  pname = "tinytag";
-  version = "2.1.1";
+  version = "2.1.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "tinytag";
    repo = "tinytag";
    tag = version;
-    hash = "sha256-8+IXbLUevId4zusY6Nv55t/eRkYqGkf1cTZCMYSpuL8=";
+    hash = "sha256-DyjFIaC7FwU5pvRfQgpBCc76dps287rcQ7mxggOZjdw=";
  };

  build-system = [
@@ -40,7 +40,7 @@

 buildPythonPackage rec {
  pname = "uiprotect";
-  version = "7.20.0";
+  version = "7.21.1";
  pyproject = true;

  disabled = pythonOlder "3.10";
@@ -49,7 +49,7 @@ buildPythonPackage rec {
    owner = "uilibs";
    repo = "uiprotect";
    tag = "v${version}";
-    hash = "sha256-mrTRLwqHiYsdVsmtsEv1ZZvhLquednbT0ME4HO1wC4I=";
+    hash = "sha256-8OxEEQuCMKHTYIpa9pfgyAhgkCMy6wpvJDMcckbV8wY=";
  };

  build-system = [ poetry-core ];
@@ -2,7 +2,7 @@
 # Do not edit!

 {
-  version = "2025.8.1";
+  version = "2025.8.2";
  components = {
    "3_day_blinds" =
      ps: with ps; [
@@ -353,7 +353,7 @@ let
  extraBuildInputs = extraPackages python.pkgs;

  # Don't forget to run update-component-packages.py after updating
-  hassVersion = "2025.8.1";
+  hassVersion = "2025.8.2";

 in
 python.pkgs.buildPythonApplication rec {
@@ -374,13 +374,13 @@ python.pkgs.buildPythonApplication rec {
    owner = "home-assistant";
    repo = "core";
    tag = version;
-    hash = "sha256-o1j1ejSMa6T18nNxrmvNcOSWAMbi8b11wgHKO+w5gHA=";
+    hash = "sha256-z/wEYitbn8D0LEUTnBfDWfeo+NdDxX42Ifz2D5pbM8I=";
  };

  # Secondary source is pypi sdist for translations
  sdist = fetchPypi {
    inherit pname version;
-    hash = "sha256-6LyI3t/+wKIVIcVwCny9AIYEaONiwc4GFmbwqjv/9r8=";
+    hash = "sha256-6VnXCc6NWwKUQWmIB/xJmR2AZgfXEXh8DNmoKzSY3GI=";
  };

  build-system = with python.pkgs; [
@@ -18,7 +18,7 @@

 buildPythonPackage rec {
  pname = "pytest-homeassistant-custom-component";
-  version = "0.13.270";
+  version = "0.13.271";
  pyproject = true;

  disabled = pythonOlder "3.13";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
    owner = "MatthewFlamm";
    repo = "pytest-homeassistant-custom-component";
    rev = "refs/tags/${version}";
-    hash = "sha256-SDeQuzBZ1Fd97qotyWL6oB2CTB+qfplMN6yOaJguRmI=";
+    hash = "sha256-2XRj7W0XKKQovP8azU3VzyZaGTCYYxCtzwPWvAVv75M=";
  };

  build-system = [ setuptools ];
@@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "homeassistant-stubs";
-  version = "2025.8.1";
+  version = "2025.8.2";
  pyproject = true;

  disabled = python.version != home-assistant.python.version;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
    owner = "KapJI";
    repo = "homeassistant-stubs";
    tag = version;
-    hash = "sha256-EmZ79AmJpfdsI/VHasRC8OzUEsX0nv8zZfEEum1jneI=";
+    hash = "sha256-E4/j08PMAi4zetJtBSZWLoCB4NUlgr+wzytfRgybL34=";
  };

  build-system = [