Merge staging-next into staging

2025-08-26 18:06:29 +00:00
parent 593cfaf69b ae8ba11a5d
commit 4e5e6967e9
130 changed files with 1199 additions and 1053 deletions
@@ -27,7 +27,7 @@ jobs:
    steps:
      # Use a GitHub App to create the PR so that CI gets triggered
      # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs
-      - uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
+      - uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
        id: app-token
        with:
          app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
@@ -109,7 +109,7 @@ jobs:
      - name: Build codeowners validator
        run: nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A codeownersValidator

-      - uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
+      - uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
        if: github.event_name == 'pull_request_target' && vars.OWNER_RO_APP_ID
        id: app-token
        with:
@@ -36,7 +36,7 @@ jobs:
      # Use a GitHub App to create the PR so that CI gets triggered
      # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs
      # We only need Pull Requests: write here, but the app is also used for backports.
-      - uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
+      - uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
        id: app-token
        with:
          app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
@@ -49,7 +49,7 @@ jobs:
        run: npm install @actions/artifact bottleneck

      # Use a GitHub App, because it has much higher rate limits: 12,500 instead of 5,000 req / hour.
-      - uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
+      - uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
        if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID
        id: app-token
        with:
@@ -23,7 +23,7 @@ jobs:
    steps:
      # Use a GitHub App to create the PR so that CI gets triggered
      # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs
-      - uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
+      - uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
        id: app-token
        with:
          app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
@@ -48,7 +48,7 @@ jobs:
      #   - OWNER_APP_PRIVATE_KEY (secret)
      #
      # Can't use the token received from permissions above, because it can't get enough permissions.
-      - uses: actions/create-github-app-token@0f859bf9e69e887678d5bbfbee594437cb440ffe # v2.1.0
+      - uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
        if: github.event_name == 'pull_request_target' && vars.OWNER_APP_ID
        id: app-token
        with:
@@ -19,7 +19,6 @@
 /.github/workflows                      @NixOS/nixpkgs-ci
 /ci                                     @NixOS/nixpkgs-ci
 /ci/OWNERS                              @infinisil @philiptaron
-/maintainers                            @philiptaron

 # Development support
 /.editorconfig @Mic92 @zowoq
