Merge master into staging-next

2026-07-18 06:31:15 +00:00 · 2026-07-12 18:19:29 +00:00
parent 6b87ca95d4 d9cd59c37e
commit d3b1a00a33
54 changed files with 1132 additions and 394 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18808,6 +18808,12 @@
    githubId = 830082;
    name = "Nathan Moos";
  };
+  mootfrost = {
+    email = "hello@mootfrost.dev";
+    github = "mootfrost";
+    githubId = 75925945;
+    name = "Andrew Semeykin";
+  };
  moraxyc = {
    name = "Moraxyc Xu";
    email = "i@qaq.li";
@@ -25602,12 +25608,6 @@
    githubId = 106669955;
    name = "Léon Gessner";
  };
-  shardy = {
-    email = "shardul@baral.ca";
-    github = "shardulbee";
-    githubId = 16765155;
-    name = "Shardul Baral";
-  };
  sharpchen = {
    github = "sharpchen";
    githubId = 77432836;
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@@ -1,6 +1,7 @@
 {
  config,
  lib,
+  utils,
  pkgs,
  ...
 }:
@@ -59,7 +60,7 @@ in
    };

    output = lib.mkOption {
-      type = lib.types.path;
+      type = lib.types.externalPath;
      default = "/var/cache/locatedb";
      description = ''
        The database file to build.
@@ -249,27 +250,35 @@ in
    systemd.services.update-locatedb = {
      description = "Update Locate Database";

-      # mlocate's updatedb takes flags via a configuration file or
-      # on the command line, but not by environment variable.
-      script =
-        let
-          toFlags =
-            x: lib.optional (cfg.${x} != [ ]) "--${lib.toLower x} '${lib.concatStringsSep " " cfg.${x}}'";
-          args = lib.concatLists (
-            map toFlags [
+      serviceConfig = {
+        # mlocate's updatedb takes flags via a configuration file or
+        # on the command line, but not by environment variable.
+        ExecStart =
+          let
+            toFlags =
+              x:
+              lib.optionals (cfg.${x} != [ ]) [
+                "--${lib.toLower x}"
+                (lib.concatStringsSep " " cfg.${x})
+              ];
+            args = lib.concatMap toFlags [
              "pruneFS"
              "pruneNames"
              "prunePaths"
+            ];
+          in
+          utils.escapeSystemdExecArgs (
+            [
+              (lib.getExe' cfg.package "updatedb")
+              "--output"
+              cfg.output
+              "--prune-bind-mounts"
+              (lib.boolToYesNo cfg.pruneBindMounts)
            ]
+            ++ args
+            ++ cfg.extraFlags
          );
-        in
-        ''
-          exec ${cfg.package}/bin/updatedb \
-            --output ${toString cfg.output} ${lib.concatStringsSep " " args} \
-            --prune-bind-mounts ${lib.boolToYesNo cfg.pruneBindMounts} \
-            ${lib.concatStringsSep " " cfg.extraFlags}
-        '';
-      serviceConfig = {
+
        CapabilityBoundingSet = "CAP_DAC_READ_SEARCH CAP_CHOWN";
        Nice = 19;
        IOSchedulingClass = "idle";
--- a/nixos/modules/services/desktops/oo7.nix
+++ b/nixos/modules/services/desktops/oo7.nix
@@ -10,7 +10,7 @@ in
 {
  options.services.oo7 = {
    enable = lib.mkEnableOption ''
-      oo7, a service providing the Secret Service D-Bus API.
+      oo7, a service providing the Secret Service D-Bus API
    '';
  };

--- a/nixos/modules/services/web-apps/lasuite-meet.nix
+++ b/nixos/modules/services/web-apps/lasuite-meet.nix
@@ -50,7 +50,6 @@ let
    environment = pythonEnvironment;

    serviceConfig = {
-      RuntimeDirectory = "lasuite-meet";
      StateDirectory = "lasuite-meet";
      WorkingDirectory = "/var/lib/lasuite-meet";

@@ -382,6 +381,8 @@ in
        '';

        serviceConfig = {
+          # needs to be here so that cronjobs don't nuke it
+          RuntimeDirectory = "lasuite-meet";
          BindReadOnlyPaths = "${cfg.package}/share/static:/var/lib/lasuite-meet/static";

          ExecStart = utils.escapeSystemdExecArgs (
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -3316,6 +3316,7 @@ assertNoAdditions {
  };

  nvim-jdtls = super.nvim-jdtls.overrideAttrs (old: {
+    runtimeDeps = [ python3 ];
    meta = old.meta // {
      license = lib.licenses.gpl3Only;
    };
--- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
+++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
  core = "genesis-plus-gx";
-  version = "0-unstable-2026-06-19";
+  version = "0-unstable-2026-07-10";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "Genesis-Plus-GX";
-    rev = "f33876ca3e4f021f4b273aeabed42b551243b71c";
-    hash = "sha256-cmA4aBzR33Df3SNyB3e/reQnQmF0alT6RIeXK+ew+us=";
+    rev = "fa4dca561e08d5be9077419f7b255e1da213ed21";
+    hash = "sha256-FfO5LzCH0hYqiVpE2qPJhX4gOrXqqYCoW4XRbz93La4=";
  };

  meta = {
--- a/pkgs/by-name/_1/_1oom/package.nix
+++ b/pkgs/by-name/_1/_1oom/package.nix
@@ -1,7 +1,7 @@
 {
  lib,
  stdenv,
-  fetchFromGitHub,
+  fetchgit,
  gitUpdater,
  autoreconfHook,
  allegro,
@@ -14,18 +14,17 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "1oom";
-  version = "1.11.8";
+  version = "1.11.9";

  outputs = [
    "out"
    "doc"
  ];

-  src = fetchFromGitHub {
-    owner = "1oom-fork";
-    repo = "1oom";
+  src = fetchgit {
+    url = "https://git@git.sourcecraft.dev/fork1oom/1oom.git";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Y29Xc8ylXhpQO7dDl7z7XC7+RB4UOIRksZ8RtfaCiEc=";
+    hash = "sha256-tU396z/7qpnhDEFqj/S55e/zeXa5jZFUi2VG3O6SJdY=";
  };

  nativeBuildInputs = [
@@ -42,19 +41,19 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  strictDeps = true;
+  __structuredAttrs = true;
  enableParallelBuilding = true;

  postInstall = ''
-    install -d $doc/share/doc/1oom
-    install -t $doc/share/doc/1oom \
+    install -Dm644 -t $doc/share/doc/1oom \
      HACKING NEWS PHILOSOPHY README.md doc/*.txt
  '';

  passthru.updateScript = gitUpdater { rev-prefix = "v"; };

  meta = {
-    homepage = "https://github.com/1oom-fork/1oom";
-    changelog = "https://github.com/1oom-fork/1oom/releases/tag/v${finalAttrs.version}";
+    homepage = "https://fork1oom.sourcecraft.site/";
+    changelog = "https://sourcecraft.dev/fork1oom/1oom/releases/v${finalAttrs.version}";
    description = "Master of Orion (1993) game engine recreation; a more updated fork";
    license = lib.licenses.gpl2Only;
    platforms = lib.platforms.linux;
--- a/pkgs/by-name/aa/aasvg/package.nix
+++ b/pkgs/by-name/aa/aasvg/package.nix
@@ -8,13 +8,13 @@

 buildNpmPackage (finalAttrs: {
  pname = "aasvg";
-  version = "0.5.2";
+  version = "0.5.3";

  src = fetchFromGitHub {
    owner = "martinthomson";
    repo = "aasvg";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Le6ZbJY7ZkqblZx4TkHWIiRKn1foi8jB+rldhu95NQ0=";
+    hash = "sha256-D3ompmRt9Mxmzr0TxFLBrSl/dNE986TZbOvfuyk9rJo=";
  };

  # the project has no dependencies
--- a/pkgs/by-name/ad/adw-bluetooth/package.nix
+++ b/pkgs/by-name/ad/adw-bluetooth/package.nix
@@ -15,13 +15,13 @@
 }:

 let
-  version = "1.1.0";
+  version = "1.1.2";

  src = fetchFromGitHub {
    owner = "ezratweaver";
    repo = "adw-bluetooth";
    tag = version;
-    hash = "sha256-h3cHtecwBsx3j33qXVn/zaq4FZext71P7flzunCHqHg=";
+    hash = "sha256-0rySzx03KeKeqtl0yrbnj/tVbpVPBAKDz+1qLQ5kZRc=";
  };

  daemon = buildGoModule {
--- a/pkgs/by-name/ar/arnis/package.nix
+++ b/pkgs/by-name/ar/arnis/package.nix
@@ -12,16 +12,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "arnis";
-  version = "2.9.0";
+  version = "3.0.0";

  src = fetchFromGitHub {
    owner = "louis-e";
    repo = "arnis";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-SJT1dSQ6P5UCglYP5Song/cvisYLVXepsHH6AC5kJK4=";
+    hash = "sha256-mdBicZIHonfVs2r6eNRNdpr8saZ54k1m0czWRqBYvq4=";
  };

-  cargoHash = "sha256-h8DuDgRtI9ZUq3hPqso/DZQnGInnilFIuzTPf0qpsbo=";
+  cargoHash = "sha256-G0lEKjF9xNF4zs/+yf/8fvZTRZOH6IGud0tpEB86IXE=";

  nativeBuildInputs = [
    cargo-tauri.hook
--- a/pkgs/by-name/bl/blackfire/php-probe.nix
+++ b/pkgs/by-name/bl/blackfire/php-probe.nix
@@ -16,57 +16,57 @@ let
  phpMajor = lib.versions.majorMinor php.version;
  inherit (stdenv.hostPlatform) system;

-  version = "2026.5.0";
+  version = "2026.7.0";

  hashes = {
    "x86_64-linux" = {
      system = "amd64";
      hash = {
-        "8.1" = "sha256-FQzmRL1Dk4HBnrfbfOclDWGvqflFXTUMK8b1NLIb880=";
-        "8.2" = "sha256-e2+hVsoBXt8gURRvGC4bgAkLpB1GriefokAjFFUuO8c=";
-        "8.3" = "sha256-C/NsbJ8XlkBPlZ0lPeNL4SWxfVWSLxvQYDxTVf2PfyA=";
-        "8.4" = "sha256-gqEV9thI/oe38/dyrGZxhPtv4+ufzMDXJL0zgt8IbOA=";
-        "8.5" = "sha256-kw57CBFOcRpaToXD/V2veXjcQnVaM3uTLC3tgrKyNzc=";
+        "8.1" = "sha256-fs1zJkObPMoG6hta2fCOO6UI79nkqoKGNN7S92NSf0c=";
+        "8.2" = "sha256-UITSNAWSQfo2CNldoXOEETqk1sDEhExp0bLDHR8GNQo=";
+        "8.3" = "sha256-MPg6lGEt1t5y+fiXDATHeutgaSH0o0boTjTLGqliyTQ=";
+        "8.4" = "sha256-yIYdl+IZzk1sJTg5Z5KU8o1MNFwUK46DNUPkdGWPmpM=";
+        "8.5" = "sha256-Zrr1Rk4dcRTxUNowmWAWxxwhBaCXCxXMOGYrJfp6HHA=";
      };
    };
    "i686-linux" = {
      system = "i386";
      hash = {
-        "8.1" = "sha256-Cccapa4s6Wvo/MOjReCbbJY4H1HNe5uF8Fe4UX8ftFs=";
-        "8.2" = "sha256-1k8m4Mram806XIbR4x0Kf6IH7rvhbLbaqPgM9v1SHS4=";
-        "8.3" = "sha256-Si0boOO5BRDKARZbAbPPrxRIaUjwViQLepZ5tNvkjGk=";
-        "8.4" = "sha256-BOjlJy48fS2SWK28Lcd9/MVhciDEaBJe6mRIhTa9JhI=";
-        "8.5" = "sha256-OBySA7eGI+YqvMnsOlr7p6RznqYq7DJptnYjhMfqk2Q=";
+        "8.1" = "sha256-akPwQdmUplIG0o7uNXuPBrv1QTG4ulXMD+E9FFf8cdc=";
+        "8.2" = "sha256-o2T8WLXk5N21Z2kLZnHiyoy/A3I9cqwY/ezlEpD3LOo=";
+        "8.3" = "sha256-FqWzbE8o9IsmTfeS46ZLawdq8I+ttRU2bUIeruzDNO8=";
+        "8.4" = "sha256-x8zmKWdffLPL1FIpEtnK1pio6Pdj2gacwTjhm5FUASQ=";
+        "8.5" = "sha256-l3Sb3ONIURDikQhfhxbAABwVFZtSQf+R8z3z82Dwz7Q=";
      };
    };
    "aarch64-linux" = {
      system = "arm64";
      hash = {
-        "8.1" = "sha256-Od+c9X4yg4xW9aAI0x1CacUNp7PdJl1KRIi++m4DLY8=";
-        "8.2" = "sha256-ZI2n0lXkwUg8BvpjdhqHz1F3Z7dlX+oGv6IsjRVzzWA=";
-        "8.3" = "sha256-6NMvylxdwPpbmIN5EDVcBuplP2kEQDyY+fD23k89k48=";
-        "8.4" = "sha256-356ECFSrqu5kJX/qP+SNtKl7bsGGD/ROJd9vgEX5wSM=";
-        "8.5" = "sha256-z7GMQ9wqIr2/BKi3G2Wf3cZBtU/ZC+uKMcbnmYfmm8w=";
+        "8.1" = "sha256-rBKmlBuI7Wj4HbcaBEgB21OFmPgYKiLapswcuxGVWp4=";
+        "8.2" = "sha256-H3B3e4zP+DSL8XkpaMZ6yhp18TJJrE38SQlc9N7QaKo=";
+        "8.3" = "sha256-Cwm69608MEkmqgJMJCTEY4+1DHCMkawjDYb1eZD2U4c=";
+        "8.4" = "sha256-M8y5VoaIHTsJEcYA61oK7Ks6oFCqlCzvo/uQbJM12pU=";
+        "8.5" = "sha256-rNsy+IPEnxqH9pP99sM9mMX7K1ZzhRJQx9BuJkEvUD0=";
      };
    };
    "aarch64-darwin" = {
      system = "arm64";
      hash = {
-        "8.1" = "sha256-vlb6HCz9KqSL+bSuVixiHVgVVkEAuCaoR7ww0/ZSdR8=";
-        "8.2" = "sha256-3XVHonZ7UW3LENuKgywyZ5q3Mo/6XBhnbiuARRGqPAg=";
-        "8.3" = "sha256-Dw+L0Bo/6BeFi+w3sm5kekR0mXoMUcsCuEksCdFpVA0=";
-        "8.4" = "sha256-i5R+vUn08yNWvPaJGRRHBPAbpxdqDmvPq3l9NPCuqxg=";
-        "8.5" = "sha256-vyBbyS8Y1mD+zFO01bMbim8Riq45+ns9YA4k41KQup8=";
+        "8.1" = "sha256-Ou54kb3vhRK9ZP35ixc3cuXC0s9B6yOMoxS8QWn8GH4=";
+        "8.2" = "sha256-Xx9h61zzDI4dA7G6nqJA7lgd1TzmhQmvuFVhVRVFHz8=";
+        "8.3" = "sha256-/EM1fAYaEHtBnN4ElnCaA6RvcYMjhx5nhsmA/Lxx3jI=";
+        "8.4" = "sha256-W5A+WAJ9MNX4Zkmhu0v5k1KQvVtSJn60JpRvVuFD98Q=";
+        "8.5" = "sha256-GpvF7cgcTXLguwQCj0vOwtn7EbUQYqolzt7JPr8RtCM=";
      };
    };
    "x86_64-darwin" = {
      system = "amd64";
      hash = {
-        "8.1" = "sha256-0xf09E58+kOGZbfpUeaCNdeeJx/Sv4QazfgcdV3Fqho=";
-        "8.2" = "sha256-BU3INTjuVXJ+WB16Q/6I1I5y0k+7sR158vKOiuh6H4w=";
-        "8.3" = "sha256-TBTuabrEpQR7ff+ULjZCD99a1xX4KNjTWlMQTJ1l6NU=";
-        "8.4" = "sha256-45R0CrE6MZ4RU4HslaF5/jbMOz32fCMnzj8R1F9tu34=";
-        "8.5" = "sha256-40+kki7h6DLQemLyoKOSdd8hmQXJE+Yt4rcC4V706vs=";
+        "8.1" = "sha256-bRoTC959irVHSTbMmBEQPw2O5ecoMj4zJK+a5AT1i7M=";
+        "8.2" = "sha256-6DGh0Ajlxt6L7acen3171gfyUajmb9k6fAY+h56BZCI=";
+        "8.3" = "sha256-KhZ5KD+9lCC+4bSVZPfkvWpWgRmOZ9iL87NfQ/YMWzw=";
+        "8.4" = "sha256-DRU0I60T9ZvIHYU82qbHFmEQwn3Vrp/MGmhiKzOm3og=";
+        "8.5" = "sha256-LrGek8mg9tBhccLGBKeokKsiYSxitxE+MP9sya3H4aY=";
      };
    };
  };
--- a/pkgs/by-name/bl/blueman/package.nix
+++ b/pkgs/by-name/bl/blueman/package.nix
@@ -76,6 +76,8 @@ stdenv.mkDerivation rec {
    (lib.enableFeature withPulseAudio "pulseaudio")
  ];

+  dontWrapGApps = true;
+
  makeWrapperArgs = [
    "--prefix PATH ':' ${
      lib.makeBinPath [
@@ -85,6 +87,7 @@ stdenv.mkDerivation rec {
      ]
    }"
    "--suffix PATH ':' ${lib.makeBinPath [ xdg-utils ]}"
+    "\${gappsWrapperArgs[@]}"
  ];

  postFixup = ''
--- a/pkgs/by-name/bo/boringtun/package.nix
+++ b/pkgs/by-name/bo/boringtun/package.nix
@@ -6,16 +6,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "boringtun";
-  version = "0.6.0";
+  version = "0.7.1";

  src = fetchFromGitHub {
    owner = "cloudflare";
    repo = "boringtun";
    tag = "boringtun-${finalAttrs.version}";
-    hash = "sha256-QrgKO0SVU4Z9GlNtZZmOV+Xcm1PonzLbUTGAFFOV/BM=";
+    hash = "sha256-IilQNWcN4cyTRiHppQzFxLPZvz0ep4nrvCrP2FWXerM=";
  };

-  cargoHash = "sha256-j1I16QC46MMxcK7rbZJgI8KiKJvF29hkuGKiYLc6uW0=";
+  cargoHash = "sha256-Sm46l+/6QBa54PdTCNcWltRM9bMkzASYbEvuKsM6zHk=";

  # Testing this project requires sudo, Docker and network access, etc.
  doCheck = false;
--- a/pkgs/by-name/co/codegraph/package.nix
+++ b/pkgs/by-name/co/codegraph/package.nix
@@ -7,6 +7,7 @@
  writeShellScript,
  curl,
  common-updater-scripts,
+  gnused,
  cctools,
  darwin,
  rcodesign,
@@ -14,7 +15,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "codegraph";
-  version = "0.9.9";
+  version = "1.4.1";

  src =
    finalAttrs.passthru.sources.${stdenv.hostPlatform.system}
@@ -75,19 +76,19 @@ stdenv.mkDerivation (finalAttrs: {
    sources = {
      "aarch64-darwin" = fetchurl {
        url = "https://github.com/colbymchenry/codegraph/releases/download/v${finalAttrs.version}/codegraph-darwin-arm64.tar.gz";
-        hash = "sha256-Jm7gOMUpRulu4iKEP8bz5E01E0HtmPEfUne9/OmIDKU=";
+        hash = "sha256-Smea5aXLn/+QDdWbt4baalgbf2j0z3E73t0TfjR9NNw=";
      };
      "aarch64-linux" = fetchurl {
        url = "https://github.com/colbymchenry/codegraph/releases/download/v${finalAttrs.version}/codegraph-linux-arm64.tar.gz";
-        hash = "sha256-c8bldypGnYwcs8+OuToIULDeLoAQWwoCrA/QWdEn3pk=";
+        hash = "sha256-DWLF6yci+NGdIPehvZdEReGNUpTLWb4Ragw9Vc6HWR8=";
      };
      "x86_64-darwin" = fetchurl {
        url = "https://github.com/colbymchenry/codegraph/releases/download/v${finalAttrs.version}/codegraph-darwin-x64.tar.gz";
-        hash = "sha256-tYPq7T5Ou0/tPGsI47H3j3v2Z8WAQVU9aWIpsh4+nxE=";
+        hash = "sha256-Q2+WlDz9km6m0KhFTxiDPSElTV/Zs9IkMXsUJhMt75U=";
      };
      "x86_64-linux" = fetchurl {
        url = "https://github.com/colbymchenry/codegraph/releases/download/v${finalAttrs.version}/codegraph-linux-x64.tar.gz";
-        hash = "sha256-xA7oC84tNUyHS+/l7OmWKBy0bPCDAENy02/YpyOLWfs=";
+        hash = "sha256-+1hf9QGNb6qkbSgrYfT2ibx5Z+2KG0Z6XFVt187ZtUI=";
      };
    };
    updateScript = writeShellScript "update-codegraph" ''
@@ -96,6 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
        lib.makeBinPath [
          curl
          common-updater-scripts
+          gnused
        ]
      }"
      NEW_VERSION=$(curl --silent -fsSLI -o /dev/null -w '%{url_effective}' "https://github.com/colbymchenry/codegraph/releases/latest" | sed -n 's#.*/releases/tag/v##p')
--- a/pkgs/by-name/fl/flytectl/package.nix
+++ b/pkgs/by-name/fl/flytectl/package.nix
@@ -49,7 +49,7 @@ buildGoModule (finalAttrs: {
  passthru.tests.version = testers.testVersion {
    package = finalAttrs.finalPackage;
    command = "flytectl version";
-    version = "v${finalAttrs.src.version}";
+    version = "v${finalAttrs.version}";
  };

  meta = {
--- a/pkgs/by-name/fo/folia-major/package.nix
+++ b/pkgs/by-name/fo/folia-major/package.nix
@@ -0,0 +1,115 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchNpmDeps,
+  nodejs,
+  npmHooks,
+  makeWrapper,
+  electron,
+  copyDesktopItems,
+  makeDesktopItem,
+  nix-update-script,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "folia-major";
+  version = "0.5.26";
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "chthollyphile";
+    repo = "folia-major";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-0G7Mh34xW8kx3iP7V5u9qSqKdzqSsciVBW/g+0z7YVY=";
+  };
+
+  npmDeps = fetchNpmDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-ihFIXw9y2Ab+Z6CecBxFqcEGU4+sdy41hQoaknpCpb4=";
+  };
+
+  nativeBuildInputs = [
+    nodejs
+    npmHooks.npmConfigHook
+    makeWrapper
+    copyDesktopItems
+  ];
+
+  env = {
+    ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+    ELECTRON_DEV = "false";
+    ELECTRON = "true";
+  };
+
+  # workaround for https://github.com/electron/electron/issues/31121
+  postPatch = ''
+    substituteInPlace electron/main.cjs \
+      --replace-fail "process.resourcesPath" "'$out/lib/folia-major/resources'"
+
+    substituteInPlace vite.config.ts \
+      --replace-fail "git rev-parse --short HEAD" "echo unknown" \
+      --replace-fail "git rev-parse --abbrev-ref HEAD" "echo main"
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    npm run build
+    npm exec electron-builder -- \
+      --dir \
+      -c.electronDist=${electron.dist} \
+      -c.electronVersion=${electron.version}
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib/folia-major
+    cp -r release/*-unpacked/{locales,resources{,.pak}} $out/lib/folia-major/
+
+    install -D build/icon.png $out/share/icons/hicolor/512x512/apps/folia-major.png
+
+    makeWrapper '${lib.getExe electron}' $out/bin/folia-major \
+      --add-flags $out/lib/folia-major/resources/app.asar \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \
+      --set-default ELECTRON_FORCE_IS_PACKAGED 1 \
+      --set-default ELECTRON_IS_DEV 0 \
+      --inherit-argv0
+
+    runHook postInstall
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "folia-major";
+      desktopName = "Folia";
+      exec = "folia-major";
+      terminal = false;
+      type = "Application";
+      icon = "folia-major";
+      startupWMClass = "folia";
+      comment = "Lyrics Reimagine";
+      categories = [
+        "AudioVideo"
+        "Player"
+      ];
+    })
+  ];
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
+
+  meta = {
+    description = "Lyrics Reimagine desktop app";
+    homepage = "https://folia-site.vercel.app/";
+    downloadPage = "https://github.com/chthollyphile/folia-major/releases";
+    license = lib.licenses.agpl3Only;
+    mainProgram = "folia-major";
+    maintainers = with lib.maintainers; [ chillcicada ];
+    platforms = lib.platforms.linux;
+  };
+})
--- a/pkgs/by-name/gi/github-copilot-cli/package.nix
+++ b/pkgs/by-name/gi/github-copilot-cli/package.nix
@@ -83,7 +83,6 @@ stdenv.mkDerivation (finalAttrs: {
    changelog = "https://github.com/github/copilot-cli/releases/tag/v${finalAttrs.version}";
    license = lib.licenses.unfree;
    maintainers = with lib.maintainers; [
-      dbreyfogle
      me-and
    ];
    mainProgram = "copilot";
--- a/pkgs/by-name/gi/gittuf/package.nix
+++ b/pkgs/by-name/gi/gittuf/package.nix
@@ -3,41 +3,56 @@
  fetchFromGitHub,
  buildGoModule,
  git,
+  gnupg,
+  less,
  openssh,
+  versionCheckHook,
+  nix-update-script,
 }:

 buildGoModule (finalAttrs: {
  pname = "gittuf";
-  version = "0.12.0";
+  version = "0.15.0";

  src = fetchFromGitHub {
    owner = "gittuf";
    repo = "gittuf";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-/PKbo8LPvU6ZTav9n82mrj2h6z6AyJ225mCH7EfazVU=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-VWbM7y9XCs/pANJtPa3MDbDhuEtVQ97X5Cyo6yY0Rd8=";
  };

-  vendorHash = "sha256-unj9PpRkfNHWQzeCmcjppMFGAlHNcP0/j9EiGvpRzRc=";
+  vendorHash = "sha256-VTfS0bLq7B037qmFABO5JDrV98zik5ycR4s6NZr3H4s=";

  ldflags = [ "-X github.com/gittuf/gittuf/internal/version.gitVersion=${finalAttrs.version}" ];

+  __structuredAttrs = true;
+  strictDeps = true;
+
  nativeCheckInputs = [
    git
+    gnupg
+    less
    openssh
  ];
-  checkFlags = [
-    "-skip=TestLoadRepository"
-    "-skip=TestSSH"
-  ];
+  checkFlags = [ "-skip=TestLoadRepository|TestSSH" ];

-  postInstall = "rm $out/bin/cli"; # remove gendoc cli binary
+  postInstall = "rm $out/bin/cli $out/bin/sandbox"; # remove gendoc helper binaries
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };

  meta = {
-    changelog = "https://github.com/gittuf/gittuf/blob/v${finalAttrs.version}/CHANGELOG.md";
+    changelog = "https://github.com/gittuf/gittuf/blob/${finalAttrs.src.tag}/CHANGELOG.md";
    description = "Security layer for Git repositories";
    homepage = "https://gittuf.dev";
    license = lib.licenses.asl20;
    mainProgram = "gittuf";
-    maintainers = with lib.maintainers; [ flandweber ];
+    maintainers = with lib.maintainers; [
+      flandweber
+      anish
+    ];
  };
 })
--- a/pkgs/by-name/gr/graphite/package.nix
+++ b/pkgs/by-name/gr/graphite/package.nix
@@ -29,12 +29,12 @@
 }:

 let
-  version = "0-unstable-2026-07-01";
-  rev = "95c1ab81f31f318a9e344d1d229feacff861ad39";
+  version = "0-unstable-2026-07-09";
+  rev = "97f8113fe43d41b15ca3a56c300c48b7c8fda5c4";

-  srcHash = "sha256-0GNoGD0S3YrHAaJ/aPNyVG6SfFi1h1NyTR1xmvd5+DQ=";
-  shaderHash = "sha256-4lKBrGh1rfhTBczmCDvIF2KxLyEHzHdKVGgQ+jLd/Dw=";
-  cargoHash = "sha256-1KZsh4M+ijd5LcoELzW9sGsuC+91XBamimvw0AXIgNU=";
+  srcHash = "sha256-EPZzS3sxHYLi2qaRKvJbjUfS0LWaIWwJW/z4op+/uZM=";
+  shaderHash = "sha256-iwtT43vnhgZZhtvWdTLDL5xZVStkOUb2D832/wjqsUE=";
+  cargoHash = "sha256-uwLZFB3+jefE3WihUc3ta8L5G1vdmDdhEDVkDOwAveE=";
  npmHash = "sha256-Rb0bLPk54QigNp7TkDkJJy/TEJXAhlXOCruckwvdXks=";

  brandingRev = "0d004aa61e6b48d316e8e5db6d59ccc4788f192d";
--- a/pkgs/by-name/he/hex/package.nix
+++ b/pkgs/by-name/he/hex/package.nix
@@ -8,16 +8,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "hex";
-  version = "0.6.0";
+  version = "0.7.0";

  src = fetchFromGitHub {
    owner = "sitkevij";
    repo = "hex";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-YctXDhCMJvDQLPsuhzdyYDUIlFE2vKltNtrFFeE7YE8=";
+    hash = "sha256-mqBVoaPKk3gG/drvwX+nHOzIXVM53hbkBJRdKk3a6Lo=";
  };

-  cargoHash = "sha256-3lrNZyQVP+gswbF+pqQmVIHg3bjiJ22y87PtTHDwIXs=";
+  cargoHash = "sha256-faZTjori9MXzH4jC73G498WI7THFkGdh31fFb/F6fvA=";

  passthru.tests.version = testers.testVersion {
    package = hex;
--- a/pkgs/by-name/kl/kluctl/package.nix
+++ b/pkgs/by-name/kl/kluctl/package.nix
@@ -2,6 +2,7 @@
  lib,
  stdenv,
  buildGoModule,
+  buildNpmPackage,
  buildPackages,
  fetchFromGitHub,
  installShellFiles,
@@ -38,6 +39,29 @@ buildGoModule (finalAttrs: {
  # Depends on docker
  doCheck = false;

+  preBuild =
+    let
+      webui = buildNpmPackage {
+        pname = "kluctl-webui";
+        inherit (finalAttrs) version src;
+
+        sourceRoot = "source/pkg/webui/ui";
+
+        npmDepsHash = "sha256-e5Ic3W1UPQn/2ggaYez7G7exXNZA6BobP4BTM6B6rlI=";
+
+        npmBuildScript = "build";
+
+        installPhase = ''
+          mkdir -p $out
+          cp -r build $out/
+        '';
+      };
+    in
+    ''
+      rm -rf pkg/webui/ui/build
+      cp -r ${webui}/build pkg/webui/ui/build
+    '';
+
  postInstall =
    let
      emulator = stdenv.hostPlatform.emulator buildPackages;
--- a/pkgs/by-name/la/lakefs/package.nix
+++ b/pkgs/by-name/la/lakefs/package.nix
@@ -12,13 +12,13 @@

 buildGoModule (finalAttrs: {
  pname = "lakefs";
-  version = "1.79.0";
+  version = "1.83.0";

  src = fetchFromGitHub {
    owner = "treeverse";
    repo = "lakeFS";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-UL9JvrNvtHADI0POguLXMDNNvO1oKHXXwfr8tOyvFYc=";
+    hash = "sha256-5/2iI5/87x+VJ1MbYw7zPEDeTm1XVuLmSsI6KssRGRE=";
  };

  webui = buildNpmPackage {
@@ -30,7 +30,7 @@ buildGoModule (finalAttrs: {

    nodejs = nodejs_22;

-    npmDepsHash = "sha256-Z9oOIKK6Hm/Bg3E37f4FqFFL1exMIf0KNEHQXIyox+Q=";
+    npmDepsHash = "sha256-AKCsxBW2ZBQB5fPkS1adAt8z6mHuC/zGMHhRW8pVyYs=";

    installPhase = ''
      runHook preInstall
@@ -41,7 +41,7 @@ buildGoModule (finalAttrs: {

  subPackages = [ "cmd/lakefs" ];
  proxyVendor = true;
-  vendorHash = "sha256-6XOJBDdAERD6mcneQ7UFqAPGq+pXroNlzQGNvycpVBc=";
+  vendorHash = "sha256-UNDIqP79CG2+M8HKkHT1l7X2/Dt6YDTQzADR5T7klUg=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/li/live-server/package.nix
+++ b/pkgs/by-name/li/live-server/package.nix
@@ -9,21 +9,28 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "live-server";
-  version = "0.11.0";
+  version = "0.11.1";

  src = fetchFromGitHub {
    owner = "lomirus";
    repo = "live-server";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-FKX1rbRKWkWsxzJZDicVAUqrHBwEe2o7EXIouK74UMA=";
+    hash = "sha256-CV+QUwOYGg6lzEDlAlAYoKO3RqWlF3857/6rDmdLjZQ=";
  };

-  cargoHash = "sha256-gaBYnhljcMqSEPViaOPMtuHjoDP8iY64UizlfK+fcQA=";
+  cargoHash = "sha256-C/uqEz8ww+YIg1QbnYgKUPNyLnIIf8Tcf8x99PGmOG4=";

  nativeBuildInputs = [ pkg-config ];

  buildInputs = [ openssl ];

+  __darwinAllowLocalNetworking = true;
+  # Tests that require a browser
+  checkFlags = [
+    "--skip=browser_reloads_on_file_change"
+    "--skip=page_content_is_served"
+  ];
+
  passthru.updateScript = nix-update-script { };

  meta = {
--- a/pkgs/by-name/mc/mcp-gateway/package.nix
+++ b/pkgs/by-name/mc/mcp-gateway/package.nix
@@ -7,16 +7,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "mcp-gateway";
-  version = "3.0.1";
+  version = "3.3.0";

  src = fetchFromGitHub {
    owner = "MikkoParkkola";
    repo = "mcp-gateway";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-BtKPUKcZFu1ybnDmp9yme5/2/gzv1ASQ5E9G/QZClOc=";
+    hash = "sha256-R+k9NpbYcqu56cALHCU15lp0UCc3aJQGdk6ZJgs02D8=";
  };

-  cargoHash = "sha256-hzx9qyqMk3kK8iCRYPtwGqXTQBaQUtt+l6KEn3KF1WE=";
+  cargoHash = "sha256-quIQXrJ/ANOyh76Q3ZErUamLDfJpqPMYSZe9wUyS0Pg=";

  nativeInstallCheckInputs = [
    versionCheckHook
--- a/pkgs/by-name/mi/mindustry/deps.json
+++ b/pkgs/by-name/mi/mindustry/deps.json
@@ -1,60 +1,31 @@
 {
 "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
 "!version": 1,
- "https://download.savannah.gnu.org": {
-  "releases/freetype/freetype-2.14.1": {
-   "tar.gz": "sha256-F02eU0AuG/nscnfiLsGZuj5Vpr4sB0DLGMDumFD8jDQ="
-  }
- },
- "https://github.com": {
-  "nigels-com/glew/releases/download/glew-2.2.0/glew-2.2.0": {
-   "zip": "sha256-qQRqkTd0OVoJXtzAsKwtgcOqzKYXh7OYOblB6b4U4NQ="
-  }
- },
 "https://jitpack.io/com/github": {
-  "Anuken#jabel/0.9.0": {
-   "jar": "sha256-uFYvq/P7dVZNH8xfSZPmm57JI+h47A7YqOaN3bsFLuo=",
-   "module": "sha256-r0Hiyh4MXzQkBudNhixHcXf1QOr4GWU841ypzRa0w/g=",
-   "pom": "sha256-2Zp//AsIqW7/+5ybmtConz5ykh3ZYrFBi6SzLuKTz8A="
+  "Anuken#rhino/e74ac129d2bff72c1deb536d7d99a0dbb7046d2e": {
+   "jar": "sha256-iRvhgKzqoi/8VMmkiM5ibGULv6e07A98e8QoMB6XROQ=",
+   "module": "sha256-c02sDzu5Z+dMXP2DcCFen9ImCWTtZ2I06uSrrtJ8QIo=",
+   "pom": "sha256-kUrWd9wtr/SN21fjmyInwRN8CSxp2nKfeji3qz1OteA="
  },
-  "Anuken#rhino/54b75cbd1207ef1fd5cff517cbd188e763c85baa": {
-   "jar": "sha256-sZ5zFOXvyOLYEbb/LAQLU2u2S4FZ41T+rFHBfrG5O/Y=",
-   "module": "sha256-QqoHjAbLp9eza+7r921k2L6bbV8zqjhdkqHhCy1qIkA=",
-   "pom": "sha256-5xheV+aFDLRgYUS6b7GoGW0b2KSYsA8jY7NPy+Gb+H8="
+  "Anuken#steamworks4j/da41c05b7a2a44c8625ca0ba7d6ca1a2e73f621a": {
+   "jar": "sha256-+8oDVVVbQSpioDAUXKm+vqe3YutsioD4eON7bp9JW0k=",
+   "pom": "sha256-F0jV/Pn+62IzshAyMgSj/kWaAcs98nH+iFEH4m0D8q0="
  },
-  "Anuken#steamworks4j/0b86023401880bb5e586bc404bedbaae9b1f1c94": {
-   "jar": "sha256-YbaPhCjWtlExwQ1dFNA6JrkiAfQYWxJ0VRV9rLnoYhY=",
-   "pom": "sha256-ktvhk8s3T1zswrYWuXz+cWHRyK3YbkikD5Sv/gjcfz4="
-  },
-  "libgdx/gdx-jnigen#gdx-jnigen-gradle/2.5.1": {
-   "jar": "sha256-58CVbO1KcCD3O1KssA1fjFtmFv/w1ELaKjpxYQy4uOo=",
-   "module": "sha256-ed8mnMRwzTx8sz6m1K00O/m5TUClRgFBr7Z52QTvMYI=",
-   "pom": "sha256-39d36SZMtgx/Lcu44RQbayrsHGmqq+7mUbHyZul96fc="
-  },
-  "libgdx/gdx-jnigen#gdx-jnigen-loader/2.5.1": {
-   "jar": "sha256-6I+6THOtnaVYhOB4feFo1xkdF25G6T5iJfQyPCTc+Wo=",
-   "module": "sha256-Sdga7alkfzS4Loy6XAGXvw/+E0AoS6I1HcWD3cBPej4=",
-   "pom": "sha256-ieP1KOe4XwibX7rqHWJat1iH0saLcvfGjosSbODwKcc="
-  },
-  "libgdx/gdx-jnigen#gdx-jnigen/2.5.1": {
-   "jar": "sha256-OeLq815DT4ZtC8d7Ko/3VtV3u7R8Rj8HGX8mQb0eAZw=",
-   "module": "sha256-nicta1Y8N7VYMmNINhN4BRjsUCljtHv+g1lphUuKno8=",
-   "pom": "sha256-lpq6D25HGTFHWR3WDgKd4G2irqsk1rnjvMQlqKL1/NM="
+  "Anuken/steamworks4j#build/da41c05b7a2a44c8625ca0ba7d6ca1a2e73f621a": {
+   "jar": "sha256-aUW6wELo6ixScFyjAAACxDsv1pc5Qy22JAxxHfu99ns=",
+   "module": "sha256-G4us5o9uhVf5uovjADWvn4uzac+lqhNaPIlQgLai2eg=",
+   "pom": "sha256-gqPxOnpZeJXAWsPvVZr5ja/aoMgxY/3Fp0zHNBuvh5I="
  }
 },
 "https://plugins.gradle.org/m2": {
-  "de/undercouch#gradle-download-task/5.0.1": {
-   "jar": "sha256-7VONXLvRug+MUcCRaEVg0S4JPuJwyFvDN6emaj97Rcc=",
-   "pom": "sha256-AkX+RSGxdvwB9LLDtWi08AGYjBxHtCg7cm2rRqhqC4g="
-  },
  "de/undercouch/download#de.undercouch.download.gradle.plugin/5.0.1": {
   "pom": "sha256-GR8NCdz7n02v4EMwQRsdllH9IUpaZ5FoGnfOzSPCQ7A="
  },
-  "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/2.1.10": {
-   "pom": "sha256-KoiNElh3d5C3j7zg6xTZUFBwv1uLzKS7YB4s6/pCPtA="
+  "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/2.3.20": {
+   "pom": "sha256-OVGM+ut/cxup+D2UpCkwR/U6Th+1KpF1cFddfYzWs04="
  },
-  "org/jetbrains/kotlin/kapt#org.jetbrains.kotlin.kapt.gradle.plugin/2.1.10": {
-   "pom": "sha256-HzOk8LbO3qaMYhC518PU/t7EGF2dUIqsqs0933q2Ti8="
+  "org/jetbrains/kotlin/kapt#org.jetbrains.kotlin.kapt.gradle.plugin/2.3.20": {
+   "pom": "sha256-IRkFLEQtpZu0sZW6Ci+dOl91zWp06K4BzR80nfVBX0k="
  }
 },
 "https://raw.githubusercontent.com": {
@@ -68,28 +39,75 @@
   "module": "sha256-LYLf2sMRuwSqec4UpQGJCvdAbJyj6CQHMidx1/QaXrQ=",
   "pom": "sha256-7o1bwxjqVI5VT8I/gm1Fooq5AEpGqZ4dkaZIQxuHcAc="
  },
+  "ch/qos/logback#logback-classic/1.4.12": {
+   "jar": "sha256-S0qZ4ZMbsOpsC2xI1CvEjN42oY6Nycwve4yKI2TC7JM=",
+   "pom": "sha256-1A/n7uF47GHF9MP5om1v7TJfV0EORmfFIL0OFF+gkpU="
+  },
+  "ch/qos/logback#logback-core/1.4.14": {
+   "jar": "sha256-+MLwX0JTCxhSc5UHwXkvAIAWeFDtjzlkRMaRPWYXopM=",
+   "pom": "sha256-XFBVktFPZqp/F3xpuTPkcE/R1pS2L5ST6peCbvVQAj0="
+  },
+  "ch/qos/logback#logback-parent/1.4.12": {
+   "pom": "sha256-PhKCXGfj5aKg6GFY13DslpJOgo+E5DVFSkGiytIWZJ8="
+  },
+  "ch/qos/logback#logback-parent/1.4.14": {
+   "pom": "sha256-5bddPe8EJ1dkUEoXp8GqHj7jcKWxpUiIS74Vfr3eXv0="
+  },
+  "com/badlogicgames/jnigen#jnigen-commons/3.1.1": {
+   "jar": "sha256-GhpDx0Kwd5H1I6LjAGzkysOnyWC60i3qcE0lf5+5Uic=",
+   "module": "sha256-h5TNmSGiisv/kGGm6e7jU3JW26POyMo58eKt7d1zG2E=",
+   "pom": "sha256-lKy0mhhj7cQgfVn6iwc9U1m4PuGhX+eYY0RTlYvaoTQ="
+  },
+  "com/badlogicgames/jnigen#jnigen-core/3.1.1": {
+   "jar": "sha256-9sl8HgFko1FKWFPR7+emTKYoXAZis5C6GGEMVRddqOM=",
+   "module": "sha256-arm2LaOD7BF6rY5Iv4bW2e3SP5Gq6TgJhlrO9vkg+AY=",
+   "pom": "sha256-ig4v9L0DMgIIumfHwy+YZbn3dKwvz97+nPdHHT2oOl4="
+  },
+  "com/badlogicgames/jnigen#jnigen-generator/3.1.1": {
+   "jar": "sha256-ipB6ZfxDED5WNDk7eq8Cc6Iog9AgkoBbyCGrmvMht4E=",
+   "module": "sha256-l4Y/xRC2r16qspcGcADJsnp2nY2owo56r+SVGEXyc/U=",
+   "pom": "sha256-/MiUlSd0enOtc7FBjbjjVlW/tfTaIF+GjuEq0rmbQlg="
+  },
+  "com/badlogicgames/jnigen#jnigen-gradle/3.1.1": {
+   "jar": "sha256-riahTjGeDivvNIIZdnd6hZ8L0a0omdLioDJ4VT6PXEw=",
+   "module": "sha256-Smwq0R4Dlv2f5RdgwERw18Zps62iGewN5bttg6pY8pg=",
+   "pom": "sha256-Yh5nfY9xbZWvlhWI1UFOWJud0YG/KEl7LR75XVf/mV8="
+  },
  "com/github/javaparser#javaparser-core/3.14.14": {
-   "jar": "sha256-Z4GYXisXFCvQfhp75Zt5NIXLAms3ZnN30WYQrpgUi24=",
   "pom": "sha256-70ERyN/Uh+Zp5w1Qzz2z8O3YuTLKvjXmYzuzzuuGpIo="
  },
+  "com/github/javaparser#javaparser-core/3.26.3": {
+   "jar": "sha256-okxPp3mf/gx6mvEdTuzXVwmO1EmPhgZ78otGsr/qGDM=",
+   "pom": "sha256-ZiXjSXeLPDEAJopgk6v0RHLl6WYe85nDNHjYdx+Fgu0="
+  },
  "com/github/javaparser#javaparser-parent/3.14.14": {
   "pom": "sha256-RwgtW3eLzkmjEnRtUWHJ48yhfYwh2eO+MTF68Io2FDc="
  },
+  "com/github/javaparser#javaparser-parent/3.26.3": {
+   "pom": "sha256-oQvtmKrkapQj/eE719L60v+wIjz/WY/MjbzA72a7wyg="
+  },
  "com/google/code/findbugs#jsr305/3.0.2": {
   "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=",
   "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4="
  },
-  "com/google/code/gson#gson-parent/2.8.9": {
-   "pom": "sha256-sW4CbmNCfBlyrQ/GhwPsN5sVduQRuknDL6mjGrC7z/s="
+  "com/google/code/gson#gson-parent/2.11.0": {
+   "pom": "sha256-issfO3Km8CaRasBzW62aqwKT1Sftt7NlMn3vE6k2e3o="
  },
-  "com/google/code/gson#gson/2.8.9": {
-   "jar": "sha256-05mSkYVd5JXJTHQ3YbirUXbP6r4oGlqw2OjUUyb9cD4=",
-   "pom": "sha256-r97W5qaQ+/OtSuZa2jl/CpCl9jCzA9G3QbnJeSb91N4="
+  "com/google/code/gson#gson/2.11.0": {
+   "jar": "sha256-V5KNblpu3rKr03cKj5W6RNzkXzsjt6ncKzCcWBVSp4s=",
+   "pom": "sha256-wOVHvqmYiI5uJcWIapDnYicryItSdTQ90sBd7Wyi42A="
+  },
+  "com/google/errorprone#error_prone_annotations/2.27.0": {
+   "jar": "sha256-JMkjNyxY410LnxagKJKbua7cd1IYZ8J08r0HNd9bofU=",
+   "pom": "sha256-TKWjXWEjXhZUmsNG0eNFUc3w/ifoSqV+A8vrJV6k5do="
  },
  "com/google/errorprone#error_prone_annotations/2.28.0": {
   "jar": "sha256-8/yKOgpAIHBqNzsA5/V8JRLdJtH4PSjH04do+GgrIx4=",
   "pom": "sha256-DOkJ8TpWgUhHbl7iAPOA+Yx1ugiXGq8V2ylet3WY7zo="
  },
+  "com/google/errorprone#error_prone_parent/2.27.0": {
+   "pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ="
+  },
  "com/google/errorprone#error_prone_parent/2.28.0": {
   "pom": "sha256-rM79u1QWzvX80t3DfbTx/LNKIZPMGlXf5ZcKExs+doM="
  },
@@ -120,10 +138,32 @@
   "jar": "sha256-g/D9S66+w78p7jrSwCSzBl3e+CWlqin33PXBifn6KWI=",
   "pom": "sha256-pxrD2PJ8ua0yyHtdiVnyLWca60YMejVdCfV35MV+TF8="
  },
+  "de/undercouch#gradle-download-task/5.0.1": {
+   "jar": "sha256-7VONXLvRug+MUcCRaEVg0S4JPuJwyFvDN6emaj97Rcc=",
+   "pom": "sha256-Pos7wzs3Vgzic+Pp+EZKtfdb9E5jlmEwMpdGrROyAX8="
+  },
+  "io/github/java-diff-utils#java-diff-utils-parent/4.12": {
+   "pom": "sha256-2BHPnxGMwsrRMMlCetVcF01MCm8aAKwa4cm8vsXESxk="
+  },
+  "io/github/java-diff-utils#java-diff-utils/4.12": {
+   "jar": "sha256-mZCiA5d49rTMlHkBQcKGiGTqzuBiDGxFlFESGpAc1bU=",
+   "pom": "sha256-wm4JftyOxoBdExmBfSPU5JbMEBXMVdxSAhEtj2qRZfw="
+  },
  "org/apiguardian#apiguardian-api/1.1.0": {
   "jar": "sha256-qarp/4rj4XoqGPeRdegrFiZ8JG+708qd+7spCwjc/dQ=",
   "pom": "sha256-qUW5y1zZt3sscRhE5lnEPsBw71nZ9Qn6n0wYYbSGJxE="
  },
+  "org/bytedeco#javacpp-presets/1.5.11": {
+   "pom": "sha256-h5CUm0S86GPsXnwI098BpFQdA2pAUPqw3JqxdCt6fc8="
+  },
+  "org/bytedeco#javacpp/1.5.11": {
+   "jar": "sha256-LjzDxddfBtY9+uqDnE8avJc/ty1RgYYBZXHHRnzfhDQ=",
+   "pom": "sha256-tfBkwcm2a+EJvCvdk2Gj+pRlP77zou/w1lEF0MuAbM8="
+  },
+  "org/bytedeco#llvm/19.1.3-1.5.11": {
+   "jar": "sha256-0b34tW7UTg3h9RI3JJ1eTG/A6rCPYIAYLVDIkE9F73g=",
+   "pom": "sha256-ql73P0v3Pl2WwzEV2fIVJweCBp+BI9NE/qFB3KHOzZU="
+  },
  "org/checkerframework#checker-qual/3.43.0": {
   "jar": "sha256-P7wumPBYVMPfFt+auqlVuRsVs+ysM2IyCO1kJGQO8PY=",
   "module": "sha256-+BYzJyRauGJVMpSMcqkwVIzZfzTWw/6GD6auxaNNebQ=",
@@ -133,150 +173,177 @@
   "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=",
   "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c="
  },
-  "org/jetbrains/intellij/deps#trove4j/1.0.20200330": {
-   "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=",
-   "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k="
+  "org/jetbrains/kotlin#abi-tools-api/2.3.20": {
+   "jar": "sha256-U2hfV4OwSQaDiY11Wrrk1Bi26DugYTSFiv3ctZRYmek=",
+   "pom": "sha256-qIbJ/X8rlmlFf+wCHxnc8V8EY+DbS9rVOuGBJTZsxvk="
  },
-  "org/jetbrains/kotlin#kotlin-annotation-processing-gradle/2.1.10": {
-   "jar": "sha256-rWzLNdLrwlw0eUNMGkAhS34juqdz7nYbhAgeWlOHHcE=",
-   "pom": "sha256-6K//Db8Bs37UdsOwKXRpJOG4X4+F3KNreYUVTARBb1k="
+  "org/jetbrains/kotlin#abi-tools/2.3.20": {
+   "jar": "sha256-R9fBgRPZhYUGWrUky6HEcLTDaTB2l8qdHIEOULk9C9E=",
+   "pom": "sha256-Pi8inRHuIgaFPTAL/l0R3dzpYFqJ5cmvrwa3Ij0Zh1c="
  },
-  "org/jetbrains/kotlin#kotlin-build-common/2.1.10": {
-   "jar": "sha256-mXapS/X6gXTrOY+3Y0u59GUuBVfJhzfLJi7qUKPg4l8=",
-   "pom": "sha256-zo5bvGb+sXKAsxWzo1WjgeB84qxe1/PVYBeye9RkAwM="
+  "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.3.20": {
+   "module": "sha256-bNjWSw5lN3kE8wb2qFja/ZMcQTUkD4RMk9UpTumP6Dk=",
+   "pom": "sha256-SgpFTor25QOv5ngwoYVjubaA3u67GhcGoNe0S8UHQKE="
  },
-  "org/jetbrains/kotlin#kotlin-build-statistics/2.1.10": {
-   "jar": "sha256-8XMePfcMSH0QB0tGAGQpLY99xwQj1IVkGN2Sb6DaXYM=",
-   "pom": "sha256-qU9wshjcayKAYaLTq+ERNpMejI9onWsCh8T85Xfb9CM="
+  "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.3.20/gradle813": {
+   "jar": "sha256-pPEKPw6l3dH1VaT3BuCep/VSs8hSK7EAY2HdMG4152o="
  },
-  "org/jetbrains/kotlin#kotlin-build-tools-api/2.1.10": {
-   "jar": "sha256-JXFnlQAsewLbzOUQyZFvrn6UaFxIePT3vzxNA+yRqr4=",
-   "pom": "sha256-nGYMBDRvBWBfxozxgDeda3yDTnO3moOZoNy3Rthah00="
+  "org/jetbrains/kotlin#kotlin-annotation-processing-gradle/2.3.20": {
+   "jar": "sha256-C+KMOeA/kQzQfZzqJkvx5uc06Zm6OvkPkkyaHc1JoNM=",
+   "pom": "sha256-cEzCAo+0gbjJP95chIAd5HE+52zN+pfU4v5mt8UerKs="
  },
-  "org/jetbrains/kotlin#kotlin-build-tools-impl/2.1.10": {
-   "jar": "sha256-ZWZ1x/B9nL28lPCY80lTVx7j7Px7w+JXqAfzgHn6SGk=",
-   "pom": "sha256-bBzPBAe3L8cRem+iGpzPQzX6qfd/f6YMmpcOogWaOSA="
+  "org/jetbrains/kotlin#kotlin-build-statistics/2.3.20": {
+   "jar": "sha256-ptJ7PINhdlLdBlYG+Yz1nPviY/jCDr5OvVpvJonrDU8=",
+   "pom": "sha256-nQqNf/FyPV1y00ldVVc9jTxrd3TWHYBXlxT3nCQmX48="
  },
-  "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.1.10": {
-   "jar": "sha256-OW8ohW8P1wQyCBk5jVlZp4G98iWy3CrALNUkhELr1bg=",
-   "pom": "sha256-bec+IDkYqNyV/5qm5l9QIn2eCFPuh1y0o3I8YDz285I="
+  "org/jetbrains/kotlin#kotlin-build-tools-api/2.3.20": {
+   "jar": "sha256-IvGrIjhUuUkJn2slnO9UHVtYo2Q9+aScRXfGPEFuhDs=",
+   "pom": "sha256-G14LLDaQXcL1XgpLeBKuY+MSXe/PaG0sD0kPg7c9nV4="
  },
-  "org/jetbrains/kotlin#kotlin-compiler-runner/2.1.10": {
-   "jar": "sha256-xC0ODpzkT1zzRP8lJoetKvPt3lhGlQAQI5TRN1E8gq8=",
-   "pom": "sha256-I49shzgP13Q28GBf5yJU7cUFUty5MoLbKFahQZT4s4A="
+  "org/jetbrains/kotlin#kotlin-build-tools-compat/2.3.20": {
+   "jar": "sha256-RMMHtO3UysUflgqBNBEtZkyTB2cAzaXoZulNmkKWNA4=",
+   "pom": "sha256-rpC+JesEdhCNlo6+Mqjd9SXhQIhYj6BUc9sSgVoPG3Q="
  },
-  "org/jetbrains/kotlin#kotlin-daemon-client/2.1.10": {
-   "jar": "sha256-zxinYYIDWuLUjoJZllBSTh4VHnND6KsP0G0GB8QUXNE=",
-   "pom": "sha256-S3sZUpiHwl0qCtdvAWO2k1qrzzRWQyCDOigoQqZJEKA="
+  "org/jetbrains/kotlin#kotlin-build-tools-cri-impl/2.3.20": {
+   "jar": "sha256-VOztYw8oEkzP4uRk5srMKB5SiopQqJclchVUyWk1SP4=",
+   "pom": "sha256-5zeMZYHvXw4stA46TOxR0rlj5iVkWpK2fqCVJa+XxMM="
  },
-  "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.1.10": {
-   "jar": "sha256-fvo/pbcG6xvbzapHYWRRm58JwtwWgAGUNTSNOc4kvh0=",
-   "pom": "sha256-MAw4DKEU2HmZEG78T5kRDHrEKxm2utmiSFiwLGzIvbA="
+  "org/jetbrains/kotlin#kotlin-build-tools-impl/2.3.20": {
+   "jar": "sha256-loG8IWSovZ9t30wIXPSoNrktJ1BmZ9c7q59thVM2yRA=",
+   "pom": "sha256-gswavl5j0/5nV+eXKE8F25r9fq3D6D0ROcOlW2TUstU="
  },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.1.10": {
-   "jar": "sha256-hhPV1T4x5SeS3qFerN2V6F6SSE3AMtZaC4D8OrCiaDo=",
-   "pom": "sha256-gToJLb+aST/lrRx1zy00r3eQYnETzrVkLvSE2PE7kP8="
+  "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.3.20": {
+   "jar": "sha256-l2+YnQtfXYDo6KitS3PaC/wn/dllufo4Nisr557MEzc=",
+   "pom": "sha256-DDWu7jcvB1FOvtN7lAe44RgdFCd1UTnlzudxnKBf5+g="
  },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.10": {
-   "jar": "sha256-rhutPDYWMMZrRBwN6CPI1nLsPSSaw9i2ltH06TaNJno=",
-   "module": "sha256-qfypH2qYul//RE/ydG2QsMfGiVyekxnCyUmbU+pmNds=",
-   "pom": "sha256-GlNAFMLCXyWMs7i+xds8pUcB5iG7xUmp4QG2lH4mHaw="
+  "org/jetbrains/kotlin#kotlin-compiler-runner/2.3.20": {
+   "jar": "sha256-wGnzCkA75wyBUviqnyXsy6GI7q1UJjrgKvFEIUN6Igg=",
+   "pom": "sha256-jYTqDt1gs4vOpWLeUXgVKiZxqaAFPWcPkxRSs9sBMig="
  },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.1.10": {
-   "jar": "sha256-0vcj8UlcfYLj1mbhAKYRAExZKh2NO1zTLmlr6QrILn4=",
-   "pom": "sha256-mnIVKRX/eLdKTOvB3OFLk4UPnTEsPPSreRYQ/sdTmFY="
+  "org/jetbrains/kotlin#kotlin-daemon-client/2.3.20": {
+   "jar": "sha256-xxp8G+j7/wTgr0XJ7oy3ph2JU7ymuL8iWlcZxyWpC0Q=",
+   "pom": "sha256-nnyLgHJBF/cqrOZfa+SNg224/Dl1OtlR8ruQhi1+cIA="
  },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.1.10": {
-   "jar": "sha256-Gn6NQPVJhknnsZleh71zUEh1JUrZytCTuGuBNH6AFRw=",
-   "module": "sha256-+ZK7mjYrAOahF6ugQe7EDYP2hPYw3hMA+t8v2jClYdE=",
-   "pom": "sha256-IY9nplnGzjz9BR+nSbQVLjLlMTssO1Me4XGRtFN2FJk="
+  "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.3.20": {
+   "jar": "sha256-iHC6uEC4CHyWxN3AYIi0rt9RMcQIrzZ0MGME8flq8/Q=",
+   "pom": "sha256-YVQOWzoywLEZYkSWZZJMbNdVTqmu4IVb2OT1t/YQoKs="
  },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.1.10": {
-   "jar": "sha256-ZM7lN+LvqAjIr0rCdZHIRfCGHFH7oNBk29dLpN7dg84=",
-   "module": "sha256-RVHiwEMx4WWf25kNvN2ZYG2HNLWkCN8KezuFuMKYTXA=",
-   "pom": "sha256-ijsc4TMDkoEFIUEhBHANqfxhYd50COmp1LZFg4p+EwM="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.3.20": {
+   "jar": "sha256-4WYu10cyK2P2HU+t2Zq3gQTEXq8JwRp4mGJBXoHBjcQ=",
+   "pom": "sha256-aP+Cf8E1DZPw1nM2jAZHm2K31eXDBlipWM+TBmgx6Nk="
  },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin/2.1.10": {
-   "module": "sha256-E2mm+exHB1Vh3Cc1x7sd6MmZLZFULnaYkJPb+Fv0mKY=",
-   "pom": "sha256-wt7LThQ0Um66OKV4EKQzWITQsAxy12kSwzKpVWak35A="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.3.20": {
+   "module": "sha256-04UBEP9ajrcP7S1Xi0X7B+vESvaika5M88eUMMZRKLo=",
+   "pom": "sha256-AdVSITSRyFPVb4frdIEwON+e4dhekIaqN70GY7JJb4g="
  },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin/2.1.10/gradle85": {
-   "jar": "sha256-jCaugsJNq9Mn2HfSLsNW8md9zdYnFxJ2a2PxNeTdyqI="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.3.20/gradle813": {
+   "jar": "sha256-ybwX32m/OZB8WXweGb7EtHnHWqx1+/1jIeNEW0lxLog="
  },
-  "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.1.10": {
-   "module": "sha256-aN0fMZG0eiTJtyPop9+DbucnRZuw6G09x6H164hK1sY=",
-   "pom": "sha256-062RriLdACJzgzmvHvQMFC/THz4XpI9VsIZEQytA7Ck="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.3.20": {
+   "jar": "sha256-5Cicv5/0lAfwQd3GM24bV3pspM8r4dKjEzgnHBPu0+0=",
+   "pom": "sha256-9veHObqf4nEunwyeW8T16TcZzP6pW0fC9JslC+F2NX4="
  },
-  "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.1.10": {
-   "jar": "sha256-G+wqyVJiA0voFoeToFQU7lYozB4oxIeyXV+XSc5y2ls=",
-   "pom": "sha256-+k+PHiJyweeF4c2eVOiyLq00B4a8x0uKx2C2MzUDVrY="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.3.20": {
+   "jar": "sha256-lS5zlI4qINOYwmuHprtwzPZkGPuvFSfDUVsYjqnUvWA=",
+   "module": "sha256-b7XZcwCl5Vmv1Nn/msA1bE2Wb31pS2Yvrhaf2HQhUx4=",
+   "pom": "sha256-WROHIVGNgqND99wvCRK3BJjT7vM2PJ66wiCssPyTjsw="
  },
-  "org/jetbrains/kotlin#kotlin-klib-commonizer-embeddable/2.1.10": {
-   "jar": "sha256-0zJ6QnAZhNmS+/JavXKNlE3LLj8TL1wyU5+ccabPkNs=",
-   "pom": "sha256-zAYLn8Rzs74lFPsNeEu46al6zLHFXe8f4i7UPPUHArE="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin/2.3.20": {
+   "module": "sha256-lVUmc7gbNXitmy86/xRUtjzoBsb9SrfGBJIx6GQKtHE=",
+   "pom": "sha256-EcMjwt2KgE6fWOBHwsAYZLKgHcDYEys2PApDEiFbwJs="
  },
-  "org/jetbrains/kotlin#kotlin-native-utils/2.1.10": {
-   "jar": "sha256-L8Behn3ERw9lhR0WJjSY+xfdyxglErg9FeF4gVngomo=",
-   "pom": "sha256-lhBo1LVVnBlUAEVoCRoJUJdsZVz391Fh9v4kIqy12rQ="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin/2.3.20/gradle813": {
+   "jar": "sha256-RuFu4mWU9ID+y5LJbarjdTDoNQJreON+8yUelX8D9vs="
+  },
+  "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.3.20": {
+   "module": "sha256-+CvXZF0MPv609PZVIKPGWz6MMCsIMyIDegABuHsC6ZA=",
+   "pom": "sha256-3WuRkZfhMv5x3axw9vxdj65/Und6/YN7FN6HG4wKVAA="
+  },
+  "org/jetbrains/kotlin#kotlin-klib-abi-reader/2.3.20": {
+   "jar": "sha256-XAo6pyBAjdL2PnYIdd0/Z9t+0Ws/AAKA4IgcYHDOT2M=",
+   "pom": "sha256-ui+7W5OjnlGraeWCJPGNdxYqDrYDkIbl9lVne8O3xno="
+  },
+  "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.3.20": {
+   "jar": "sha256-vpN3SFQS0A8B54KZyzC+SAJZHCcwNCtuva/AiU91J0M=",
+   "pom": "sha256-IbFbpb1i0h1Ta7egyMtnQ1cfwPQwklSKQjWybyodIgs="
+  },
+  "org/jetbrains/kotlin#kotlin-klib-commonizer-embeddable/2.3.20": {
+   "jar": "sha256-4FeWYwUcbaKyPZX8LDpBKnYnnbg6eQHuhqfjrPbnHjQ=",
+   "pom": "sha256-shhlfghlbEa018djdux6BOoGAJpGLTpkcBFvr92OPss="
+  },
+  "org/jetbrains/kotlin#kotlin-metadata-jvm/2.3.20": {
+   "jar": "sha256-FyZLlpD+7TSqi459VW+y55UfaABGLxFyQ/upYgEBT30=",
+   "pom": "sha256-DF/7/5dG1Ca56GasBWviiSizGKJc3FaDkIHsRJspzZc="
+  },
+  "org/jetbrains/kotlin#kotlin-native-utils/2.3.20": {
+   "jar": "sha256-QxnCdkeV773/K3julUVRV9evC5FVaYuqG6Uqar46vy0=",
+   "pom": "sha256-LAp+ADViCIXUN+fxJidEdbpYqiJC+1279D+R8gyvpwg="
  },
  "org/jetbrains/kotlin#kotlin-reflect/1.6.10": {
   "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=",
   "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak="
  },
-  "org/jetbrains/kotlin#kotlin-script-runtime/2.1.10": {
-   "jar": "sha256-4kTA5/ZkERdV8ubpd4Ybcabro7T0UWJwSDPkbfqIOug=",
-   "pom": "sha256-zSWhAsEny99KW5n1M2pYSwyNR1zPzDUCya2LpelH2zc="
+  "org/jetbrains/kotlin#kotlin-script-runtime/2.3.20": {
+   "jar": "sha256-b8232m5lz4zEPlqrq5S9zEiCXnkzaG+KG/aU64j44A4=",
+   "pom": "sha256-ZgmWdnA6CB/ZrEMTlmWIPlwUUCC2QHWd4FOdiRb/JH8="
  },
-  "org/jetbrains/kotlin#kotlin-scripting-common/2.1.10": {
-   "jar": "sha256-R3VyCGt1QtldsIyGY3rA7bm/DWsiq5uhNA5BoEiUEHk=",
-   "pom": "sha256-D/eXewgtbVneBV+q/2ACZVjJxZxllzsDnRG3i0SvEko="
+  "org/jetbrains/kotlin#kotlin-scripting-common/2.3.20": {
+   "jar": "sha256-tMI52HsjvhgvBb9Xz16B+V1wv370qYnrmLczicbryJ8=",
+   "pom": "sha256-h+/vFa4RjxNDUmPrEJcAZGD7qDlph340uKcvDjPIOsk="
  },
-  "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.1.10": {
-   "jar": "sha256-SeX8hK2b5s5TGUZrOKFxfUGh4jDZ4k2yb6xIse6sSo0=",
-   "pom": "sha256-isI7V2FoDl5lZHicZMvxEP5JWXp3JNqGQCRTLfUNrco="
+  "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.3.20": {
+   "jar": "sha256-vVX49hvUHOxSllbC1HeEvLpawmDpT0FWwnLDFJZu71k=",
+   "pom": "sha256-1l8YaBd9zkuKkv+93bVrFzH5+66IyOcw7XvLcAy7soo="
  },
-  "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.1.10": {
-   "jar": "sha256-16kVX3BT+b4c4TX5/8QW4RaLsj0VCeslYoVHP9Of/4A=",
-   "pom": "sha256-FkJ9B0RZDHhkH9RywRNEvkBbBcA8CNmnIES/7djRzMg="
+  "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.3.20": {
+   "jar": "sha256-gG/WOzvOxea17rGghD1qsJTVV4aoRl5HSiQ5KVocCiU=",
+   "pom": "sha256-xKkTo4XzTjKlbyBd8XoI3U4RfDBsV+XkfcXUlSPw6+E="
  },
-  "org/jetbrains/kotlin#kotlin-scripting-jvm/2.1.10": {
-   "jar": "sha256-lUZtpQ9CjAG9g2WE0wxVpomGHJOz2Xd4dKY2PRnPLdw=",
-   "pom": "sha256-/+onoApjoxX6ZoDQckI0xttuSJO4uGA6UmuNYuW+jc0="
+  "org/jetbrains/kotlin#kotlin-scripting-jvm/2.3.20": {
+   "jar": "sha256-cEfOA1P0kSXDx0Z5LU92wyZde3L+YmlLfuwHW7oCUow=",
+   "pom": "sha256-B8Ba4tHs4K4e1mAQ7TGNnN3LNYcEbGM8GGvRTM8EYdU="
  },
-  "org/jetbrains/kotlin#kotlin-stdlib/2.1.10": {
-   "jar": "sha256-XyrByo3Is3o/QxTnFtNpaevwInp1GB0yaZ0Kj2RbHCE=",
-   "module": "sha256-jSwdcXxzVG1WOC0TbIZQtZpxWZQBciY4GJNKzkTLBI0=",
-   "pom": "sha256-SSISHT8LxgzkB/Ny3kLQKgt+lOddDD0VCLaDVyHySe8="
+  "org/jetbrains/kotlin#kotlin-stdlib/2.3.20": {
+   "jar": "sha256-CuElBKUEDrrzdwOQhINCDRpWJN0dk/NXZl+Md8hIoB4=",
+   "module": "sha256-9Os0T8TR46KK4WwIbsPkL1I3O0ZtQwgYL7OG45LA76M=",
+   "pom": "sha256-yDwC2afi6VRzBJHDPC8dwDwnZi4ntWbsK0TS0Bhjm5g="
  },
-  "org/jetbrains/kotlin#kotlin-tooling-core/2.1.10": {
-   "jar": "sha256-QXbGEgmMuS3zikhf+LEKqiSrtAD2ENSPUIiusHyAAsg=",
-   "pom": "sha256-o9KW5sNBKQy36ihbNCnXjSwiEtow339G2UcV80D1JJ4="
+  "org/jetbrains/kotlin#kotlin-tooling-core/2.3.20": {
+   "jar": "sha256-NnFCeBKZvA+RIMHe7A5ik0oa+ep/AaqpxaU1TcXY19k=",
+   "pom": "sha256-R+Ou/SS1vmLYB7bLzXnFW4P5S1XP4Y79xuM84RvxkOQ="
  },
-  "org/jetbrains/kotlin#kotlin-util-io/2.1.10": {
-   "jar": "sha256-RLWV7VtKEqqn3Wv4zYtWA+Eu3U0ykhkRPlJoX4xD7co=",
-   "pom": "sha256-yjmmo1CjkEEvKF9UWcl5rbkkkIeTBkmOTjdYwxLT+is="
+  "org/jetbrains/kotlin#kotlin-util-io/2.3.20": {
+   "jar": "sha256-DnbnRx6RxT6mjS0k7x8p+1kqxfuw0dEPqpFkMO/z2so=",
+   "pom": "sha256-lcKKgo/B8eWeZWOCR6ZPdm2B2LWfbY3r7y0YoMwyH4k="
  },
-  "org/jetbrains/kotlin#kotlin-util-klib-metadata/2.1.10": {
-   "jar": "sha256-obxgwmV1SpF06sB7JG7jtsyz4nhWoS8OXtAaJoc6DF4=",
-   "pom": "sha256-r0E3VoZzMQsOlRpGSN0JqJuY5cI5Cl2O7p5Hb7tCRT8="
+  "org/jetbrains/kotlin#kotlin-util-klib-metadata/2.3.20": {
+   "jar": "sha256-qJlOC8poRt+xn0WMTMFdexN3nKGw2fNIgLX/LCorc7M=",
+   "pom": "sha256-jxApEHGu+rvY5m/5r3dDojiB1pxqryjhNhbMDpW9F7c="
  },
-  "org/jetbrains/kotlin#kotlin-util-klib/2.1.10": {
-   "jar": "sha256-wfBzMVzvkLaPI+vtaEfWfxny+ALR3URtNkTBryhAKHY=",
-   "pom": "sha256-aXGWCNsaiYCD5kOr5GR7lS471tQKxS74Gn8xZswO34A="
+  "org/jetbrains/kotlin#kotlin-util-klib/2.3.20": {
+   "jar": "sha256-lWK407egS+uisUwFZx5xOFnqVLvAohB+ZbK88nP6hEg=",
+   "pom": "sha256-WlhMPMK6O0HR5c1+eiCDV2wbjDl6ebuBY2dtjvew6hc="
  },
-  "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/2.1.10": {
-   "pom": "sha256-ZeQcdCx+bntc5pEXF/23xNIMpDcqFKSYFis2OljR5dA="
+  "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/2.3.20": {
+   "pom": "sha256-VdcHKXaj+iaZzzQy2Ls6rgEhnXcW4iX8ecddxqZRTwg="
  },
-  "org/jetbrains/kotlin/kapt#org.jetbrains.kotlin.kapt.gradle.plugin/2.1.10": {
-   "pom": "sha256-DUmjkkxWv9dmrd2/Jhhh8oLUisdzNZ1+bN5mCz6P0Fs="
+  "org/jetbrains/kotlin/kapt#org.jetbrains.kotlin.kapt.gradle.plugin/2.3.20": {
+   "pom": "sha256-KgxHvSyS1Vp0n5Q0EyOtHffOgpNNAHfTNt1O+KMwcqQ="
  },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": {
-   "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE="
+  "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.8.0": {
+   "pom": "sha256-Ejnp2+E5fNWXE0KVayURvDrOe2QYQuQ3KgiNz6i5rVU="
  },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.6.4": {
-   "jar": "sha256-wkyLsnuzIMSpOHFQGn5eDGFgdjiQexl672dVE9TIIL4=",
-   "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=",
-   "pom": "sha256-Cdlg+FkikDwuUuEmsX6fpQILQlxGnsYZRLPAGDVUciQ="
+  "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.8.0": {
+   "jar": "sha256-mGCQahk3SQv187BtLw4Q70UeZblbJp8i2vaKPR9QZcU=",
+   "module": "sha256-/2oi2kAECTh1HbCuIRd+dlF9vxJqdnlvVCZye/dsEig=",
+   "pom": "sha256-pWM6vVNGfOuRYi2B8umCCAh3FF4LduG3V4hxVDSIXQs="
+  },
+  "org/jline#jline-parent/4.0.0": {
+   "pom": "sha256-qTWw4PG+PcA92t0Mhztwp1MdnO+RFf3JQLb0mor7w9s="
+  },
+  "org/jline#jline/4.0.0": {
+   "jar": "sha256-bcYGBxAc6o6XQOPLYjs46HMduP94j3WaOl+rwRkmcDI=",
+   "pom": "sha256-cbdxuk5C/hYpW1lmJEDdhqMveltqxYeNHzsl+TqUF9Y="
  },
  "org/json#json/20230618": {
   "jar": "sha256-cAQAep/Yf+HYb2c7RywDcuW8ULrLckwCmmES18S0pkA=",
@@ -311,10 +378,25 @@
   "module": "sha256-S2knc2Ouooq1DFpnYZ++q/jAgk5JOOYmC6wEjlvrga8=",
   "pom": "sha256-dmAvWZVKo9+mjjHIDKibb7ouoAG0+wbLUfoV6tfIWjA="
  },
+  "org/junit/platform#junit-platform-launcher/1.7.1": {
+   "jar": "sha256-MSKsb7KEvFDjr+RkGfyXf5TVgOnT0epYgF0gC1EKme4=",
+   "module": "sha256-iFMX9wTYc+F+oqGIZQY2MKbiSjCjq/6TTBXHSelJRt4=",
+   "pom": "sha256-Rk59Ip+eCnCgt1W2HYO+aiQhqsnQ87ZahfBueu4Wa2c="
+  },
  "org/opentest4j#opentest4j/1.2.0": {
   "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=",
   "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ="
  },
+  "org/slf4j#slf4j-api/2.0.16": {
+   "jar": "sha256-oSV43eG6AL2bgW04iguHmSjQC6s8g8JA9wE79BlsV5o=",
+   "pom": "sha256-saAPWxxNvmK4BdZdI5Eab3cGOInXyx6G/oOJ1hkEc/c="
+  },
+  "org/slf4j#slf4j-bom/2.0.16": {
+   "pom": "sha256-BWYEjsglzfKHWGIK9k2eFK44qc2HSN1vr6bfSkGUwnk="
+  },
+  "org/slf4j#slf4j-parent/2.0.16": {
+   "pom": "sha256-CaC0zIFNcnRhbJsW1MD9mq8ezIEzNN5RMeVHJxsZguU="
+  },
  "org/sonatype/oss#oss-parent/7": {
   "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
  },
@@ -322,9 +404,9 @@
   "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
  }
 },
- "https://www.libsdl.org": {
-  "release/SDL2-devel-2.32.8-mingw": {
-   "tar.gz": "sha256-9ZCzcHaJViSD3tBb8V6vD10z65f0nQ/TuJQiX+F8xSs="
+ "https://sourceforge.net": {
+  "projects/freetype/files/freetype2/2.14.3/freetype-2.14.3": {
+   "tar.gz/download": "sha256-5hsxqyY1i5Rudn7X639LsuUH2hz+/reohhrOf9XImaE="
  }
 }
 }
--- a/pkgs/by-name/mi/mindustry/package.nix
+++ b/pkgs/by-name/mi/mindustry/package.nix
@@ -38,7 +38,7 @@

 let
  pname = "mindustry";
-  version = "155.4";
+  version = "159.3";
  buildVersion = makeBuildVersion version;

  jdk = jdk17;
@@ -48,21 +48,21 @@ let
    owner = "Anuken";
    repo = "Mindustry";
    tag = "v${version}";
-    hash = "sha256-NHI+YLh4ptuAEff6NM9ZgN2haB+iZ9np7nf6iRMzgHw=";
+    hash = "sha256-i29EbiKBVWab9YJWPWeVFQLLvRcigvHJPc7803A5e6g=";
  };
  Arc = fetchFromGitHub {
    name = "Arc-source";
    owner = "Anuken";
    repo = "Arc";
    tag = "v${version}";
-    hash = "sha256-9nUj9aP1yAvZEDBuJPfE4ZzGEbZOSuVK+KbD1kUG+dM=";
+    hash = "sha256-1HEPON+cfsPYhPtYwVhj7zrc7fMdwpOA6H2r8yp4erE=";
  };
  soloud = fetchFromGitHub {
    owner = "Anuken";
    repo = "soloud";
-    # This is pinned in Arc's arc-core/build.gradle
-    tag = "2025.12.01";
-    hash = "sha256-I+VZW34eRGn1RJmK8e9nVSXIFSOK/pER+xEhmXeUB4Y=";
+    # This is pinned in Arc's build.gradle
+    tag = "2026.06.01";
+    hash = "sha256-0/A3myfCYb+AMP3WH6stmXeb1eiA4dgX6H1Quj4AD9Q=";
  };

  desktopItem = makeDesktopItem {
@@ -98,11 +98,27 @@ stdenv.mkDerivation {
    rm -r Arc/backends/backend-*/libs/*
    rm -f Arc/arc-core/unsafe/unsafe.jar

-    cd Mindustry
+    # Remove unbuildable Android
+    substituteInPlace Arc/settings.gradle \
+      --replace-fail 'include ":natives:natives-android"' ""
+    rm Arc/backends/backend-android/build.gradle

-    # Fix duplicate class entries in arc-core jar with newer Gradle
-    substituteInPlace ../Arc/arc-core/build.gradle \
-      --replace-fail 'jar{' 'jar{ duplicatesStrategy = DuplicatesStrategy.EXCLUDE'
+    # avoid a circular dependency with rebuilding those
+    pushd Arc/arc-core/unsafe/
+    javac --target 8 --source 8 -d . UnsafeBuffers.java
+    javac --target 16 --source 16 -d . Java16Buffers.java
+    jar cvf unsafe.jar arc
+    rm -r arc
+    popd
+
+    # We need to mock those as otherwise mitmCache tries to download them
+    pushd Arc/backends/backend-sdl/
+    mkdir -p build/jnigen/sources/
+    touch build/jnigen/sources/glew.zip
+    touch build/jnigen/sources/sdlmingw.tar.gz
+    popd
+
+    cd Mindustry

    # Remove unbuildable iOS stuff
    sed -i '/^project(":ios"){/,/^}/d' build.gradle
@@ -150,30 +166,23 @@ stdenv.mkDerivation {

  buildPhase = ''
    runHook preBuild
-
-    pushd ../Arc
-    gradle :arc-core:recompileUnsafe
-    popd
  ''
  + lib.optionalString enableServer ''
    gradle server:dist
  ''
  + lib.optionalString enableClient ''
    pushd ../Arc
-    gradle jnigenBuildLinux64
+    gradle jnigenBuildLinux_x86_64
    # Copy freshly-built libraries to where Gradle resource dirs expect them.
    # Using jnigenBuildLinux64 skips the postJni tasks, so we copy manually.
    # arc-core uses relative libsDir, others use absolute which causes path doubling.
-    cp arc-core/libs/linux64/* natives/natives-desktop/libs/
-    cp -r backends/backend-sdl/build/Arc/backends/backend-sdl/libs/* backends/backend-sdl/libs/
-    cp extensions/freetype/build/Arc/extensions/freetype/libs/*/* natives/natives-freetype-desktop/libs/
-    cp extensions/filedialogs/build/Arc/extensions/filedialogs/libs/*/* natives/natives-filedialogs/libs/
-    glewlib=${lib.getLib glew}/lib/libGLEW.so
-    sdllib=${lib.getLib SDL2}/lib/libSDL2.so
+    cp arc-core/build/natives/*/* natives/natives-desktop/libs/
+    cp extensions/freetype/build/natives/*/* natives/natives-freetype-desktop/libs/
+    cp extensions/filedialogs/build/natives/*/* natives/natives-filedialogs/libs/
    patchelf backends/backend-sdl/libs/linux64/libsdl-arc*.so \
-      --add-needed "$glewlib" \
-      --add-needed "$sdllib"
-    gradle jnigenJarNativesDesktop
+      --add-needed "${lib.getLib glew}/lib/libGLEW.so" \
+      --add-needed "${lib.getLib SDL2}/lib/libSDL2.so"
+    gradle jnigenPackageAllDesktop
    popd

    gradle desktop:dist
--- a/pkgs/by-name/mi/minizip-ng/package.nix
+++ b/pkgs/by-name/mi/minizip-ng/package.nix
@@ -15,13 +15,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "minizip-ng" + lib.optionalString enableCompat "-compat";
-  version = "4.2.1";
+  version = "4.2.2";

  src = fetchFromGitHub {
    owner = "zlib-ng";
    repo = "minizip-ng";
    rev = finalAttrs.version;
-    hash = "sha256-gpjM8Cqoe4kafXgl2wXhhCRx39WC94qJ1DIDyd2n0G8=";
+    hash = "sha256-yPDH9Far8I+tpNeIoXt6w2Aj1/LEYFjwaHyLZMavCCA=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/mk/mkvtoolnix/package.nix
+++ b/pkgs/by-name/mk/mkvtoolnix/package.nix
@@ -98,10 +98,13 @@ stdenv.mkDerivation (finalAttrs: {
  ++ optionals withGUI [ cmark ]
  ++ optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ];

-  # autoupdate is not needed but it silences a ton of pointless warnings
  postPatch = ''
+    # autoupdate is not needed but it silences a ton of pointless warnings
    patchShebangs . > /dev/null
    autoupdate configure.ac ac/*.m4
+
+    # fix unit tests with GUI disabled
+    sed -i '5i$gtest_apps.delete("gui") if !$build_mkvtoolnix_gui' rake.d/gtest.rb
  '';

  configureFlags = [
--- a/pkgs/by-name/mo/mona-sans/package.nix
+++ b/pkgs/by-name/mo/mona-sans/package.nix
@@ -7,7 +7,7 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "mona-sans";
-  version = "2.0.23";
+  version = "2.0.27";

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

  src = fetchFromGitHub {
-    rev = finalAttrs.version;
    owner = "github";
    repo = "mona-sans";
-    sha256 = "sha256-VBbn59v1EqP2cEDqna5vSz/uSgFHmF97bsAHyOBbRt0=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-P5Dy38iS0Cly+Rcjg3EQSZozvdfsXwa6yz+IdgrSq4M=";
  };

  nativeBuildInputs = [ installFonts ];
--- a/pkgs/by-name/mt/mtail/package.nix
+++ b/pkgs/by-name/mt/mtail/package.nix
@@ -8,17 +8,17 @@

 buildGoModule (finalAttrs: {
  pname = "mtail";
-  version = "3.4.0";
+  version = "3.4.3";

  src = fetchFromGitHub {
    owner = "jaqx0r";
    repo = "mtail";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-iNTj8bXtJl1H0rNiFGITgIxD9oAZ7zKUAoyDaxvcR6o=";
+    hash = "sha256-KX47oD7qLBpwItUVltysiekjy4wtpK13SVdvjSx9jmU=";
  };

  proxyVendor = true;
-  vendorHash = "sha256-NKNCpTCfc2U5fqdhXu30w7QlUjCwSX0l+t5ivWtEgdU=";
+  vendorHash = "sha256-9XEg7Io3yi/6PKgc0oKmTWNYACOLf8FfKM/c15jXOUQ=";

  nativeBuildInputs = [
    gotools # goyacc
--- a/pkgs/by-name/oh/oha/package.nix
+++ b/pkgs/by-name/oh/oha/package.nix
@@ -4,6 +4,7 @@
  fetchFromGitHub,
  stdenv,
  cacert,
+  installShellFiles,
  libredirect,
  pkg-config,
  openssl,
@@ -29,7 +30,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
    CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1";
  };

-  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+  nativeBuildInputs = [
+    installShellFiles
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
    pkg-config
  ];

@@ -54,6 +58,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
    "--skip=test_proxy"
  ];

+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    for shell in bash fish zsh; do
+      installShellCompletion --cmd oha --$shell <($out/bin/oha --completions $shell)
+    done
+  '';
+
  nativeInstallCheckInputs = [
    versionCheckHook
  ];
--- a/pkgs/by-name/op/openvscode-server/package.nix
+++ b/pkgs/by-name/op/openvscode-server/package.nix
@@ -42,6 +42,9 @@ stdenv.mkDerivation (finalAttrs: {
  pname = "openvscode-server";
  version = "1.109.5";

+  executableName = "openvscode-server";
+  longName = "OpenVSCode Server";
+
  src = fetchFromGitHub {
    owner = "gitpod-io";
    repo = "openvscode-server";
--- a/pkgs/by-name/pt/pt2-clone/package.nix
+++ b/pkgs/by-name/pt/pt2-clone/package.nix
@@ -10,13 +10,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "pt2-clone";
-  version = "1.90";
+  version = "1.91";

  src = fetchFromGitHub {
    owner = "8bitbubsy";
    repo = "pt2-clone";
    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-NoFOgDRBgpwNeyiTlKqYokKy2+1ZAhzzSIgPCKsWq7M=";
+    sha256 = "sha256-Kti3oWkgpdZu3w0FjW3pjYSSkda56Ht/a/oaC3JDHIM=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/by-name/ra/ramus/deps.json
+++ b/pkgs/by-name/ra/ramus/deps.json
@@ -0,0 +1,305 @@
+{
+ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
+ "!version": 1,
+ "https://repo.maven.apache.org/maven2": {
+  "batik#batik-awt-util/1.6-1": {
+   "jar": "sha256-c6Frxvqr0kKLG6uyEJ56TIDXuxM42G9ZXHuNfwUhCAU=",
+   "pom": "sha256-ygI3pRs8n21qGmoD0rzDaGoMhA0iCiVYbhvOyRxqAbo="
+  },
+  "batik#batik-css/1.6-1": {
+   "jar": "sha256-AhTce1d4VD1pcCD0YSHxbT+RiZmhF9ls83tWHpPaqHM=",
+   "pom": "sha256-U26wI2lUT2qgH9vITEhNAqkgf/B13jRUnAvcilwIFnI="
+  },
+  "batik#batik-dom/1.6-1": {
+   "jar": "sha256-0/XzSRXOiNqhWf3k8NRQxNdS0s8VmOnWOeR0FRn1sQU=",
+   "pom": "sha256-Ap4Zpf+w/aNma/v/epHZo00mQ1/u5WhatGN8PfeMu0c="
+  },
+  "batik#batik-ext/1.6-1": {
+   "jar": "sha256-nlYrteiYVpFdjPlyqYGCqQEwNEcrPocRJjWd+Gdp/NM=",
+   "pom": "sha256-4WsbpEeumM3aPfrN36WVa2IGvC6UKRHsCmycxtL1rGA="
+  },
+  "batik#batik-gui-util/1.6-1": {
+   "jar": "sha256-nyVM3quDvIcDe4FmQLWPm/t2tNQhdDtFjFwUm+RjejQ=",
+   "pom": "sha256-RaBVaeR2VuiozbU5nWhdt7UL2Zuv3mI2iTppzOlx5CE="
+  },
+  "batik#batik-gvt/1.6-1": {
+   "jar": "sha256-yKqO2fSbGrmSBLYTXhsA+zbqq1CfNL3zjHz2kx3pZeg=",
+   "pom": "sha256-D3z3uV7DZHULrgtyGmTpj+h2wJrbuwk22CXJa1jlVb4="
+  },
+  "batik#batik-parser/1.6-1": {
+   "jar": "sha256-VnoVBWH8gi3cYLGVb5gNFQ9YztD2pLpcYIpE8J5zZlM=",
+   "pom": "sha256-Kttk1L11tSkmK3wgvHnqlErFIhOaN3tGJW5ahuXeePg="
+  },
+  "batik#batik-svg-dom/1.6-1": {
+   "jar": "sha256-csWIomPDRFWtFNrpknYiDXToWV1P40Hspwj/hLGxgUA=",
+   "pom": "sha256-nQeoOS7/df8eHMPRhDSLbyYPGn5XB+JK/bWz5jL7ggQ="
+  },
+  "batik#batik-svggen/1.6-1": {
+   "jar": "sha256-+LZ6GxWaFtKexQV0Somok7B6XSR6rCdl4VVhv6GM+lo=",
+   "pom": "sha256-u9nZnC0u9913Y5S6G74D/43YZIJ6tlqDBL29Z4Io0eM="
+  },
+  "batik#batik-util/1.6-1": {
+   "jar": "sha256-ssFejZTfEyNiI2fSRZqIj7MZR9sPiqGGOp+/BeMLX4E=",
+   "pom": "sha256-5p+cU052ennD6stwQ4PHc324M2BfiAFvAIGtFWLIz9c="
+  },
+  "batik#batik-xml/1.6-1": {
+   "jar": "sha256-F6VKr+JBXLnqMRuE3xc8cY2sus03ixOWlytvgqlzhqQ=",
+   "pom": "sha256-SbT8BqYaZRdJMHsWcgcTxKabcWm5gVkOtlLn7A3YbX4="
+  },
+  "com/barchart/base#barchart-archon/2.1.2": {
+   "pom": "sha256-DGZ6dWDViif/dPbf6ovqkxblNB5XNvDY45oPK6DkYjk="
+  },
+  "com/barchart/wrap#barchart-wrap-browser-launcher/1.3.0-build001": {
+   "jar": "sha256-B4KbyIc53O9me1pn35xfY07ZJnFIFzqzwK3qUNpl/Ls=",
+   "pom": "sha256-TsYLyJLTx84uiPLWNgpXyezjpfH8pcCcbkiUNEzd7W0="
+  },
+  "com/bmuschko#gradle-izpack-plugin/3.1": {
+   "jar": "sha256-ZA3q1uBojMRDEscz/yTn3n/pl2nZwXlOC9kUjSjevr0=",
+   "pom": "sha256-OtkOVNT7rKzSUOC1DQzK+TKJJEfUqCElkdKVbvJ4Hqg="
+  },
+  "com/caucho#hessian/4.0.38": {
+   "jar": "sha256-k2dxsmxSQ2UEepOcHHlsq1no/zhu4Q2yQQsd9qsc7Fs=",
+   "pom": "sha256-jNpOTxWVeruUsFb3nK6tSYvo0v7MuZOpDXmfgMKu5BI="
+  },
+  "com/h2database#h2/1.3.163": {
+   "jar": "sha256-HRvoQ682XoiB4icyyGQOKwTCghoNeqYdQVKsP5kbtzU=",
+   "pom": "sha256-YkVaBc/CoP5MOJLXqqSjteNZlWQ4U0VH+IGhhYvv7zg="
+  },
+  "com/itextpdf#itext-parent/1.0.0": {
+   "pom": "sha256-GNAMwmb3aLDhqMaxJCvLn62N+ghs+5xiqeKXSwSRh7A="
+  },
+  "com/itextpdf#itextpdf/5.5.7": {
+   "jar": "sha256-Ui1pgsBacxt+w3RP6sPNZXy4mXWrK4Fra3iDNTzqHq4=",
+   "pom": "sha256-/ssW71U5mmX4sEaCVMJ4Bnvn354OdDMJKMQqyuG/Onw="
+  },
+  "com/sun/xml/bind#jaxb-bom-ext/2.3.0": {
+   "pom": "sha256-+9fhvXsf/lKWbaih4hDHTkJ0/vCSh1Lj/bkNWszoFZM="
+  },
+  "com/sun/xml/bind#jaxb-core/2.3.0": {
+   "jar": "sha256-MwYa+NKgc3nUUvjw/dy79RhCjf07g9ni1HnBlIAgeVs=",
+   "pom": "sha256-pWda8runIvgY7yWpCO77/Vy8/DbQneeYxX/y+/C4amc="
+  },
+  "com/sun/xml/bind#jaxb-impl/2.3.0": {
+   "jar": "sha256-7daR/GrXx/MWfhpoMzcjZ77fb08qS4Iw30RKWbs3GLE=",
+   "pom": "sha256-L/gnWmfxTqiD5/QLdI+V1mozANlxpGn3dkbWFVRhQO8="
+  },
+  "com/sun/xml/bind/mvn#jaxb-bundles/2.3.0": {
+   "pom": "sha256-AuZrosGxHBr7jp1Uxaj8uC1D6lGz9hK4Jl1lDLpefh8="
+  },
+  "com/sun/xml/bind/mvn#jaxb-parent/2.3.0": {
+   "pom": "sha256-idoEzlchcb/cOHyaTwb0kQIvQNgWSvSEQRjpPMmHBFI="
+  },
+  "commons-codec#commons-codec/1.3": {
+   "jar": "sha256-G6/S7OLojbTN+DWn+PDeZfq1sRR5d6XcxZt8G4xvUIA=",
+   "pom": "sha256-0VfjQkTohN2R+gGSHKhDcuEfe7CP7bXUVsBnDCgFRjY="
+  },
+  "commons-codec#commons-codec/1.9": {
+   "jar": "sha256-rRnSYBw6vwuUa1w6QRPiJqjB4zBeOVuQATt43ZSnI84=",
+   "pom": "sha256-5e/PA5zZCWiMIB3FR5sUT9bwHw5AJSt/xefS4bXAeZA="
+  },
+  "commons-collections#commons-collections/3.1": {
+   "jar": "sha256-wVR9GFumiAvMLaJhxfdTNRK2/9u8GJjbW3k8DLgw/PA=",
+   "pom": "sha256-Wcnl/HXleQ5Wl2wWaonyy9rZn3bEm5L3ShdJaJr3JqI="
+  },
+  "commons-lang#commons-lang/2.1": {
+   "jar": "sha256-Le1zQ9yOV97NXmMCM3E5vgIP3YhaKTWSXo1XWXXkgLk=",
+   "pom": "sha256-8acJzUifI0mKC2s9+/wNIdTxWQR5FEbex/ilin2lvWo="
+  },
+  "commons-logging#commons-logging/1.0.4": {
+   "jar": "sha256-6Ur0l0k4TBH1qlDo0PX+Z5vncSlbUgMDONMoQ8mANR4=",
+   "pom": "sha256-ZdMQUJNStUJRGCJe5gCgH4O6chQtA1AUtdFkvASy0oQ="
+  },
+  "de/sciss#jsyntaxpane/1.0.0": {
+   "jar": "sha256-mjqD568vnSJSY+uSnYKWVHSVpNjtLBzzw24VpU3nSLs=",
+   "pom": "sha256-5UGbz/czRGYn3CATkx5w8u0igW39f4gZ6jelgkkNytw="
+  },
+  "javax/help#javahelp/2.0.05": {
+   "jar": "sha256-/PSSLTj/hRhPHSMoMXu2CCbhTalIq9YG7j1bjGpw3r0=",
+   "pom": "sha256-uIEr4lGsoTl/S2pCO/Tt06KERONFOyIDtTSTNrmVgik="
+  },
+  "javax/xml/bind#jaxb-api-parent/2.3.0": {
+   "pom": "sha256-dreqxkEyadC920e4uON7sxRXicmppC34CSeuta7v+3I="
+  },
+  "javax/xml/bind#jaxb-api/2.3.0": {
+   "jar": "sha256-iDAHmJ03PRnzUrqXkrJd7CHcfQ4gWnEKk6OBUQG7PQM=",
+   "pom": "sha256-Rm9ue5kB6VKuGtJPDpSUpWgJYfBOQiObWuZOjcr2KXo="
+  },
+  "junit#junit/4.10": {
+   "jar": "sha256-NqdHyh4LhvbqiAVbhyO7hwMNYndm2mKIvwd6/e6w91o=",
+   "pom": "sha256-IqG/C6rothBretgCbs8nxZ5+R920nWKXUDa+rbLGLrU="
+  },
+  "junit#junit/4.11": {
+   "jar": "sha256-kKjhYD7spI5+h586+8lWBxUyKYXzmidPb2BwtD+dBv4=",
+   "pom": "sha256-GK2LCunmWpGV0E4lQn3+i1gXWrza6HWlpAau44vd+yY="
+  },
+  "log4j#log4j/1.2.9": {
+   "jar": "sha256-0rnfspe8qnvh/N1wJkKpyXE9eEfcqHBOnBW9gp8Ksb8=",
+   "pom": "sha256-rE5NJGOOHa+sSYCplCpWEv+pttCCIMsyewRWXHIhJQA="
+  },
+  "net/htmlparser/jericho#jericho-html/3.3": {
+   "jar": "sha256-FJ90kpWJxnt27+hYBMLChewcxatvzBwryZaUR1oWVtY=",
+   "pom": "sha256-aM44z30iYYIBh1+kAEn9mZeSLrCztY0oLSn10Dgcoak="
+  },
+  "net/java#jvnet-parent/3": {
+   "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o="
+  },
+  "net/java#jvnet-parent/5": {
+   "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo="
+  },
+  "org/acegisecurity#acegi-security-parent/1.0.7": {
+   "pom": "sha256-stPfTtHW8GjANdOuC8PbTn1hHLAr1Ugxo1uB4VR1+Zc="
+  },
+  "org/acegisecurity#acegi-security/1.0.7": {
+   "jar": "sha256-xZ4DY6H50mLaO8asWjfWYTcuFNjLT1r8pzTIFedSmgs=",
+   "pom": "sha256-qwsqF9960izlcRbS1DQp5kXFl/GXx3JYOJSwd3KlS2I="
+  },
+  "org/apache#apache/13": {
+   "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0="
+  },
+  "org/apache/commons#commons-parent/32": {
+   "pom": "sha256-5NJYr4sv9AMhSNQVN53veHB4mmAD6AV28VBLEPJrS+g="
+  },
+  "org/apache/poi#poi/3.13": {
+   "jar": "sha256-7sp9XXKHPXRfTHEEx23eXUC2YgREO2LcIyh8nbvkuCM=",
+   "pom": "sha256-WVCjd9dm1VM8a7Tibk68GPsqstJiA9YRIRdtMoZZInQ="
+  },
+  "org/dockingframes#docking-frames-base/1.1.1": {
+   "pom": "sha256-E1D3WmgMqFcvAAm4R2ASzeFFJVykCBVUXcjErHSbPFo="
+  },
+  "org/dockingframes#docking-frames-common/1.1.1": {
+   "jar": "sha256-ydcL54WL1R4Noj8xkjF3GZ2V6m0DjPEhHcyEnuFkQ0k=",
+   "pom": "sha256-ztD5kSXL+r1QjtOk0B63NASQihlAGCKW96AFIrTeiOs="
+  },
+  "org/dockingframes#docking-frames-core/1.1.1": {
+   "jar": "sha256-WfMWl11YJJ3lLQgCBGxrA5/jOhEftXdNLFZN9BI+/t8=",
+   "pom": "sha256-nnPNhc7RsSFw2SUzuHLSCW4Z6W4KrW0xyu6rg+Ab8nU="
+  },
+  "org/freehep#freehep-graphics2d/2.4": {
+   "jar": "sha256-Ked+r+wjqicsnyvOkfoKgx2UN/KW+YHcbpYOBmMR+HA=",
+   "pom": "sha256-5gIUwRKGxq30FBHBR6paaDuEHAHkILOnV04HC/c5rZg="
+  },
+  "org/freehep#freehep-graphicsbase/2.4": {
+   "jar": "sha256-0wVLnV4VNO86jxibDK4tPIWtUdLxWmxhzopXbBxkdxM=",
+   "pom": "sha256-RhCd1vJ6OWprYH5miPvlAtOO2Zu8aea7QPuz+cQXk7w="
+  },
+  "org/freehep#freehep-graphicsio-emf/2.4": {
+   "jar": "sha256-bym9G27RRFzEB7vZi7NTD4lwT1h3vy/9YBF8exr9kY4=",
+   "pom": "sha256-Ci8pV4jyP+qTl7qaboy1VoE2E4gQ3UFsaCE3TuHz2f8="
+  },
+  "org/freehep#freehep-graphicsio-tests/2.4": {
+   "jar": "sha256-LjS7K9We5kz1zZiurxfrMu/VxSEwnwf21Nsy8safEGo=",
+   "pom": "sha256-3ZN2idh9wFVw/43Kc2pWlhyGCRYuW3c5No98F2Q883g="
+  },
+  "org/freehep#freehep-graphicsio/2.4": {
+   "jar": "sha256-9fiEx5XU5Bdd0FhRElpmgFRifrXW+sybNDsx8UvvSlw=",
+   "pom": "sha256-7nb+bsIMaOqxgnnFqfcqZdxR5+AFKdGtr132rTGnErM="
+  },
+  "org/freehep#freehep-io/2.2.2": {
+   "jar": "sha256-TBk0Km5974H1n7HxPzTGslxJyZA0BN6RP24G8fcjORE=",
+   "pom": "sha256-ITXGh0ji/tWHj7Vcp7yUj/YTbmM2Ep6yOyMzgPHwdqw="
+  },
+  "org/freehep#freehep-vectorgraphics/2.4": {
+   "pom": "sha256-5NPXgYfaFngGl/2GydMP0cKaaPKyHIeqYZ8TT1N00TM="
+  },
+  "org/glassfish/jaxb#jaxb-bom/2.3.0": {
+   "pom": "sha256-9P6WMlVnrr4PLzTRjHEmHdOl1mEPXfbrl/195BheVxQ="
+  },
+  "org/hamcrest#hamcrest-core/1.1": {
+   "jar": "sha256-A2HRST/w2U+GE1nv6pEgByBjUHITR5LvtyF/bgnVz/s=",
+   "pom": "sha256-OXOH9AbGjMtAP0d8y+wcgYz8a4/0+tpaM+Jhg6hBfIM="
+  },
+  "org/hamcrest#hamcrest-core/1.3": {
+   "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=",
+   "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM="
+  },
+  "org/hamcrest#hamcrest-parent/1.1": {
+   "pom": "sha256-FOaVChpimMvLg8+UKcrEFf8nMWf28Vh2hZQTsNbAfjo="
+  },
+  "org/hamcrest#hamcrest-parent/1.3": {
+   "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps="
+  },
+  "org/jfree#jcommon/1.0.23": {
+   "jar": "sha256-HmcEAoCUhMcex01VtAAipMSTnHkRvTnuWgz7Oq9WOXw=",
+   "pom": "sha256-nQUY1AnTPb8Hqj393yfsegxuRKHgtsmSPfh8offBPL8="
+  },
+  "org/jfree#jfreechart/1.0.19": {
+   "jar": "sha256-FT0HfWOZd2pF3pfFVa0CbrYgHUvYr4bPznuLTM+mYmM=",
+   "pom": "sha256-23y6Pds/wxN0CN6qOSA3KN8Kfs2zhK65mnc7VJoGLHg="
+  },
+  "org/jruby#jruby-common/1.6.8": {
+   "pom": "sha256-LwHtFW+mRDSGyUv7xCPhJHB7i2llun1sZDLwSNuElPU="
+  },
+  "org/jruby#jruby-complete/1.6.8": {
+   "jar": "sha256-0ArtO1pnY2e9jMVW0fznCbYEXTKePYHezo1ReQG2IPs=",
+   "pom": "sha256-34MsUc3evR/4SgcZ25oiE9r16paS/xxgSc/2dxUmOL0="
+  },
+  "org/jruby#shared/1.6.8": {
+   "pom": "sha256-vnez5Pdcnv/0SOlS17jlJkrW7/sQZ1BVrC5KimEv0x8="
+  },
+  "org/mozilla#rhino/1.7.7": {
+   "jar": "sha256-c7jWu70aajqH6g7qMBmW3qyD+NQLQEUYoQr9TTILWzE=",
+   "pom": "sha256-FP3G9O2EScxijYFISbe59MoU5d8QW/YnmbqMQDs1+UQ="
+  },
+  "org/sonatype/oss#oss-parent/7": {
+   "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
+  },
+  "org/sonatype/oss#oss-parent/9": {
+   "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
+  },
+  "org/springframework#spring-aop/1.2.9": {
+   "jar": "sha256-J1q73LUzMavBChjdWq+54HlYVlLruugmJWswC+NE1PQ=",
+   "pom": "sha256-FedTwQPhiQzRt3bad6Pj/GDPoycOq3Kdj6kOD94FkEA="
+  },
+  "org/springframework#spring-beans/1.2.9": {
+   "jar": "sha256-em6YzDDC/L6c7hmxC+H/slsknDYPatvrCmAC+TH3M+o=",
+   "pom": "sha256-xw0/5MibQRb2z8T3z0BiLP6iBi+vFaPuyApusv7cXPA="
+  },
+  "org/springframework#spring-context/1.2.9": {
+   "jar": "sha256-NqCjcsOljpWj+v2xoSrsNK10vtag927ZVc/8V9afmeo=",
+   "pom": "sha256-YGaX+Eru9kp5z0Za7f9YvcBiFEr+JeHc183gEpOlQeA="
+  },
+  "org/springframework#spring-core/1.2.9": {
+   "jar": "sha256-RE5njKJBlwGbss3u3+RjEkMfpEsgU3bulNeKd1xrJ5g=",
+   "pom": "sha256-nbxnIN1zvLmXGiFIcvgIjEoqjXBx//Oc98WTleJI+lE="
+  },
+  "org/springframework#spring-dao/1.2.9": {
+   "jar": "sha256-SxQQ1tgabOo1phUuJXJih02HpmY0/h/D3SgaOl6dRt4=",
+   "pom": "sha256-pOCR3iXPH8A++5jLt+2deisRMFeN4fheeSRwZnqvY5I="
+  },
+  "org/springframework#spring-jdbc/1.2.9": {
+   "jar": "sha256-DMxV4WkLwtCXiYRFAHcPnIE1IPg3tXse2079ij9yxCE=",
+   "pom": "sha256-JMfteDwxXzDcloCm1+Xp7Kb/HkTeq623wMz2NsVc+VE="
+  },
+  "org/springframework#spring-remoting/1.2.9": {
+   "jar": "sha256-+2Qzhtg3Ty2452Bne/IhSjsPPrY85pWysKb8cGdM4Yg=",
+   "pom": "sha256-/nLMbPvKWXCivCe9PbimJje2g5rjbzlhBNQS5mRMesM="
+  },
+  "org/springframework#spring-support/1.2.9": {
+   "jar": "sha256-hxaa490mS4CC4FNlVnFPPif3mUVSga7DmazRRSA16Gc=",
+   "pom": "sha256-AGvP6Bx5Q82wxBD2V/oW3hBjCM0v/QJovLnAwCzUKF8="
+  },
+  "org/swinglabs/swingx#swingx-all/1.6.5-1": {
+   "jar": "sha256-Kk+Cl5zRbY8cnuojKphd/2K/acR5Sje5YJmyDTIpB8A=",
+   "pom": "sha256-EHnrM5kSXweiTGZHQiRdmAPHJbAF2eQPSX0ffMcwoKM="
+  },
+  "org/swinglabs/swingx#swingx-project/1.6.5-1": {
+   "pom": "sha256-xCRIcrbfrYVjyJtW8dbr+ZN5xXl68N2QVRrzErLAwsk="
+  },
+  "oro#oro/2.0.8": {
+   "jar": "sha256-4AzNrV3360P97kQjLvZGAr9jgHwtEzp76Dugn9Sa8m4=",
+   "pom": "sha256-mqnf6y6F4dXnkyyHFAaXzswrD63ZM9Z5/UIKLkODGoI="
+  },
+  "tablelayout#TableLayout/20050920": {
+   "jar": "sha256-CHCCQOxOBt3ZJzR6+SaiYfdbd/NK4rvgaZZT9TsAFCM=",
+   "pom": "sha256-h2hGHz4dEsKDWEO49fRRiDQYUoxvK1Qj3oA4AhC0uxE="
+  },
+  "xerces#xercesImpl/2.5.0": {
+   "jar": "sha256-0f9wHJP91IOLlczvVLg7Py+SAAUv40/ouCoPur/Bpyw=",
+   "pom": "sha256-jLm5fq1Xdz0tHNwQYUhJGTd4SnkOfdu87RyrLQMuiw8="
+  },
+  "xml-apis#xmlParserAPIs/2.0.2": {
+   "jar": "sha256-x+jYA1RsizWeOQF4h+VsLhZywZfMmGKgVL0EKZlXTRs=",
+   "pom": "sha256-Iz+7lGSu45mKSbuDAWaGihJy/g3ChPB8+ncD5UbZ+7U="
+  }
+ }
+}
--- a/pkgs/by-name/ra/ramus/package.nix
+++ b/pkgs/by-name/ra/ramus/package.nix
@@ -0,0 +1,84 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  gradle,
+  jre,
+  makeWrapper,
+  libx11,
+  libxext,
+  libGL,
+}:
+let
+  self = stdenv.mkDerivation (finalAttrs: {
+    pname = "ramus";
+    version = "2.0.2";
+    strictDeps = true;
+    __structuredAttrs = true;
+
+    src = fetchFromGitHub {
+      owner = "Vitaliy-Yakovchuk";
+      repo = "ramus";
+      tag = "v${finalAttrs.version}";
+      hash = "sha256-2rbcUqM0YgwPLo8lNFCRJQDlHZQEivB3GRG/iIlwXiQ=";
+    };
+
+    nativeBuildInputs = [
+      gradle
+      makeWrapper
+    ];
+
+    mitmCache = gradle.fetchDeps {
+      pkg = finalAttrs;
+      data = ./deps.json;
+    };
+
+    doCheck = false;
+    postPatch = ''
+      sed -i "/plugins {/,/^}/d" build.gradle
+      sed -i "/^dependencies {/,/^}/d" build.gradle
+      sed -i "/^izpack {/,/^}/d" build.gradle
+      sed -i "s|org.dockingframes:docking-frames-common:1.1.2-SNAPSHOT|org.dockingframes:docking-frames-common:1.1.1|g" \
+        gui-framework-core/build.gradle
+      sed -i "/    maven {/{N;N;/freehep/d}" client/build.gradle
+      sed -i "s/sourceCompatibility = 1\.6/sourceCompatibility = 8/" build.gradle
+      sed -i "s/targetCompatibility = 1\.6/targetCompatibility = 8/" build.gradle
+    '';
+
+    gradleBuildTask = "copyFiles";
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out/share/ramus
+      cp -r dest/full/lib $out/share/ramus/
+      cp -r dest/full/bin $out/share/ramus/
+
+      makeWrapper ${jre}/bin/java $out/bin/ramus \
+        --add-flags "-cp '$out/share/ramus/lib/ramus/*:$out/share/ramus/lib/thirdparty/*' com.ramussoft.local.Main" \
+        --prefix LD_LIBRARY_PATH : "${
+          lib.makeLibraryPath [
+            libx11
+            libxext
+            libGL
+          ]
+        }"
+
+      runHook postInstall
+    '';
+
+    meta = {
+      description = "Java-based IDEF0 and DFD modelling tool";
+      longDescription = ''
+        Ramus is a desktop application for creating IDEF0 functional decomposition
+        diagrams and Data Flow Diagrams (DFD). It is written in Java/Swing and
+        supports saving/loading projects in its own XML-based format.
+      '';
+      homepage = "https://github.com/Vitaliy-Yakovchuk/ramus";
+      license = lib.licenses.gpl3Only;
+      maintainers = with lib.maintainers; [ mootfrost ];
+      mainProgram = "ramus";
+      platforms = lib.platforms.linux;
+    };
+  });
+in
+self
--- a/pkgs/by-name/rb/rbspy/package.nix
+++ b/pkgs/by-name/rb/rbspy/package.nix
@@ -10,16 +10,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "rbspy";
-  version = "0.48.0";
+  version = "0.49.0";

  src = fetchFromGitHub {
    owner = "rbspy";
    repo = "rbspy";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-OUbKCD+Q7eAK3Yf/qDGD472Xk6w+vN1GhpCSN7n3epE=";
+    hash = "sha256-H4SFivaMmRvAhJy5n/QZ1dHFRfYywrpABMl1A9waYzo=";
  };

-  cargoHash = "sha256-WZ3XDBx0mXw63X1DritVXjI7wB2BedZsVm2UUvcVThA=";
+  cargoHash = "sha256-NtUJxQTRmXsI76DjJ43UfBf9FskFk/gehw5STcuQEuQ=";

  doCheck = true;

--- a/pkgs/by-name/rc/rcp/package.nix
+++ b/pkgs/by-name/rc/rcp/package.nix
@@ -6,16 +6,16 @@

 pkgsStatic.rustPlatform.buildRustPackage (finalAttrs: {
  pname = "rcp";
-  version = "0.35.0";
+  version = "0.36.0";

  src = fetchFromGitHub {
    owner = "wykurz";
    repo = "rcp";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-toO+gVPHfc/drP9Xj0vJOJvOxsH/0VqXKSwfYvkZfnE=";
+    hash = "sha256-laGQWJbke+q0dAdqR8opXw4oQm6wdJJT0/t/A9c7d9s=";
  };

-  cargoHash = "sha256-lbS67Hiv0ay0DzzoZsFRxc9EKl9sw+pYJwn9FmXquos=";
+  cargoHash = "sha256-+T9aGsewRHdmKMtZisXv4st+9kBTNtEZnPraLz8S4e8=";

  env.RUSTFLAGS = "--cfg tokio_unstable";

@@ -33,6 +33,11 @@ pkgsStatic.rustPlatform.buildRustPackage (finalAttrs: {
    "--skip=test_preserve_settings_dir_7777_preserves_special_bits"
    "--skip=test_preserve_settings_file_7777_preserves_special_bits"
    "--skip=test_preserve_settings_none_strips_special_bits_on_directories"
+    "--skip=no_setid_clears_bits_for_unchanged_owner_rule"
+    "--skip=no_setid_clears_existing_bits_for_unrelated_mode"
+    "--skip=no_setid_dry_run_reports_but_does_not_clear_bits"
+    "--skip=no_setid_respects_filter_and_per_type_scope"
+    "--skip=no_setid_retains_sticky_and_clears_setgid_on_directory"
    # this test expects overwrite behavior that doesn't work in a sandbox
    "--skip=test_overwrite_behavior"
    # these tests require network access to determine local IP address
--- a/pkgs/by-name/re/rebels-in-the-sky/package.nix
+++ b/pkgs/by-name/re/rebels-in-the-sky/package.nix
@@ -15,24 +15,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "rebels-in-the-sky";
-  version = "1.6.1";
+  version = "1.7.1";

  src = fetchFromGitHub {
    owner = "ricott1";
    repo = "rebels-in-the-sky";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-alXqHtaGtv2zPt1OpNyEwHpQ+GKhS8xqOQFa5PvCsqc=";
+    hash = "sha256-bLyAki9XJuQRwKhO8jiR1wcssfvXTXGftOS4WRyvVe0=";
  };

-  cargoHash = "sha256-PvSOjuK1cObDuZeAKYEEqwezCuv7RM1W/aimrc4QV28=";
-
-  cargoPatches = [
-    (fetchpatch {
-      # The lock file was updated after the release
-      url = "https://github.com/ricott1/rebels-in-the-sky/commit/4cd33144b7e2e6297c5e0d6a6a0e46bc976279d0.patch";
-      hash = "sha256-HUzABNtpBgts7rtuPB/OCtCTQk+XsLGEOyRRgy3uIdI=";
-    })
-  ];
+  cargoHash = "sha256-PUo9avg1wWgS7D6u3zIBbgv1/eM6N9PbA+EwzdNHC0w=";

  patches = lib.optionals (!withRadio) [
    ./disable-radio.patch
--- a/pkgs/by-name/sc/screen/package.nix
+++ b/pkgs/by-name/sc/screen/package.nix
@@ -2,7 +2,6 @@
  lib,
  stdenv,
  fetchurl,
-  fetchpatch,
  autoreconfHook,
  texinfo,
  ncurses,
@@ -12,40 +11,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "screen";
-  version = "5.0.1";
+  version = "5.0.2";

  src = fetchurl {
    url = "mirror://gnu/screen/screen-${finalAttrs.version}.tar.gz";
-    hash = "sha256-La429Ns3n/zRS2kVlrpuwYrDqeIrxHrCOXiatYQJhp0=";
+    hash = "sha256-yposfiQJGbx6wSEkWTrkUpu0619zSdiFeCm34/CzszI=";
  };

-  patches = [
-    (fetchpatch {
-      url = "https://file.savannah.gnu.org/file/0001-test-fix-unit-tests.patch?file_id=57558";
-      stripLen = 1;
-      hash = "sha256-q3jQQrzweLf2T/V5X9iL4ZZK342QEXLG5fZTaMOB4tY=";
-    })
-    # Following 3 commits fix screen.info file issues
-    (fetchpatch {
-      name = "screen.info-1st.patch";
-      url = "https://cgit.git.savannah.gnu.org/cgit/screen.git/patch/?id=7333452aa52d61a170b1fc199869ea6059849058";
-      stripLen = 1;
-      hash = "sha256-fYkljMNefDJtf+uA9qPotQEOxwhlQj0nZfTszhl/oik=";
-    })
-    (fetchpatch {
-      name = "screen.info-2nd.patch";
-      url = "https://cgit.git.savannah.gnu.org/cgit/screen.git/patch/?id=6790fb8e1931783646c07a364657fadb5c9d1e63";
-      stripLen = 1;
-      hash = "sha256-+fRPfCbJKYUW/ZE6C63xB2WEtTv6KPi8waXLt9N+AuU=";
-    })
-    (fetchpatch {
-      name = "screen.info-3rd.patch";
-      url = "https://cgit.git.savannah.gnu.org/cgit/screen.git/patch/?id=94c3e1fd81826ce3b677d49f7a452e6fe77ed63b";
-      stripLen = 1;
-      hash = "sha256-Wq4Bx5wCqsOWtrfUON5wTuhpBH8JxyoOiHHfDT2CsHw=";
-    })
-  ];
-
  configureFlags = [
    "--enable-telnet"
    "--enable-pam"
--- a/pkgs/by-name/sh/shelter/package.nix
+++ b/pkgs/by-name/sh/shelter/package.nix
@@ -10,12 +10,12 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "shelter";
-  version = "0-unstable-2026-06-05";
+  version = "0-unstable-2026-06-10";
  src = fetchFromGitHub {
    owner = "uwu";
    repo = "shelter";
-    rev = "4c08e2e8ad5d7e8fe741be3c9e2151ec25d20d8d";
-    hash = "sha256-8poWWDuCOrgJYjwRfOPIXTdyVlau5SxG9FxjcN8o/wo=";
+    rev = "6217da059488a0d367b661c20ae5fa52e3cbbe9c";
+    hash = "sha256-aF13I8zLF1mluhnE8OJSwnatCcqujP1UuQDlbXEUhPM=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/sm/smux/package.nix
+++ b/pkgs/by-name/sm/smux/package.nix
@@ -12,16 +12,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "smux";
-  version = "0.3.1";
+  version = "0.4.0";

  src = fetchFromGitHub {
    owner = "Aietes";
    repo = "smux";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-mc7sspGN4Wf8Jn995S/jsZ0v1s5kgJ0ASn9iGbzH13U=";
+    hash = "sha256-oEnlxIRk41hqkoIqcJAIqm5VcGvXJ29M1pfz2tj+S48=";
  };

-  cargoHash = "sha256-nUJwIOdVmZR+inDz4kYpPTFXREyZyf891ATed6UFIJo=";
+  cargoHash = "sha256-P4uzdP4eOlL6TDOSzVf8s6U9DyO0HbAdGIcObDC06fU=";

  __structuredAttrs = true;
  strictDeps = true;
--- a/pkgs/by-name/sp/space-station-14-launcher/package.nix
+++ b/pkgs/by-name/sp/space-station-14-launcher/package.nix
@@ -2,6 +2,7 @@
  lib,
  stdenv,
  config,
+  nix-update-script,
  buildDotnetModule,
  dotnetCorePackages,
  fetchFromGitHub,
@@ -39,7 +40,7 @@
 }:
 let
  pname = "space-station-14-launcher";
-  version = "0.39.0";
+  version = "0.39.1";
 in
 buildDotnetModule rec {
  inherit pname;
@@ -52,7 +53,7 @@ buildDotnetModule rec {
    owner = "space-wizards";
    repo = "SS14.Launcher";
    tag = "v${version}";
-    hash = "sha256-i5jcaB1wa+Toj6orpEQ9sK3EX1CLWadnhTEQDOU7QU4=";
+    hash = "sha256-u3tsPWAFMckWSHhiPqL50i9BMxR+VrLnpUSWGRRu9AA=";
    fetchSubmodules = true;
  };

@@ -133,6 +134,8 @@ buildDotnetModule rec {
    icoFileToHiColorTheme SS14.Launcher/Assets/icon.ico ${pname} $out
  '';

+  passthru.updateScript = nix-update-script { };
+
  meta = {
    description = "Launcher for Space Station 14, a multiplayer game about paranoia and disaster";
    homepage = "https://spacestation14.io";
--- a/pkgs/by-name/tu/tutanota-desktop/package.nix
+++ b/pkgs/by-name/tu/tutanota-desktop/package.nix
@@ -8,11 +8,11 @@

 appimageTools.wrapType2 rec {
  pname = "tutanota-desktop";
-  version = "350.260608.0";
+  version = "353.260630.0";

  src = fetchurl {
    url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage";
-    hash = "sha256-y/wUe8kNlA4XmbJrjjAYSnNAMAB8OgVmCrum6bYAyV4=";
+    hash = "sha256-ZJdiufoyZQxZncxyJZd1rhVyBMlkep+8uvchO/D/Krs=";
  };

  extraPkgs = pkgs: [ pkgs.libsecret ];
--- a/pkgs/by-name/vo/vollkorn/package.nix
+++ b/pkgs/by-name/vo/vollkorn/package.nix
@@ -2,31 +2,31 @@
  lib,
  stdenvNoCC,
  fetchzip,
+  installFonts,
 }:

-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "vollkorn";
  version = "4.105";

+  outputs = [
+    "out"
+    "webfont"
+    "doc"
+  ];
+
  src = fetchzip {
    url = "http://vollkorn-typeface.com/download/vollkorn-${
-      builtins.replaceStrings [ "." ] [ "-" ] version
+      builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version
    }.zip";
    stripRoot = false;
    hash = "sha256-oG79GgCwCavbMFAPakza08IPmt13Gwujrkc/NKTai7g=";
  };

-  installPhase = ''
-    runHook preInstall
+  nativeBuildInputs = [ installFonts ];

-    mkdir -pv $out/share/{doc/${pname}-${version},fonts/{opentype,truetype,WOFF,WOFF2}}
-    cp -v {Fontlog,OFL-FAQ,OFL}.txt $out/share/doc/${pname}-${version}/
-    cp -v PS-OTF/*.otf $out/share/fonts/opentype
-    cp -v TTF/*.ttf $out/share/fonts/truetype
-    cp -v WOFF/*.woff $out/share/fonts/WOFF
-    cp -v WOFF2/*.woff2 $out/share/fonts/WOFF2
-
-    runHook postInstall
+  postInstall = ''
+    install -Dm444 {Fontlog,OFL-FAQ,OFL}.txt -t $doc/share/doc/${finalAttrs.pname}-${finalAttrs.version}/
  '';

  meta = {
@@ -36,4 +36,4 @@ stdenvNoCC.mkDerivation rec {
    platforms = lib.platforms.all;
    maintainers = [ lib.maintainers.schmittlauch ];
  };
-}
+})
--- a/pkgs/by-name/we/webdav/package.nix
+++ b/pkgs/by-name/we/webdav/package.nix
@@ -6,16 +6,16 @@

 buildGoModule (finalAttrs: {
  pname = "webdav";
-  version = "5.12.0";
+  version = "5.13.0";

  src = fetchFromGitHub {
    owner = "hacdias";
    repo = "webdav";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-lUekgI1p0abPDRQ4XU89EEIMO96jAnxMkDOP8xXngXw=";
+    hash = "sha256-BzdXc5CvQ/PUUjtVptBZC6UJsyn4MvqsdJuAEDomT6M=";
  };

-  vendorHash = "sha256-ZZ0wAivVN6xp/+16sbUDYVKmoMOGMf+sdHxa3fxaFOk=";
+  vendorHash = "sha256-qk97AB2UEEnVNM1Z7FBdAAWjto9xPjnCXCaO8R0dOh8=";

  __darwinAllowLocalNetworking = true;

--- a/pkgs/by-name/ya/yabai/package.nix
+++ b/pkgs/by-name/ya/yabai/package.nix
@@ -28,12 +28,17 @@ stdenv.mkDerivation (finalAttrs: {
  nativeBuildInputs = [
    installShellFiles
    xxd
+    # TODO: Clean up on `staging`.
+    llvmPackages.lld
  ];

  buildInputs = [
    apple-sdk_15
  ];

+  # TODO: Clean up on `staging`.
+  env.NIX_CFLAGS_LINK = "-fuse-ld=lld";
+
  # Upstream Makefile races clean-build against linking under parallel make.
  enableParallelBuilding = false;

@@ -101,7 +106,6 @@ stdenv.mkDerivation (finalAttrs: {
    mainProgram = "yabai";
    maintainers = with lib.maintainers; [
      cmacrae
-      shardy
      khaneliman
    ];
    sourceProvenance = [ lib.sourceTypes.fromSource ];
--- a/pkgs/by-name/za/zapp/package.nix
+++ b/pkgs/by-name/za/zapp/package.nix
@@ -11,7 +11,7 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "zapp";
-  version = "1.0.1";
+  version = "1.0.2";

  __structuredAttrs = true;
  strictDeps = true;
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    owner = "zsa";
    repo = "zapp";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-KhWL+SsN1z9qpxwHpaqRo3qAk7xAOHVkRAOa02Q2Myc=";
+    hash = "sha256-K+L8Hyw8BFyYoHGofRJrZqwTwth3Q2ypAq3uj8rO57I=";
  };

  nativeBuildInputs = [
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    udev
  ];

-  cargoHash = "sha256-gDyNwHrMdNQdKdr9RGfwFAU8IaUlGrlJxV0WClQ25JM=";
+  cargoHash = "sha256-4MhPi6Ej37M+O7OE5sgzS7zhUhgawLEwxkNRSadwVcI=";
  passthru.updateScript = nix-update-script { };
  nativeInstallCheckInputs = [ versionCheckHook ];
  doInstallCheck = true;
--- a/pkgs/by-name/zo/zotero/package.nix
+++ b/pkgs/by-name/zo/zotero/package.nix
@@ -30,14 +30,14 @@ let
  nodejs = nodejs_22;

  pname = "zotero";
-  version = "9.0.5";
+  version = "9.0.6";

  src = fetchFromGitHub {
    owner = "zotero";
    repo = "zotero";
    tag = version;
    fetchSubmodules = true;
-    hash = "sha256-yNGx3GpBnQHB6//7JNKRz9GKjJJeUb/UkYDGDdOUTAk=";
+    hash = "sha256-9Rku6iF7Sczqekw8ms8hluIc+B/5BE9zHlBqp7vGlY4=";
  };

  pdf-js = buildNpmPackage {
--- a/pkgs/development/python-modules/dpcontracts/default.nix
+++ b/pkgs/development/python-modules/dpcontracts/default.nix
@@ -20,13 +20,10 @@ buildPythonPackage {
    hash = "sha256-FygJPXo7lZ9tlfqY6KmPJ3PLIilMGLBr3013uj9hCEs=";
  };

-  # Replacements in README.rst are necessary to check it with doctest
-  postPatch = ''
-    substituteInPlace README.rst \
-      --replace-fail " PreconditionError" " dpcontracts.PreconditionError" \
-      --replace-fail " PostconditionError" " dpcontracts.PostconditionError" \
-      --replace-fail ">>> class Counter:" $'>>> from dpcontracts import preserve\n    >>> class Counter:'
-  '';
+  patches = [
+    # Replacements in README.rst are necessary to check it with doctest
+    ./fix-doctests.patch
+  ];

  build-system = [
    setuptools
--- a/pkgs/development/python-modules/dpcontracts/fix-doctests.patch
+++ b/pkgs/development/python-modules/dpcontracts/fix-doctests.patch
@@ -0,0 +1,66 @@
+diff --git a/README.rst b/README.rst
+index 94855fe..c761229 100644
+--- a/README.rst
+++ b/README.rst
+@@ -299,7 +299,7 @@ automatically generated based on the code of that function:
+     ...     return math.sqrt(x)
+     >>> square_root(-1)
+     Traceback (most recent call last):
+-    PreconditionError: @require(lambda args: args.x > 0) failed
+    dpcontracts.PreconditionError: @require(lambda args: args.x > 0) failed
+ 
+ This is true for postconditions as well:
+ 
+@@ -308,7 +308,7 @@ This is true for postconditions as well:
+     ...     return x - y
+     >>> sub(10, 100)
+     Traceback (most recent call last):
+-    PostconditionError: @ensure(lambda args, result: result > 0) failed
+    dpcontracts.PostconditionError: @ensure(lambda args, result: result > 0) failed
+ 
+ And of course for invariants:
+ 
+@@ -321,7 +321,7 @@ And of course for invariants:
+     >>> counter = Counter(10)
+     >>> counter.increment(-100)
+     Traceback (most recent call last):
+-    PostconditionError: @invariant(lambda self: self.counter >= 0) failed
+    dpcontracts.PostconditionError: @invariant(lambda self: self.counter >= 0) failed
+ 
+ Tests can span more than one line as well:
+ 
+@@ -333,7 +333,7 @@ Tests can span more than one line as well:
+     ...     return x - y
+     >>> sub2(10, 100)
+     Traceback (most recent call last):
+-    PostconditionError: @ensure(lambda args, result: all([
+    dpcontracts.PostconditionError: @ensure(lambda args, result: all([
+         result > 0])) failed
+ 
+ Preserving Old Values
+@@ -342,6 +342,7 @@ Sometimes it's important to be able to compare the results of a function with th
+ previous state of the program. Earlier states can be preserved using the
+ `preserve` decorator:
+ 
+    >>> from dpcontracts import preserve
+     >>> class Counter:
+     ...     def __init__(self, initial_value):
+     ...         self.value = initial_value
+@@ -359,7 +360,7 @@ previous state of the program. Earlier states can be preserved using the
+     >>> counter.increment(10)
+     >>> counter.increment(9)
+     Traceback (most recent call last):
+-    PostconditionError: counter is incremented by value
+    dpcontracts.PostconditionError: counter is incremented by value
+ 
+ Note that Python's pass-by-reference semantics still apply, so if you need to
+ preserve an old value, you might have to copy it.
+@@ -445,7 +446,7 @@ Contracts can be placed on coroutines (that is, async functions):
+     ... async def func(a, b="Foo", *c):
+     ...     await asyncio.sleep(1)
+ 
+-    >>> asyncio.get_event_loop().run_until_complete(
+    >>> asyncio.run(
+     ...     func( 1, "foo", True, True, False))
+ 
+ Predicates functions themselves cannot be coroutines, as this could
--- a/pkgs/development/python-modules/paddlex/default.nix
+++ b/pkgs/development/python-modules/paddlex/default.nix
@@ -27,14 +27,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "paddlex";
-  version = "3.7.1";
+  version = "3.7.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "PaddlePaddle";
    repo = "PaddleX";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Hmy70oTITF/olEyQELnZIotk2afvO+zxCcLZwVHuUWc=";
+    hash = "sha256-E9WvXQTqpD9y/1tSNjOEws1ELRp65w9hTgeVq1lLBvI=";
  };

  build-system = [
--- a/pkgs/development/python-modules/sqlalchemy/1.3-0001-fix-create-new-event-loop-if-not-exists.patch
+++ b/pkgs/development/python-modules/sqlalchemy/1.3-0001-fix-create-new-event-loop-if-not-exists.patch
@@ -0,0 +1,26 @@
+From 98fd6e87243c6d5992429a9b90426af73dbcc3ff Mon Sep 17 00:00:00 2001
+From: Bart Oostveen <bart@bartoostveen.nl>
+Date: Fri, 10 Jul 2026 13:59:21 +0200
+Subject: [PATCH] fix: create new event loop if not exists
+
+---
+ lib/sqlalchemy/util/_concurrency_py3k.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lib/sqlalchemy/util/_concurrency_py3k.py b/lib/sqlalchemy/util/_concurrency_py3k.py
+index 1e4ffef..5aaf12c 100644
+--- a/lib/sqlalchemy/util/_concurrency_py3k.py
+++ b/lib/sqlalchemy/util/_concurrency_py3k.py
+@@ -190,6 +190,8 @@ def get_event_loop():
+         try:
+             return asyncio.get_running_loop()
+         except RuntimeError:
+-            return asyncio.get_event_loop_policy().get_event_loop()
+            loop = asyncio.new_event_loop()
+            asyncio.set_event_loop(loop)
+            return loop
+     else:
+         return asyncio.get_event_loop()
+-- 
+2.54.0
+
--- a/pkgs/development/python-modules/sqlalchemy/1_3.nix
+++ b/pkgs/development/python-modules/sqlalchemy/1_3.nix
@@ -37,6 +37,8 @@ buildPythonPackage (finalAttrs: {
    hash = "sha256-6qAjyqMVrugABHssAQuql3z1YHTAOSm5hARJuJXJJvo=";
  };

+  patches = [ ./1.3-0001-fix-create-new-event-loop-if-not-exists.patch ];
+
  postPatch = ''
    sed -i '/tag_build = dev/d' setup.cfg
  '';
--- a/pkgs/servers/nosql/mongodb/mongodb.nix
+++ b/pkgs/servers/nosql/mongodb/mongodb.nix
@@ -39,7 +39,7 @@ let
      pyyaml
      cheetah3
      psutil
-      setuptools
+      setuptools_80
      distutils
      packaging
      pymongo