@@ -166,7 +166,7 @@ The following is a non-exhaustive list of such differences:
 - Other environment variables may be inconsistent with a `nix-build` either due to `nix-shell`'s initialization script or due to the use of `nix-shell` without the `--pure` option.

 If the build fails differently inside the shell than in the sandbox, consider using [`breakpointHook`](#breakpointhook) and invoking `nix-build` instead.
-The [`--keep-failed`](https://nixos.org/manual/nix/unstable/command-ref/conf-file#opt--keep-failed) option for `nix-build` may also be useful to examine the build directory of a failed build.
+The [`--keep-failed`](https://nixos.org/manual/nix/unstable/command-ref/conf-file#conf-keep-failed) option for `nix-build` may also be useful to examine the build directory of a failed build.
 :::

 ## Tools provided by `stdenv` {#sec-tools-of-stdenv}
@@ -7759,6 +7759,13 @@
    github = "ErinvanderVeen";
    githubId = 10973664;
  };
+  eripa = {
+    name = "Eric Ripa";
+    email = "eric@ripa.io";
+    keys = [ { fingerprint = "L2IODNAzlzi0tkpCy4LHixqMUhkEas9D3+mo4a+PQZg"; } ];
+    github = "eripa";
+    githubId = 1429673;
+  };
  ern775 = {
    email = "eren.demir2479090@gmail.com";
    github = "ern775";
@@ -9368,6 +9375,12 @@
    githubId = 471835;
    name = "Giorgio Gallo";
  };
+  gipphe = {
+    email = "gipphe@gmail.com";
+    github = "Gipphe";
+    githubId = 2266817;
+    name = "Victor Nascimento Bakke";
+  };
  GirardR1006 = {
    email = "julien.girard2@cea.fr";
    github = "GirardR1006";
@@ -14125,6 +14138,11 @@
    githubId = 61395246;
    name = "Lampros Pitsillos";
  };
+  langsjo = {
+    name = "langsjo";
+    github = "langsjo";
+    githubId = 104687438;
+  };
  larsr = {
    email = "Lars.Rasmusson@gmail.com";
    github = "larsr";
@@ -18030,6 +18048,12 @@
    githubId = 42888162;
    keys = [ { fingerprint = "A0B9 48C5 A263 55C2 035F  8567 FBB7 2A94 52D9 1A72"; } ];
  };
+  neurofibromin = {
+    name = "Neurofibromin";
+    github = "Neurofibromin";
+    githubId = 125222560;
+    keys = [ { fingerprint = "9F9B FE94 618A D266 67BD 2821 4F67 1AFA D8D4 428B"; } ];
+  };
  neverbehave = {
    email = "i@never.pet";
    github = "NeverBehave";
@@ -20815,11 +20839,10 @@
    githubId = 7279609;
  };
  pyrotelekinetic = {
-    name = "Clover";
-    email = "carter@isons.org";
+    name = "Clover Ison";
+    email = "clover@isons.org";
    github = "pyrotelekinetic";
    githubId = 29682759;
-    keys = [ { fingerprint = "5963 78DB 25AA 608D 2743  D466 5D6A D9AE 71B3 F983"; } ];
  };
  pyrox0 = {
    name = "Pyrox";
@@ -21168,6 +21191,12 @@
    githubId = 5653911;
    name = "Rampoina";
  };
+  randomdude = {
+    name = "Random Dude";
+    email = "randomdude16671@proton.me";
+    github = "randomdude16671";
+    githubId = 210965013;
+  };
  rane = {
    name = "Rane";
    email = "rane+git@junkyard.systems";
@@ -23954,6 +23983,12 @@
    githubId = 55726;
    name = "Stanislav Ochotnický";
  };
+  sodagunz = {
+    name = "sodagunz";
+    github = "sodagunz";
+    githubId = 19618127;
+    email = "sodagunz+nixpkgs@proton.me";
+  };
  sodiboo = {
    name = "sodiboo";
    github = "sodiboo";
@@ -20,7 +20,8 @@ in
        {
          options = {
            passwordFile = lib.mkOption {
-              type = lib.types.str;
+              type = with lib.types; nullOr str;
+              default = null;
              description = ''
                Read the repository password from a file.
              '';
@@ -366,8 +367,10 @@ in
    assertions = lib.flatten (
      lib.mapAttrsToList (name: backup: [
        {
-          assertion = (backup.repository == null) != (backup.repositoryFile == null);
-          message = "services.restic.backups.${name}: exactly one of repository or repositoryFile should be set";
+          assertion =
+            ((backup.repository == null) != (backup.repositoryFile == null))
+            || (backup.environmentFile != null);
+          message = "services.restic.backups.${name}: exactly one of repository, repositoryFile or environmentFile should be set";
        }
        {
          assertion =
@@ -378,6 +381,10 @@ in
            !(fileBackup && commandBackup);
          message = "services.restic.backups.${name}: cannot do both a command backup and a file backup at the same time.";
        }
+        {
+          assertion = (backup.passwordFile != null) || (backup.environmentFile != null);
+          message = "services.restic.backups.${name}: passwordFile or environmentFile must be set";
+        }
      ]) config.services.restic.backups
    );
    systemd.services = lib.mapAttrs' (
@@ -256,8 +256,16 @@
            };

            nodeRuntimes = lib.mkOption {
-              type = with lib.types; nonEmptyListOf (enum [ "node20" ]);
-              default = [ "node20" ];
+              type =
+                with lib.types;
+                nonEmptyListOf (enum [
+                  "node20"
+                  "node24"
+                ]);
+              default = [
+                "node20"
+                "node24"
+              ];
              description = ''
                List of Node.js runtimes the runner should support.
              '';
@@ -1345,6 +1345,7 @@ in
  simple = runTest ./simple.nix;
  sing-box = runTest ./sing-box.nix;
  slimserver = runTest ./slimserver.nix;
+  slipshow = runTest ./slipshow.nix;
  slurm = runTest ./slurm.nix;
  snmpd = runTest ./snmpd.nix;
  smokeping = runTest ./smokeping.nix;
@@ -0,0 +1,35 @@
+{
+  lib,
+  pkgs,
+  ...
+}:
+{
+  name = "slipshow presentation test";
+
+  meta.maintainers = with lib.maintainers; [ ethancedwards8 ];
+
+  nodes.machine = {
+    environment.systemPackages = with pkgs; [ slipshow ];
+
+    environment.etc."slipshow".source = pkgs.fetchFromGitHub {
+      owner = "meithecatte";
+      repo = "bbslides";
+      rev = "ce1c08cafa71ae36dda8cc581956548b8386ae16";
+      hash = "sha256-sOydmvtDeMhNejDkwlsXdrbwtqN6lcNnzTnGzBVRFxA=";
+    };
+  };
+
+  testScript =
+    { nodes, ... }:
+    ''
+      start_all()
+
+      # it may take around a minute to compile the file and serve it
+      machine.succeed("slipshow serve /etc/slipshow/bbslides.md &>/dev/null &")
+
+      # slipshow serves defaultly on :8080 and unfortunately cannot
+      # be changed currently
+      machine.wait_for_open_port(8080)
+      machine.succeed("curl -i 0.0.0.0:8080")
+    '';
+}
@@ -13,7 +13,7 @@ lib.makeScope pkgs.newScope (
      inherit lib;
      inherit (pkgs)
        fetchFromBitbucket
-        fetchFromSavannah
+        fetchurl
        ;
    };

@@ -69,7 +69,6 @@
  # Boolean flags
  withNativeCompilation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
  noGui ? false,
-  srcRepo ? true,
  withAcl ? false,
  withAlsaLib ? false,
  withAthena ? false,
@@ -200,9 +199,11 @@ mkDerivation (finalAttrs: {
    ];

  postPatch = lib.concatStringsSep "\n" [
-    (lib.optionalString srcRepo ''
-      rm -fr .git
-    '')
+
+    # See: https://github.com/NixOS/nixpkgs/issues/170426
+    ''
+      find . -type f \( -name "*.elc" -o -name "*loaddefs.el" \) -exec rm {} \;
+    ''

    # Add the name of the wrapped gvfsd
    # This used to be carried as a patch but it often got out of sync with
@@ -247,11 +248,6 @@ mkDerivation (finalAttrs: {
  nativeBuildInputs = [
    makeWrapper
    pkg-config
-  ]
-  ++ lib.optionals (variant == "macport") [
-    texinfo
-  ]
-  ++ lib.optionals srcRepo [
    autoreconfHook
    texinfo
  ]
@@ -1,7 +1,7 @@
 {
  lib,
  fetchFromBitbucket,
-  fetchFromSavannah,
+  fetchurl,
 }:

 let
@@ -26,9 +26,9 @@ let
      src =
        {
          "mainline" = (
-            fetchFromSavannah {
-              repo = "emacs";
-              inherit rev hash;
+            fetchurl {
+              url = "mirror://gnu/emacs/emacs-${rev}.tar.xz";
+              inherit hash;
            }
          );
          "macport" = (
@@ -108,7 +108,7 @@ in
    version = "30.2";
    variant = "mainline";
    rev = "30.2";
-    hash = "sha256-3Lfb3HqdlXqSnwJfxe7npa4GGR9djldy8bKRpkQCdSA=";
+    hash = "sha256-s/NvGKbdJxVxM3AWYlfeL64B+dOM/oeM7Zsebe1b79k=";
    patches = fetchpatch: [
      (builtins.path {
        name = "inhibit-lexical-cookie-warning-67916.patch";
@@ -493,8 +493,8 @@ let
        mktplcRef = {
          publisher = "banacorn";
          name = "agda-mode";
-          version = "0.6.4";
-          hash = "sha256-KBOVVVDw+72QSYv4jynqeVBdIfYz+T5hD2//royVJpw=";
+          version = "0.6.5";
+          hash = "sha256-fq3JiqdtYN9kAWDvu8X+2mlU5kj2RwUTPA4QF43vShQ=";
        };
        meta = {
          changelog = "https://marketplace.visualstudio.com/items/banacorn.agda-mode/changelog";
@@ -920,8 +920,8 @@ let
        mktplcRef = {
          name = "crabviz";
          publisher = "chanhx";
-          version = "0.4.0";
-          hash = "sha256-SOsoSQLDNRqby91Ire4euSz6udRZI6G/RVloVjIvhUM=";
+          version = "0.5.0";
+          hash = "sha256-YLNx/9jmHc0HDm/yHquOlMDPmAbpIdd6UZn0JZQVJko=";
        };
        meta = {
          description = "VSCode extension for generating call graphs based on LSP";
@@ -1614,8 +1614,8 @@ let
        mktplcRef = {
          name = "elixir-ls";
          publisher = "JakeBecker";
-          version = "0.29.2";
-          hash = "sha256-+MkKUhyma/mc5MZa0+RFty5i7rox0EARPTm/uggQj6M=";
+          version = "0.29.3";
+          hash = "sha256-cghDjgv3FWsNpnH6Pa9iPuiPOlLI/iucGH+fzF35ERk=";
        };
        meta = {
          changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog";
@@ -9,13 +9,13 @@
 }:
 mkLibretroCore {
  core = "citra";
-  version = "0-unstable-2025-06-22";
+  version = "0-unstable-2025-08-17";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "citra";
-    rev = "176214934cd46d6e072adcbda5f676bc4ca3162e";
-    hash = "sha256-cdBR64OBOGMy0ROR89mbKXC0xk+QkBHUKEkIn2czGiQ=";
+    rev = "5263fae3344e5e9af43036e0e38bec2d10fb2407";
+    hash = "sha256-66kbE1taODjxXDhO3uV5R212nikyXfHwCHC/zamZuL0=";
    fetchSubmodules = true;
  };

@@ -110,7 +110,20 @@ rec {
  };

  # Eventually, switch to an updateScript without versionPrefix hardcoded...
-  thunderbird-esr = thunderbird-128;
+  thunderbird-esr = thunderbird-140;
+
+  thunderbird-140 = common {
+    applicationName = "Thunderbird ESR";
+
+    version = "140.2.0esr";
+    sha512 = "6a10f95b805f00a0820c822ae07bc52ac39d0a55f084c319d27f01710d8a1d809b7b224da966632ae0a22658bf14e76c8fd7cec022718316c306c43809a4997d";
+
+    updateScript = callPackage ./update.nix {
+      attrPath = "thunderbirdPackages.thunderbird-140";
+      versionPrefix = "140";
+      versionSuffix = "esr";
+    };
+  };

  thunderbird-128 = common {
    applicationName = "Thunderbird ESR";
@@ -11,13 +11,13 @@

 stdenv.mkDerivation rec {
  pname = "obs-text-pthread";
-  version = "2.0.5";
+  version = "2.0.6";

  src = fetchFromGitHub {
    owner = "norihiro";
    repo = "obs-text-pthread";
    rev = version;
-    sha256 = "sha256-zrgxKs3jmrwQJiEgKfZz1BOVToTLauQXtFYcuFlV71o=";
+    sha256 = "sha256-lDGji2ZdK5XoBKLRdgYCIDPndVkhIZltc94wWFRTLCA=";
  };

  nativeBuildInputs = [
@@ -0,0 +1,26 @@
+diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
+index 16888323d7..b96450a247 100644
+--- a/docshell/base/nsAboutRedirector.cpp
+++ b/docshell/base/nsAboutRedirector.cpp
+@@ -90,9 +90,6 @@ static const RedirEntry kRedirMap[] = {
+     {"addons", "chrome://mozapps/content/extensions/aboutaddons.html",
+      nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},
+ #endif
+-    {"buildconfig", "chrome://global/content/buildconfig.html",
+-     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
+-         nsIAboutModule::IS_SECURE_CHROME_UI},
+     {"checkerboard", "chrome://global/content/aboutCheckerboard.html",
+      nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
+          nsIAboutModule::ALLOW_SCRIPT},
+diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
+index eb6c179b60..57568668b1 100644
+--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
+@@ -40,7 +40,6 @@ toolkit.jar:
+    content/global/aboutUrlClassifier.js
+    content/global/aboutUrlClassifier.xhtml
+    content/global/aboutUrlClassifier.css
+-*   content/global/buildconfig.html
+    content/global/buildconfig.css
+    content/global/contentAreaUtils.js
+    content/global/datepicker.xhtml
@@ -305,7 +305,8 @@ buildStdenv.mkDerivation {
  ];

  patches =
-    lib.optionals (lib.versionAtLeast version "139" && lib.versionOlder version "141") [
+    lib.optionals (lib.versionAtLeast version "136") [ ./136-no-buildconfig.patch ]
+    ++ lib.optionals (lib.versionAtLeast version "139" && lib.versionOlder version "141") [
      # https://bugzilla.mozilla.org/show_bug.cgi?id=1955112
      # https://hg-edge.mozilla.org/mozilla-central/rev/aa8a29bd1fb9
      ./139-wayland-drag-animation.patch
@@ -9,6 +9,7 @@ dartConfigHook() {
    echo "Installing dependencies"
    mkdir -p .dart_tool
    cp "$packageConfig" .dart_tool/package_config.json
+    @python3@ @packageGraphScript@ > .dart_tool/package_graph.json

    packagePath() {
        jq --raw-output --arg name "$1" '.packages.[] | select(.name == $name) .rootUri | sub("file://"; "")' .dart_tool/package_config.json
@@ -4,6 +4,7 @@
  dart,
  yq,
  jq,
+  python3,
 }:

 {
@@ -11,6 +12,8 @@
    name = "dart-config-hook";
    substitutions.yq = "${yq}/bin/yq";
    substitutions.jq = "${jq}/bin/jq";
+    substitutions.python3 = lib.getExe (python3.withPackages (ps: with ps; [ pyyaml ]));
+    substitutions.packageGraphScript = ../../pub2nix/package-graph.py;
  } ./dart-config-hook.sh;
  dartBuildHook = makeSetupHook {
    name = "dart-build-hook";
@@ -0,0 +1,54 @@
+"""
+https://github.com/dart-lang/pub/issues/4522
+This script generates a package_graph.json file.
+"""
+
+import json
+import os
+from pathlib import Path
+from urllib.parse import unquote, urlparse
+
+import yaml
+
+
+def get_package(pubspec_path: Path, dev_dependencies: bool = False):
+    with pubspec_path.open("r", encoding="utf-8") as f:
+        pubspec = yaml.load(f, Loader=yaml.CSafeLoader)
+    package = {
+        "name": pubspec["name"],
+        "version": pubspec.get("version") or "0.0.0",
+        "dependencies": list(pubspec.get("dependencies") or {}),
+    }
+    if dev_dependencies:
+        package["devDependencies"] = list(pubspec.get("dev_dependencies") or {})
+    return package
+
+
+def main() -> None:
+    package_config_file_path = Path(os.environ["packageConfig"])  # noqa: SIM112
+    with package_config_file_path.open("r", encoding="utf-8") as f:
+        package_config = json.load(f)
+    package_graph = []
+    root_package = get_package(Path("pubspec.yaml"), dev_dependencies=True)
+    for data in package_config.get("packages", []):
+        if data["name"] == root_package["name"] or data["rootUri"] == "flutter_gen":
+            continue
+        package_graph.append(
+            get_package(Path(unquote(urlparse(data["rootUri"]).path)) / "pubspec.yaml")
+        )
+    package_graph.append(root_package)
+    print(
+        json.dumps(
+            {
+                "roots": [root_package["name"]],
+                "packages": package_graph,
+                "configVersion": 1,
+            },
+            indent=2,
+            ensure_ascii=False,
+        )
+    )
+
+
+if __name__ == "__main__":
+    main()
@@ -11,6 +11,8 @@
  xz,
  version,
  pharHash,
+  installShellFiles,
+  stdenv,
 }:

 stdenvNoCC.mkDerivation (finalAttrs: {
@@ -24,7 +26,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {

  dontUnpack = true;

-  nativeBuildInputs = [ makeBinaryWrapper ];
+  nativeBuildInputs = [
+    makeBinaryWrapper
+    installShellFiles
+  ];

  installPhase = ''
    runHook preInstall
@@ -46,13 +51,19 @@ stdenvNoCC.mkDerivation (finalAttrs: {
    runHook postInstall
  '';

+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd composer \
+      --bash <($out/bin/composer completion bash)
+  '';
+
  meta = {
    changelog = "https://github.com/composer/composer/releases/tag/${finalAttrs.version}";
    description = "Dependency Manager for PHP, shipped from the PHAR file";
    homepage = "https://getcomposer.org/";
    license = lib.licenses.mit;
    mainProgram = "composer";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ lib.maintainers.patka ];
+    teams = [ lib.teams.php ];
    platforms = lib.platforms.all;
  };
 })
@@ -9,7 +9,7 @@
  nodejs,
  jpegoptim,
  oxipng,
-  nodePackages,
+  svgo,
  nix-update-script,
 }:

@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
    nodejs
    jpegoptim
    oxipng
-    nodePackages.svgo
+    svgo
  ];

  postPatch = ''
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
    # (Losslessly) optimise compression of image artifacts
    find dist -type f -name '*.jpg' -execdir ${jpegoptim}/bin/jpegoptim -w$NIX_BUILD_CORES {} \;
    find dist -type f -name '*.png' -execdir ${oxipng}/bin/oxipng -o max -t $NIX_BUILD_CORES {} \;
-    find dist -type f -name '*.svg' -execdir ${nodePackages.svgo}/bin/svgo {} \;
+    find dist -type f -name '*.svg' -execdir ${svgo}/bin/svgo {} \;

    cp -R -v dist $out

@@ -65,13 +65,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "amnezia-vpn";
-  version = "4.8.9.1";
+  version = "4.8.9.2";

  src = fetchFromGitHub {
    owner = "amnezia-vpn";
    repo = "amnezia-client";
    tag = finalAttrs.version;
-    hash = "sha256-docQqOVzmgqWPhKzOmKeXhssjyhtfYy1fNn0ZGXjsZ0=";
+    hash = "sha256-UavKtAwnEa+Ym1a7XzC3JPDLovqggjsav4q2MiYUxbI=";
    fetchSubmodules = true;
  };

@@ -5,29 +5,55 @@
  installShellFiles,
  nix-update-script,
  stdenv,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  nodejs,
 }:

 buildGoModule rec {
  pname = "argocd";
-  version = "2.14.11";
+  version = "3.1.0";

  src = fetchFromGitHub {
    owner = "argoproj";
    repo = "argo-cd";
    rev = "v${version}";
-    hash = "sha256-KCU/WMytx4kOzlkZDwLfRRfutBtdk6UVBNdXOWC5kWc=";
+    hash = "sha256-zg6zd10hpGUOukrwMK0qJXBL8nVgPSZJ6+jh+/mbOL0=";
+  };
+
+  ui = stdenv.mkDerivation {
+    pname = "${pname}-ui";
+    inherit version;
+    src = src + "/ui";
+
+    offlineCache = fetchYarnDeps {
+      yarnLock = "${src}/ui/yarn.lock";
+      hash = "sha256-ekhSPWzIgFhwSw0bIlBqu8LTYk3vuJ9VM8eHc3mnHGM=";
+    };
+
+    nativeBuildInputs = [
+      yarnConfigHook
+      yarnBuildHook
+      nodejs
+    ];
+
+    postInstall = ''
+      mkdir -p $out
+      cp -r dist $out/dist
+    '';
  };

  proxyVendor = true; # darwin/linux hash mismatch
-  vendorHash = "sha256-Xm9J08pxzm3fPQjMA6NDu+DPJGsvtUvj+n/qrOZ9BE4=";
+  vendorHash = "sha256-tYHA1WlziKWOvv3uF3tTSrvqDoHBVRhUnKZXOxT1rMk=";

  # Set target as ./cmd per cli-local
-  # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227
+  # https://github.com/argoproj/argo-cd/blob/master/Makefile
  subPackages = [ "cmd" ];

  ldflags =
    let
-      packageUrl = "github.com/argoproj/argo-cd/v2/common";
+      packageUrl = "github.com/argoproj/argo-cd/v3/common";
    in
    [
      "-s"
@@ -41,12 +67,17 @@ buildGoModule rec {

  nativeBuildInputs = [ installShellFiles ];

+  preBuild = ''
+    cp -r ${ui}/dist ./ui
+    stat ./ui/dist/app/index.html # Sanity check
+  '';
+
  # set ldflag for kubectlVersion since it is needed for argo
  # Per https://github.com/search?q=repo%3Aargoproj%2Fargo-cd+%22KUBECTL_VERSION%3D%22+path%3AMakefile&type=code
  prePatch = ''
    export KUBECTL_VERSION=$(grep 'k8s.io/kubectl v' go.mod | cut -f 2 -d " " | cut -f 1 -d "=" )
    echo using $KUBECTL_VERSION
-    ldflags="''${ldflags} -X github.com/argoproj/argo-cd/v2/common.kubectlVersion=''${KUBECTL_VERSION}"
+    ldflags="''${ldflags} -X github.com/argoproj/argo-cd/v3/common.kubectlVersion=''${KUBECTL_VERSION}"
  '';
  installPhase = ''
    runHook preInstall
@@ -7,13 +7,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "asciiquarium-transparent";
-  version = "1.3";
+  version = "1.4";

  src = fetchFromGitHub {
    owner = "nothub";
    repo = "asciiquarium";
-    rev = "${finalAttrs.version}";
-    hash = "sha256-zQyVIfwmhF3WsCeIZLwjDufvKzAfjLxaK2s7WTedqCg=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-lUNPg+/R/UwnHxjVXROMjvQxBZuCPBrYWB546OHplJM=";
  };

  nativeBuildInputs = [ makeWrapper ];
@@ -9,10 +9,10 @@
 }:
 let
  pname = "beeper";
-  version = "4.1.111";
+  version = "4.1.135";
  src = fetchurl {
    url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}.AppImage";
-    hash = "sha256-0cr6syveIHIIy8+FyE23U8iidMYJXkN8CqhhbH0oNt0=";
+    hash = "sha256-bp0RGU689A8kgphNgJJnlbQBh1fAubwWUvM9StzLwB4=";
  };
  appimageContents = appimageTools.extract {
    inherit pname version src;
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  hugo,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "blowfish-tools";
+  version = "1.10.0";
+
+  src = fetchFromGitHub {
+    owner = "nunocoracao";
+    repo = "blowfish-tools";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-90EKsRKOO2Hb64Wy3TlwzlPU2K8AAlSxc17ek5ZLoG0=";
+  };
+
+  dontNpmBuild = true;
+
+  npmDepsHash = "sha256-P6XHXR4QcVCRz5ju36OzCTNxXtW9RYxkfhbp7kJVfoY=";
+
+  postFixup = ''
+    wrapProgram $out/bin/blowfish-tools \
+      --prefix PATH : ${lib.makeBinPath [ hugo ]}
+  '';
+
+  meta = {
+    description = "CLI to initialize and configure a Blowfish project";
+    homepage = "https://blowfish.page";
+    changelog = "https://github.com/nunocoracao/blowfish-tools/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ eripa ];
+    mainProgram = "blowfish-tools";
+  };
+})
@@ -6,16 +6,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "choose";
-  version = "1.3.6";
+  version = "1.3.7";

  src = fetchFromGitHub {
    owner = "theryangeary";
    repo = "choose";
    rev = "v${version}";
-    sha256 = "sha256-ojmib9yri/Yj1VSwwssbXv+ThnZjUXLTmOpfPGdGFaU=";
+    sha256 = "sha256-nqL8CAnpqOaecC6vHlCtVXFRO0OAGZAn12TdOM5iUFA=";
  };

-  cargoHash = "sha256-SecWDujJu68K1LMQJQ55LeW51Ag/aCt1YKcdWeRp22c=";
+  cargoHash = "sha256-NVpkCs1QY2e+WiI9nk1uz/j3pOtsJpMwgAMspB6Bs1E=";

  meta = with lib; {
    description = "Human-friendly and fast alternative to cut and (sometimes) awk";
@@ -19,12 +19,12 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "circt";
-  version = "1.125.0";
+  version = "1.128.0";
  src = fetchFromGitHub {
    owner = "llvm";
    repo = "circt";
    rev = "firtool-${version}";
-    hash = "sha256-bpQvBUSYpmv6bmgXSCz9pfGgFxlGVFFDfaSkvk7481E=";
+    hash = "sha256-pIuBIl1iZRuqjy7CPfsTnR82Fq7iH22TtpbSk4oBshQ=";
    fetchSubmodules = true;
  };

@@ -75,6 +75,7 @@ stdenv.mkDerivation rec {
          "CIRCT :: circt-as-dis/.*\\.mlir"
          "CIRCT :: circt-reduce/.*\\.mlir"
          "CIRCT :: circt-test/basic.mlir"
+          "CIRCT :: firld/.*\\.mlir"
        ]
        ++ [
          # Temporarily disable for bump: https://github.com/llvm/circt/issues/8000
@@ -20,6 +20,7 @@
  jq,
  ripgrep,
  common-updater-scripts,
+  headless ? false,
 }:

 let
@@ -38,7 +39,7 @@ in
 stdenv.mkDerivation rec {
  inherit version;

-  pname = "cloudflare-warp";
+  pname = "cloudflare-warp" + lib.optionalString headless "-headless";

  src =
    sources.${stdenv.hostPlatform.system}
@@ -49,20 +50,24 @@ stdenv.mkDerivation rec {
    autoPatchelfHook
    versionCheckHook
    makeWrapper
+  ]
+  ++ lib.optionals (!headless) [
    copyDesktopItems
    desktop-file-utils
  ];

  buildInputs = [
    dbus
-    gtk3
    libpcap
    openssl
    nss
    (lib.getLib stdenv.cc.cc)
+  ]
+  ++ lib.optionals (!headless) [
+    gtk3
  ];

-  desktopItems = [
+  desktopItems = lib.optionals (!headless) [
    (makeDesktopItem {
      name = "com.cloudflare.WarpCli";
      desktopName = "Cloudflare Zero Trust Team Enrollment";
@@ -93,22 +98,35 @@ stdenv.mkDerivation rec {
    mv lib/systemd/system $out/lib/systemd/
    substituteInPlace $out/lib/systemd/system/warp-svc.service \
      --replace-fail "ExecStart=" "ExecStart=$out"
-    substituteInPlace $out/lib/systemd/user/warp-taskbar.service \
-      --replace-fail "ExecStart=" "ExecStart=$out" \
-      --replace-fail "BindsTo=" "PartOf="
+    ${lib.optionalString (!headless) ''
+      substituteInPlace $out/lib/systemd/user/warp-taskbar.service \
+        --replace-fail "ExecStart=" "ExecStart=$out" \
+        --replace-fail "BindsTo=" "PartOf="

-    cat >>$out/lib/systemd/user/warp-taskbar.service <<EOF
+      cat >>$out/lib/systemd/user/warp-taskbar.service <<EOF

-    [Service]
-    BindReadOnlyPaths=$out:/usr:
-    EOF
+      [Service]
+      BindReadOnlyPaths=$out:/usr:
+      EOF
+    ''}
+    ${lib.optionalString headless ''
+      # For headless version, remove GUI components
+      rm $out/bin/warp-taskbar
+      rm -r $out/lib/systemd/user
+      rm -r $out/etc
+      rm -r $out/share/applications
+      rm -r $out/share/icons
+      rm -r $out/share/warp
+    ''}

    runHook postInstall
  '';

  postInstall = ''
    wrapProgram $out/bin/warp-svc --prefix PATH : ${lib.makeBinPath [ nftables ]}
-    wrapProgram $out/bin/warp-cli --prefix PATH : ${lib.makeBinPath [ desktop-file-utils ]}
+    ${lib.optionalString (!headless) ''
+      wrapProgram $out/bin/warp-cli --prefix PATH : ${lib.makeBinPath [ desktop-file-utils ]}
+    ''}
  '';

  doInstallCheck = true;
@@ -146,7 +164,9 @@ stdenv.mkDerivation rec {
  };

  meta = with lib; {
-    description = "Replaces the connection between your device and the Internet with a modern, optimized, protocol";
+    description =
+      "Replaces the connection between your device and the Internet with a modern, optimized, protocol"
+      + lib.optionalString headless " (headless version)";
    homepage = "https://pkg.cloudflareclient.com/";
    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
    license = licenses.unfree;
@@ -8,13 +8,13 @@

 buildGoModule rec {
  pname = "cri-tools";
-  version = "1.33.0";
+  version = "1.34.0";

  src = fetchFromGitHub {
    owner = "kubernetes-sigs";
    repo = "cri-tools";
    rev = "v${version}";
-    hash = "sha256-KxckDpZ3xfD+buCGrQ+udJF0X2D9sg/d3TLSQEcWyV4=";
+    hash = "sha256-nWbxPw8lz1FYLHXJ2G4kzOl5nBPXSl4nEJ9KgzS/wmA=";
  };

  vendorHash = null;
@@ -7,14 +7,14 @@

 python3Packages.buildPythonApplication rec {
  pname = "django-upgrade";
-  version = "1.22.2";
+  version = "1.25.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "adamchainz";
    repo = "django-upgrade";
    tag = version;
-    hash = "sha256-QhowVqvN1kODKFLp2uA9CXLWqNJl1p5kC5z4rjRqKNk=";
+    hash = "sha256-Y49GNAc1RFGcjQbZhKzf71KxCcPJT4jPhpjq1HvIBWU=";
  };

  build-system = [ python3Packages.setuptools ];
@@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec {
  meta = {
    description = "Automatically upgrade your Django projects";
    homepage = "https://github.com/adamchainz/django-upgrade";
-    changelog = "https://github.com/adamchainz/django-upgrade/blob/${version}/CHANGELOG.rst";
+    changelog = "https://github.com/adamchainz/django-upgrade/blob/${version}/docs/changelog.rst";
    mainProgram = "django-upgrade";
    license = lib.licenses.mit;
    maintainers = [ lib.maintainers.kalekseev ];
@@ -5,15 +5,15 @@
  cmake,
 }:

-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
  pname = "edlib";
-  version = "unstable-2021-08-20";
+  version = "1.3.9.post1";

  src = fetchFromGitHub {
    owner = "Martinsos";
    repo = "edlib";
-    rev = "f8afceb49ab0095c852e0b8b488ae2c88e566afd";
-    hash = "sha256-P/tFbvPBtA0MYCNDabW+Ypo3ltwP4S+6lRDxwAZ1JFo=";
+    tag = finalAttrs.version;
+    hash = "sha256-XejxohLVdBBzpYZ//OpqC1ActmCaZ8tunJyhOYtZmKQ=";
  };

  nativeBuildInputs = [ cmake ];
@@ -25,11 +25,11 @@ stdenv.mkDerivation {
    runHook postCheck
  '';

-  meta = with lib; {
+  meta = {
    homepage = "https://martinsos.github.io/edlib";
    description = "Lightweight, fast C/C++ library for sequence alignment using edit distance";
-    maintainers = with maintainers; [ bcdarwin ];
-    license = licenses.mit;
-    platforms = platforms.unix;
+    maintainers = with lib.maintainers; [ bcdarwin ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
  };
-}
+})
@@ -6,6 +6,7 @@
  ninja,
  pkg-config,
  glib,
+  blueprint-compiler,
  gobject-introspection,
  gtk4,
  desktop-file-utils,
@@ -19,13 +20,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "embellish";
-  version = "0.4.7";
+  version = "0.5.1";

  src = fetchFromGitHub {
    owner = "getnf";
    repo = "embellish";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-+tTuQNok2rqTcQR4CRMc4qRqw0Ah2rovIut618z9GhU=";
+    hash = "sha256-Db7/vo9LVE7IeFFHx/BKs+qxzsvuB+6ZLRb7A1NHrxQ=";
  };

  nativeBuildInputs = [
@@ -33,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
    ninja
    pkg-config
    glib
+    blueprint-compiler
    gobject-introspection
    gtk4
    gettext
@@ -6,7 +6,7 @@

 python3Packages.buildPythonPackage {
  pname = "evdevremapkeys";
-  version = "unstable-2021-05-04";
+  version = "1.0.0";
  format = "pyproject";

  src = fetchFromGitHub {
@@ -11,16 +11,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "fd";
-  version = "10.2.0";
+  version = "10.3.0";

  src = fetchFromGitHub {
    owner = "sharkdp";
    repo = "fd";
    rev = "v${version}";
-    hash = "sha256-B+lOohoPH7UkRxRNTzSVt0SDrqEwh4hIvBF3uWliDEI=";
+    hash = "sha256-rUoR8LHtzwGQBwJGEsWpMYKG6HcGKcktcyF7TxTDJs8=";
  };

-  cargoHash = "sha256-0LzraGDujLMs60/Ytq2hcG/3RYbo8sJkurYVhRpa2D8=";
+  cargoHash = "sha256-yiR23t48I0USD21tnFZzmTmO0D8kWNzP9Ff3QM9GitU=";

  nativeBuildInputs = [ installShellFiles ];

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

 python3Packages.buildPythonApplication rec {
  pname = "fdroidserver";
-  version = "2.4.0";
+  version = "2.4.2";

  pyproject = true;

@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
    owner = "fdroid";
    repo = "fdroidserver";
    tag = version;
-    hash = "sha256-PQZz3dyX6vCS0axHfSINMMX5ETdVs44K9XjR87gtd3s=";
+    hash = "sha256-26D+nnytLOsEAWNj2XvKM2O00epGtvJaJhUw+yoBl9Y=";
  };

  pythonRelaxDeps = [
@@ -1,9 +1,15 @@
--- a/CMakeLists.txt	2025-08-15 11:37:20
-+++ b/CMakeLists.txt	2025-08-15 11:40:06
-@@ -29,21 +29,7 @@
- if(EXISTS "${CMAKE_SOURCE_DIR}/external/Qt-Color-Widgets/CMakeLists.txt")
-     add_subdirectory("${CMAKE_SOURCE_DIR}/external/Qt-Color-Widgets" EXCLUDE_FROM_ALL)
- else()
+--- a/CMakeLists.txt	2025-08-21 13:12:55
+++ b/CMakeLists.txt	2025-08-21 13:16:26
+@@ -24,28 +24,8 @@
+ #Needed due to linker error with QtColorWidget
+ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+ 
+find_package(QtColorWidgets REQUIRED)
+ 
+-# Dependency can be fetched via flatpak builder
+-if(EXISTS "${CMAKE_SOURCE_DIR}/external/Qt-Color-Widgets/CMakeLists.txt")
+-    add_subdirectory("${CMAKE_SOURCE_DIR}/external/Qt-Color-Widgets" EXCLUDE_FROM_ALL)
+-else()
 -    FetchContent_Declare(
 -        qtColorWidgets
 -        GIT_REPOSITORY https://gitlab.com/mattbas/Qt-Color-Widgets.git
@@ -19,25 +25,12 @@
 -  else()
 -      FetchContent_MakeAvailable(qtColorWidgets)
 -  endif()
-+    find_package(QtColorWidgets REQUIRED)
- endif()
- 
+-endif()
+-
 # This can be read from ${PROJECT_NAME} after project() is called
-@@ -115,12 +101,7 @@
-   if(EXISTS "${CMAKE_SOURCE_DIR}/external/KDSingleApplication/CMakeLists.txt")
-     add_subdirectory("${CMAKE_SOURCE_DIR}/external/KDSingleApplication")
-   else()
-    FetchContent_Declare(
-        kdsingleApplication
-        GIT_REPOSITORY https://github.com/KDAB/KDSingleApplication.git
-        GIT_TAG v1.2.0
-    )
-    FetchContent_MakeAvailable(KDSingleApplication)
-+    find_package(KDSingleApplication-qt6 REQUIRED)
-   endif()
- endif()
- 
-@@ -128,12 +109,7 @@
+ if (APPLE)
+   set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
+@@ -133,12 +113,7 @@
 option(BUILD_STATIC_LIBS ON)
 
 if (APPLE)
@@ -1,18 +1,11 @@
--- a/src/CMakeLists.txt	2025-08-12 16:34:27
-+++ b/src/CMakeLists.txt	2025-08-15 11:45:56
-@@ -220,7 +220,7 @@
- 
-   target_link_libraries(
-           flameshot
-          kdsingleapplication
-+          kdsingleapplication-qt6
-   )
- endif()
- 
-@@ -447,64 +447,3 @@
+--- a/src/CMakeLists.txt	2025-08-21 13:12:55
+++ b/src/CMakeLists.txt	2025-08-21 13:18:55
+@@ -449,66 +449,4 @@
+     else ()
+         message(WARNING "Unable to find executable windeployqt.")
     endif ()
- endif ()
- 
+-endif ()
+-
 -# macdeployqt
 -if (APPLE)
 -# Code signing settings - optional, set to empty string to skip signing
@@ -73,4 +66,4 @@
 -   endif()
 -
 -
-endif ()
+ endif ()
@@ -10,7 +10,7 @@
  makeBinaryWrapper,
  kdsingleapplication,
  nix-update-script,
-  enableWlrSupport ? false,
+  enableWlrSupport ? !stdenv.hostPlatform.isDarwin,
  enableMonochromeIcon ? false,
 }:

@@ -18,17 +18,18 @@ assert stdenv.hostPlatform.isDarwin -> (!enableWlrSupport);

 stdenv.mkDerivation (finalAttrs: {
  pname = "flameshot";
-  version = "13.0.1";
+  version = "13.1.0";

  src = fetchFromGitHub {
    owner = "flameshot-org";
    repo = "flameshot";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Zo+rhvpwhcYqgn8PZ0b48sCb/YWqGSormFnY6pbY8Qc=";
+    hash = "sha256-Wg0jc1AqgetaESmTyhzAHx3zal/5DMDum7fzhClqeck=";
  };

  cmakeFlags = [
    "-DCMAKE_CXX_FLAGS=-I${kdsingleapplication}/include/kdsingleapplication-qt6"
+    (lib.cmakeBool "USE_BUNDLED_KDSINGLEAPPLICATION" false)
    (lib.cmakeBool "DISABLE_UPDATE_CHECKER" true)
    (lib.cmakeBool "USE_MONOCHROME_ICON" enableMonochromeIcon)
  ]
@@ -30,13 +30,13 @@ lib.checkListOfEnum "${pname}: available color variants"
  stdenvNoCC.mkDerivation
  rec {
    inherit pname;
-    version = "2025-02-26";
+    version = "2025-08-21";

    src = fetchFromGitHub {
      owner = "vinceliuice";
      repo = "Fluent-icon-theme";
      tag = version;
-      hash = "sha256-nL9hk+H2ees2grBvVULvJs54FlFTXrA7o1STbDDJGhQ=";
+      hash = "sha256-qAKNAbmSfVuzUGDJGVU0QF3LMc5tRzAy+l0ZwEXaJ28=";
    };

    nativeBuildInputs = [
@@ -1,396 +1,85 @@
-diff --git a/forge-adventure/pom.xml b/forge-adventure/pom.xml
-index b35356ea76..b7ab1c775b 100644
--- a/forge-adventure/pom.xml
-+++ b/forge-adventure/pom.xml
-@@ -47,131 +47,6 @@
-                 </configuration>
-             </plugin>
- 
-            <plugin>
-                    <groupId>com.akathist.maven.plugins.launch4j</groupId>
-                    <artifactId>launch4j-maven-plugin</artifactId>
-                    <version>1.7.25</version>
-                    <executions>
-                        <execution>
-                            <id>l4j-adv</id>
-                            <phase>package</phase>
-                            <goals>
-                                <goal>launch4j</goal>
-                            </goals>
-                            <configuration>
-                                <headerType>gui</headerType>
-                                <outfile>${project.build.directory}/forge-adventure-editor-java8.exe</outfile>
-                                <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
-                                <dontWrapJar>true</dontWrapJar>
-                                <errTitle>forge</errTitle>
-                                <icon>src/main/config/forge-adventure-editor.ico</icon>
-                                <classPath>
-                                    <mainClass>forge.adventure.Main</mainClass>
-                                    <addDependencies>false</addDependencies>
-                                    <preCp>anything</preCp>
-                                </classPath>
-                                <jre>
-                                    <minVersion>1.8.0</minVersion>
-                                    <maxHeapSize>4096</maxHeapSize>
-                                    <opts>
-                                        <opt>-Dfile.encoding=UTF-8</opt>
-                                    </opts>
-                                </jre>
-                                <versionInfo>
-                                    <fileVersion>
-                                        1.0.0.0
-                                    </fileVersion>
-                                    <txtFileVersion>
-                                        1.0.0.0
-                                    </txtFileVersion>
-                                    <fileDescription>Forge</fileDescription>
-                                    <copyright>Forge</copyright>
-                                    <productVersion>
-                                        1.0.0.0
-                                    </productVersion>
-                                    <txtProductVersion>
-                                        1.0.0.0
-                                    </txtProductVersion>
-                                    <productName>forge-adventure-editor</productName>
-                                    <internalName>forge-adventure-editor</internalName>
-                                    <originalFilename>forge-adventure-editor-java8.exe</originalFilename>
-                                </versionInfo>
-                            </configuration>
-                        </execution>
-                        <!--extra-->
-                        <execution>
-                            <id>l4j-adv2</id>
-                            <phase>package</phase>
-                            <goals>
-                                <goal>launch4j</goal>
-                            </goals>
-                            <configuration>
-                                <headerType>gui</headerType>
-                                <outfile>${project.build.directory}/forge-adventure-editor.exe</outfile>
-                                <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
-                                <dontWrapJar>true</dontWrapJar>
-                                <errTitle>forge</errTitle>
-                                <downloadUrl>https://www.oracle.com/java/technologies/downloads/</downloadUrl>
-                                <icon>src/main/config/forge-adventure-editor.ico</icon>
-                                <classPath>
-                                    <mainClass>forge.adventure.Main</mainClass>
-                                    <addDependencies>false</addDependencies>
-                                    <preCp>anything</preCp>
-                                </classPath>
-                                <jre>
-                                    <minVersion>11.0.1</minVersion>
-                                    <jdkPreference>jdkOnly</jdkPreference>
-                                    <maxHeapSize>4096</maxHeapSize>
-                                    <opts>
-                                        <opt>-Dfile.encoding=UTF-8</opt>
-                                        <opt>--add-opens java.base/java.lang=ALL-UNNAMED</opt>
-                                        <opt>--add-opens java.base/java.math=ALL-UNNAMED</opt>
-                                        <opt>--add-opens java.base/jdk.internal.misc=ALL-UNNAMED</opt>
-                                        <opt>--add-opens java.base/java.nio=ALL-UNNAMED</opt>
-                                        <opt>--add-opens=java.base/sun.nio.ch=ALL-UNNAMED</opt>
-                                        <opt>--add-opens java.base/java.util=ALL-UNNAMED</opt>
-                                        <opt>--add-opens java.base/java.lang.reflect=ALL-UNNAMED</opt>
-                                        <opt>--add-opens java.base/java.text=ALL-UNNAMED</opt>
-                                        <opt>--add-opens java.desktop/java.awt=ALL-UNNAMED</opt>
-                                        <opt>--add-opens java.desktop/java.awt.font=ALL-UNNAMED</opt>
-                                        <opt>--add-opens java.desktop/java.awt.image=ALL-UNNAMED</opt>
-                                        <opt>--add-opens java.desktop/java.awt.color=ALL-UNNAMED</opt>
-                                        <opt>--add-opens java.desktop/sun.awt.image=ALL-UNNAMED</opt>
-                                        <opt>--add-opens java.desktop/javax.swing=ALL-UNNAMED</opt>
-                                        <opt>--add-opens java.desktop/javax.swing.border=ALL-UNNAMED</opt>
-                                        <opt>--add-opens java.desktop/javax.swing.event=ALL-UNNAMED</opt>
-                                        <opt>--add-opens java.desktop/sun.swing=ALL-UNNAMED</opt>
-                                        <opt>--add-opens java.desktop/java.beans=ALL-UNNAMED</opt>
-                                        <opt>--add-opens java.base/java.util.concurrent=ALL-UNNAMED</opt>
-                                        <opt>--add-opens java.base/java.net=ALL-UNNAMED</opt>
-                                        <opt>-Dio.netty.tryReflectionSetAccessible=true</opt>
-                                    </opts>
-                                </jre>
-                                <versionInfo>
-                                    <fileVersion>
-                                        1.0.0.0
-                                    </fileVersion>
-                                    <txtFileVersion>
-                                        1.0.0.0
-                                    </txtFileVersion>
-                                    <fileDescription>Forge</fileDescription>
-                                    <copyright>Forge</copyright>
-                                    <productVersion>
-                                        1.0.0.0
-                                    </productVersion>
-                                    <txtProductVersion>
-                                        1.0.0.0
-                                    </txtProductVersion>
-                                    <productName>forge-adventure-editor</productName>
-                                    <internalName>forge-adventure-editor</internalName>
-                                    <originalFilename>forge-adventure-editor.exe</originalFilename>
-                                </versionInfo>
-                            </configuration>
-                        </execution>
-                        <!--extra-->
-                    </executions>
-            </plugin>
-
-             <plugin>
-                 <groupId>com.google.code.maven-replacer-plugin</groupId>
-                 <artifactId>replacer</artifactId>
 diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml
-index 3b74663b04..f0e324b69c 100644
+index dfe902e6b9..6fe3382f27 100644
 --- a/forge-gui-desktop/pom.xml
 +++ b/forge-gui-desktop/pom.xml
-@@ -282,59 +282,6 @@
-             <id>windows-linux-release</id>
-             <build>
-                 <plugins>
-                    <plugin>
-                        <groupId>com.akathist.maven.plugins.launch4j</groupId>
-                        <artifactId>launch4j-maven-plugin</artifactId>
-                        <version>2.1.2</version>
-                        <executions>
-                            <execution>
-                                <id>l4j-gui</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>launch4j</goal>
-                                </goals>
-                                <configuration>
-                                    <headerType>gui</headerType>
-                                    <outfile>${project.build.directory}/forge-java8.exe</outfile>
-                                    <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
-                                    <dontWrapJar>true</dontWrapJar>
-                                    <errTitle>forge</errTitle>
-                                    <icon>src/main/config/forge.ico</icon>
-                                    <classPath>
-                                        <mainClass>forge.view.Main</mainClass>
-                                        <addDependencies>false</addDependencies>
-                                        <preCp>anything</preCp>
-                                    </classPath>
-                                    <jre>
-                                        <minVersion>1.8.0</minVersion>
-                                        <maxHeapSize>4096</maxHeapSize>
-                                        <opts>
-                                            <opt>-Dfile.encoding=UTF-8</opt>
-                                        </opts>
-                                    </jre>
-                                    <versionInfo>
-                                        <fileVersion>
-                                            ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
-                                        </fileVersion>
-                                        <txtFileVersion>
-                                            ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
-                                        </txtFileVersion>
-                                        <fileDescription>Forge</fileDescription>
-                                        <copyright>Forge</copyright>
-                                        <productVersion>
-                                            ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
-                                        </productVersion>
-                                        <txtProductVersion>
-                                            ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
-                                        </txtProductVersion>
-                                        <productName>Forge</productName>
-                                        <internalName>forge</internalName>
-                                        <originalFilename>forge-java8.exe</originalFilename>
-                                    </versionInfo>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
- 
-                     <plugin>
-                         <groupId>org.apache.maven.plugins</groupId>
-@@ -447,130 +394,6 @@
-             <id>windows-linux</id>
-             <build>
-                 <plugins>
-                    <plugin>
-                        <groupId>com.akathist.maven.plugins.launch4j</groupId>
-                        <artifactId>launch4j-maven-plugin</artifactId>
-                        <version>2.1.2</version>
-                        <executions>
-                            <execution>
-                                <id>l4j-gui</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>launch4j</goal>
-                                </goals>
-                                <configuration>
-                                    <headerType>gui</headerType>
-                                    <outfile>${project.build.directory}/forge-java8.exe</outfile>
-                                    <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
-                                    <dontWrapJar>true</dontWrapJar>
-                                    <errTitle>forge</errTitle>
-                                    <icon>src/main/config/forge.ico</icon>
-                                    <classPath>
-                                        <mainClass>forge.view.Main</mainClass>
-                                        <addDependencies>false</addDependencies>
-                                        <preCp>anything</preCp>
-                                    </classPath>
-                                    <jre>
-                                        <minVersion>1.8.0</minVersion>
-                                        <maxHeapSize>4096</maxHeapSize>
-                                        <opts>
-                                            <opt>-Dfile.encoding=UTF-8</opt>
-                                        </opts>
-                                    </jre>
-                                    <versionInfo>
-                                        <fileVersion>
-                                            ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
-                                        </fileVersion>
-                                        <txtFileVersion>
-                                            ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
-                                        </txtFileVersion>
-                                        <fileDescription>Forge</fileDescription>
-                                        <copyright>Forge</copyright>
-                                        <productVersion>
-                                            ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
-                                        </productVersion>
-                                        <txtProductVersion>
-                                            ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
-                                        </txtProductVersion>
-                                        <productName>Forge</productName>
-                                        <internalName>forge</internalName>
-                                        <originalFilename>forge-java8.exe</originalFilename>
-                                    </versionInfo>
-                                </configuration>
-                            </execution>
-                            <!--extra-->
-                            <execution>
-                                <id>l4j-gui2</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>launch4j</goal>
-                                </goals>
-                                <configuration>
-                                    <headerType>gui</headerType>
-                                    <outfile>${project.build.directory}/forge.exe</outfile>
-                                    <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
-                                    <dontWrapJar>true</dontWrapJar>
-                                    <errTitle>forge</errTitle>
-                                    <downloadUrl>https://www.oracle.com/java/technologies/downloads/</downloadUrl>
-                                    <icon>src/main/config/forge.ico</icon>
-                                    <classPath>
-                                        <mainClass>forge.view.Main</mainClass>
-                                        <addDependencies>false</addDependencies>
-                                        <preCp>anything</preCp>
-                                    </classPath>
-                                    <jre>
-                                        <minVersion>11.0.1</minVersion>
-                                        <jdkPreference>jdkOnly</jdkPreference>
-                                        <maxHeapSize>4096</maxHeapSize>
-                                        <opts>
-                                            <opt>-Dfile.encoding=UTF-8</opt>
-                                            <opt>--add-opens java.base/java.lang=ALL-UNNAMED</opt>
-                                            <opt>--add-opens java.base/java.math=ALL-UNNAMED</opt>
-                                            <opt>--add-opens java.base/jdk.internal.misc=ALL-UNNAMED</opt>
-                                            <opt>--add-opens java.base/java.nio=ALL-UNNAMED</opt>
-                                            <opt>--add-opens=java.base/sun.nio.ch=ALL-UNNAMED</opt>
-                                            <opt>--add-opens java.base/java.util=ALL-UNNAMED</opt>
-                                            <opt>--add-opens java.base/java.lang.reflect=ALL-UNNAMED</opt>
-                                            <opt>--add-opens java.base/java.text=ALL-UNNAMED</opt>
-                                            <opt>--add-opens java.desktop/java.awt=ALL-UNNAMED</opt>
-                                            <opt>--add-opens java.desktop/java.awt.font=ALL-UNNAMED</opt>
-                                            <opt>--add-opens java.desktop/java.awt.image=ALL-UNNAMED</opt>
-                                            <opt>--add-opens java.desktop/java.awt.color=ALL-UNNAMED</opt>
-                                            <opt>--add-opens java.desktop/sun.awt.image=ALL-UNNAMED</opt>
-                                            <opt>--add-opens java.desktop/javax.swing=ALL-UNNAMED</opt>
-                                            <opt>--add-opens java.desktop/javax.swing.border=ALL-UNNAMED</opt>
-                                            <opt>--add-opens java.desktop/javax.swing.event=ALL-UNNAMED</opt>
-                                            <opt>--add-opens java.desktop/sun.swing=ALL-UNNAMED</opt>
-                                            <opt>--add-opens java.desktop/java.beans=ALL-UNNAMED</opt>
-                                            <opt>--add-opens java.base/java.util.concurrent=ALL-UNNAMED</opt>
-                                            <opt>--add-opens java.base/java.net=ALL-UNNAMED</opt>
-                                            <opt>-Dio.netty.tryReflectionSetAccessible=true</opt>
-                                        </opts>
-                                    </jre>
-                                    <versionInfo>
-                                        <fileVersion>
-                                            ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
-                                        </fileVersion>
-                                        <txtFileVersion>
-                                            ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
-                                        </txtFileVersion>
-                                        <fileDescription>Forge</fileDescription>
-                                        <copyright>Forge</copyright>
-                                        <productVersion>
-                                            ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
-                                        </productVersion>
-                                        <txtProductVersion>
-                                            ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
-                                        </txtProductVersion>
-                                        <productName>Forge</productName>
-                                        <internalName>forge</internalName>
-                                        <originalFilename>forge.exe</originalFilename>
-                                    </versionInfo>
-                                </configuration>
-                            </execution>
-                            <!--extra-->
-                        </executions>
-                    </plugin>
- 
-                     <plugin>
-                         <groupId>org.apache.maven.plugins</groupId>
-diff --git a/forge-gui-mobile-dev/pom.xml b/forge-gui-mobile-dev/pom.xml
-index e7439c1e3a..de0cbc16a1 100644
--- a/forge-gui-mobile-dev/pom.xml
-+++ b/forge-gui-mobile-dev/pom.xml
-@@ -64,130 +64,6 @@
-                     </replacements>
-                 </configuration>
+@@ -70,62 +70,6 @@
+                     </execution>
+                 </executions>
             </plugin>
 -            <plugin>
 -                <groupId>com.akathist.maven.plugins.launch4j</groupId>
 -                <artifactId>launch4j-maven-plugin</artifactId>
-                <version>1.7.25</version>
+-                <version>2.5.1</version>
 -                <executions>
 -                    <execution>
-                        <id>l4j-adv</id>
+-                        <id>l4j-gui</id>
 -                        <phase>package</phase>
 -                        <goals>
 -                            <goal>launch4j</goal>
 -                        </goals>
 -                        <configuration>
 -                            <headerType>gui</headerType>
-                            <outfile>${project.build.directory}/forge-adventure-java8.exe</outfile>
+-                            <outfile>${project.build.directory}/forge.exe</outfile>
 -                            <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
 -                            <dontWrapJar>true</dontWrapJar>
 -                            <errTitle>forge</errTitle>
-                            <icon>src/main/config/forge-adventure.ico</icon>
+-                            <downloadUrl>https://bell-sw.com/pages/downloads/#jdk-17-lts</downloadUrl>
+-                            <icon>src/main/config/forge.ico</icon>
 -                            <classPath>
-                                <mainClass>forge.app.Main</mainClass>
+-                                <mainClass>forge.view.Main</mainClass>
 -                                <addDependencies>false</addDependencies>
 -                                <preCp>anything</preCp>
 -                            </classPath>
 -                            <jre>
-                                <minVersion>1.8.0</minVersion>
+-                                <minVersion>17</minVersion>
+-                                <requiresJdk>true</requiresJdk>
 -                                <maxHeapSize>4096</maxHeapSize>
 -                                <opts>
-                                    <opt>-Dfile.encoding=UTF-8</opt>
+-                                    <opt>${mandatory.java.args}</opt>
+-                                    <opt>${addopen.java.args}</opt>
 -                                </opts>
 -                            </jre>
 -                            <versionInfo>
 -                                <fileVersion>
-                                    1.0.0.0
+-                                    ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
 -                                </fileVersion>
 -                                <txtFileVersion>
-                                    1.0.0.0
+-                                    ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
 -                                </txtFileVersion>
 -                                <fileDescription>Forge</fileDescription>
 -                                <copyright>Forge</copyright>
 -                                <productVersion>
-                                    1.0.0.0
+-                                    ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
 -                                </productVersion>
 -                                <txtProductVersion>
-                                    1.0.0.0
+-                                    ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
 -                                </txtProductVersion>
-                                <productName>forge-adventure</productName>
-                                <internalName>forge-adventure</internalName>
-                                <originalFilename>forge-adventure-java8.exe</originalFilename>
+-                                <productName>Forge</productName>
+-                                <internalName>forge</internalName>
+-                                <originalFilename>forge.exe</originalFilename>
 -                            </versionInfo>
 -                        </configuration>
 -                    </execution>
-                    <!--extra-->
+-                </executions>
+-            </plugin>
+             <plugin>
+                 <groupId>com.google.code.maven-replacer-plugin</groupId>
+                 <artifactId>replacer</artifactId>
+diff --git a/forge-gui-mobile-dev/pom.xml b/forge-gui-mobile-dev/pom.xml
+index 168ecba1dc..748dbf47b7 100644
+--- a/forge-gui-mobile-dev/pom.xml
+++ b/forge-gui-mobile-dev/pom.xml
+@@ -60,57 +60,6 @@
+                     <target>17</target>
+                 </configuration>
+             </plugin>
+-            <plugin>
+-                <groupId>com.akathist.maven.plugins.launch4j</groupId>
+-                <artifactId>launch4j-maven-plugin</artifactId>
+-                <version>2.5.1</version>
+-                <executions>
 -                    <execution>
-                        <id>l4j-adv2</id>
+-                        <id>l4j-adv</id>
 -                        <phase>package</phase>
 -                        <goals>
 -                            <goal>launch4j</goal>
@@ -401,40 +90,14 @@ index e7439c1e3a..de0cbc16a1 100644
 -                            <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
 -                            <dontWrapJar>true</dontWrapJar>
 -                            <errTitle>forge</errTitle>
-                            <downloadUrl>https://www.oracle.com/java/technologies/downloads/</downloadUrl>
+-                            <downloadUrl>https://bell-sw.com/pages/downloads/#jdk-17-lts</downloadUrl>
 -                            <icon>src/main/config/forge-adventure.ico</icon>
-                            <classPath>
-                                <mainClass>forge.app.Main</mainClass>
-                                <addDependencies>false</addDependencies>
-                                <preCp>anything</preCp>
-                            </classPath>
 -                            <jre>
-                                <minVersion>11.0.1</minVersion>
-                                <jdkPreference>jdkOnly</jdkPreference>
+-                                <minVersion>17</minVersion>
+-                                <requiresJdk>true</requiresJdk>
 -                                <maxHeapSize>4096</maxHeapSize>
 -                                <opts>
-                                    <opt>-Dfile.encoding=UTF-8</opt>
-                                    <opt>--add-opens java.base/java.lang=ALL-UNNAMED</opt>
-                                    <opt>--add-opens java.base/java.math=ALL-UNNAMED</opt>
-                                    <opt>--add-opens java.base/jdk.internal.misc=ALL-UNNAMED</opt>
-                                    <opt>--add-opens java.base/java.nio=ALL-UNNAMED</opt>
-                                    <opt>--add-opens=java.base/sun.nio.ch=ALL-UNNAMED</opt>
-                                    <opt>--add-opens java.base/java.util=ALL-UNNAMED</opt>
-                                    <opt>--add-opens java.base/java.lang.reflect=ALL-UNNAMED</opt>
-                                    <opt>--add-opens java.base/java.text=ALL-UNNAMED</opt>
-                                    <opt>--add-opens java.desktop/java.awt=ALL-UNNAMED</opt>
-                                    <opt>--add-opens java.desktop/java.awt.font=ALL-UNNAMED</opt>
-                                    <opt>--add-opens java.desktop/java.awt.image=ALL-UNNAMED</opt>
-                                    <opt>--add-opens java.desktop/java.awt.color=ALL-UNNAMED</opt>
-                                    <opt>--add-opens java.desktop/sun.awt.image=ALL-UNNAMED</opt>
-                                    <opt>--add-opens java.desktop/javax.swing=ALL-UNNAMED</opt>
-                                    <opt>--add-opens java.desktop/javax.swing.border=ALL-UNNAMED</opt>
-                                    <opt>--add-opens java.desktop/javax.swing.event=ALL-UNNAMED</opt>
-                                    <opt>--add-opens java.desktop/sun.swing=ALL-UNNAMED</opt>
-                                    <opt>--add-opens java.desktop/java.beans=ALL-UNNAMED</opt>
-                                    <opt>--add-opens java.base/java.util.concurrent=ALL-UNNAMED</opt>
-                                    <opt>--add-opens java.base/java.net=ALL-UNNAMED</opt>
-                                    <opt>-Dio.netty.tryReflectionSetAccessible=true</opt>
+-                                    <opt>${mandatory.java.args}</opt>
 -                                </opts>
 -                            </jre>
 -                            <versionInfo>
@@ -462,5 +125,5 @@ index e7439c1e3a..de0cbc16a1 100644
 -                </executions>
 -            </plugin>
             <plugin>
-                 <artifactId>maven-assembly-plugin</artifactId>
-                 <configuration>
+                 <groupId>com.google.code.maven-replacer-plugin</groupId>
+                 <artifactId>replacer</artifactId>
@@ -6,16 +6,21 @@
  maven,
  makeWrapper,
  openjdk,
+  libGL,
+  makeDesktopItem,
+  copyDesktopItems,
+  imagemagick,
+  nix-update-script,
 }:

 let
-  version = "1.6.65";
+  version = "2.0.05";

  src = fetchFromGitHub {
    owner = "Card-Forge";
    repo = "forge";
    rev = "forge-${version}";
-    hash = "sha256-MCJl3nBHbX/O24bzD4aQ12eMWxYY2qJC5vomvtsIBek=";
+    hash = "sha256-71CZBI4FvN5X7peDjhv+0cdTYv8hWwzM8ePdvQSb6QI=";
  };

  # launch4j downloads and runs a native binary during the package phase.
@@ -26,11 +31,56 @@ maven.buildMavenPackage {
  pname = "forge-mtg";
  inherit version src patches;

-  mvnHash = "sha256-ouF0Ja3oGrlUCcT0PzI5i9FQ+oLdEhE/LvhJ0QGErvI=";
+  mvnHash = "sha256-krPOUaJTo5i3imkDvEkBJH3W01y1KypdvitqmZ5JMMA=";

  doCheck = false; # Needs a running Xorg

-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [
+    makeWrapper
+    copyDesktopItems
+    imagemagick
+  ];
+  desktopItems = [
+    (makeDesktopItem {
+      name = "forge";
+      exec = "forge";
+      actions = {
+        forge-adventure = {
+          exec = "forge-adventure";
+          name = "Play Adventure";
+        };
+        forge-adventure-editor = {
+          exec = "forge-adventure-editor";
+          name = "Adventure Editor";
+        };
+        forge-classic = {
+          exec = "forge";
+          name = "Play Classic";
+        };
+      };
+      icon = "forge-mtg";
+      comment = "Magic: the Gathering card game with rules enforcement";
+      desktopName = "Forge MTG";
+      genericName = "Card Game";
+      categories = [
+        "Game"
+        "BoardGame"
+      ];
+      keywords = [
+        "Magic"
+        "MTG"
+        "Card Game"
+        "Trading Card Game"
+        "TCG"
+      ];
+    })
+  ];
+
+  mvnParameters = lib.escapeShellArgs [
+    "-pl"
+    ":adventure-editor,:forge-gui-desktop,:forge-gui-mobile-dev" # forge-gui-mobile-dev is required for forge-adventure
+    "--also-make"
+  ];

  installPhase = ''
    runHook preInstall
@@ -40,16 +90,25 @@ maven.buildMavenPackage {
      forge-gui-desktop/target/forge-gui-desktop-${version}-jar-with-dependencies.jar \
      forge-gui-mobile-dev/target/forge-adventure.sh \
      forge-gui-mobile-dev/target/forge-gui-mobile-dev-${version}-jar-with-dependencies.jar \
-      forge-adventure/target/forge-adventure-editor.sh \
-      forge-adventure/target/forge-adventure-${version}-jar-with-dependencies.jar \
+      adventure-editor/target/adventure-editor-jar-with-dependencies.jar \
      forge-gui/res \
      $out/share/forge
+    cp adventure-editor/target/adventure-editor.sh $out/share/forge/forge-adventure-editor.sh
+
+    mkdir -p $out/share/icons/hicolor/128x128/apps
+    magick AppIcon.png -resize 128x128 $out/share/icons/hicolor/128x128/apps/forge-mtg.png
+
    runHook postInstall
  '';

  preFixup = ''
    for commandToInstall in forge forge-adventure forge-adventure-editor; do
      chmod 555 $out/share/forge/$commandToInstall.sh
+      PREFIX_CMD=""
+      if [ "$commandToInstall" = "forge-adventure" ]; then
+        PREFIX_CMD="--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]}"
+      fi
+
      makeWrapper $out/share/forge/$commandToInstall.sh $out/bin/$commandToInstall \
        --prefix PATH : ${
          lib.makeBinPath [
@@ -59,13 +118,18 @@ maven.buildMavenPackage {
          ]
        } \
        --set JAVA_HOME ${openjdk}/lib/openjdk \
-        --set SENTRY_DSN ""
+        --set SENTRY_DSN "" \
+        $PREFIX_CMD
    done
  '';

+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version-regex=forge-(.*)" ];
+  };
+
  meta = with lib; {
    description = "Magic: the Gathering card game with rules enforcement";
-    homepage = "https://www.slightlymagic.net/forum/viewforum.php?f=26";
+    homepage = "https://card-forge.github.io/forge";
    license = licenses.gpl3Plus;
    maintainers = with maintainers; [ eigengrau ];
  };
@@ -6,19 +6,19 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "fromager";
-  version = "0.47.0";
+  version = "0.59.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "python-wheel-build";
    repo = "fromager";
    tag = version;
-    hash = "sha256-Jw5fOhY4WOwYG5QPCcsT6+BicGtqz9UrHcpPsPQlOWc=";
+    hash = "sha256-aKoZKpzgJ3e5JRYSSeLmLlji1Fj8omxvwGZfNXDOhLs=";
  };

  build-system = with python3.pkgs; [
-    setuptools
-    setuptools-scm
+    hatchling
+    hatch-vcs
  ];

  dependencies = with python3.pkgs; [
@@ -32,6 +32,7 @@ python3.pkgs.buildPythonApplication rec {
    pyproject-hooks
    pyyaml
    requests
+    requests-mock
    resolvelib
    rich
    setuptools
@@ -8,7 +8,7 @@

 let
  pname = "gallery-dl";
-  version = "1.30.4";
+  version = "1.30.5";
 in
 python3Packages.buildPythonApplication {
  inherit pname version;
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication {
    owner = "mikf";
    repo = "gallery-dl";
    tag = "v${version}";
-    hash = "sha256-fDLtB3l682+APcOkvQCPAfxCqWhjEi2E7sEU617fzyg=";
+    hash = "sha256-RsYg3DSiB6DWVlwAJT7iN7rNxUJqT5EAIGNEuMuIm8Y=";
  };

  build-system = [ python3Packages.setuptools ];
@@ -16,12 +16,22 @@
  buildPackages,
  runtimeShell,
  # List of Node.js runtimes the package should support
-  nodeRuntimes ? [ "node20" ],
+  nodeRuntimes ? [
+    "node20"
+    "node24"
+  ],
  nodejs_20,
+  nodejs_24,
 }:

 # Node.js runtimes supported by upstream
-assert builtins.all (x: builtins.elem x [ "node20" ]) nodeRuntimes;
+assert builtins.all (
+  x:
+  builtins.elem x [
+    "node20"
+    "node24"
+  ]
+) nodeRuntimes;

 buildDotnetModule (finalAttrs: {
  pname = "github-runner";
@@ -226,6 +236,9 @@ buildDotnetModule (finalAttrs: {
  ''
  + lib.optionalString (lib.elem "node20" nodeRuntimes) ''
    ln -s ${nodejs_20} _layout/externals/node20
+  ''
+  + lib.optionalString (lib.elem "node24" nodeRuntimes) ''
+    ln -s ${nodejs_24} _layout/externals/node24
  '';

  postInstall = ''
@@ -268,6 +281,9 @@ buildDotnetModule (finalAttrs: {
  + lib.optionalString (lib.elem "node20" nodeRuntimes) ''
    ln -s ${nodejs_20} $out/lib/externals/node20
  ''
+  + lib.optionalString (lib.elem "node24" nodeRuntimes) ''
+    ln -s ${nodejs_24} $out/lib/externals/node24
+  ''
  + ''
    # Install Nodejs scripts called from workflows
    install -D src/Misc/layoutbin/hashFiles/index.js $out/lib/github-runner/hashFiles/index.js
@@ -60,9 +60,6 @@ let
      orjson
      psycopg
      pydantic
-      # undocumented on django-allauth side
-      # https://codeberg.org/allauth/django-allauth/issues/4493
-      pyyaml
      sentry-sdk
      symbolic
      user-agents
@@ -71,6 +68,7 @@ let
      whitenoise
    ]
    ++ celery.optional-dependencies.redis
+    ++ django-allauth.optional-dependencies.headless-spec
    ++ django-allauth.optional-dependencies.mfa
    ++ django-allauth.optional-dependencies.socialaccount
    ++ django-redis.optional-dependencies.hiredis
@@ -27,5 +27,6 @@ buildGoModule rec {
    license = lib.licenses.mit;
    platforms = lib.platforms.linux;
    maintainers = with lib.maintainers; [ ramblurr ];
+    mainProgram = "hacompanion";
  };
 }
@@ -0,0 +1,52 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nodejs,
+  makeWrapper,
+  versionCheckHook,
+  nix-update-script,
+}:
+buildNpmPackage (finalAttrs: {
+  pname = "jdenticon-cli";
+  version = "3.3.0";
+  src = fetchFromGitHub {
+    owner = "dmester";
+    repo = "jdenticon";
+    tag = finalAttrs.version;
+    hash = "sha256-uOPNsfEreC7F+Y0WWmudZSPnGxqarna0JPOwQyK6LiQ=";
+  };
+  npmDepsHash = "sha256-LXwvb088oHmA57EryfYtKi0L/9sB+yyUr/K/qGA1W9k=";
+
+  nativeBuildInputs = [
+    makeWrapper
+    nodejs
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -D bin/jdenticon.js "$out/lib/jdenticon/bin/jdenticon.js"
+    install -D dist/jdenticon-node.js "$out/lib/jdenticon/dist/jdenticon-node.js"
+    install -d "$out/lib/jdenticon/node_modules"
+    cp -r node_modules/canvas-renderer  "$out/lib/jdenticon/node_modules"
+    makeWrapper "${lib.getExe nodejs}" "$out/bin/jdenticon" \
+      --add-flags "$out/lib/jdenticon/bin/jdenticon.js"
+
+    runHook postInstall
+  '';
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/dmester/jdenticon/releases/tag/${finalAttrs.version}";
+    description = "JavaScript library for generating highly recognizable identicons using HTML5 canvas or SVG.";
+    homepage = "https://jdenticon.com/";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.gipphe ];
+    mainProgram = "jdenticon";
+  };
+})
@@ -1,15 +1,15 @@
 {
-  "version": "3.3.13",
+  "version": "3.4.6",
  "x86_64-linux": {
-    "url": "https://github.com/laurent22/joplin/releases/download/v3.3.13/Joplin-3.3.13.AppImage",
-    "sha256": "1gd5qlkjwrx8kxx5d97r58v5wxw4zbzjblr24ydjqbbfhjrr1zr2"
+    "url": "https://github.com/laurent22/joplin/releases/download/v3.4.6/Joplin-3.4.6.AppImage",
+    "sha256": "0xf5lmjv49rq5bnczpydflzzhha8rzcn3iy7zpi5wqzmzsp0jg2p"
  },
  "x86_64-darwin": {
-    "url": "https://github.com/laurent22/joplin/releases/download/v3.3.13/Joplin-3.3.13.dmg",
-    "sha256": "05v5idqnajlya83ax252xs6d1nc0p6679aihij35b885nqiql6f5"
+    "url": "https://github.com/laurent22/joplin/releases/download/v3.4.6/Joplin-3.4.6.dmg",
+    "sha256": "1yahng1rciyrviykksqhk2wfkmrff77frsb7fkaxbhll1p8p74hm"
  },
  "aarch64-darwin": {
-    "url": "https://github.com/laurent22/joplin/releases/download/v3.3.13/Joplin-3.3.13-arm64.dmg",
-    "sha256": "1bafq33n0qdw4hxbq3mp2499zpzz0kc4gqh9cdp650994kmq8207"
+    "url": "https://github.com/laurent22/joplin/releases/download/v3.4.6/Joplin-3.4.6-arm64.dmg",
+    "sha256": "1k5ipsbss3qkyi5b3bw9agk4jmbsakvskrff71v8hg5wk6vi3m7c"
  }
 }
@@ -41,13 +41,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
  pname = "koboldcpp";
-  version = "1.97.4";
+  version = "1.98";

  src = fetchFromGitHub {
    owner = "LostRuins";
    repo = "koboldcpp";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-z9F3q+1iq6HQV37yRjBOlJRChhnQ/cPP5sAZl5rFDUs=";
+    hash = "sha256-5VP7NfHc00TdTqr5wel1vrtOnJWDGZT44tKDEm/f2iw=";
  };

  enableParallelBuilding = true;
@@ -21,14 +21,14 @@ rustPlatform.buildRustPackage rec {
  pname = "libsignal-ffi";
  # must match the version used in mautrix-signal
  # see https://github.com/mautrix/signal/issues/401
-  version = "0.76.1";
+  version = "0.78.2";

  src = fetchFromGitHub {
    fetchSubmodules = true;
    owner = "signalapp";
    repo = "libsignal";
    tag = "v${version}";
-    hash = "sha256-411+ANwyqqUX11rxCzFvPhjMWviJ0CcQlkAiqNWs32w=";
+    hash = "sha256-4buK92sJZj5yEwFyi55WonF+1LZ5PERZ9wJZdlFjPcg=";
  };

  nativeBuildInputs = [
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
  env.BORING_BSSL_PATH = "${boringssl-wrapper}";
  env.NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++";

-  cargoHash = "sha256-9W7u0fZgU0J03hT6D4BJPpIKn3dwf9yckJiwwNkyqUA=";
+  cargoHash = "sha256-eDerNFw8jtM7qIVh3Y837Iu11yeEpAcxgFVqZJTylEc=";

  cargoBuildFlags = [
    "-p"
@@ -51,6 +51,9 @@ rustPlatform.buildRustPackage rec {
    description = "C ABI library which exposes Signal protocol logic";
    homepage = "https://github.com/signalapp/libsignal";
    license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ pentane ];
+    maintainers = with maintainers; [
+      pentane
+      SchweGELBin
+    ];
  };
 }
@@ -0,0 +1,54 @@
+{
+  lib,
+  nix-update-script,
+  fetchurl,
+  appimageTools,
+  makeBinaryWrapper,
+}:
+let
+  pname = "lmath";
+  version = "1.10.15";
+  src = fetchurl {
+    url = "https://github.com/lehtoroni/lmath-issues/releases/download/v${version}/LMath_Linux_r${version}-release.AppImage";
+    hash = "sha256-JOV+g7izjctCkHl5q/9T2PSUZzPzVPisHppbPofVYy0=";
+  };
+
+  appimageContents = appimageTools.extractType2 {
+    inherit pname version src;
+  };
+in
+appimageTools.wrapType2 {
+  inherit pname version src;
+
+  nativeBuildInputs = [
+    makeBinaryWrapper
+  ];
+
+  # '--skip-updated-bundle-check' stops automatic updates from breaking the package
+  extraInstallCommands = ''
+    install -Dm 444 ${appimageContents}/lmath.desktop $out/share/applications/lmath.desktop
+    install -Dm 444 ${appimageContents}/lmath.png $out/share/icons/hicolor/512x512/apps/lmath.png
+
+    wrapProgram $out/bin/lmath \
+      --add-flags "--no-update-check"
+
+    substituteInPlace $out/share/applications/lmath.desktop \
+      --replace-fail 'Exec=AppRun' 'Exec=lmath'
+  '';
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "^r([0-9\.]*)"
+    ];
+  };
+
+  meta = {
+    description = "Simple notebook app with LaTeX capabilities";
+    homepage = "https://lehtodigital.fi/lmath/";
+    mainProgram = "lmath";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ langsjo ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
@@ -37,6 +37,12 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-PKkyZDd4FLWGZ/kDKWkaSV8p8NDniSQGcR9Htce6uCg=";
  };

+  postPatch = ''
+    substituteInPlace src/meson.build --replace-fail \
+      "'src' / rust_target / meson.project_name()," \
+      "'src' / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name()," \
+  '';
+
  nativeBuildInputs = [
    cargo
    desktop-file-utils
@@ -73,6 +79,9 @@ stdenv.mkDerivation (finalAttrs: {
    )
  '';

+  # For https://gitlab.gnome.org/GNOME/loupe/-/blob/0e6ddb0227ac4f1c55907f8b43eaef4bb1d3ce70/src/meson.build#L34-35
+  env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec;
+
  passthru = {
    updateScript =
      let
@@ -19,13 +19,13 @@ let
 in
 buildGoModule rec {
  pname = "mautrix-signal";
-  version = "0.8.5";
+  version = "0.8.6";

  src = fetchFromGitHub {
    owner = "mautrix";
    repo = "signal";
    tag = "v${version}";
-    hash = "sha256-koO1eeMZ8wmty6z2zyJlA7zoM6gYmFlxdF8GB2hOxb8=";
+    hash = "sha256-62Z7Lasx0bzCAWLvHN7uCUqkMk6W80PR24mwfJU/n3Q=";
  };

  buildInputs =
@@ -41,7 +41,7 @@ buildGoModule rec {

  CGO_LDFLAGS = lib.optional withGoolm [ cppStdLib ];

-  vendorHash = "sha256-NmIWxc+6Leaqm1W+g2XdbMv4iU7Z7k8/g88U0iw/+98=";
+  vendorHash = "sha256-srvqflqleK2KIgesEZPNhSQh/IFmyTElJ7iUjBEmNq0=";

  doCheck = true;
  preCheck = ''
@@ -68,6 +68,7 @@ buildGoModule rec {
    maintainers = with maintainers; [
      pentane
      ma27
+      SchweGELBin
    ];
    mainProgram = "mautrix-signal";
  };
@@ -14,19 +14,19 @@

 buildGoModule rec {
  pname = "mautrix-whatsapp";
-  version = "0.12.3";
+  version = "0.12.4";

  src = fetchFromGitHub {
    owner = "mautrix";
    repo = "whatsapp";
    rev = "v${version}";
-    hash = "sha256-gbKphWFBT5+7kIptIS/GquFBPVaZzJolbEkZ6bj3Fiw=";
+    hash = "sha256-FduZKeWApGR/SmjiZsVDC0KJZq8XRtfCFQUZhxlVswM=";
  };

  buildInputs = lib.optional (!withGoolm) olm;
  tags = lib.optional withGoolm "goolm";

-  vendorHash = "sha256-LGHW1n36fdDtIPNENA2qqLcho+7FVna/zUPEYcxd9LQ=";
+  vendorHash = "sha256-Ujk/bJWo4tU7wQxyF7VP1JLqNh+VuNy5n31x9AWyEZA=";

  doCheck = false;

@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  qt6,
+  libvlc,
+  libvlcpp,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "mfaomp";
+  version = "0.4.3";
+
+  src = fetchFromGitHub {
+    owner = "Neurofibromin";
+    repo = "mfaomp";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-b8eIG5UC1i4yfHSStNwhgIttTS+g511RmFJ5OYxeYvM=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    qt6.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    qt6.qtbase
+    qt6.qtmultimedia
+    qt6.qtwebengine
+    qt6.qtsvg
+    libvlc
+    libvlcpp
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "USE_SYSTEM_PROVIDED_LIBVLCPP" true)
+    (lib.cmakeBool "USE_FETCHED_LIBVLCPP" false)
+  ];
+
+  meta = {
+    description = "Multiple Files At Once Media Player";
+    homepage = "https://github.com/Neurofibromin/mfaomp";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ neurofibromin ];
+    platforms = lib.platforms.linux;
+    mainProgram = "mfaomp";
+  };
+})
@@ -0,0 +1,25 @@
+{
+  fetchFromGitHub,
+  rustPlatform,
+  lib,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "minefair";
+  version = "1.5.0";
+  src = fetchFromGitHub {
+    owner = "LyricLy";
+    repo = "minefair";
+    tag = finalAttrs.version;
+    hash = "sha256-gABgSjS+ZhzmWJsCbbWMFstFAoTJ+Yc159CCo5nhYBc=";
+  };
+  cargoHash = "sha256-s4Wlp3IUPDuArf9N+9qWZH7JjQeczYi1phpUs7SNUd4=";
+
+  meta = {
+    description = "Fair and infinite implementation of Minesweeper";
+    homepage = "https://github.com/LyricLy/minefair";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.pyrotelekinetic ];
+    mainProgram = "minefair";
+  };
+})
@@ -30,19 +30,18 @@
  withShareSelection ? false,
  withTermion ? false,
 }:
-
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "ncspot";
-  version = "1.3.0";
+  version = "1.3.1";

  src = fetchFromGitHub {
    owner = "hrkfdn";
    repo = "ncspot";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-FSMQv2443oPQjMSv68ppfI2ZTUG79b+GcXmHNAmjPZk=";
+    hash = "sha256-bKwpvkaYIFK4USxAfx/Vudu7KlT3WP5rKQ1f5lQFbtc=";
  };

-  cargoHash = "sha256-Qjsn3U9KZr5qZliJ/vbudfkH1uOng1N5c8dAyH+Y5vQ=";
+  cargoHash = "sha256-FepaUgwOaQKW+0ugGDbqFmZmVPL7wqVaYyLk5UjND2o=";

  nativeBuildInputs = [ pkg-config ] ++ lib.optional withClipboard python3;

@@ -95,6 +94,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    maintainers = with lib.maintainers; [
      liff
      getchoo
+      sodagunz
    ];
    mainProgram = "ncspot";
  };
@@ -70,13 +70,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
  stdenvNoCC.mkDerivation
  {
    inherit pname;
-    version = "0-unstable-2025-07-28";
+    version = "0-unstable-2025-08-21";

    src = fetchFromGitHub {
      owner = "Fausto-Korpsvart";
      repo = "Nightfox-GTK-Theme";
-      rev = "ea0172aa853e8f6c2b00568c4cd6dcbea7991b7c";
-      hash = "sha256-9+RBAG/JKGXjW6zRut8eXM4EYkbNRZ+yw5tLDrSMBXg=";
+      rev = "4d73329de5ac65dc3e957e1635d471c7d3122a6b";
+      hash = "sha256-QTsouPINcn8coLk5z2EFMG1egP97rFVPgiYqGhwu62c=";
    };

    propagatedUserEnvPkgs = [ gtk-engine-murrine ];
@@ -7,16 +7,16 @@

 rustPlatform.buildRustPackage {
  pname = "npingler";
-  version = "unstable-2025-08-21";
+  version = "unstable-2025-08-24";

  src = fetchFromGitHub {
    owner = "9999years";
    repo = "npingler";
-    rev = "de47bb5c5c188ba3b36958c2284dbc6d24f2687f";
-    hash = "sha256-4Q8oG2iem9dgsTTEFfhyw2rPAxtXdGx+Uhb/9uAdUy4=";
+    rev = "b897098be1df890b669dc734edcb10bf8fc798cb";
+    hash = "sha256-mMwfonIP8fnJDNdl9ANhLmYlM8tPLtBCWNIPSRBT/D4=";
  };

-  cargoHash = "sha256-wTW0cwi6C2WRlH2ifPMTdLAEZg4VbE5Jr5Mh+e+SjaM=";
+  cargoHash = "sha256-VhMpgrNy0NauwBSCR+5vjod9H216HPC+rdQUIFVjnRg=";

  meta = {
    description = "Nix profile manager for use with npins";
@@ -609,8 +609,8 @@
  },
  {
    "pname": "Polly",
-    "version": "8.5.2",
-    "hash": "sha256-IrN06ddOIJ0VYuVefe3LvfW0kX20ATRQkEBg9CBomRA="
+    "version": "8.6.0",
+    "hash": "sha256-wlvYcfcOExa3LopwRFO4axW682jkUZvioHe+kznspHk="
  },
  {
    "pname": "Polly.Contrib.WaitAndRetry",
@@ -619,8 +619,8 @@
  },
  {
    "pname": "Polly.Core",
-    "version": "8.5.2",
-    "hash": "sha256-PAwsWqrCieCf/7Y87fV7XMKoaY2abCQNtI+4oyyMifk="
+    "version": "8.6.0",
+    "hash": "sha256-NEGMMQ+3+i4ytsGekKfP1trUe0mRZP7MV0eBiSFXHW8="
  },
  {
    "pname": "RestSharp",
@@ -19,7 +19,7 @@
  applyPatches,
 }:
 let
-  version = "1.37.0.5076";
+  version = "2.0.5.5160";
  # The dotnet8 compatibility patches also change `yarn.lock`, so we must pass
  # the already patched lockfile to `fetchYarnDeps`.
  src = applyPatches {
@@ -27,32 +27,11 @@ let
      owner = "Prowlarr";
      repo = "Prowlarr";
      tag = "v${version}";
-      hash = "sha256-uSdZaPq/aXehmRKMobwYNs5iYGPv5R76Ix9lCEVdLzM=";
+      hash = "sha256-xSAEDcBaItA+retaSKtEI6wlwj5Knfi4RwUN6GGYms0=";
    };
    postPatch = ''
      mv src/NuGet.config NuGet.Config
    '';
-    patches = lib.optionals (lib.versionOlder version "2.0") [
-      # See https://github.com/Prowlarr/Prowlarr/pull/2399
-      # Unfortunately, the .NET 8 upgrade will be merged into the v2 branch,
-      # and it may take some time for that to become stable.
-      # However, the patches cleanly apply to v1 as well.
-      (fetchpatch {
-        name = "dotnet8-compatibility";
-        url = "https://github.com/Prowlarr/Prowlarr/commit/21c408a7dac8abaac91c05958f18a556220b2304.patch";
-        hash = "sha256-Es7JEXycOJPMXN+Kgv4wRnJA+l6zltUdP2i/wVodTBs=";
-      })
-      (fetchpatch {
-        name = "dotnet8-darwin-compatibility";
-        url = "https://github.com/Prowlarr/Prowlarr/commit/7a1fca5e23a3e75a9a2b2e1073a33eaa2ce865fe.patch";
-        hash = "sha256-bReCHXC3RHgm1MYmE2kGqStt4fuBHowcupLIXT3fEes=";
-      })
-      (fetchpatch {
-        name = "bump-swashbuckle-version";
-        url = "https://github.com/Prowlarr/Prowlarr/commit/8eec321a0eaa396e2f964576e5883890c719b202.patch";
-        hash = "sha256-SOdzGvq8FFYa451zTOw8yD1CDvM++AiFYFHhFW5Soco=";
-      })
-    ];
  };
  rid = dotnetCorePackages.systemToDotnetRid stdenvNoCC.hostPlatform.system;
 in
@@ -57,6 +57,12 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-oQSH4P9WxvkXZ53KM5ZoRAZyQFt60Zz7guBbgT1iiBk=";
  };

+  postPatch = ''
+    substituteInPlace src/meson.build --replace-fail \
+      "'src' / rust_target / meson.project_name()," \
+      "'src' / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name(),"
+  '';
+
  nativeBuildInputs = [
    cargo
    desktop-file-utils
@@ -80,6 +86,9 @@ stdenv.mkDerivation (finalAttrs: {
    wireplumber_0_4
  ];

+  # For https://github.com/saivert/pwvucontrol/blob/7bf43c746cd49fffbfb244ac4474742c6b3737a9/src/meson.build#L45-L46
+  env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec;
+
  meta = {
    description = "Pipewire Volume Control";
    homepage = "https://github.com/saivert/pwvucontrol";
@@ -48,16 +48,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "rio";
-  version = "0.2.28";
+  version = "0.2.29";

  src = fetchFromGitHub {
    owner = "raphamorim";
    repo = "rio";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-bQ6Kj8kKDdcvRX5084KRjsuctp22Zi7375GWjOBznhw=";
+    hash = "sha256-hM5WFZMZRq5iA/kGpbOncmHTyG//xt/B+Jmi7Y/gGwk=";
  };

-  cargoHash = "sha256-LJLexxczsqtIZuLil7sB3aAt1S2RBOmuvOQTBeuSUP4";
+  cargoHash = "sha256-pD3s446lrXtJp67fZfjbm7Eej0FyLYf9op8AF/GkeJ8=";

  nativeBuildInputs = [
    rustPlatform.bindgenHook
@@ -15,7 +15,7 @@ let
    exec = "roomarranger";
    name = "roomarranger";
    desktopName = "Room Arranger";
-    genericName = "Design your room, office, apartment, house.";
+    genericName = "Design your room, office, apartment or house, plan gardens and more...";
    icon = "roomarranger-icon";
    terminal = false;
    categories = [ "Graphics" ];
@@ -28,11 +28,11 @@ in

 stdenv.mkDerivation {
  pname = "roomarranger";
-  version = "10.0.1";
+  version = "10.2";

  src = fetchurl {
-    url = "https://f000.backblazeb2.com/file/rooarr/rooarr1001-linux64.tar.gz";
-    hash = "sha256-OwJSOfyTQinVKzrJftpFa5NN1kGweBezedpL2aE4LbE=";
+    url = "https://f000.backblazeb2.com/file/rooarr/rooarr1020-linux64.tar.gz";
+    hash = "sha256-24AGP2le5HfcVMlqDjiMRcRWKU/zjACV7KzJlVWMpkw=";
  };

  nativeBuildInputs = [
@@ -53,9 +53,6 @@ stdenv.mkDerivation {
    mkdir -p $out/lib $out/bin
    cp -r rooarr-bin/* $out/lib/

-    # Delete bundled dynamic libraries that reference major Qt version 6
-    rm -f $out/lib/*.6
-
    ln -s $out/lib/RoomArranger $out/bin/roomarranger

    # Install application icons
@@ -80,6 +77,7 @@ stdenv.mkDerivation {
      Free for 30 days. Updates are free.
    '';
    homepage = "https://www.roomarranger.com/";
+    changelog = "https://www.roomarranger.com/whatsnew.txt";
    license = lib.licenses.unfree;
    platforms = [ "x86_64-linux" ];
    maintainers = with lib.maintainers; [ bellackn ];
@@ -14,14 +14,14 @@

 python3Packages.buildPythonApplication rec {
  pname = "seagoat";
-  version = "1.0.20";
+  version = "1.0.25";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "kantord";
    repo = "SeaGOAT";
    tag = "v${version}";
-    hash = "sha256-UbvWvPEd4SRVZpnANJD3V/oZAQrqOeEjWwr5TyOZjNI=";
+    hash = "sha256-Qg4sYp2glD7TI6MjqTGFFDlwpLdy7apckTUT29NSK6k=";
  };

  build-system = [ python3Packages.poetry-core ];
@@ -2,20 +2,27 @@
  lib,
  fetchFromGitHub,
  buildGoModule,
+  go-mockery,
  versionCheckHook,
 }:
 buildGoModule rec {
  pname = "sesh";
-  version = "2.16.0";
+  version = "2.17.1";

+  nativeBuildInputs = [
+    go-mockery
+  ];
  src = fetchFromGitHub {
    owner = "joshmedeski";
    repo = "sesh";
    rev = "v${version}";
-    hash = "sha256-3kD7t3lgkxrK53cL+5i9DB5w1hIYA4J/MiauLZ1Z7KQ=";
+    hash = "sha256-olt61AR/Tq8lLh65V0/+GDrWjCi9hrkNbHR9LOX7kY0=";
  };

-  vendorHash = "sha256-r6n0xZbOvqDU63d3WrXenvV4x81iRgpOS2h73xSlVBI=";
+  preBuild = ''
+    mockery
+  '';
+  vendorHash = "sha256-TLl8HZnsVvtx6jqusTETP0l3zTmzYmuV4NJIM958VcQ=";

  ldflags = [
    "-s"
@@ -34,6 +41,7 @@ buildGoModule rec {
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [
      gwg313
+      randomdude
      t-monaghan
    ];
    mainProgram = "sesh";
@@ -13,13 +13,13 @@

 stdenv.mkDerivation rec {
  pname = "signalbackup-tools";
-  version = "20250818-1";
+  version = "20250824";

  src = fetchFromGitHub {
    owner = "bepaald";
    repo = "signalbackup-tools";
    tag = version;
-    hash = "sha256-qVKtFgSnxXZEwmzVen62BLnLsklyoFdYCX1bVp8TNMI=";
+    hash = "sha256-V2q3eA/Bqa98RdF2/Quta2qA7MmL1xiPNXsRehee9zU=";
  };

  nativeBuildInputs = [
@@ -3,6 +3,7 @@
  ocamlPackages,
  fetchFromGitHub,
  versionCheckHook,
+  nixosTests,
  nix-update-script,
 }:

@@ -49,7 +50,10 @@ ocamlPackages.buildDunePackage rec {
  versionCheckProgramArg = "--version";
  doInstallCheck = true;

-  passthru.updateScript = nix-update-script { };
+  passthru = {
+    tests = { inherit (nixosTests) slipshow; };
+    updateScript = nix-update-script { };
+  };

  meta = {
    description = "Engine for displaying slips, the next-gen version of slides";
@@ -2,20 +2,21 @@
  lib,
  buildGoModule,
  fetchFromGitHub,
+  nix-update-script,
 }:

 buildGoModule (finalAttrs: {
  pname = "spirit";
-  version = "0.8.0";
+  version = "0.9.0";

  src = fetchFromGitHub {
    owner = "block";
    repo = "spirit";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-bGKqiCd9dggppORouoWlAoAaYdx4vAivsP22KWm1fxU=";
+    hash = "sha256-B9yrPHHIjtfjY1+auC/8h95ejs2f6HD5TCIrt+8dH2k=";
  };

-  vendorHash = "sha256-87WUqUjyfprpY63kEKCAx/AU6TN73W7oMdOaKfl8xt4=";
+  vendorHash = "sha256-pMvZxGNnLLAiyWtRRRHJcF28wEQkHgUI3nJCKTlMJhY=";

  subPackages = [ "cmd/spirit" ];

@@ -24,6 +25,10 @@ buildGoModule (finalAttrs: {
    "-w"
  ];

+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
  meta = {
    homepage = "https://github.com/block/spirit";
    description = "Online schema change tool for MySQL";
@@ -11,18 +11,18 @@
 stdenv.mkDerivation {
  inherit pname;

-  version = "1.2.69.449";
+  version = "1.2.70.409";

  src =
    if stdenv.hostPlatform.isAarch64 then
      (fetchurl {
-        url = "https://web.archive.org/web/20250811170447/https://download.scdn.co/SpotifyARM64.dmg";
-        hash = "sha256-x9lpcQI1kZc4OIvQBhKXmI7t/2DIDbzufZhpNCKTxPA=";
+        url = "https://web.archive.org/web/20250826093914/https://download.scdn.co/SpotifyARM64.dmg";
+        hash = "sha256-bs+rSMfIFG0FyHGDUtuk6tSbd5l6r6qUNH20hQQjZC0=";
      })
    else
      (fetchurl {
-        url = "https://web.archive.org/web/20250811170211/https://download.scdn.co/Spotify.dmg";
-        hash = "sha256-z6pmQ3Wmwnd3YQNf1WPdPNCRxHX1PjqAEt50trGe0Bk=";
+        url = "https://web.archive.org/web/20250826093142/https://download.scdn.co/Spotify.dmg";
+        hash = "sha256-i1mHX7zo/07sHrGm8c6SQdFekRuJXOmqCcOk2IYPeLI=";
      });

  nativeBuildInputs = [ undmg ];
@@ -14,13 +14,13 @@

 buildNpmPackage rec {
  pname = "super-productivity";
-  version = "14.1.0";
+  version = "14.3.3";

  src = fetchFromGitHub {
    owner = "johannesjo";
    repo = "super-productivity";
    tag = "v${version}";
-    hash = "sha256-wZQhSQBJPyJPAMZU927Xq9bOxAohSaEg+ylk7DoTJJE=";
+    hash = "sha256-gJ6hG5nAzT708GFMjArN/F1Mz/K4gg1R0QeHmM6jc0c=";

    postFetch = ''
      find $out -name package-lock.json -exec ${lib.getExe npm-lockfile-fix} -r {} \;
@@ -63,7 +63,7 @@ buildNpmPackage rec {
      dontInstall = true;

      outputHashMode = "recursive";
-      hash = "sha256-SmA2qTi7tXxUcAlFOI61AW8pimB7YEYe749h5hjtLN8=";
+      hash = "sha256-+e53npbip3BGdw4S6mpkxc9g6AVc+QbJxfPYK6IglSA=";
    }
  );

@@ -85,6 +85,14 @@ buildNpmPackage rec {
  buildPhase = ''
    runHook preBuild

+    # Npm hooks do not install packages for the plugins. The build
+    # script does install the packages, but it does not handle patching
+    # the shebangs.
+    find packages -name package-lock.json | while read -r p; do
+      npm --prefix "$(dirname $p)" ci --ignore-scripts
+    done
+    patchShebangs packages
+
    # electronDist needs to be modifiable on Darwin
    cp -r ${electron.dist} electron-dist
    chmod -R u+w electron-dist
@@ -0,0 +1,22 @@
+{
+  "@rollup/rollup-android-arm-eabi@npm:4.40.1": "bd6599045fbfa1bba4eb4fa6269bf11121ac377a5e9bc5f32265b66cc190d3bf0eece89a4b0503cf38c0f91fc3d64f5daeeccd55420cf522cde478c6c8dacf4c",
+  "@rollup/rollup-android-arm64@npm:4.40.1": "89932296d6f2dd08ce2d4ee91d5cc14b5305c13f5b7ddba30dad59b525682539191b7769e5b2baf849b664d664daf26b0f29fb2950c2456ff85c5bb11ca39bed",
+  "@rollup/rollup-darwin-arm64@npm:4.40.1": "0eae1bc7d76ad339ccbfb1571fae06d9c3ad60cf95a513c42f14fb7cbc74697d35ce5f81f5b9a619cb7ff17ae8d78d9f39e78ab9ed2d94bf3755fd4c4b593929",
+  "@rollup/rollup-darwin-x64@npm:4.40.1": "524543130b510ef8f9775d55ddc6dd3735a1cbd82ffb95b74d677c9cc179848027cffdc6b7318976fa516497c73bc3039da8bbdfabd268156ca0ca1cc41428a8",
+  "@rollup/rollup-freebsd-arm64@npm:4.40.1": "1e43d5075bdcf1480a04dd7121036fdb1d6432848359cf6d9669d324d4556a2e354a758e276d7a6c2761b9fbefdab1307c58d459968ea847db7be20fe51b1c22",
+  "@rollup/rollup-freebsd-x64@npm:4.40.1": "f1c1921630d49602836ae77b7c1f0790e71b1317cb68733a21ce9ed6529c222265ae93e4c33eba590695015b3f43c0c54cd0aaa138531ffe3051880673ac2f5d",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.40.1": "bea6ef52650bd0c795429d635a2c8429eecbe5f8365e927cdbca02c1d07d1e28af760669e2d4b7c5ae5ff575c803fae6c370d74b342ea5d4625276dd4651accc",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.40.1": "cf41bd211e700928864808382c183e3f41fbc6f4804a9be0292b738f31b8b48ec9721e8717703960875aa0dc15075d7a191e6feb9b6af444ee4c0acd482da50f",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.40.1": "992f2dbd1f01bfe12c6ff72c5aebc2f7624bae973f8f992aa33422e12b516a718c18076202bfd4dc678ffa82f7ef9e3583582aacca9f4f7fde3e7164e76420ce",
+  "@rollup/rollup-linux-arm64-musl@npm:4.40.1": "96a17721328bf35fbedecb2a94a881e407179b364921178d1c64a481831ff9ca5b260f627056461c7854946e9c2c854aef537e25ecbce3f1b70b810371f45267",
+  "@rollup/rollup-linux-loongarch64-gnu@npm:4.40.1": "e313a016a50431cdd0fc2f3855cd345a921304793ab205ff3860523dcd009edd6efd7afc6197220faa5a4e0b638fd29f732f79c91759a392d221d708eceb3af6",
+  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.40.1": "ebc53027c9f6b9b3c36a008fa73958b21f52ece080cda6d2329f6412f255f73ccfed52083b9efff14950511a2a6a2dcb4351347db19f19920f33bbb6d1446be8",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.40.1": "9d4e28526eedbf681bc1897da4e61b08657b9a396841e057995c7a54999aeb21548308e30430bfd9c3b9da09deeac7800b1da88bfbebea3c1f2442424107f13c",
+  "@rollup/rollup-linux-riscv64-musl@npm:4.40.1": "c5f4b1d84f9a468bca4582192da1c8a0242bbb1b96965b3becb96a8a0a19d6522f741e52d591bbf3d9aba6c16a247fef02ed7a4a37a11bbd035f50a5bfd3c5af",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.40.1": "15ddb6faa9d49a12f87f97a21e16c171b49167b1dfe86d3a81a059e38901fc8edc9d49a68fc88e809699bd77b9eb72edde8bbb49bfb58a40438aa9dd4ceba1ea",
+  "@rollup/rollup-linux-x64-gnu@npm:4.40.1": "3c240b9aafb8c5360656326cd112568f3003082450dc48fc1eb4a01da460930abbf6235a85cee153f182eeeadcb28ab65116b93e2725e8d935ae60bf098024e2",
+  "@rollup/rollup-linux-x64-musl@npm:4.40.1": "27ec9c576a7f111333dc764c1ce48c0718e9617467e86fff431fa01c904b890f606f238a73fcfbc5928c78e1e7855947be78e16e49bf6044cfc0abdeffb6da9e",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.40.1": "c4a4f46690669b6d2eea20440edc46deb103cdf7f41debcfda1c0f68c41bea66526eb6f8befdc0da6192ae762c740e82f76e30164f1bbb4c36faba6c457fb905",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.40.1": "976361a3888decf0bc81521d83010e58213c264967ce23e023990ef2110a9189785fbb72c3752466179feb069f457d7242adbcb9813c9ce8f7b6363fb3ea6063",
+  "@rollup/rollup-win32-x64-msvc@npm:4.40.1": "70f30abca4447f1a9c163f07482b0f62029d545f94abe686cf40c6cb1039bd13ee00471927a4cb595c94929b97a8b189c86d7fc9872858d48b1711096ee6d45a"
+}
@@ -0,0 +1,56 @@
+{
+  fetchFromGitHub,
+  lib,
+  makeWrapper,
+  nodejs,
+  stdenv,
+  yarn-berry_3,
+}:
+
+let
+  yarn-berry = yarn-berry_3;
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "svgo";
+  version = "4.0.0";
+
+  src = fetchFromGitHub {
+    owner = "svg";
+    repo = "svgo";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-eSttRNHxcZquIxrTogk+7YS7rhp083qnOwJI71cmO20=";
+  };
+
+  missingHashes = ./missing-hashes.json;
+
+  offlineCache = yarn-berry.fetchYarnBerryDeps {
+    inherit (finalAttrs) src missingHashes;
+    hash = "sha256-DrIbnm0TWviCfylCI/12XYsx7YOIk7JFVV18Q4dImwU=";
+  };
+
+  nativeBuildInputs = [
+    makeWrapper
+    yarn-berry.yarnBerryConfigHook
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/bin" "$out/lib/svgo"
+    cp -r bin lib node_modules package.json plugins "$out/lib/svgo"
+    makeWrapper '${lib.getExe nodejs}' "$out/bin/svgo" \
+      --add-flags "$out/lib/svgo/bin/svgo.js"
+
+    runHook postInstall
+  '';
+
+  meta = {
+    changelog = "https://github.com/svg/svgo/releases/tag/${finalAttrs.src.tag}";
+    description = "Node.js tool for optimizing SVG files";
+    homepage = "https://github.com/svg/svgo";
+    license = lib.licenses.mit;
+    mainProgram = "svgo";
+    maintainers = [ ];
+    platforms = lib.platforms.all;
+  };
+})
@@ -7,6 +7,7 @@
  symfony-cli,
  nssTools,
  makeBinaryWrapper,
+  installShellFiles,
 }:

 buildGoModule (finalAttrs: {
@@ -39,15 +40,22 @@ buildGoModule (finalAttrs: {

  buildInputs = [ makeBinaryWrapper ];

+  nativeBuildInputs = [ installShellFiles ];
+
  postInstall = ''
    mkdir $out/libexec
    mv $out/bin/symfony-cli $out/libexec/symfony

    makeBinaryWrapper $out/libexec/symfony $out/bin/symfony \
      --prefix PATH : ${lib.makeBinPath [ nssTools ]}
+
+    installShellCompletion --cmd symfony \
+      --bash <($out/bin/symfony completion bash) \
+      --fish <($out/bin/symfony completion fish) \
+      --zsh <($out/bin/symfony completion zsh)
  '';

-  # Tests requires network access
+  # Tests require network access
  doCheck = false;

  passthru = {
@@ -65,6 +73,6 @@ buildGoModule (finalAttrs: {
    homepage = "https://github.com/symfony-cli/symfony-cli";
    license = lib.licenses.agpl3Plus;
    mainProgram = "symfony";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ patka ];
  };
 })
@@ -1,19 +1,32 @@
 {
-  lib,
-  rustPlatform,
  fetchFromGitHub,
+  lib,
+  openssl,
+  rustPlatform,
+  stdenv,
 }:
 rustPlatform.buildRustPackage rec {
  pname = "taskchampion-sync-server";
-  version = "0.6.1";
+  version = "0.7.0";
  src = fetchFromGitHub {
    owner = "GothenburgBitFactory";
    repo = "taskchampion-sync-server";
    tag = "v${version}";
-    hash = "sha256-spuTCRsF1uHTTWfOjkMRokZnBhqP53CPAi3WMJB3yq4=";
+    hash = "sha256-DNGugytc4dMjj8je4BpEjNjdrnTBnWc1MNeMqcdTr4s=";
  };

-  cargoHash = "sha256-bsB/dPqPmzviHsGA8gtSew2PQdySNzifZ6dhu7XQ8IU=";
+  cargoHash = "sha256-A0alSDqsqlAL0XW0rJ35rYcoyx2ndX/Xft9Qff/rr9I=";
+
+  env = {
+    # Use system openssl.
+    OPENSSL_DIR = lib.getDev openssl;
+    OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib";
+    OPENSSL_NO_VENDOR = 1;
+  };
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    openssl
+  ];

  meta = {
    description = "Sync server for Taskwarrior 3";
@@ -1,20 +1,19 @@
 {
  lib,
-  buildGoModule,
+  buildGo125Module,
  fetchFromGitHub,
  versionCheckHook,
  mockgen,
 }:
-
-buildGoModule (finalAttrs: {
+buildGo125Module (finalAttrs: {
  pname = "terragrunt";
-  version = "0.85.0";
+  version = "0.86.0";

  src = fetchFromGitHub {
    owner = "gruntwork-io";
    repo = "terragrunt";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-ey3Qbwg036OzWYfw/0lso3CentUXGF0/NB/w3ss3Dp0=";
+    hash = "sha256-Xmka1391wEGufEEavQNoB5YuzR7npe6ky8MzKJnGQt8=";
  };

  nativeBuildInputs = [
@@ -26,7 +25,7 @@ buildGoModule (finalAttrs: {
    make generate-mocks
  '';

-  vendorHash = "sha256-n0fPaeigwXvd0S5KvMG+ZerDqdaapUGK6mhY7WmEkIE=";
+  vendorHash = "sha256-aQzt7yeNoL1OF+mO6y2axeiuJbfuMBzoEAm0+Y9+Xr8=";

  doCheck = false;

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

 buildGoModule (finalAttrs: {
  pname = "timoni";
-  version = "0.25.1";
+  version = "0.25.2";

  src = fetchFromGitHub {
    owner = "stefanprodan";
    repo = "timoni";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-iTVTlxMCLHTXQj3I+nDHhE5w4fDaaM7p52wuvZY2uy4=";
+    hash = "sha256-u59+FGBURP3p1zosZU+6IfCZMHl4plrf/8/FUUgj/qw=";
  };

-  vendorHash = "sha256-JFJZguXpPrLbIC5lzvcOMDv5n2K7OoNXKJvWWcNOzKc=";
+  vendorHash = "sha256-bWhXhZJHdiWY/Yz0l2VAPKJrMVb9XbvVEGPNZIQtvFQ=";

  subPackages = [ "cmd/timoni" ];
  nativeBuildInputs = [ installShellFiles ];
@@ -7,15 +7,16 @@
  libX11,
  libXtst,
  makeWrapper,
+  versionCheckHook,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "urserver";
-  version = "3.13.0.2505";
+  version = "3.14.0.2574";

  src = fetchurl {
    url = "https://www.unifiedremote.com/static/builds/server/linux-x64/${builtins.elemAt (builtins.splitVersion finalAttrs.version) 3}/urserver-${finalAttrs.version}.tar.gz";
-    hash = "sha256-rklv6Ppha1HhEPunbL8ELYdQ9Z1FN4FrVsNwny3/gA4=";
+    hash = "sha256-4wA2VPb5QN30TWa72pUVTYfvsxlGTO8Vngh7wDHXhDE=";
  };

  nativeBuildInputs = [
@@ -23,26 +24,31 @@ stdenv.mkDerivation (finalAttrs: {
    makeWrapper
  ];

-  buildInputs = [
-    (lib.getLib stdenv.cc.cc)
-    bluez
-    libX11
-    libXtst
-  ];
+  buildInputs = [ (lib.getLib stdenv.cc.cc) ];

  installPhase = ''
    install -m755 -D urserver $out/bin/urserver
-    wrapProgram $out/bin/urserver --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}"
+    wrapProgram $out/bin/urserver --prefix LD_LIBRARY_PATH : "${
+      lib.makeLibraryPath [
+        libX11
+        libXtst
+        bluez
+      ]
+    }"
    cp -r remotes $out/bin/remotes
    cp -r manager $out/bin/manager
  '';

-  meta = with lib; {
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  meta = {
    homepage = "https://www.unifiedremote.com/";
    description = "One-and-only remote for your computer";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfree;
-    maintainers = with maintainers; [ sfrijters ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ sfrijters ];
    platforms = [ "x86_64-linux" ];
+    mainProgram = "urserver";
  };
 })
@@ -17,6 +17,11 @@ python3Packages.buildPythonApplication rec {
    hash = "sha256-umKMcQcQST0bBGf7ZXxNcWq/5/ht3jp+3JVjowBdeO0=";
  };

+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail '"packaging~=24.1"' '"packaging"'
+  '';
+
  build-system = with python3Packages; [
    hatchling
    uv-dynamic-versioning
@@ -2,6 +2,7 @@
  stdenv,
  lib,
  fetchFromGitHub,
+  fetchpatch,
  rustPlatform,
  pkg-config,
  openssl,
@@ -63,6 +64,14 @@ rustPlatform.buildRustPackage {
    zlib
  ];

+  patches = [
+    (fetchpatch {
+      name = "1.89-mismatched-lifetime-syntaxes.patch";
+      url = "https://patch-diff.githubusercontent.com/raw/vectordotdev/vector/pull/23645.patch";
+      hash = "sha256-2ADlF4/Z1uR3LR6608lA4tseh+MnHb097PACD/Nq6/0=";
+    })
+  ];
+
  # Rust 1.80.0 introduced the unexepcted_cfgs lint, which requires crates to allowlist custom cfg options that they inspect.
  # Upstream is working on fixing this in https://github.com/vectordotdev/vector/pull/20949, but silencing the lint lets us build again until then.
  # TODO remove when upgrading Vector
@@ -10,13 +10,13 @@

 buildGoModule (finalAttrs: {
  pname = "VictoriaLogs";
-  version = "1.26.0";
+  version = "1.29.0";

  src = fetchFromGitHub {
    owner = "VictoriaMetrics";
    repo = "VictoriaLogs";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-PnXpu2Dna5grozKOGRHi/Gic7djszYh7wJ96EiEYP8U=";
+    hash = "sha256-IKKVCVsHFijSnLawy9oq1qCji2O4+QkSWUvQ4S6tAN8=";
  };

  vendorHash = null;
@@ -32,6 +32,15 @@ buildGoModule (finalAttrs: {
    ]
    ++ lib.optionals withVlAgent [ "app/vlagent" ];

+  postPatch = ''
+    # Allow older go versions
+    substituteInPlace go.mod \
+      --replace-fail "go 1.25.0" "go ${finalAttrs.passthru.go.version}"
+
+    substituteInPlace vendor/modules.txt \
+      --replace-fail "go 1.25.0" "go ${finalAttrs.passthru.go.version}"
+  '';
+
  ldflags = [
    "-s"
    "-w"
@@ -10,13 +10,13 @@
  libglvnd,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "xp-pen-g430-driver";
  version = "1.2.13.1";

  src = fetchzip {
    url = "https://archive.org/download/linux-pentablet-v-1.2.13.1.tar.gz-20200428/Linux_Pentablet_V1.2.13.1.tar.gz%2820200428%29.zip/Linux_Pentablet_V1.2.13.1.tar.gz";
-    name = "xp-pen-g430-driver-${version}.tar.gz";
+    name = "xp-pen-g430-driver-${finalAttrs.version}.tar.gz";
    hash = "sha256-Wavf4EAzR/NX3GOfdAEdFX08gkD03FVvAkIl37Zmipc=";
  };

@@ -48,4 +48,4 @@ stdenv.mkDerivation rec {
    platforms = [ "x86_64-linux" ];
    maintainers = with lib.maintainers; [ ];
  };
-}
+})
@@ -8,15 +8,12 @@
  zlib,
  libnetfilter_queue,
  libnfnetlink,
-
-  iptables,
-  nftables,
-  gawk,
+  libmnl,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "zapret";
-  version = "71";
+  version = "71.4";

  src = fetchFromGitHub {
    owner = "bol-van";
@@ -30,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
    '';

    tag = "v${finalAttrs.version}";
-    hash = "sha256-cwwj0xGEiR3sg2WheurtQo6Hy5JAARcZJNHEHMfAoOE=";
+    hash = "sha256-n7UasKtoQ4zfy2ho2vOREb0RPrDnhjYYbXcXTjelDvg=";
  };

  buildInputs = [
@@ -38,12 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
    zlib
    libnetfilter_queue
    libnfnetlink
-  ];
-
-  nativeBuildInputs = [
-    iptables
-    nftables
-    gawk
+    libmnl
  ];

  preBuild = ''
@@ -17,7 +17,7 @@ let
    }:
    stdenv.mkDerivation rec {
      inherit pname;
-      version = "7.4";
+      version = "7.6";
      src = fetchurl {
        url = "https://github.com/subframe7536/Maple-font/releases/download/v${version}/${pname}.zip";
        inherit hash;
@@ -1,47 +1,46 @@
 {
-  "MapleMono-CN-unhinted": "sha256-pYhWiOB9RGof+3Uy5KlVgGtHRtoPjkKHW/aulEftrN8=",
-  "MapleMono-CN": "sha256-uDhFvaS8Cz0Gh4uPdHxGHB+ibnmjPgo3brw1Reyubjo=",
-  "MapleMono-NF-CN-unhinted": "sha256-m0OenEinfqOzFPd9J+9hvmlWZyo9gN48KsvtnSJZbQw=",
-  "MapleMono-NF-CN": "sha256-1H1AkMaE+yG2Wlp4NxvKu9z/VEnSyGLVVHX7YK9YlKg=",
-  "MapleMono-NF-unhinted": "sha256-1D7oAcurpS3PCQRky+Spb2l0z2j+ZxMqzQqLdCXAppA=",
-  "MapleMono-NF": "sha256-qPAKfND9r5YomfKQyS6lO7BQwwo4F+KqQdX7Jr9EM9Y=",
-  "MapleMono-OTF": "sha256-6Zl9snDOsgvoswTIa8dqRx+pYAy9N5yQ4J62qvsdlKs=",
-  "MapleMono-TTF-AutoHint": "sha256-ddzGDLCD73+qpdmgY+g2zbk0dNdsLF1dA9yuw3xzTS0=",
-  "MapleMono-TTF": "sha256-ggAJq9Sg8i1lXpE6adNqhVXJH5A1N7derskN/ZTn+KE=",
-  "MapleMono-Variable": "sha256-YKWtUvz3aGrEjihEzcjq6gKG0xFpRKqiSW6cGfhvsy8=",
-  "MapleMono-Woff2": "sha256-NPniX47eSSt6pp7qiqhhq6EpacBDKxlWsiwRToyT2E0=",
-  "MapleMonoNL-CN-unhinted": "sha256-KqFyvmKeDizD1LlaR+L3kiIeXSe+7VoaMJGV1/NMz/8=",
-  "MapleMonoNL-CN": "sha256-HJAWQ/Dw3Mpfjcc756aquUPsRLgKv7tN/w8jDZh4xZ4=",
-  "MapleMonoNL-NF-CN-unhinted": "sha256-hgjKmKScjn3erpKgBetzf7iiJa5WYdC4JzTZQkGbqNg=",
-  "MapleMonoNL-NF-CN": "sha256-qIBhdbJSw9w9k8Vh/goG2F46Yvhn1apeqlSbkD2yn1Q=",
-  "MapleMonoNL-NF-unhinted": "sha256-UI8OAt0PuRXYek4gtg00zZaYKiNiZWx5c79izq/eAbY=",
-  "MapleMonoNL-NF": "sha256-8UlJu96gL1XhZFs1llmAaisH+KsIYsXA9DIqB2EMfjo=",
-  "MapleMonoNL-OTF": "sha256-OOa/etMQQvmrrqC4ZZu4QwLHnsUtypKb00vGlp8Y2j4=",
-  "MapleMonoNL-TTF-AutoHint": "sha256-eQyk1LR+dff3UxfT/I0RCgU0spm1LWRoZtQ0m0JUGRE=",
-  "MapleMonoNL-TTF": "sha256-aRhtKSbzUs179usRUhOpsFMyrM4dqh7xt5mY0POskR4=",
-  "MapleMonoNL-Variable": "sha256-1ueWNUfeavEnHxH4g5Qhci/+LxobRwZq4pTsj4v1os4=",
-  "MapleMonoNL-Woff2": "sha256-5ZRCll9rq79oAnr9WgWxgNFtcdL8ljY72wDZnsox5bI=",
-  "MapleMonoNormal-CN-unhinted": "sha256-hNJfhsaxRnzv/3Y8Gzaf5ym9XxDEyVOrLR3E9FpFl8s=",
-  "MapleMonoNormal-CN": "sha256-SoS52L09o2qZlyKFuRBO5F4PKXBFAFxI6xpc4Ef1XHc=",
-  "MapleMonoNormal-NF-CN-unhinted": "sha256-vbWIGQl5g/OKFF0UK3m2RUZ30bu3H/btzXe0MbJk5IA=",
-  "MapleMonoNormal-NF-CN": "sha256-bcH9LMLMaKJ5A+9994yvbMoUNgz43vQUDTs200YeHn4=",
-  "MapleMonoNormal-NF-unhinted": "sha256-yW15Rf7GE8Qy5Ye9QGBMLma+Kx2Kj+3l/SAAzpBLg8k=",
-  "MapleMonoNormal-NF": "sha256-Eg3hKcHkslsvGzkJDrhkyN0IAYrjHJ+erzFAVAu/K0g=",
-  "MapleMonoNormal-OTF": "sha256-PVsYL/MdD7aX3P5kYafa/xwR84B2uG5TzMfi7i1ROWM=",
-  "MapleMonoNormal-TTF-AutoHint": "sha256-vtEHKBv0gjI6IuzXBmZcUVJS6fPNH/HJqohVZBwXN0U=",
-  "MapleMonoNormal-TTF": "sha256-YkUNl59nllTQca1Duj9phu20rLMiTSmcCXc0RluKln4=",
-  "MapleMonoNormal-Variable": "sha256-i0slIrBUwAXZj6VVUBUsEyN+mySgIBJcA5LL7iBamBA=",
-  "MapleMonoNormal-Woff2": "sha256-U4w4PqR8YC0HotDs/rHuUSf28WBnKNnVHe8FtO8MCHA=",
-  "MapleMonoNormalNL-CN-unhinted": "sha256-dJ2Si+l+NQAC+arOxOhvBFyy5uvWWRKh3RD62fSIl8Q=",
-  "MapleMonoNormalNL-CN": "sha256-/c5jU7O6M+hnRYZuFDVxg/PA+wk75HdllNX5IIarw2k=",
-  "MapleMonoNormalNL-NF-CN-unhinted": "sha256-At6I9eSGrF+9aWF5L2f4b2a3PWq4er7YMnYZJg4xwC8=",
-  "MapleMonoNormalNL-NF-CN": "sha256-EVHoFU4PQkbHknlfEfafYzDKwPwfQsAd+1oZaT8heao=",
-  "MapleMonoNormalNL-NF-unhinted": "sha256-5acGvUcFPQMdSh9CK7MWS/NNo52eiDpUiBRiVH3rsz4=",
-  "MapleMonoNormalNL-NF": "sha256-Y2XSNB9xCOGx9y1fnEHGztK7c9BjAdYj4PH2+Ft9cQ8=",
-  "MapleMonoNormalNL-OTF": "sha256-Sp81tk2teKk9fg7p0LJ0CLXmoh65ZcFNi/BOVzemGqQ=",
-  "MapleMonoNormalNL-TTF-AutoHint": "sha256-JKPgSZOaxqTSlsqEqbfo6ra27LqCxzFRpe78aUWunBw=",
-  "MapleMonoNormalNL-TTF": "sha256-KZBB4fyQmTUVwXsRC8yqiZtG9ED3isj64/tE8sDgSS4=",
-  "MapleMonoNormalNL-Variable": "sha256-95OvqOs9qo/38UPnGWGCF5SGxrRWnEE6OWT8M0J6XY0=",
-  "MapleMonoNormalNL-Woff2": "sha256-BwRa9BpkAe8Tw4mn16+g41Z3giIVoxJTGdC2Vk30lgg="
+  "MapleMono-CN-unhinted": "sha256-QnjRoW04WvGtgoKVm46U0Z0wImp2YVBdB/8LD37mfWk=",
+  "MapleMono-CN": "sha256-BF8VP6uZHgyuy/X0iie43jdJ6zyJUCXHlzHt6fOPEEQ=",
+  "MapleMono-NF-CN-unhinted": "sha256-8PSw/qGYXjpaazyY99bOQFbM+QOkJfizrmll8DTGwq8=",
+  "MapleMono-NF-CN": "sha256-q3wIvSszhOLyZkqvgvipQ2eEvG9K3Sf2o5hrpHS2vD8=",
+  "MapleMono-NF-unhinted": "sha256-7KEs6EtgfdO2DZIFGlHAWdIzKqKDaq7aRTG08HEYihw=",
+  "MapleMono-NF": "sha256-If/kKAFiyOs5NnxXeDOGsLSZRsCdhDmgOtP0SuN96pg=",
+  "MapleMono-OTF": "sha256-5XsHz8QsruS4oNfwazEfAWXSPr+mX+a5ayUPe5DF/nc=",
+  "MapleMono-TTF-AutoHint": "sha256-gmBHcBQk8GuWhdVF+TCB23Bh0raB5HVSwHNacVOScWM=",
+  "MapleMono-TTF": "sha256-n4kivPRcI80jEj7dRX3/SKyWHiBiiXXoY4jEV7eCSSI=",
+  "MapleMono-Variable": "sha256-8US2XL/RTIeWHatHeLv7/yWib5Vv7rdOyNC5qosRXw0=",
+  "MapleMono-Woff2": "sha256-f6khGfztBDMX8q7o9VlvLA2YikPoNDqxCf0KVxAR498=",
+  "MapleMonoNL-CN-unhinted": "sha256-qmtqUCoaWpqGIfIGOBlUU2WIm6vUOUP3S/SyUCCQSSE=",
+  "MapleMonoNL-CN": "sha256-rs5WcOBR9SYVsCFog6CY04RstSfZmbwo4HuwpeGw/V8=",
+  "MapleMonoNL-NF-CN-unhinted": "sha256-p8J1tiBXxus2xTvV884QjT8N19vV/uIlz/bCIIGCUp0=",
+  "MapleMonoNL-NF-CN": "sha256-aDutuElaeOrcKBjNxi096SEylvsSHVe5Fmcj3yoT19M=",
+  "MapleMonoNL-NF-unhinted": "sha256-fcAQa79JDpxB6A4bAGpY5K9RZhVTmoVnyHx72pRtHxE=",
+  "MapleMonoNL-NF": "sha256-HZByDLhGkJPDV7t0LXsINLDMYKso19bJD72MiWU/8N4=",
+  "MapleMonoNL-OTF": "sha256-4zjWL0g7BubP8lVswUe4nPuLHV0rBsAHD/TwmROVXdI=",
+  "MapleMonoNL-TTF-AutoHint": "sha256-9Q4MdpzfiTZB9QFbH3K2O66hkEQmJdgjPRA1iGG51yc=",
+  "MapleMonoNL-TTF": "sha256-PM5Dy1lU5MX5nilxHA34x5jBNYp4m8BknJ/aHrprxpY=",
+  "MapleMonoNL-Variable": "sha256-jvUfLi+DLTCHkdNuKMgcVp49MMeRiVVjwdIVXNKOaYc=",
+  "MapleMonoNL-Woff2": "sha256-SOCpyCMfXS9atPD2g58dTK67M61rJkoYOIolveCjVYY=",
+  "MapleMonoNormal-CN-unhinted": "sha256-X6cnYCp2V7pNLxeYE7BmxQncOfes6Vl4TTpONb10xrI=",
+  "MapleMonoNormal-CN": "sha256-FmZt06ZgRWTRemGMzxkQjU9B26FSQsAFXLc8b/Hv1Ko=",
+  "MapleMonoNormal-NF-CN-unhinted": "sha256-uRJEJVkcoAyK85V788UU29R9lH9Vuw9RbsrrSEOzdMU=",
+  "MapleMonoNormal-NF-CN": "sha256-nXENizBJawD/UgrYUNP9mU8m2mt9KH2Sy6vQeXFOmNI=",
+  "MapleMonoNormal-NF-unhinted": "sha256-qIDYALvHBz8g3V4/jaVAEz5ZIgfNSkLqrVv/AT6pRPM=",
+  "MapleMonoNormal-NF": "sha256-xWAhVQl9xsKXTJWNCfPBUV6gdHhmf9WUUrAYk2erTM0=",
+  "MapleMonoNormal-OTF": "sha256-EU4/dvUR68LaM/je41IyXTQyDxroJUTQ6GvkcaTHsSw=",
+  "MapleMonoNormal-TTF-AutoHint": "sha256-N7DM6nzYRi2zGXMlvc9FmwcWMLvC1bq1AULzsZu0c9E=",
+  "MapleMonoNormal-TTF": "sha256-HRy0W3srGzO54/VxFk+7q6m0iXFHcii47+Tcxz2RkzI=",
+  "MapleMonoNormal-Variable": "sha256-CE1XGv0AlbXRW9uRzXKN4pcQHqK4gtoOQyYLM3S4QZo=",
+  "MapleMonoNormal-Woff2": "sha256-tUvhscxn9r8P8DSJPMRmmUhIB7Owv5fI3fYCYP3CWtg=",
+  "MapleMonoNormalNL-CN-unhinted": "sha256-XT7cnDJsjNm8OFPqnBWMargcaWo9nl77K+4+DHuYZ4w=",
+  "MapleMonoNormalNL-CN": "sha256-6okDLMwtXgIiHfSapwKPk7ZKSSxGTBHFzg5STmgTO9Q=",
+  "MapleMonoNormalNL-NF-CN-unhinted": "sha256-6xQPEAlMjEFb0BaTSqC/4QfCcZYD8uUYMDOgGVFqdrs=",
+  "MapleMonoNormalNL-NF-CN": "sha256-z1xQa89ex5M4fOnl30Ay0O+eVpuP5644OpRVwE4s8qo=",
+  "MapleMonoNormalNL-NF-unhinted": "sha256-7BBO3nUUxFf/Nd1CWBukNjGIhc5MmvB8R7B5V0nTJ6I=",
+  "MapleMonoNormalNL-NF": "sha256-yd8HUSmsTq2RdTNaK0gkh8WpPfuf93vMUD9SZOU415s=",
+  "MapleMonoNormalNL-OTF": "sha256-nNbOJeqWG55IXWmShMMb2YTrjQe5Yz5A0y2zwwV9irI=",
+  "MapleMonoNormalNL-TTF-AutoHint": "sha256-/Dpk7Hb7h/VCU5dHR8AyVrrJTGNHHB6OMY85eJNhMhU=",
+  "MapleMonoNormalNL-TTF": "sha256-ydFuYEgK8o57s67lK1ZAxwTBpuM7fHFGZamQh7YmZcI=",
+  "MapleMonoNormalNL-Variable": "sha256-KcWDxyp2/kdehiL3/eE1I33so+pR7iFl4zSsKSygsWE=",
+  "MapleMonoNormalNL-Woff2": "sha256-f5MaDdfaBgxeR0rGlBr6LrCqyPalZjc2ffUVarD24aw="
 }
-
@@ -1,38 +0,0 @@
-This patch introducing error handling in the invocation of packagesWithNativeAssets within flutter_tools.
-
--- a/packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart
-+++ b/packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart
-@@ -357,7 +357,15 @@
- }
-
- Future<bool> _nativeBuildRequired(FlutterNativeAssetsBuildRunner buildRunner) async {
-  final List<String> packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();
-+  late final List<String> packagesWithNativeAssets;
-+  try {
-+    packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();
-+  } catch (error, stackTrace) {
-+    globals.logger.printTrace(
-+      'Error while checking for native assets packages: $error\n$stackTrace'
-+    );
-+    packagesWithNativeAssets = <String>[];
-+  }
-   if (packagesWithNativeAssets.isEmpty) {
-     globals.logger.printTrace(
-       'No packages with native assets. Skipping native assets compilation.',
-@@ -385,7 +393,15 @@
-   FileSystem fileSystem,
-   FlutterNativeAssetsBuildRunner buildRunner,
- ) async {
-  final List<String> packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();
-+  late final List<String> packagesWithNativeAssets;
-+  try {
-+    packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();
-+  } catch (error, stackTrace) {
-+    globals.logger.printTrace(
-+      'Error while checking for native assets packages: $error\n$stackTrace'
-+    );
-+    packagesWithNativeAssets = <String>[];
-+  }
-   if (packagesWithNativeAssets.isEmpty) {
-     globals.logger.printTrace(
-       'No packages with native assets. Skipping native assets compilation.',
@@ -1,95 +0,0 @@
-Prevent crashes due to missing or incomplete package_graph.json
-
-Modify package graph parsing to safely handle missing package_graph.json file
-and missing dependencies or devDependencies entries by using empty defaults
-instead of throwing errors.
-
--- a/packages/flutter_tools/lib/src/package_graph.dart
-+++ b/packages/flutter_tools/lib/src/package_graph.dart
-@@ -36,18 +36,9 @@
-     isExclusiveDevDependency: true,
-   );
-
-  final List<String>? dependencies = packageGraph.dependencies[project.manifest.appName];
-  if (dependencies == null) {
-    throwToolExit('''
-Failed to parse ${packageGraph.file.path}: dependencies for `${project.manifest.appName}` missing.
-Try running `flutter pub get`''');
-  }
-  final List<String>? devDependencies = packageGraph.devDependencies[project.manifest.appName];
-  if (devDependencies == null) {
-    throwToolExit('''
-Failed to parse ${packageGraph.file.path}: devDependencies for `${project.manifest.appName}` missing.
-Try running `flutter pub get`''');
-  }
-+  final List<String> dependencies = packageGraph.dependencies[project.manifest.appName] ?? <String>[];
-+  final List<String> devDependencies = packageGraph.devDependencies[project.manifest.appName] ?? <String>[];
-+
-   final packageNamesToVisit = <String>[...dependencies, ...devDependencies];
-   while (packageNamesToVisit.isNotEmpty) {
-     final String current = packageNamesToVisit.removeLast();
-@@ -55,13 +46,7 @@
-       continue;
-     }
-
-    final List<String>? dependencies = packageGraph.dependencies[current];
-
-    if (dependencies == null) {
-      throwToolExit('''
-Failed to parse ${packageGraph.file.path}: dependencies for `$current` missing.
-Try running `flutter pub get`''');
-    }
-+    final List<String> dependencies = packageGraph.dependencies[current] ?? <String>[];
-     packageNamesToVisit.addAll(dependencies);
-
-     result[current] = Dependency(
-@@ -89,7 +74,7 @@
-       currentDependency.rootUri,
-       isExclusiveDevDependency: false,
-     );
-    packageNamesToVisit.addAll(packageGraph.dependencies[current]!);
-+    packageNamesToVisit.addAll(packageGraph.dependencies[current] ?? <String>[]);
-   }
-   return result.values.toList();
- }
-@@ -147,6 +132,9 @@
-     final File file = project.packageConfig.fileSystem.file(
-       project.packageConfig.uri.resolve('package_graph.json'),
-     );
-+    if (!file.existsSync()) {
-+      return PackageGraph(file, <String>[], <String, List<String>>{}, <String, List<String>>{});
-+    }
-     try {
-       return PackageGraph.fromJson(file, jsonDecode(file.readAsStringSync()));
-     } on IOException catch (e) {
-
--- a/packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart
-+++ b/packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart
-@@ -384,7 +384,12 @@
- }
-
- Future<bool> _nativeBuildRequired(FlutterNativeAssetsBuildRunner buildRunner) async {
-  final List<String> packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();
-+  late final List<String> packagesWithNativeAssets;
-+  try {
-+    packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();
-+  } catch (error) {
-+    packagesWithNativeAssets = <String>[];
-+  }
-   if (packagesWithNativeAssets.isEmpty) {
-     globals.logger.printTrace(
-       'No packages with native assets. Skipping native assets compilation.',
-@@ -412,7 +417,12 @@
-   FileSystem fileSystem,
-   FlutterNativeAssetsBuildRunner buildRunner,
- ) async {
-  final List<String> packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();
-+  late final List<String> packagesWithNativeAssets;
-+  try {
-+    packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();
-+  } catch (error) {
-+    packagesWithNativeAssets = <String>[];
-+  }
-   if (packagesWithNativeAssets.isEmpty) {
-     globals.logger.printTrace(
-       'No packages with native assets. Skipping native assets compilation.',
@@ -1,4 +1,6 @@
 import ./generic.nix {
-  version = "3.114";
-  hash = "sha256-YVtXk1U9JtqfOH7+m/+bUI/yXJcydqjjGbCy/5xbMe8=";
+  version = "3.114.1";
+  hash = "sha256-xs7G5MHOd6mPVpBfDd2fFG2qw+5KypBTPqErbl0zfrk=";
+  filename = "3_114.nix";
+  versionRegex = "NSS_(3)_(114)(?:_(\\d+))?_RTM";
 }
@@ -1,4 +1,6 @@
 import ./generic.nix {
  version = "3.101.2";
  hash = "sha256-i5K47pzQYOiD4vFHBN6VeqXEdPBOM7U1oSK0qSi2M2Y=";
+  filename = "esr.nix";
+  versionRegex = "NSS_(3)_(101)(?:_(\\d+))?_RTM";
 }
@@ -1,4 +1,9 @@
-{ version, hash }:
+{
+  version,
+  hash,
+  filename,
+  versionRegex,
+}:
 {
  lib,
  stdenv,
@@ -19,6 +24,7 @@
  enableFIPS ? false,
  nixosTests,
  nss_latest,
+  nix-update-script,
 }:

 let
@@ -229,7 +235,14 @@ stdenv.mkDerivation rec {
      runHook postInstall
    '';

-  passthru.updateScript = ./update.sh;
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--override-filename"
+      "pkgs/development/libraries/nss/${filename}"
+      "--version-regex"
+      versionRegex
+    ];
+  };

  passthru.tests =
    lib.optionalAttrs (lib.versionOlder version nss_latest.version) {
@@ -5,6 +5,8 @@
 #       Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert

 import ./generic.nix {
-  version = "3.115";
-  hash = "sha256-8PeFeaIOtjBZJLBx3ONwZlK5SaLnjKEFoZWvVsu/3tA=";
+  version = "3.115.1";
+  hash = "sha256-SuXNqRW0lBPioYxmoGa3ZbfxC7ud6TW3xVpakVwtm14=";
+  filename = "latest.nix";
+  versionRegex = "NSS_(\\d+)_(\\d+)(?:_(\\d+))?_RTM";
 }
@@ -1,10 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl gnugrep gnused coreutils common-updater-scripts
-
-set -x
-
-base_url="https://ftp.mozilla.org/pub/security/nss/releases/"
-
-version="$(curl -sSL ${base_url}  | grep 'RTM' | grep -v WITH_CKBI | sed 's|.*>\(NSS_[0-9]*_[0-9]*_*[0-9]*_*[0-9]*_RTM\)/.*|\1|g' | sed 's|NSS_||g' | sed 's|_RTM||g' | sed 's|_|.|g' | sort -V | tail -1)"
-hash="$(nix-hash --type sha256 --base32 ${base_url}/NSS_${version/\./_}_RTM/src/nss-${version}.tar.gz)"
-update-source-version nss "${version}" "${hash}"
@@ -203,6 +203,7 @@ mapAliases {
  inherit (pkgs) stylelint; # added 2023-09-13
  surge = pkgs.surge-cli; # Added 2023-09-08
  inherit (pkgs) svelte-language-server; # Added 2024-05-12
+  inherit (pkgs) svgo; # added 2025-08-24
  swagger = throw "swagger was removed because it was broken and abandoned upstream"; # added 2023-09-09
  inherit (pkgs) tailwindcss; # added 2024-12-04
  teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # added 2024-08-23
--- a/Show More
+++ b/Show More