Merge staging-next into staging

2026-01-12 18:07:31 +00:00
parent e36daf16c4 5166743ea4
commit 446370ea5d
161 changed files with 4847 additions and 979 deletions
@@ -606,17 +606,6 @@
    githubId = 50264672;
    name = "Adam Freeth";
  };
-  adamperkowski = {
-    name = "Adam Perkowski";
-    email = "me@adamperkowski.dev";
-    matrix = "@adam:matrix.system72.dev";
-    github = "koibtw";
-    githubId = 75480869;
-    keys = [
-      { fingerprint = "00F6 1623 FB56 BC5B B709  4E63 4CE6 C117 2DF6 BE79"; }
-      { fingerprint = "5A53 0832 DA91 20B0 CA57  DDB6 7CBD B58E CF1D 3478"; }
-    ];
-  };
  adamt = {
    email = "mail@adamtulinius.dk";
    github = "adamtulinius";
@@ -11631,6 +11620,13 @@
    githubId = 49811314;
    keys = [ { fingerprint = "CC36 4CF4 32DD 443F 27FC  033C 3475 AA20 D72F 6A93"; } ];
  };
+  jaanonim = {
+    name = "Jaanonim";
+    email = "mat8mro@gmail.com";
+    github = "jaanonim";
+    githubId = 28810058;
+    keys = [ { fingerprint = "5C4A 273F 5F11 3DF7 ECDF  0AD7 933A F32D 3ABD 5CAF"; } ];
+  };
  jab = {
    name = "Joshua Bronson";
    email = "jabronson@gmail.com";
@@ -14032,6 +14028,17 @@
    githubId = 67888720;
    name = "Kira";
  };
+  koi = {
+    name = "koi";
+    email = "me@koi.rip";
+    matrix = "@koi:system72.dev";
+    github = "koibtw";
+    githubId = 75480869;
+    keys = [
+      { fingerprint = "00F6 1623 FB56 BC5B B709  4E63 4CE6 C117 2DF6 BE79"; }
+      { fingerprint = "5A53 0832 DA91 20B0 CA57  DDB6 7CBD B58E CF1D 3478"; }
+    ];
+  };
  kolaente = {
    email = "k@knt.li";
    github = "kolaente";
@@ -61,7 +61,7 @@ In addition to numerous new and updated packages, this release has the following

 - [blesh](https://github.com/akinomyoga/ble.sh), a line editor written in pure bash. Available as [programs.bash.blesh](#opt-programs.bash.blesh.enable).

- [Budgie Desktop](https://github.com/BuddiesOfBudgie/budgie-desktop), a familiar, modern desktop environment. Available as [services.xserver.desktopManager.budgie](options.html#opt-services.xserver.desktopManager.budgie).
+- [Budgie Desktop](https://github.com/BuddiesOfBudgie/budgie-desktop), a familiar, modern desktop environment. Available as `services.xserver.desktopManager.budgie`.

 - [clash-verge](https://github.com/zzzgydi/clash-verge), a Clash GUI based on tauri. Available as [programs.clash-verge](#opt-programs.clash-verge.enable).

@@ -10,7 +10,7 @@ let
  settingsFormat = pkgs.formats.toml { };
 in
 {
-  meta.maintainers = with lib.maintainers; [ adamperkowski ];
+  meta.maintainers = with lib.maintainers; [ koi ];

  options.programs.nvrs = {
    enable = lib.mkEnableOption "nvrs";
@@ -156,6 +156,7 @@ in
        SystemCallFilter = [
          "@system-service"
          "~@privileged"
+          "mincore"
        ];
      };

@@ -17,7 +17,7 @@ let
    types
    ;

-  cfg = config.services.xserver.desktopManager.budgie;
+  cfg = config.services.desktopManager.budgie;

  nixos-background-light = pkgs.nixos-artwork.wallpapers.nineish;
  nixos-background-dark = pkgs.nixos-artwork.wallpapers.nineish-dark-gray;
@@ -63,8 +63,15 @@ in
 {
  meta.maintainers = lib.teams.budgie.members;

+  imports = [
+    (lib.mkRenamedOptionModule
+      [ "services" "xserver" "desktopManager" "budgie" ]
+      [ "services" "desktopManager" "budgie" ]
+    )
+  ];
+
  options = {
-    services.xserver.desktopManager.budgie = {
+    services.desktopManager.budgie = {
      enable = mkEnableOption "the Budgie desktop";

      sessionPath = mkOption {
@@ -128,7 +135,7 @@ in
      };
    };

-    services.xserver.desktopManager.budgie.sessionPath = [ pkgs.budgie-desktop-view ];
+    services.desktopManager.budgie.sessionPath = [ pkgs.budgie-desktop-view ];

    environment.extraInit = ''
      ${concatMapStrings (p: ''
@@ -101,6 +101,12 @@ in
    };

    wopi = lib.mkEnableOption "Enable WOPI support";
+
+    loglevel = lib.mkOption {
+      type = lib.types.str;
+      default = "WARN";
+      description = "Default loglevel to use for documentserver and converter";
+    };
  };

  config = lib.mkIf cfg.enable {
@@ -264,8 +270,15 @@ in
          "postgresql.target"
        ];
        wantedBy = [ "multi-user.target" ];
+        environment = {
+          NODE_CONFIG_DIR = "/run/onlyoffice/config";
+          NODE_DISABLE_COLORS = "1";
+          NODE_ENV = "production-linux";
+        };
        serviceConfig = {
-          ExecStart = "${cfg.package.fhs}/bin/onlyoffice-wrapper FileConverter/converter /run/onlyoffice/config";
+          # needs to be ran wrapped in FHS for now
+          # because the default config refers to many FHS paths
+          ExecStart = "${cfg.package.fhs}/bin/onlyoffice-wrapper ${cfg.package.fileconverter}/bin/fileconverter /run/onlyoffice/config";
          Group = "onlyoffice";
          Restart = "always";
          RuntimeDirectory = "onlyoffice";
@@ -326,6 +339,10 @@ in
            jq '.FileConverter.converter.x2tPath = "${cfg.x2t}/bin/x2t"' \
              /run/onlyoffice/config/production-linux.json | sponge /run/onlyoffice/config/production-linux.json

+            chmod u+w /run/onlyoffice/config/log4js/production.json
+            jq '.categories.default.level = "${cfg.loglevel}"' \
+              /run/onlyoffice/config/log4js/production.json | sponge /run/onlyoffice/config/log4js/production.json
+
            if psql -d onlyoffice -c "SELECT 'task_result'::regclass;" >/dev/null; then
              psql -f ${cfg.package}/var/www/onlyoffice/documentserver/server/schema/postgresql/removetbl.sql
              psql -f ${cfg.package}/var/www/onlyoffice/documentserver/server/schema/postgresql/createdb.sql
@@ -344,7 +361,7 @@ in
          requires = [ "postgresql.target" ];
          wantedBy = [ "multi-user.target" ];
          serviceConfig = {
-            ExecStart = "${cfg.package.fhs}/bin/onlyoffice-wrapper DocService/docservice /run/onlyoffice/config";
+            ExecStart = "${cfg.package.fhs}/bin/onlyoffice-wrapper ${cfg.package.docservice}/bin/docservice /run/onlyoffice/config";
            ExecStartPre = [ onlyoffice-prestart ];
            Group = "onlyoffice";
            Restart = "always";
@@ -37,7 +37,7 @@ in
    ./surf-display.nix
    ./cde.nix
    ./cinnamon.nix
-    ./budgie.nix
+    ../../desktop-managers/budgie.nix
    ../../desktop-managers/lomiri.nix
    ../../desktop-managers/cosmic.nix
    ../../desktop-managers/gnome.nix
@@ -0,0 +1,33 @@
+{
+  vmTools,
+  perl,
+  coreutils,
+  acl,
+}:
+# Can't run this within a VM because tests require root access
+# Can't easily use a standard VM test because we need to have access to intermediate build results
+vmTools.runInLinuxVM (
+  acl.overrideAttrs (old: {
+    postPatch = old.postPatch or "" + ''
+      # The runwrapper uses LD_PRELOAD to override available user/groups
+      substituteInPlace Makefile.in --replace-fail \
+        'TEST_LOG_COMPILER = $(srcdir)/test/runwrapper' \
+        'TEST_LOG_COMPILER = $(srcdir)/test/run'
+    '';
+    nativeCheckInputs = old.nativeCheckInputs or [ ] ++ [
+      perl
+      # By default `ls` would come from bootstrap tools,
+      # which doesn't support showing ACLs, which the tests rely on
+      coreutils
+    ];
+    preCheck = ''
+      cp test/test.passwd /etc/passwd
+      cp test/test.group /etc/group
+    '';
+    doCheck = true;
+    outputs = [ "out" ];
+    installPhase = ''
+      touch $out
+    '';
+  })
+)
@@ -188,6 +188,7 @@ in
  # keep-sorted start case=no numeric=no block=yes
  _3proxy = runTest ./3proxy.nix;
  aaaaxy = runTest ./aaaaxy.nix;
+  acl = pkgs.callPackage ./acl.nix { };
  acme = import ./acme/default.nix {
    inherit runTest;
    inherit (pkgs) lib;
@@ -12,20 +12,18 @@
      ];

      services.xserver.enable = true;
+      services.xserver.displayManager.lightdm.enable = true;

-      services.xserver.displayManager = {
-        lightdm.enable = true;
-        autoLogin = {
-          enable = true;
-          user = "alice";
-        };
+      services.displayManager.autoLogin = {
+        enable = true;
+        user = "alice";
      };

      # We don't ship gnome-text-editor in Budgie module, we add this line mainly
      # to catch eval issues related to this option.
      environment.budgie.excludePackages = [ pkgs.gnome-text-editor ];

-      services.xserver.desktopManager.budgie = {
+      services.desktopManager.budgie = {
        enable = true;
        extraPlugins = [
          pkgs.budgie-analogue-clock-applet
@@ -13,7 +13,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
    name = "harper";
    publisher = "elijah-potter";
    version = harper.version;
-    hash = "sha256-6aR9A2hZMtIIiaJinWUSyJBGAt4Dd9C+r70K6W4K3DA";
+    hash = "sha256-9deNEjrt8+PGqdF8WH+nh/K7ypG35GRHSW1nYD8LMdU=";
  };

  nativeBuildInputs = [
@@ -9,7 +9,7 @@
  # For the wrapper
  makeWrapper,
  # For lndir
-  xorg,
+  lndir,
  # To define a the gnuradio.pkgs scope
  newScope,
  # For Emulating wrapGAppsHook3
@@ -222,13 +222,16 @@ let
          ;
        nativeBuildInputs = [
          makeWrapper
-          xorg.lndir
+          lndir
        ];
        buildCommand = ''
-          mkdir $out
+          ${builtins.concatStringsSep "\n" (
+            map (output: ''
+              mkdir ''$${output}
+              lndir -silent ${unwrapped.${output}} ''$${output}
+            '') outputs
+          )}
          cd $out
-          lndir -silent ${unwrapped.out}
-          lndir -silent ${unwrapped.man}
          ${lib.optionalString (extraPackages != [ ]) (
            builtins.concatStringsSep "\n" (
              map (pkg: ''
@@ -246,7 +249,7 @@ let
            mv -f "$i".tmp "$i"
            if head -1 "$i" | grep -q ${unwrapped.python}; then
              substituteInPlace "$i" \
-                --replace ${unwrapped.python} ${pythonEnv}
+                --replace-fail ${unwrapped.python} ${pythonEnv}
            fi
            wrapProgram "$i" ${makeWrapperArgs}
          done
@@ -158,7 +158,7 @@ stdenv.mkDerivation rec {
  '';

  # Required for build with gcc-14
-  env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int";
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int -std=gnu17";

  enableParallelBuilding = true;

@@ -64,6 +64,8 @@

  obs-pipewire-audio-capture = callPackage ./obs-pipewire-audio-capture.nix { };

+  obs-plugin-countdown = qt6Packages.callPackage ./obs-plugin-countdown.nix { };
+
  obs-recursion-effect = callPackage ./obs-recursion-effect.nix { };

  obs-replay-source = qt6Packages.callPackage ./obs-replay-source.nix { };
@@ -0,0 +1,43 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  obs-studio,
+  cmake,
+  qt6,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "obs-plugin-countdown";
+  version = "2.1.1";
+
+  src = fetchFromGitHub {
+    owner = "ashmanix";
+    repo = "obs-plugin-countdown";
+    tag = finalAttrs.version;
+    hash = "sha256-rDs+X2eH8aUUH6phEo/pelUY1mHnnJNc6mqcT/lT+6c=";
+  };
+
+  buildInputs = [
+    obs-studio
+    qt6.qtbase
+  ];
+  dontWrapQtApps = true;
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  postInstall = ''
+    rm -rf "$out/obs-plugins" "$out/data"
+  '';
+
+  meta = {
+    description = "OBS plugin that creates countdown timers";
+    homepage = "https://github.com/ashmanix/obs-plugin-countdown";
+    changelog = "https://github.com/ashmanix/obs-plugin-countdown/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+    platforms = lib.platforms.linux;
+  };
+})
@@ -8,7 +8,7 @@

 stdenvNoCC.mkDerivation rec {
  pname = "aapt";
-  version = "8.4.1-11315950";
+  version = "8.13.2-14304508";

  src =
    let
@@ -16,12 +16,12 @@ stdenvNoCC.mkDerivation rec {
        if stdenvNoCC.hostPlatform.isLinux then
          {
            url = "https://dl.google.com/android/maven2/com/android/tools/build/aapt2/${version}/aapt2-${version}-linux.jar";
-            hash = "sha256-eSQaZrRtb5aCG320hrXAL256fxa/oMhBC4hcTA1KRxs=";
+            hash = "sha256-eiNY58ueDpcyKvAteRuKFVr3r22kOhwSADkaH3CRwKw=";
          }
        else if stdenvNoCC.hostPlatform.isDarwin then
          {
            url = "https://dl.google.com/android/maven2/com/android/tools/build/aapt2/${version}/aapt2-${version}-osx.jar";
-            hash = "sha256-LUihNjase79JbUkHDb10A5d6pJ+VXDVfv7m09hkL8kY=";
+            hash = "sha256-RI/S2oXMSvipALRfeRTsiXUh130/b8iP+EO0yltd7x0=";
          }
        else
          throw "Unsupport platform: ${stdenvNoCC.system}";
@@ -5,7 +5,7 @@
  "packages": {
    "": {
      "dependencies": {
-        "@sourcegraph/amp": "^0.0.1767672851-gfc2f63"
+        "@sourcegraph/amp": "^0.0.1768219292-g8af118"
      }
    },
    "node_modules/@napi-rs/keyring": {
@@ -228,9 +228,9 @@
      }
    },
    "node_modules/@sourcegraph/amp": {
-      "version": "0.0.1767672851-gfc2f63",
-      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1767672851-gfc2f63.tgz",
-      "integrity": "sha512-hlr9zHZjcf2RaUGnHwechEee2yxH+KifgszbHyK5mkdYRrk7dAOKMy/jCOJ8LqVFEGaUpqH7f9PAKvvvR1U8ZQ==",
+      "version": "0.0.1768219292-g8af118",
+      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1768219292-g8af118.tgz",
+      "integrity": "sha512-GW5MyNOiTu4G4cY29UI/0ttXu4b2QRwjmz4I9pvZqvIFrMmotBKC4wQinj8Dt6jD0ey7284Rhm8xHJ1iRtMoxA==",
      "license": "Amp Commercial License",
      "dependencies": {
        "@napi-rs/keyring": "1.1.9"
@@ -9,11 +9,11 @@

 buildNpmPackage (finalAttrs: {
  pname = "amp-cli";
-  version = "0.0.1767672851-gfc2f63";
+  version = "0.0.1768219292-g8af118";

  src = fetchzip {
    url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";
-    hash = "sha256-o2EgjwaaKnOT6DxxROuZxn3Iso8QPHPr6ecfj9ThttM=";
+    hash = "sha256-DstiWCfox5CuHKfy3EgLk7N8KK67txuMG/flriiDH3I=";
  };

  postPatch = ''
@@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: {
    chmod +x bin/amp-wrapper.js
  '';

-  npmDepsHash = "sha256-PWVsz7QiiQHBiuizEXa2yovBIc3T7kz+SaznRLL0Miw=";
+  npmDepsHash = "sha256-oB8YPiKoCG6+oNGlE6YdZ6F/6FEq96qJq/tdC164nrM=";

  propagatedBuildInputs = [
    ripgrep
@@ -34,6 +34,8 @@
  xorg,
  enableQtTranslations ? true,
  qt6,
+  gtk3,
+  gsettings-desktop-schemas,
  enableCubeb ? true,
  cubeb,
  useDiscordRichPresence ? true,
@@ -152,6 +154,13 @@ stdenv.mkDerivation (finalAttrs: {
    (cmakeBool "ENABLE_SSE42" enableSSE42)
  ];

+  preFixup = ''
+    qtWrapperArgs+=(
+      --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}"
+      --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}"
+    )
+  '';
+
  passthru.updateScript = nix-update-script { };

  meta = {
@@ -0,0 +1,34 @@
+{
+  lib,
+  flutter338,
+  fetchFromGitHub,
+}:
+
+let
+  version = "1.18.15";
+
+  src = fetchFromGitHub {
+    owner = "fossasia";
+    repo = "badgemagic-app";
+    tag = "v${version}";
+    hash = "sha256-zQ7ajVHueyCJP2n81dogM5YytxOoJ/hJt/qYbmw64e0=";
+  };
+in
+flutter338.buildFlutterApplication {
+  pname = "badgemagic-app";
+  inherit version src;
+
+  pubspecLock = lib.importJSON ./pubspec.lock.json;
+
+  meta = {
+    description = "Badge Magic with LEDs - mobile and desktop app";
+    homepage = "https://github.com/fossasia/badgemagic-app";
+    license = with lib.licenses; [ asl20 ];
+    maintainers = [ lib.maintainers.matthewcroughan ];
+    platforms = [
+      "aarch64-linux"
+      "x86_64-linux"
+    ];
+    mainProgram = "badgemagic";
+  };
+}
@@ -0,0 +1,41 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  dbus,
+  systemdLibs,
+}:
+
+rustPlatform.buildRustPackage {
+  pname = "badgemagic-rs";
+  version = "0.1.0-unstable-2025-07-15";
+
+  src = fetchFromGitHub {
+    owner = "fossasia";
+    repo = "badgemagic-rs";
+    rev = "5d745ab8fda418204425f3df0e969a98bf479f2d";
+    hash = "sha256-IyPUPNbXkLNz/cuzVuzrD2iCE1ddeO3xkAOKhbrNU+k=";
+  };
+
+  cargoHash = "sha256-jT/pJLqdWGTpQFlnhuZo1FLqRQJWXCD2tuDB2AEyNPQ=";
+
+  buildFeatures = [ "cli" ];
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    dbus
+    systemdLibs
+  ];
+
+  meta = {
+    description = "Badge Magic in Rust";
+    homepage = "https://github.com/fossasia/badgemagic-rs";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ matthewcroughan ];
+    mainProgram = "badgemagic-rs";
+  };
+}
@@ -0,0 +1,20 @@
+# not a stable interface, do not reference outside the windmill package but make a copy if you need
+{
+  lib,
+  stdenv,
+  fetchurl,
+}:
+
+{
+  fetchLibrustyV8 =
+    args:
+    fetchurl {
+      name = "librusty_v8-${args.version}";
+      url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a.gz";
+      sha256 = args.shas.${stdenv.hostPlatform.system};
+      meta = {
+        inherit (args) version;
+        sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+      };
+    };
+}
@@ -0,0 +1,13 @@
+# auto-generated file -- DO NOT EDIT!
+{ fetchLibrustyV8 }:
+
+fetchLibrustyV8 {
+  version = "140.2.0";
+  shas = {
+    # NOTE; Follows supported platforms of package (see meta.platforms attribute)!
+    x86_64-linux = "0xgkyjx4vhi001p8iv0wqjpal4nl0vj65fnhp5x8ckss6mhanymg";
+    aarch64-linux = "1gal8sylc0k9x37m4lrlncmcfaxn5bdizgi9rhyfb9da9wi41n9f";
+    x86_64-darwin = "0y117lgc1d90f3z285ljazacscs02mmk9b57h403ilgqfly8dzh7";
+    aarch64-darwin = "106n64mrmwk0jzm8zy891kjjbxrr7yggj7m986pxinf8igvab7br";
+  };
+}
@@ -0,0 +1,76 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  callPackage,
+  librusty_v8 ? (
+    callPackage ./librusty_v8.nix {
+      inherit (callPackage ./fetchers.nix { }) fetchLibrustyV8;
+    }
+  ),
+  openssl,
+  tzdata,
+  versionCheckHook,
+  _experimental-update-script-combinators,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "brioche";
+  version = "0.1.6";
+
+  src = fetchFromGitHub {
+    owner = "brioche-dev";
+    repo = "brioche";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-tMVBpFCTxesrkj7Z3huVD86baw1tYAtPdPAzYJzTCnA=";
+  };
+
+  cargoHash = "sha256-LPHJHS69oUvmTaYoMSINCcyYIHYMq++UCUMh9KrCm/0=";
+
+  env = {
+    OPENSSL_NO_VENDOR = true;
+    RUSTY_V8_ARCHIVE = librusty_v8;
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    openssl
+  ];
+
+  checkFlags = [
+    # Require internet access
+    "--skip=test_bake_process"
+  ];
+
+  nativeCheckInputs = [
+    # Otherwise, some tests fail with:
+    # Error: failed to find time zone `Etc/Unknown` since there is no time zone database configured at line 1 column 415
+    tzdata
+  ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = _experimental-update-script-combinators.sequence [
+    (nix-update-script { })
+    ./update-librusty.sh
+  ];
+
+  meta = {
+    description = "Package manager for building and running complex software projects";
+    homepage = "https://brioche.dev/";
+    downloadPage = "https://github.com/brioche-dev/brioche";
+    changelog = "https://github.com/brioche-dev/brioche/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+    mainProgram = "brioche";
+  };
+})
@@ -0,0 +1,47 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p gnugrep gnused nix jq
+# shellcheck shell=bash
+
+set -eu -o pipefail
+
+echo "librusty_v8: UPDATING"
+
+# ASSUMES; The Cargo.lock file is located at <REPO>/backend/Cargo.toml
+
+BRIOCHE_LATEST_VERSION=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} --silent --fail --location "https://api.github.com/repos/brioche-dev/brioche/releases/latest" | jq --raw-output .tag_name)
+CARGO_LOCK=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} --silent --fail --location "https://github.com/brioche-dev/brioche/raw/$BRIOCHE_LATEST_VERSION/Cargo.lock")
+
+PACKAGE_DIR=$(dirname "$(readlink --canonicalize-existing "${BASH_SOURCE[0]}")")
+OUTPUT_FILE="$PACKAGE_DIR/librusty_v8.nix"
+NEW_VERSION=$(echo "$CARGO_LOCK" | grep --after-context 5 'name = "v8"' | grep 'version =' | sed -E 's/version = "//;s/"//')
+
+CURRENT_VERSION=""
+if [ -f "$OUTPUT_FILE" ]; then
+  CURRENT_VERSION="$(grep 'version =' "$OUTPUT_FILE" | sed -E 's/version = "//;s/"//')"
+fi
+
+if [ "$CURRENT_VERSION" == "$NEW_VERSION" ]; then
+  echo "No update needed, $CURRENT_VERSION is already latest"
+  exit 0
+fi
+
+TEMP_FILE="$OUTPUT_FILE.tmp"
+cat >"$TEMP_FILE" <<EOF
+# auto-generated file -- DO NOT EDIT!
+{ fetchLibrustyV8 }:
+
+fetchLibrustyV8 {
+  version = "$NEW_VERSION";
+  shas = {
+    # NOTE; Follows supported platforms of package (see meta.platforms attribute)!
+    x86_64-linux = "$(nix-prefetch-url --type sha256 https://github.com/denoland/rusty_v8/releases/download/v"$NEW_VERSION"/librusty_v8_release_x86_64-unknown-linux-gnu.a.gz)";
+    aarch64-linux = "$(nix-prefetch-url --type sha256 https://github.com/denoland/rusty_v8/releases/download/v"$NEW_VERSION"/librusty_v8_release_aarch64-unknown-linux-gnu.a.gz)";
+    x86_64-darwin = "$(nix-prefetch-url --type sha256 https://github.com/denoland/rusty_v8/releases/download/v"$NEW_VERSION"/librusty_v8_release_x86_64-apple-darwin.a.gz)";
+    aarch64-darwin = "$(nix-prefetch-url --type sha256 https://github.com/denoland/rusty_v8/releases/download/v"$NEW_VERSION"/librusty_v8_release_aarch64-apple-darwin.a.gz)";
+  };
+}
+EOF
+
+mv "$TEMP_FILE" "$OUTPUT_FILE"
+
+echo "librusty_v8: UPDATE DONE"
@@ -197,7 +197,7 @@ cfgbudgie = """  # Enable the X11 windowing system.

  # Enable the Budgie Desktop environment.
  services.xserver.displayManager.lightdm.enable = true;
-  services.xserver.desktopManager.budgie.enable = true;
+  services.desktopManager.budgie.enable = true;

 """

@@ -0,0 +1,28 @@
+{
+  stdenv,
+  cmake,
+  fetchFromGitHub,
+  lib,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "chuffed";
+  version = "0.13.2";
+
+  src = fetchFromGitHub {
+    owner = "chuffed";
+    repo = "chuffed";
+    tag = finalAttrs.version;
+    hash = "sha256-D4HEcCDcJi05AL9suc7Twtf/wjpwBkLEeumGY3nNi5g=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = {
+    homepage = "https://github.com/chuffed/chuffed";
+    description = "The Chuffed CP solver";
+    longDescription = "Chuffed is a state of the art lazy clause solver designed from the ground up with lazy clause generation in mind.";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jaanonim ];
+    platforms = lib.platforms.all;
+  };
+})
@@ -8,16 +8,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "clorinde";
-  version = "1.2.0";
+  version = "1.3.0";

  src = fetchFromGitHub {
    owner = "halcyonnouveau";
    repo = "clorinde";
    tag = "clorinde-v${finalAttrs.version}";
-    hash = "sha256-d+fVk3ZWccw/E6/mAyiGkP5t5/nl3riBAHwhzsaLiDs=";
+    hash = "sha256-Jf7OvZgSkCLZAWUn+GF1ogtH2DO9gS3p1UUHzq9TvmE=";
  };

-  cargoHash = "sha256-bu31l7slpWIHe2Ze/pP2udygt/KeWrdh0MYkCXCSWIc=";
+  cargoHash = "sha256-ybp60gpixHSXuuZdscHhZ5vXT2jO0I7Kh3b+F9kEoo4=";

  cargoBuildFlags = [ "--package=clorinde" ];

@@ -9,26 +9,26 @@ let
  inherit (stdenv) hostPlatform;
  sources = {
    x86_64-linux = fetchurl {
-      url = "https://downloads.cursor.com/lab/2026.01.02-80e4d9b/linux/x64/agent-cli-package.tar.gz";
-      hash = "sha256-xQml5yMZ2cjBvG2J8mH5Ai65ZArt3kOkstwS245RP1k=";
+      url = "https://downloads.cursor.com/lab/2026.01.09-231024f/linux/x64/agent-cli-package.tar.gz";
+      hash = "sha256-FT4dPRYXWVLnl02KevhiMuh6F3P9Bu+YJXiWrQtH2vo=";
    };
    aarch64-linux = fetchurl {
-      url = "https://downloads.cursor.com/lab/2026.01.02-80e4d9b/linux/arm64/agent-cli-package.tar.gz";
-      hash = "sha256-PpI3CgFi5hWZyKKRybolm8UZnPf3qAEH7+MqPkwsFUo=";
+      url = "https://downloads.cursor.com/lab/2026.01.09-231024f/linux/arm64/agent-cli-package.tar.gz";
+      hash = "sha256-23P7GxKzb66HNYasW87wgSFvL7PseXrZJ29Gewqx1O0=";
    };
    x86_64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/lab/2026.01.02-80e4d9b/darwin/x64/agent-cli-package.tar.gz";
-      hash = "sha256-F5DwlZYK79ZNSZS9BhTMD6ryUbbkLHqaDnwhQtmtLKc=";
+      url = "https://downloads.cursor.com/lab/2026.01.09-231024f/darwin/x64/agent-cli-package.tar.gz";
+      hash = "sha256-kYXTaddjTkuz+tzWJHU4Bk80jABTbQdVKLjEKvSBgX8=";
    };
    aarch64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/lab/2026.01.02-80e4d9b/darwin/arm64/agent-cli-package.tar.gz";
-      hash = "sha256-By3afWNXURIcmaZjFk9f0Aw0Z54S3zrgeYwzX0lTBD0=";
+      url = "https://downloads.cursor.com/lab/2026.01.09-231024f/darwin/arm64/agent-cli-package.tar.gz";
+      hash = "sha256-wOPvhIOkg8NQch5GLe5JbK2Xl2vTboVCPPMa+aMV+MI=";
    };
  };
 in
 stdenv.mkDerivation {
  pname = "cursor-cli";
-  version = "0-unstable-2026-01-02";
+  version = "0-unstable-2026-01-09";

  src = sources.${hostPlatform.system};

@@ -22,14 +22,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "curtail";
-  version = "1.13.0";
+  version = "1.14.0";
  format = "other";

  src = fetchFromGitHub {
    owner = "Huluti";
    repo = "Curtail";
    tag = version;
-    sha256 = "sha256-JfioWtd0jGTyaD5uELAqH6J+h04MOrfEqdR7GWgXyMw=";
+    sha256 = "sha256-AxQe7abHZp4SRp90fkFbmXf3ZQH3VmxQVkpxRcit+54=";
  };

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

 buildGoModule rec {
  pname = "doc2go";
-  version = "0.9.1";
+  version = "0.12.0";

  src = fetchFromGitHub {
    owner = "abhinav";
    repo = "doc2go";
    rev = "v${version}";
-    hash = "sha256-vxGzDHTtA6GgyAq1bcXL1Jrn4H6ug/ZeHl+aWezOYGo=";
+    hash = "sha256-gJQ0cs8R1fbGpFd9k2L53khnQ9M5U18DOtS2bn0lGig=";
  };
-  vendorHash = "sha256-GuBjImliR3iOthOL1/4AtH2ldf5AecYXPoexHGxm4zs=";
+  vendorHash = "sha256-lMoEbNeSQFrMG8hCMaFRvyzt6kaPVP7Kse0i7NJY10I=";

  ldflags = [
    "-s"
@@ -10,16 +10,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "flake-edit";
-  version = "0.0.2";
+  version = "0.3.0";

  src = fetchFromGitHub {
    owner = "a-kenji";
    repo = "flake-edit";
    rev = "v${version}";
-    hash = "sha256-7n8WANm9AijZYI5nlnevLI+aZtV55teroeQIEld7tkE=";
+    hash = "sha256-cBW2UH25MRSqqQ1930xxIydg+sSf62NFvbjqfkK0vnI=";
  };

-  cargoHash = "sha256-hK79yHSneD9OFm+M+RPSfu6HW1MmdpcMLysPIKlFDv8=";
+  cargoHash = "sha256-VhDN9Wq6O5lB78zEE/vjO7uzr5de0jKWfd2nRlyLtu8=";

  nativeBuildInputs = [
    installShellFiles
@@ -0,0 +1,87 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  ncurses6,
+  libxcrypt-legacy,
+  xz,
+  zstd,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "gcc-arm-embedded";
+  version = "15.2.rel1";
+
+  platform =
+    {
+      aarch64-darwin = "darwin-arm64";
+      aarch64-linux = "aarch64";
+      x86_64-linux = "x86_64";
+    }
+    .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+
+  src = fetchurl {
+    url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz";
+    # hashes obtained from location ${url}.sha256asc
+    sha256 =
+      {
+        aarch64-darwin = "1938a84b7105c192e3fb4fa5e893ba25f425f7ddab40515ae608cd40f68669a8";
+        aarch64-linux = "d061559d814b205ed30c5b7c577c03317ec447ca51cd5a159d26b12a5bbeb20c";
+        x86_64-linux = "597893282ac8c6ab1a4073977f2362990184599643b4c5ee34870a8215783a16";
+      }
+      .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+  };
+
+  dontConfigure = true;
+  dontBuild = true;
+  dontPatchELF = true;
+  dontStrip = true;
+
+  installPhase = ''
+    mkdir -p $out
+    cp -r * $out
+    # these binaries require ancient Python 3.8 not available in Nixpkgs
+    rm $out/bin/{arm-none-eabi-gdb-py,arm-none-eabi-gdb-add-index-py} || :
+  '';
+
+  preFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
+    find $out -type f | while read f; do
+      patchelf "$f" > /dev/null 2>&1 || continue
+      patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
+      patchelf --set-rpath ${
+        lib.makeLibraryPath [
+          "$out"
+          stdenv.cc.cc
+          ncurses6
+          libxcrypt-legacy
+          xz
+          zstd
+        ]
+      } "$f" || true
+    done
+  '';
+
+  meta = {
+    description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors";
+    homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";
+    license = with lib.licenses; [
+      bsd2
+      gpl2
+      gpl3
+      lgpl21
+      lgpl3
+      mit
+    ];
+    maintainers = with lib.maintainers; [
+      prusnak
+      prtzl
+      ryand56
+    ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+      "aarch64-darwin"
+    ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  };
+}
@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
    description = "GitHub CLI extension to chatter with Webhooks";
    homepage = "https://github.com/cli/gh-webhook";
    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ adamperkowski ];
+    maintainers = with lib.maintainers; [ koi ];
    mainProgram = "gh-webhook";
  };
 })
@@ -8,13 +8,13 @@

 buildGoModule (finalAttrs: {
  pname = "go-httpbin";
-  version = "2.19.0";
+  version = "2.20.0";

  src = fetchFromGitHub {
    owner = "mccutchen";
    repo = "go-httpbin";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-agElHziDwv2MGwTUKPsyDMVlTNNkuSZp4OAR2/zbW1U=";
+    hash = "sha256-FXD5XgvdQ5b6AcDC2VJPSDJXjb6RwOskPNtBV4fy6Pc=";
  };

  vendorHash = null;
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
    homepage = "https://github.com/Achno/gocheat";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [
-      adamperkowski
+      koi
      sebaguardian
    ];
    mainProgram = "gocheat";
@@ -23,13 +23,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "h2o";
-  version = "2.3.0-rolling-2025-12-05";
+  version = "2.3.0-rolling-2026-01-06";

  src = fetchFromGitHub {
    owner = "h2o";
    repo = "h2o";
-    rev = "df3d192f701e48864459fff80bc81135c339b7b0";
-    hash = "sha256-XArZFBkV0nnsh+QXmoZUttvB9vlz8+CrFWaQt8dR7n4=";
+    rev = "2e62ee29c98ef70e9f1749884557229fd255a8e5";
+    hash = "sha256-fzP95nV1uxjdknsf8BIKerybkmPmlmRF1/m498MSqyk=";
  };

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

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "harper";
-  version = "1.4.0";
+  version = "1.4.1";

  src = fetchFromGitHub {
    owner = "Automattic";
    repo = "harper";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-JHefzppRB8OmnSH0zAUZTFyBt8sgam4QBfAoZRurYYg=";
+    hash = "sha256-dJd/+9cFT7SVxTg3igJSC3lbOZcVIwjgGtiB+zPVUFU=";
  };

  buildAndTestSubdir = "harper-ls";

-  cargoHash = "sha256-XjE+CXJ25/VfDhkElv+fNDgjBJ2rLeFpnUC/DG8hXAk=";
+  cargoHash = "sha256-cc8TR+AJbnmzIBNykw1gh6nkuPZWZ7GsGdq06THlh1s=";

  passthru.updateScript = nix-update-script { };

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

 rustPackages.rustPlatform.buildRustPackage (finalAttrs: {
  pname = "hawkeye";
-  version = "6.3.0";
+  version = "6.4.0";

  src = fetchFromGitHub {
    owner = "korandoru";
    repo = "hawkeye";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-73v09Lb8okJBtjQ/Kdfla9e3ezgMrSxifE83z6bjj64=";
+    hash = "sha256-iK6h4xxZzahK045711TWbhjxwWNPShOX7V8HMmADkaA=";
  };

-  cargoHash = "sha256-tjdxBl/XjL801yrtLZ/iEuF3kkXwSob0S2eIgW8jp7k=";
+  cargoHash = "sha256-QmVERRi4rB92Z7hn5gQJaWNQCQrzGC9lf8eHjUODmv0=";

  nativeBuildInputs = [
    pkg-config
@@ -9,16 +9,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "http-nu";
-  version = "0.5.0";
+  version = "0.9.0";

  src = fetchFromGitHub {
    owner = "cablehead";
    repo = "http-nu";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Ri0/HnTINXGrdzh26uT+JD32sbKLnbzq8ps2+LUbbI8=";
+    hash = "sha256-Tnu5Ophc20+fhAfqfRgfuJVdWojBBPThNPNlcefDVrs=";
  };

-  cargoHash = "sha256-C4VYE6dLHwYaJ9LI4A+R1AvK3Qu8lV2ISy+8ymFKQg8=";
+  cargoHash = "sha256-J1zGm5F+as/B7lXbiZVBWD4/axfRBFSDL0MEUOQ09GI=";

  nativeBuildInputs = lib.optionals stdenvNoCC.hostPlatform.isDarwin [
    rustPlatform.bindgenHook
@@ -2,7 +2,8 @@
  lib,
  stdenv,
  fetchzip,
-  jdk,
+  jdk_headless,
+  jre_minimal,
  ant,
  gettext,
  which,
@@ -12,6 +13,22 @@
  gmp,
 }:

+let
+  jre = jre_minimal.override {
+    modules = [
+      "java.base"
+      "java.desktop"
+      "java.instrument"
+      "java.logging"
+      "java.management"
+      "java.naming"
+      "java.rmi"
+      "java.security.jgss"
+      "java.sql"
+      "java.xml"
+    ];
+  };
+in
 stdenv.mkDerivation (finalAttrs: {
  pname = "i2p";
  version = "2.10.0";
@@ -34,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
    makeWrapper
    ant
    gettext
-    jdk
+    jdk_headless
    which
  ];

@@ -77,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
      fi
    done

-    makeWrapper ${jdk}/bin/java $out/bin/i2prouter \
+    makeWrapper ${jre}/bin/java $out/bin/i2prouter \
      --add-flags "-cp $CP -Djava.library.path=$out/lib/ -Di2p.dir.base=$out -DloggerFilenameOverride=logs/log-router-@.txt" \
      --add-flags "net.i2p.router.RouterLaunch"

@@ -6,13 +6,13 @@

 buildGoModule (finalAttrs: {
  pname = "jd-diff-patch";
-  version = "2.3.1";
+  version = "2.4.0";

  src = fetchFromGitHub {
    owner = "josephburnett";
    repo = "jd";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-HVbEVRe9u5D6Blfif9mEw9QZYJM7786GLB4njq3n+2U=";
+    hash = "sha256-PefNgh/ASQ2hPOcWH6ThXEZk4Esd0Q+sLx3bWWnpBNM=";
  };

  sourceRoot = "${finalAttrs.src.name}/v2";
@@ -4,6 +4,7 @@
  fetchFromGitHub,
  nix-update-script,
  versionCheckHook,
+  stdenv,
 }:
 buildGoModule (finalAttrs: {
  pname = "jjui";
@@ -20,6 +21,10 @@ buildGoModule (finalAttrs: {

  ldflags = [ "-X main.Version=${finalAttrs.version}" ];

+  checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [
+    "-skip=TestServerAskpass"
+  ];
+
  doInstallCheck = true;
  nativeInstallCheckInputs = [ versionCheckHook ];
  versionCheckProgramArg = "-version";
@@ -122,7 +122,7 @@ clangStdenv.mkDerivation (finalAttrs: {
    ];
    mainProgram = "julec";
    maintainers = with lib.maintainers; [
-      adamperkowski
+      koi
      sebaguardian
    ];
  };
@@ -6,16 +6,16 @@

 buildGoModule (finalAttrs: {
  pname = "jwx";
-  version = "3.0.12";
+  version = "3.0.13";

  src = fetchFromGitHub {
    owner = "lestrrat-go";
    repo = "jwx";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-8TUme6YezwVkRYenSNaVZjC4TNq7kUV7wbIhWFQ/AR0=";
+    hash = "sha256-f2L78kS0H3FxS/qS0hP+GUXjkH3teJ1L5rrzy1oq+Wk=";
  };

-  vendorHash = "sha256-7lMvSwLi588UBI31YDi/VqyAqwUjWUwjOZbxE3fZQWU=";
+  vendorHash = "sha256-BGxLwALZ6PZiErbIngaJCUjBhkg3UbfZig/MMOgAZTQ=";

  sourceRoot = "${finalAttrs.src.name}/cmd/jwx";

@@ -25,23 +25,23 @@
  };
  "kicad-testing" = {
    kicadVersion = {
-      version = "9.0-2025-02-21";
+      version = "9.0-2026-01-10";
      src = {
-        rev = "c4c32aa7bbadd3862fb720457b71e7a19420604c";
-        sha256 = "01zbvg6n8kajilj3q1sp0zpaqz94bq28wrxjax1968wvwv05g0dp";
+        rev = "f6fb40f1108f3a7f9c78ad9d8d1f0fda1cf0069b";
+        sha256 = "1lg7jjl80x8apy98fxs6fjxqdkdji7kw195qwjhrwl1vlxlmd3y0";
      };
    };
    libVersion = {
-      version = "9.0-2025-02-21";
+      version = "9.0-2026-01-10";
      libSources = {
-        symbols.rev = "e1c3371228f97b36c6fd61b66d056184930f078e";
-        symbols.sha256 = "0l8da2ix917jlsj6v5zclc1cb5pvjaxwmys0gjdv55ic31hhfyyw";
-        templates.rev = "3ed4538b0f965d821df63a5fffc4441e723cfe7f";
+        symbols.rev = "65d897cc92950ff2af888eb67e527ba7a2b99fe8";
+        symbols.sha256 = "08qb4rqxsyhrcvj1k200m2c06jjy7jwjmf9n1qkcm0biqqc5dba4";
+        templates.rev = "cdf507d0373b5bfd8161b45f6fb86a49b56c4694";
        templates.sha256 = "0zs29zn8qjgxv0w1vyr8yxmj02m8752zagn4vcraqgik46dwg2id";
-        footprints.rev = "ef91963f57028aa095f2d0c4239ba994ea822f73";
-        footprints.sha256 = "16zslgvjg4swgkkvnd9fmiks3wzg63364d03hixiyzcpjlgk2bbk";
-        packages3d.rev = "b40831fd7ea2ca8f9c7282143dbb7d2f5015cd69";
-        packages3d.sha256 = "0bg54lg1iw01gw06ajg34y7x4y36wm6ls3jnpjy13i18d4ik77g4";
+        footprints.rev = "084757e0326f98c10943b8ffe5be284fe912a160";
+        footprints.sha256 = "1w7dkb93s84ymi1syxpzacbmkxlnlh0k4z1c62nabspb901nn524";
+        packages3d.rev = "123ddef066ce40e20443e678c5baf6a7d4a04399";
+        packages3d.sha256 = "1bv1k8i01x7gyayrlkzl3d2nsf7mcdmzx8gjwx1i2va9557rgli9";
      };
    };
  };
@@ -15,7 +15,7 @@ in
  inherit useVSCodeRipgrep;
  commandLineArgs = extraCommandLineArgs;

-  version = "0.8.0";
+  version = "0.8.86";
  pname = "kiro";

  # You can find the current VSCode version in the About dialog:
@@ -1,14 +1,14 @@
 {
  "x86_64-linux": {
-    "url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.8.0/tar/kiro-ide-0.8.0-stable-linux-x64.tar.gz",
-    "hash": "sha256-4sEy0cnn0cALGX7zBgGg0SUakh5CIscgSE98lrbPKGM="
+    "url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.8.86/tar/kiro-ide-0.8.86-stable-linux-x64.tar.gz",
+    "hash": "sha256-Qa8Yy6pHDk2id9749HY068sEulhIV1CcQYjo3P7XRNg="
  },
  "x86_64-darwin": {
-    "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.8.0/kiro-ide-0.8.0-stable-darwin-x64.dmg",
-    "hash": "sha256-cAs91Mq8HSdAuAi9KeUFddbyE824iFWFbVkuRiyNBbc="
+    "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.8.86/kiro-ide-0.8.86-stable-darwin-x64.dmg",
+    "hash": "sha256-fyuvVj4gbAVRKwHF8qkSSV7E3HcPBIKkPGhY3C2NRlc="
  },
  "aarch64-darwin": {
-    "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.8.0/kiro-ide-0.8.0-stable-darwin-arm64.dmg",
-    "hash": "sha256-+wyZ3ar3Kp41xREMQsdd06nqr9+ep5i/g/xWbAytDOE="
+    "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.8.86/kiro-ide-0.8.86-stable-darwin-arm64.dmg",
+    "hash": "sha256-HVq0b7oe2Ly2At4emLwSQCoWNpiOBnpS0uOSlwn9BMo="
  }
 }
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: {

  src = fetchFromGitea {
    domain = "codeberg.org";
-    owner = "adamperkowski";
+    owner = "koibtw";
    repo = "kitget";
    tag = "v${finalAttrs.version}";
    hash = "sha256-i26nu5SkcPhqwh+/bw1rz7h8K2u+hhSsOGiLj3sF1RQ=";
@@ -28,9 +28,9 @@ rustPlatform.buildRustPackage (finalAttrs: {

  meta = {
    description = "Display and customize cat images in your terminal";
-    homepage = "https://codeberg.org/adamperkowski/kitget";
+    homepage = "https://codeberg.org/koibtw/kitget";
    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ adamperkowski ];
+    maintainers = with lib.maintainers; [ koi ];
    mainProgram = "kitget";
    platforms = lib.platforms.linux;
  };
@@ -6,13 +6,13 @@

 buildGoModule (finalAttrs: {
  pname = "kubelogin";
-  version = "1.35.0";
+  version = "1.35.2";

  src = fetchFromGitHub {
    owner = "int128";
    repo = "kubelogin";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-POJY3r+8Fx9RUurShNADsin/LHZGvpB/4H6I9eG+4pQ=";
+    hash = "sha256-jSPNvr+spZvilTooK7s6l8CyvP5tzSWxqJzaoJCA5AM=";
  };

  subPackages = [ "." ];
@@ -22,7 +22,7 @@ buildGoModule (finalAttrs: {
    "-X main.version=v${finalAttrs.version}"
  ];

-  vendorHash = "sha256-Bjge514SLWjRuoOhnI0OxSJm5utvfDB0hx77uYnGsgY=";
+  vendorHash = "sha256-otzcOmW3mkiJrIv69wme5cHp5/iO2YSH+ecZgeX2aV0=";

  # test all packages
  preCheck = ''
@@ -167,16 +167,16 @@
        },
        {
            "name": "illuminate/collections",
-            "version": "v12.42.0",
+            "version": "v12.46.0",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/collections.git",
-                "reference": "16657effa6a5a4e728f9aeb3e38fb4fa9ba70e7d"
+                "reference": "d3f104a32fdfbf416cd1a839dad0e2c670a03f4e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/collections/zipball/16657effa6a5a4e728f9aeb3e38fb4fa9ba70e7d",
-                "reference": "16657effa6a5a4e728f9aeb3e38fb4fa9ba70e7d",
+                "url": "https://api.github.com/repos/illuminate/collections/zipball/d3f104a32fdfbf416cd1a839dad0e2c670a03f4e",
+                "reference": "d3f104a32fdfbf416cd1a839dad0e2c670a03f4e",
                "shasum": ""
            },
            "require": {
@@ -184,6 +184,7 @@
                "illuminate/contracts": "^12.0",
                "illuminate/macroable": "^12.0",
                "php": "^8.2",
+                "symfony/polyfill-php83": "^1.33",
                "symfony/polyfill-php84": "^1.33",
                "symfony/polyfill-php85": "^1.33"
            },
@@ -222,11 +223,11 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2025-12-06T18:08:25+00:00"
+            "time": "2026-01-07T21:26:29+00:00"
        },
        {
            "name": "illuminate/conditionable",
-            "version": "v12.42.0",
+            "version": "v12.46.0",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/conditionable.git",
@@ -272,16 +273,16 @@
        },
        {
            "name": "illuminate/contracts",
-            "version": "v12.42.0",
+            "version": "v12.46.0",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/contracts.git",
-                "reference": "19e8938edb73047017cfbd443b96844b86da4a59"
+                "reference": "2c0015e16b40f32c41e49810b6a0acf61204ea3d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/contracts/zipball/19e8938edb73047017cfbd443b96844b86da4a59",
-                "reference": "19e8938edb73047017cfbd443b96844b86da4a59",
+                "url": "https://api.github.com/repos/illuminate/contracts/zipball/2c0015e16b40f32c41e49810b6a0acf61204ea3d",
+                "reference": "2c0015e16b40f32c41e49810b6a0acf61204ea3d",
                "shasum": ""
            },
            "require": {
@@ -316,20 +317,20 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2025-11-26T21:36:01+00:00"
+            "time": "2026-01-07T14:57:06+00:00"
        },
        {
            "name": "illuminate/filesystem",
-            "version": "v12.42.0",
+            "version": "v12.46.0",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/filesystem.git",
-                "reference": "b1fbb20010e868f838feac86aeac8ba439fca10d"
+                "reference": "29e1b5f572306c91742514adea3aff93e85f3d3b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/filesystem/zipball/b1fbb20010e868f838feac86aeac8ba439fca10d",
-                "reference": "b1fbb20010e868f838feac86aeac8ba439fca10d",
+                "url": "https://api.github.com/repos/illuminate/filesystem/zipball/29e1b5f572306c91742514adea3aff93e85f3d3b",
+                "reference": "29e1b5f572306c91742514adea3aff93e85f3d3b",
                "shasum": ""
            },
            "require": {
@@ -383,11 +384,11 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2025-10-29T15:59:33+00:00"
+            "time": "2025-12-10T20:11:11+00:00"
        },
        {
            "name": "illuminate/macroable",
-            "version": "v12.42.0",
+            "version": "v12.46.0",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/macroable.git",
@@ -433,7 +434,7 @@
        },
        {
            "name": "illuminate/reflection",
-            "version": "v12.42.0",
+            "version": "v12.46.0",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/reflection.git",
@@ -484,16 +485,16 @@
        },
        {
            "name": "illuminate/support",
-            "version": "v12.42.0",
+            "version": "v12.46.0",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/support.git",
-                "reference": "d35411be5657e0b5560a5885f3c9140e4cbe0be5"
+                "reference": "14bfa6aa9a89fa6366c70d266d6d490f0a349c15"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/support/zipball/d35411be5657e0b5560a5885f3c9140e4cbe0be5",
-                "reference": "d35411be5657e0b5560a5885f3c9140e4cbe0be5",
+                "url": "https://api.github.com/repos/illuminate/support/zipball/14bfa6aa9a89fa6366c70d266d6d490f0a349c15",
+                "reference": "14bfa6aa9a89fa6366c70d266d6d490f0a349c15",
                "shasum": ""
            },
            "require": {
@@ -560,7 +561,7 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2025-12-09T15:26:52+00:00"
+            "time": "2026-01-07T14:57:38+00:00"
        },
        {
            "name": "laravel/prompts",
@@ -957,16 +958,16 @@
        },
        {
            "name": "symfony/console",
-            "version": "v7.4.1",
+            "version": "v7.4.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "6d9f0fbf2ec2e9785880096e3abd0ca0c88b506e"
+                "reference": "732a9ca6cd9dfd940c639062d5edbde2f6727fb6"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/6d9f0fbf2ec2e9785880096e3abd0ca0c88b506e",
-                "reference": "6d9f0fbf2ec2e9785880096e3abd0ca0c88b506e",
+                "url": "https://api.github.com/repos/symfony/console/zipball/732a9ca6cd9dfd940c639062d5edbde2f6727fb6",
+                "reference": "732a9ca6cd9dfd940c639062d5edbde2f6727fb6",
                "shasum": ""
            },
            "require": {
@@ -1031,7 +1032,7 @@
                "terminal"
            ],
            "support": {
-                "source": "https://github.com/symfony/console/tree/v7.4.1"
+                "source": "https://github.com/symfony/console/tree/v7.4.3"
            },
            "funding": [
                {
@@ -1051,7 +1052,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-12-05T15:23:39+00:00"
+            "time": "2025-12-23T14:50:43+00:00"
        },
        {
            "name": "symfony/deprecation-contracts",
@@ -1122,16 +1123,16 @@
        },
        {
            "name": "symfony/finder",
-            "version": "v7.4.0",
+            "version": "v7.4.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/finder.git",
-                "reference": "340b9ed7320570f319028a2cbec46d40535e94bd"
+                "reference": "fffe05569336549b20a1be64250b40516d6e8d06"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/340b9ed7320570f319028a2cbec46d40535e94bd",
-                "reference": "340b9ed7320570f319028a2cbec46d40535e94bd",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/fffe05569336549b20a1be64250b40516d6e8d06",
+                "reference": "fffe05569336549b20a1be64250b40516d6e8d06",
                "shasum": ""
            },
            "require": {
@@ -1166,7 +1167,7 @@
            "description": "Finds files and directories via an intuitive fluent interface",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/finder/tree/v7.4.0"
+                "source": "https://github.com/symfony/finder/tree/v7.4.3"
            },
            "funding": [
                {
@@ -1186,7 +1187,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-11-05T05:42:40+00:00"
+            "time": "2025-12-23T14:50:43+00:00"
        },
        {
            "name": "symfony/polyfill-ctype",
@@ -1765,16 +1766,16 @@
        },
        {
            "name": "symfony/process",
-            "version": "v7.4.0",
+            "version": "v7.4.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/process.git",
-                "reference": "7ca8dc2d0dcf4882658313aba8be5d9fd01026c8"
+                "reference": "2f8e1a6cdf590ca63715da4d3a7a3327404a523f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/7ca8dc2d0dcf4882658313aba8be5d9fd01026c8",
-                "reference": "7ca8dc2d0dcf4882658313aba8be5d9fd01026c8",
+                "url": "https://api.github.com/repos/symfony/process/zipball/2f8e1a6cdf590ca63715da4d3a7a3327404a523f",
+                "reference": "2f8e1a6cdf590ca63715da4d3a7a3327404a523f",
                "shasum": ""
            },
            "require": {
@@ -1806,7 +1807,7 @@
            "description": "Executes commands in sub-processes",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/process/tree/v7.4.0"
+                "source": "https://github.com/symfony/process/tree/v7.4.3"
            },
            "funding": [
                {
@@ -1826,7 +1827,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-10-16T11:21:06+00:00"
+            "time": "2025-12-19T10:00:43+00:00"
        },
        {
            "name": "symfony/service-contracts",
@@ -2007,16 +2008,16 @@
        },
        {
            "name": "symfony/translation",
-            "version": "v8.0.1",
+            "version": "v8.0.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/translation.git",
-                "reference": "770e3b8b0ba8360958abedcabacd4203467333ca"
+                "reference": "60a8f11f0e15c48f2cc47c4da53873bb5b62135d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/770e3b8b0ba8360958abedcabacd4203467333ca",
-                "reference": "770e3b8b0ba8360958abedcabacd4203467333ca",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/60a8f11f0e15c48f2cc47c4da53873bb5b62135d",
+                "reference": "60a8f11f0e15c48f2cc47c4da53873bb5b62135d",
                "shasum": ""
            },
            "require": {
@@ -2076,7 +2077,7 @@
            "description": "Provides tools to internationalize your application",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/translation/tree/v8.0.1"
+                "source": "https://github.com/symfony/translation/tree/v8.0.3"
            },
            "funding": [
                {
@@ -2096,7 +2097,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-12-01T09:13:36+00:00"
+            "time": "2025-12-21T10:59:45+00:00"
        },
        {
            "name": "symfony/translation-contracts",
@@ -3988,5 +3989,5 @@
        "php": "^8.2"
    },
    "platform-dev": {},
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.9.0"
 }
@@ -7,19 +7,19 @@
 }:
 php.buildComposerProject2 (finalAttrs: {
  pname = "laravel";
-  version = "5.23.2";
+  version = "5.24.0";

  src = fetchFromGitHub {
    owner = "laravel";
    repo = "installer";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-ZGGbWRRmotqUwVICdqHRHy2wH8Nb4WRn+6Ape9kxFlY=";
+    hash = "sha256-E8BJp4HlViXEzLDStiIn9Rz8COqJ9z+tdLtA+xcoV/A=";
  };

  nativeBuildInputs = [ makeWrapper ];

  composerLock = ./composer.lock;
-  vendorHash = "sha256-fQGj673X6Zmm+6jy2WZ8su8zELPlcI6z4u5NbtQ9gAk=";
+  vendorHash = "sha256-GV7CiCvkzJvQAv0T7oHPnYu8w4zsLsr6gwAuR1/Zsfo=";

  # Adding npm (nodejs) and php composer to path
  postInstall = ''
@@ -3,10 +3,12 @@
  lib,
  fetchFromGitLab,
  gettext,
+  meson,
+  ninja,
  pkg-config,
  python3,
+  vala,
  wayland-scanner,
-  xfce4-dev-tools,
  glib,
  gtk3,
  libdisplay-info,
@@ -41,20 +43,32 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-TVu6S/Cip9IqniAvrTU5uSs7Dgm0WZNxjgB4vjHvBNU=";
  };

+  patches = [
+    # Headers depend on gtk3 but it is only listed in Requires.private,
+    # which does not influence Cflags on non-static builds in nixpkgs’s
+    # pkg-config. Let’s add it to Requires to ensure Cflags are set correctly.
+    ./pkg-config-requires.patch
+  ];
+
+  strictDeps = true;
+
+  depsBuildBuild = [ pkg-config ];
+
  nativeBuildInputs = [
    gettext
+    meson
+    ninja
    pkg-config
    python3
    wayland-scanner
-    xfce4-dev-tools
  ]
  ++ lib.optionals withIntrospection [
    gobject-introspection
+    vala # vala bindings require GObject introspection
  ];

  buildInputs = [
    glib
-    gtk3
    libdisplay-info
    libwnck
    libX11
@@ -64,12 +78,18 @@ stdenv.mkDerivation (finalAttrs: {
    wlr-protocols
  ];

+  propagatedBuildInputs = [
+    gtk3
+  ];
+
  postPatch = ''
    patchShebangs xdt-gen-visibility
  '';

-  configureFlags = [ "--enable-maintainer-mode" ];
-  enableParallelBuilding = true;
+  mesonFlags = [
+    (lib.mesonBool "introspection" withIntrospection)
+    (lib.mesonEnable "vala" withIntrospection)
+  ];

  passthru.updateScript = gitUpdater {
    rev-prefix = "libxfce4windowing-";
@@ -0,0 +1,24 @@
+diff --git a/libxfce4windowing/meson.build b/libxfce4windowing/meson.build
+index b1a020b..fcb1b12 100644
+--- a/libxfce4windowing/meson.build
+++ b/libxfce4windowing/meson.build
+@@ -144,6 +144,7 @@ pkgconfig.generate(
+   name: libxfce4windowing_pkgname,
+   filebase: libxfce4windowing_pkgname,
+   description: 'X11/Wayland windowing utility library for Xfce',
+  requires: ['gtk+-3.0'],
+   subdirs: ['xfce4' / libxfce4windowing_pkgname],
+   install_dir: get_option('prefix') / get_option('libdir') / 'pkgconfig',
+ )
+diff --git a/libxfce4windowingui/meson.build b/libxfce4windowingui/meson.build
+index 68aa909..f56c3c1 100644
+--- a/libxfce4windowingui/meson.build
+++ b/libxfce4windowingui/meson.build
+@@ -76,6 +76,7 @@ pkgconfig.generate(
+   name: libxfce4windowingui_pkgname,
+   filebase: libxfce4windowingui_pkgname,
+   description: 'X11/Wayland windowing utility library for Xfce - extra widgets',
+  requires: ['gtk+-3.0'],
+   subdirs: ['xfce4' / libxfce4windowing_pkgname],
+   install_dir: get_option('prefix') / get_option('libdir') / 'pkgconfig',
+ )
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {

  offlineCache = fetchYarnDeps {
    yarnLock = "${src}/frontend/yarn.lock";
-    hash = "sha256-pOBW3E3Nw+4IEwnNxNjZ+QfR7IF9Zk6MxnD8pFzssro=";
+    hash = "sha256-FVnODCSLJYXb9KO2nNV52Z6hza+1619KjXNtXqmZv8o=";
  };

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

 buildGoModule (finalAttrs: {
  pname = "listmonk";
-  version = "5.1.0";
+  version = "6.0.0";

  src = fetchFromGitHub {
    owner = "knadh";
    repo = "listmonk";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-rb0/T7I6yLGJBXikOHuXwDdW20nFXpssXfgViHSIIOU=";
+    hash = "sha256-qfFspzAbb+wCv0rVasfgEVUgbFuFLR1ouT3LeWyKShQ=";
  };

-  vendorHash = "sha256-bFUWjaaFHB2pnGHBsvUBS2icQkMrB/CfXFa+3vGFFvU=";
+  vendorHash = "sha256-R4chuOzpy/aEB5i5owZV3M7ByqnrXzxLaCeUOcjzQKE=";

  nativeBuildInputs = [
    stuffbin
@@ -43,7 +43,7 @@ buildGoModule (finalAttrs: {
      vfsMappings = [
        "config.toml.sample"
        "schema.sql"
-        "queries.sql"
+        "queries"
        "permissions.json"
        "static/public:/public"
        "${finalAttrs.passthru.frontend}/altcha.umd.js:/public/static/altcha.umd.js"
@@ -0,0 +1,26 @@
+{
+  python3Packages,
+  fetchPypi,
+  lib,
+}:
+python3Packages.buildPythonApplication rec {
+  pname = "mintotp";
+  version = "0.3.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-0PTbXts4p0gRIBdqUm6MKVObnoBYHdLcwYEVV9d8+tU=";
+  };
+
+  build-system = [ python3Packages.setuptools ];
+
+  meta = {
+    description = "Minimal TOTP generator";
+    homepage = "https://github.com/susam/mintotp";
+    changelog = "https://github.com/susam/mintotp/raw/${version}/CHANGES.md";
+    license = lib.licenses.mit;
+    mainProgram = "mintotp";
+    maintainers = with lib.maintainers; [ provokateurin ];
+  };
+}
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {

  patches = [ ./dont_register_file_types.patch ];

-  # fix build with GCC 14
-  env.NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration -Wno-implicit-int -Wno-return-mismatch";
+  # fix build with GCC 14+
+  env.NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration -Wno-implicit-int -Wno-return-mismatch -std=gnu17";

  postPatch = ''
    substituteInPlace ./makefile --replace '-L/usr/X11R6/lib'  "" \
@@ -3,8 +3,9 @@
  stdenv,
  fetchurl,
  pkg-config,
+  removeReferencesTo,
  bison,
-  numactl,
+  rdma-core,
  libxml2,
  perl,
  gfortran,
@@ -13,37 +14,35 @@
  hwloc,
  zlib,
  makeWrapper,
+  python3,
  # InfiniBand dependencies
-  opensm,
-  rdma-core,
+  ucx,
  # OmniPath dependencies
-  libpsm2,
  libfabric,
  # Compile with slurm as a process manager
  useSlurm ? false,
-  # Network type for MVAPICH2
-  network ? "ethernet",
+  # Network backend for MVAPICH2
+  network ? "ucx",
 }:

 assert builtins.elem network [
-  "ethernet"
-  "infiniband"
-  "omnipath"
+  "ucx"
+  "ofi"
 ];

 stdenv.mkDerivation rec {
  pname = "mvapich";
-  version = "2.3.7";
+  version = "4.1";

  src = fetchurl {
-    url = "http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich2-${version}.tar.gz";
-    sha256 = "sha256-w5pEkvS+UN9hAHhXSLoolOI85FCpQSgYHVFtpXV3Ua4=";
+    url = "https://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich-${version}.tar.gz";
+    sha256 = "sha256-JaU9NyW2aeLGSBWPt8n8WxOIlT86L5SXSFhsRH0OQ+4=";
  };

  outputs = [
    "out"
-    "doc"
-    "man"
+    "dev"
+    "benchmarks"
  ];

  nativeBuildInputs = [
@@ -51,26 +50,22 @@ stdenv.mkDerivation rec {
    bison
    makeWrapper
    gfortran
+    python3
+    removeReferencesTo
  ];
-  propagatedBuildInputs = [
-    numactl
-    rdma-core
-    zlib
-    opensm
-  ];
+
  buildInputs = [
-    numactl
    libxml2
    perl
    openssh
    hwloc
+    zlib
  ]
-  ++ lib.optionals (network == "infiniband") [
+  ++ lib.optionals (network == "ucx") [
+    ucx
+  ]
+  ++ lib.optionals (network == "ofi") [
    rdma-core
-    opensm
-  ]
-  ++ lib.optionals (network == "omnipath") [
-    libpsm2
    libfabric
  ]
  ++ lib.optional useSlurm slurm;
@@ -82,39 +77,47 @@ stdenv.mkDerivation rec {
    "--enable-threads=multiple"
    "--enable-hybrid"
    "--enable-shared"
-    "FFLAGS=-fallow-argument-mismatch" # fix build with gfortran 10
  ]
-  ++ lib.optional useSlurm "--with-pm=slurm"
-  ++ lib.optional (network == "ethernet") "--with-device=ch3:sock"
-  ++ lib.optionals (network == "infiniband") [
-    "--with-device=ch3:mrail"
-    "--with-rdma=gen2"
-    "--disable-ibv-dlopen"
+  ++ lib.optionals (network == "ucx") [
+    "--with-device=ch4:ucx"
  ]
-  ++ lib.optionals (network == "omnipath") [
-    "--with-device=ch3:psm"
-    "--with-psm2=${libpsm2}"
+  ++ lib.optionals (network == "ofi") [
+    "--with-device=ch4:ofi"
  ];

-  doCheck = true;
+  doCheck = false; # requries bindir/bin/mpicc before install is run

-  preFixup = ''
-    # /tmp/nix-build... ends up in the RPATH, fix it manually
-    for entry in $out/bin/mpichversion $out/bin/mpivars; do
-      echo "fix rpath: $entry"
-      patchelf --allowed-rpath-prefixes ${builtins.storeDir} --shrink-rpath $entry
+  postInstall = ''
+    for e in mpif77 mpif90 mpifort mpichversion mpic++ mpicxx mpicc mpivars; do
+      moveToOutput "bin/$e" "''${!outputDev}"
    done

-    # Ensure the default compilers are the ones mvapich was built with
-    substituteInPlace $out/bin/mpicc --replace 'CC="gcc"' 'CC=${stdenv.cc}/bin/cc'
-    substituteInPlace $out/bin/mpicxx --replace 'CXX="g++"' 'CXX=${stdenv.cc}/bin/c++'
-    substituteInPlace $out/bin/mpifort --replace 'FC="gfortran"' 'FC=${gfortran}/bin/gfortran'
+    mkdir -p $benchmarks
+    moveToOutput "libexec/osu-micro-benchmarks/" $benchmarks
+  '';
+
+  # Ensure the default compilers are the ones mvapich was built with
+  preFixup = ''
+    substituteInPlace $dev/bin/mpicc --replace-fail 'CC="gcc"' 'CC=${stdenv.cc}/bin/cc'
+    substituteInPlace $dev/bin/mpicxx --replace-fail 'CXX="g++"' 'CXX=${stdenv.cc}/bin/c++'
+    substituteInPlace $dev/bin/mpifort --replace-fail 'FC="gfortran"' 'FC=${gfortran}/bin/gfortran'
+
+  '';
+
+  postFixup = ''
+    for e in mpi mpifort mpicxx; do
+      remove-references-to -t "''${!outputDev}" $(readlink -f $out/lib/lib$e${stdenv.hostPlatform.extensions.library})
+    done
+
+    if [ -e $out/bin/mpiexec.hydra ]; then
+      remove-references-to -t "''${!outputDev}" $out/bin/mpiexec.hydra
+    fi
  '';

  enableParallelBuilding = true;

  meta = {
-    description = "MPI-3.1 implementation optimized for Infiband transport";
+    description = "MPI-3.1 implementation optimized for Infiband and OmniPath transport";
    homepage = "https://mvapich.cse.ohio-state.edu";
    license = lib.licenses.bsd3;
    maintainers = [ lib.maintainers.markuskowa ];
@@ -14,16 +14,16 @@

 buildGoModule (finalAttrs: {
  pname = "nerdctl";
-  version = "2.2.0";
+  version = "2.2.1";

  src = fetchFromGitHub {
    owner = "containerd";
    repo = "nerdctl";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-M3np4NfzEfMt4ii7Fdbdt+y1K7lSTWrqA9Bl+zpzxog=";
+    hash = "sha256-KD7wXU3RSWJWLSOd7ZFEAfETezb/5ijWPyxXMjIeX6E=";
  };

-  vendorHash = "sha256-cnusyughQitdvYhHtuvCGS9/LdI/ku7DETBdAWttKsY=";
+  vendorHash = "sha256-vq4NpKS8JvsOGK25fksjsqdNS6H/B1VPqTYwqYv2blc=";

  nativeBuildInputs = [
    makeWrapper
@@ -8,16 +8,16 @@
 }:
 buildGoModule (finalAttrs: {
  pname = "nezha-agent";
-  version = "1.14.3";
+  version = "1.14.4";

  src = fetchFromGitHub {
    owner = "nezhahq";
    repo = "agent";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-/DDk57rUXiACQaXl4KTMiOFFMopHtYvRI4vnPORseFE=";
+    hash = "sha256-6/1B+jBTiM3y7eg4aum3OCcIwo7fsCWctJ5NN3VVUwM=";
  };

-  vendorHash = "sha256-A0oVUyCflbEY3vBbJwy7cF2m1x9vHCY2jAOsrm3659E=";
+  vendorHash = "sha256-d9FYXcVyWEA6HkHYG4mQzZXq0Btb9WgzEr+e99YofA4=";

  ldflags = [
    "-s"
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
  version = "0.1.9";

  src = fetchFromGitHub {
-    owner = "adamperkowski";
+    owner = "koibtw";
    repo = "nvrs";
    tag = "v${finalAttrs.version}";
    hash = "sha256-6ATkebFYuOOvhzSO+gClPbtaz9/Zph4m8/cqkufRYFw=";
@@ -47,9 +47,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
  meta = {
    description = "Fast new version checker for software releases";
    homepage = "https://nvrs.adamperkowski.dev";
-    changelog = "https://github.com/adamperkowski/nvrs/blob/v${finalAttrs.version}/CHANGELOG.md";
+    changelog = "https://github.com/koibtw/nvrs/blob/v${finalAttrs.version}/CHANGELOG.md";
    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ adamperkowski ];
+    maintainers = with lib.maintainers; [ koi ];
    mainProgram = "nvrs";
    platforms = lib.platforms.linux;
  };
@@ -1,78 +1,135 @@
 {
-  lib,
-  stdenv,
  buildFHSEnv,
+  buildNpmPackage,
  corefonts,
-  dejavu_fonts,
  dpkg,
+  dejavu_fonts,
+  fetchFromGitHub,
  fetchurl,
  gcc-unwrapped,
+  lib,
  liberation_ttf_v1,
-  writeScript,
-  xorg,
+  lndir,
  nixosTests,
+  pkg-config,
+  stdenv,
+  vips,
+  writeScript,
+  x2t,
 }:

 let
+  version = "9.2.1";
+  server-src = fetchFromGitHub {
+    owner = "ONLYOFFICE";
+    repo = "server";
+    tag = "v9.2.1.1";
+    hash = "sha256-McG+PGL+ZmmnInuBhqVqMeX0o36/LbC0C5vQA1TDjO8=";
+  };
+  common = buildNpmPackage (finalAttrs: {
+    name = "onlyoffice-server-Common";
+    src = server-src;
+    sourceRoot = "${finalAttrs.src.name}/Common";
+    npmDepsHash = "sha256-zFGqDtnNFzXCwp6uvK04GDMRG6BATv6ti3Wi8ikLjBU=";
+    dontNpmBuild = true;
+    postPatch = ''
+      # https://github.com/ONLYOFFICE/build_tools/blob/ef8153c053bed41909ceb0762b124f8fe7faa0a7/scripts/build_server.py#L34
+      sed -e "s/^const buildVersion = '[0-9.]*'/const buildVersion = '${version}'/" -i sources/commondefines.js
+    '';
+    postInstall = ''
+      ln -s $out/lib/node_modules/common $out/lib/node_modules/Common
+    '';
+  });
+  docservice = buildNpmPackage (finalAttrs: {
+    name = "onlyoffice-server-DocService";
+    src = server-src;
+    sourceRoot = "${finalAttrs.src.name}/DocService";
+    nativeBuildInputs = [
+      pkg-config
+    ];
+    buildInputs = [
+      vips.dev
+    ];
+    npmDepsHash = "sha256-4t3wrO+Tt3bTRzmvB+tbVr5D3fXpn7CCU7+dNRc7xEo=";
+    npmFlags = [ "--loglevel=verbose" ];
+    dontNpmBuild = true;
+    postInstall = ''
+      # it would be neater if this were a 'ln -s', but this is not possible
+      # because common/sources/notificationService.js has a circular dependency
+      # back on DocService
+      cp -r ${common}/lib/node_modules/common $out/lib/node_modules/Common
+      ln -s $out/lib/node_modules/coauthoring $out/lib/node_modules/DocService
+    '';
+  });
+  fileconverter = buildNpmPackage (finalAttrs: {
+    name = "onlyoffice-server-FileConverter";
+    src = server-src;
+
+    sourceRoot = "${finalAttrs.src.name}/FileConverter";
+
+    npmDepsHash = "sha256-JKZqbpVBNe6dwxsTg8WqlJAlAqOYmqm+LyWgIxpRb8k=";
+
+    dontNpmBuild = true;
+
+    postInstall = ''
+      ln -s ${common}/lib/node_modules/common $out/lib/node_modules/Common
+      ln -s ${docservice}/lib/node_modules/coauthoring $out/lib/node_modules/DocService
+    '';
+  });
  # var/www/onlyoffice/documentserver/server/DocService/docservice
-  onlyoffice-documentserver = stdenv.mkDerivation rec {
+  onlyoffice-documentserver = stdenv.mkDerivation {
    pname = "onlyoffice-documentserver";
    version = "9.2.1";

-    src = fetchurl (
-      {
-        "aarch64-linux" = {
-          url = "https://github.com/ONLYOFFICE/DocumentServer/releases/download/v${version}/onlyoffice-documentserver_arm64.deb";
-          sha256 = "sha256-1hSGR68v2azRT2PsthXKjEekGekgAv0FFESrXK6vGs0=";
-        };
-        "x86_64-linux" = {
-          url = "https://github.com/ONLYOFFICE/DocumentServer/releases/download/v${version}/onlyoffice-documentserver_amd64.deb";
-          sha256 = "sha256-/H/x069JA9MtrfILos5KRT0IKOHKOuS7nI1ZspizvvA=";
-        };
-      }
-      .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}")
-    );
+    src = fetchFromGitHub {
+      owner = "ONLYOFFICE";
+      repo = "document-server-package";
+      tag = "v9.2.1.13";
+      hash = "sha256-jyXSYkWu63vdeWsRm1Pl/3p3jRjasj0whzN0CytdHks=";
+    };

-    preferLocalBuild = true;
-
-    unpackCmd = "dpkg -x $curSrc source";
-
-    nativeBuildInputs = [
-      dpkg
-    ];
+    buildPhase = ''
+      runHook preBuild
+      # nothing for now
+      runHook postBuild
+    '';

    installPhase = ''
-      # replace dangling symlinks which are not copied into fhs with actually files
-      mkdir lib
-      for file in var/www/onlyoffice/documentserver/server/FileConverter/bin/*.so* ; do
-        ln -rs "$file" lib/$(basename "$file")
-      done
+      mkdir -p $out/etc/onlyoffice/documentserver/log4js
+      cp ${server-src}/Common/config/default.json $out/etc/onlyoffice/documentserver
+      cp ${server-src}/Common/config/production-linux.json $out/etc/onlyoffice/documentserver
+      cp ${server-src}/Common/config/log4js/production.json $out/etc/onlyoffice/documentserver/log4js

-      # NixOS uses systemd, not supervisor
-      rm -rf etc/supervisor
+      mkdir -p $out/var/www/onlyoffice/documentserver-example
+      cp -r common/documentserver-example/welcome $out/var/www/onlyoffice/documentserver-example

-      install -Dm755 usr/bin/documentserver-prepare4shutdown.sh -t $out/bin
-      # maintainer scripts which expect supervisorctl, try to write into the nix store or are handled by nixos modules
-      rm -rf usr/bin
+      mkdir -p $out/var/www/onlyoffice/documentserver
+      ln -s ${x2t.components.web-apps} $out/var/www/onlyoffice/documentserver/web-apps
+      # copying instead of linking for now because we want to inject
+      # AllFonts.js in here:
+      cp -r ${x2t.components.sdkjs} $out/var/www/onlyoffice/documentserver/sdkjs

-      # .deb default documentation
-      rm -rf usr/share
+      # we don't currently support sdkjs plugins in NixOS
+      # https://github.com/ONLYOFFICE/build_tools/blob/master/scripts/deploy_server.py#L130
+      mkdir -p $out/var/www/onlyoffice/documentserver/sdkjs-plugins
+      echo "[]" > $out/var/www/onlyoffice/documentserver/sdkjs-plugins/plugin-list-default.json

-      # required for bwrap --bind
-      mkdir -p var/lib/onlyoffice/ var/www/onlyoffice/documentserver/fonts/
+      mkdir -p $out/var/www/onlyoffice/documentserver/server/schema
+      cp -r ${server-src}/schema/* $out/var/www/onlyoffice/documentserver/server/schema
+      mkdir -p $out/var/www/onlyoffice/documentserver/server/FileConverter/bin

-      # see usr/bin/documentserver-flush-cache.sh
-      cp var/www/onlyoffice/documentserver/web-apps/apps/api/documents/api.js{.tpl,}
-      substituteInPlace var/www/onlyoffice/documentserver/web-apps/apps/api/documents/api.js \
-        --replace-fail '{{HASH_POSTFIX}}' "$(basename $out | cut -d '-' -f 1)"
-
-      mv * $out/
+      ## required for bwrap --bind
+      chmod u+w $out/var
+      mkdir -p $out/var/lib/onlyoffice
+      chmod u+w $out/var/www/onlyoffice/documentserver
+      mkdir $out/var/www/onlyoffice/documentserver/fonts
    '';

    # stripping self extracting javascript binaries likely breaks them
    dontStrip = true;

    passthru = {
+      inherit fileconverter common docservice;
      tests = nixosTests.onlyoffice;
      fhs = buildFHSEnv {
        name = "onlyoffice-wrapper";
@@ -85,6 +142,7 @@ let
          corefonts
          dejavu_fonts
          liberation_ttf_v1
+          fileconverter
        ];

        extraBuildCommands = ''
@@ -105,7 +163,7 @@ let
          export NODE_DISABLE_COLORS=1
          export NODE_ENV=production-linux

-          if [[ $1 == DocService/docservice ]]; then
+          if [[ $1 == *"docservice" ]]; then
            mkdir -p var/www/onlyoffice/documentserver/sdkjs/slide/themes/
            # symlinking themes/src breaks discovery in allfontsgen
            rm -rf var/www/onlyoffice/documentserver/sdkjs/slide/themes/src
@@ -114,14 +172,15 @@ let

            # onlyoffice places generated files in those directores
            rm -rf var/www/onlyoffice/documentserver/sdkjs/common/*
-            ${xorg.lndir}/bin/lndir -silent ${onlyoffice-documentserver}/var/www/onlyoffice/documentserver/sdkjs/common/ var/www/onlyoffice/documentserver/sdkjs/common/
+            ${lndir}/bin/lndir -silent ${onlyoffice-documentserver}/var/www/onlyoffice/documentserver/sdkjs/common/ var/www/onlyoffice/documentserver/sdkjs/common/
            rm -rf var/www/onlyoffice/documentserver/server/FileConverter/bin/*
-            ${xorg.lndir}/bin/lndir -silent ${onlyoffice-documentserver}/var/www/onlyoffice/documentserver/server/FileConverter/bin/ var/www/onlyoffice/documentserver/server/FileConverter/bin/
+            ${lndir}/bin/lndir -silent ${onlyoffice-documentserver}/var/www/onlyoffice/documentserver/server/FileConverter/bin/ var/www/onlyoffice/documentserver/server/FileConverter/bin/

            # https://github.com/ONLYOFFICE/document-server-package/blob/master/common/documentserver/bin/documentserver-generate-allfonts.sh.m4
+            # TODO --use-system doesn't actually appear to make a difference?
            echo -n Generating AllFonts.js, please wait...
-            "var/www/onlyoffice/documentserver/server/tools/allfontsgen"\
-              --input="${onlyoffice-documentserver}/var/www/onlyoffice/documentserver/core-fonts"\
+            "${x2t.components.allfontsgen}/bin/allfontsgen"\
+              --input="${x2t.components.core-fonts}"\
              --allfonts-web="var/www/onlyoffice/documentserver/sdkjs/common/AllFonts.js"\
              --allfonts="var/www/onlyoffice/documentserver/server/FileConverter/bin/AllFonts.js"\
              --images="var/www/onlyoffice/documentserver/sdkjs/common/Images"\
@@ -130,21 +189,22 @@ let
              --use-system="true"
            echo Done

+            # TODO x2t brings its on DoctRenderer.config, so it wouldn't pick up the new fonts:
            echo -n Generating presentation themes, please wait...
-            "var/www/onlyoffice/documentserver/server/tools/allthemesgen"\
-              --converter-dir="var/www/onlyoffice/documentserver/server/FileConverter/bin"\
+            "${x2t.components.allthemesgen}/bin/allthemesgen"\
+              --converter-dir="${x2t}/bin"\
              --src="var/www/onlyoffice/documentserver/sdkjs/slide/themes"\
              --output="var/www/onlyoffice/documentserver/sdkjs/common/Images"

-            "var/www/onlyoffice/documentserver/server/tools/allthemesgen"\
-              --converter-dir="var/www/onlyoffice/documentserver/server/FileConverter/bin"\
+            "${x2t.components.allthemesgen}/bin/allthemesgen"\
+              --converter-dir="${x2t}/bin"\
              --src="var/www/onlyoffice/documentserver/sdkjs/slide/themes"\
              --output="var/www/onlyoffice/documentserver/sdkjs/common/Images"\
              --postfix="ios"\
              --params="280,224"

-            "var/www/onlyoffice/documentserver/server/tools/allthemesgen"\
-              --converter-dir="var/www/onlyoffice/documentserver/server/FileConverter/bin"\
+            "${x2t.components.allthemesgen}/bin/allthemesgen"\
+              --converter-dir="${x2t}/bin"\
              --src="var/www/onlyoffice/documentserver/sdkjs/slide/themes"\
              --output="var/www/onlyoffice/documentserver/sdkjs/common/Images"\
              --postfix="android"\
@@ -152,14 +212,13 @@ let
            echo Done
          fi

-          exec var/www/onlyoffice/documentserver/server/$1
+          exec $1
        '';
      };
    };

    meta = {
      description = "ONLYOFFICE Document Server is an online office suite comprising viewers and editors";
-      mainProgram = "documentserver-prepare4shutdown.sh";
      longDescription = ''
        ONLYOFFICE Document Server is an online office suite comprising viewers and editors for texts, spreadsheets and presentations,
        fully compatible with Office Open XML formats: .docx, .xlsx, .pptx and enabling collaborative editing in real time.
@@ -170,7 +229,6 @@ let
        "x86_64-linux"
        "aarch64-linux"
      ];
-      sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
      maintainers = with lib.maintainers; [ raboof ];
    };
  };
@@ -117,6 +117,9 @@ stdenv.mkDerivation rec {

  passthru = lib.optionalAttrs enableMpi { inherit mpi; };

+  # fix build with GCC 15
+  env.NIX_CFLAGS_COMPILE = "-std=gnu17";
+
  cmakeFlags = [
    "-DOPENMP=ON"
    "-DTOOLS=ON"
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
  ];

  # Required for build with gcc-14
-  env.NIX_CFLAGS_COMPILE = "-std=c++14";
+  env.NIX_CFLAGS_COMPILE = "-std=c++14 -Wno-template-body";

  cmakeFlags = [
    "-DENABLE_OPENMP=ON"
@@ -24,7 +24,7 @@ buildNpmPackage (finalAttrs: {
    description = "Formatter plugin for Jinja2 template files";
    homepage = "https://github.com/davidodenwald/prettier-plugin-jinja-template";
    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ adamperkowski ];
+    maintainers = with lib.maintainers; [ koi ];
    mainProgram = "prettier-plugin-jinja-template";
  };
 })
@@ -24,6 +24,7 @@
  enableOVHCloud ? true,
  enablePuppetDB ? true,
  enableScaleway ? true,
+  enableSTACKIT ? true,
  enableTriton ? true,
  enableUyuni ? true,
  enableVultr ? true,
@@ -127,6 +128,7 @@ buildGoModule (finalAttrs: {
    ${lib.optionalString enableOVHCloud "echo - github.com/prometheus/prometheus/discovery/ovhcloud"}
    ${lib.optionalString enablePuppetDB "echo - github.com/prometheus/prometheus/discovery/puppetdb"}
    ${lib.optionalString enableScaleway "echo - github.com/prometheus/prometheus/discovery/scaleway"}
+    ${lib.optionalString enableSTACKIT "echo - github.com/prometheus/prometheus/discovery/stackit"}
    ${lib.optionalString enableTriton "echo - github.com/prometheus/prometheus/discovery/triton"}
    ${lib.optionalString enableUyuni "echo - github.com/prometheus/prometheus/discovery/uyuni"}
    ${lib.optionalString enableVultr "echo - github.com/prometheus/prometheus/discovery/vultr"}
@@ -1,6 +1,6 @@
 {
-  version = "3.8.1";
-  hash = "sha256-mb1aMWpIELyZaqjYX1teYdtAK/+W9jzdPwzgbT7AVj4=";
-  npmDepsHash = "sha256-wmxvlQWQO2gP2apupMJssqAPr1ntWWIazduQU3AuodU=";
-  vendorHash = "sha256-35pVMl1Hu970BQE6jMzT1xaz/3FaIFWUtel0cl/uBdw=";
+  version = "3.9.1";
+  hash = "sha256-kqqWFvzEfpG+e+7ils9KE/RNs0eadLqrzMQJsSunQOM=";
+  npmDepsHash = "sha256-Z+EaIDQLgJ1YQ9tmGZLtvOVaDvZX1qeJJxsCAd/h41k=";
+  vendorHash = "sha256-CGec9hR/BpO3rXNGYm0V9AESsGIR6a0734e8t9oMOpA=";
 }
@@ -47,6 +47,8 @@ stdenv.mkDerivation (finalAttrs: {
    (lib.mesonOption "dynpath" "${placeholder "out"}/var/lib/qtgreet")
  ];

+  NIX_LDFLAGS = "-lwayqt-utils-qt6";
+
  meta = {
    description = "Qt based greeter for greetd, to be run under wayfire or similar wlr-based compositors";
    homepage = "https://gitlab.com/marcusbritanicus/QtGreet";
@@ -8,13 +8,13 @@

 buildGoModule (finalAttrs: {
  pname = "resterm";
-  version = "0.15.1";
+  version = "0.17.1";

  src = fetchFromGitHub {
    owner = "unkn0wn-root";
    repo = "resterm";
    tag = "v${finalAttrs.version}";
-    sha256 = "sha256-N1/q1i/J8T52DRrwJsBQZKoUXAgS+dETjtGWuP1N8+A=";
+    sha256 = "sha256-+lYbSOLY0TF8aVx5pyjwVpibVPxMnWRrs1vdloc+JOk=";
  };

  vendorHash = "sha256-E/Y4kW5xy7YamUP5bxFmDCAK6RqiqGN7DpEPG1MaCHc=";
@@ -11,13 +11,13 @@

 buildGoModule rec {
  pname = "rosa";
-  version = "1.2.59";
+  version = "1.2.60";

  src = fetchFromGitHub {
    owner = "openshift";
    repo = "rosa";
    rev = "v${version}";
-    hash = "sha256-/5J0R8LMNnKv2jMgMg9O1IBU84/bAznra5uXt5HvsUY=";
+    hash = "sha256-VKaoN91kxfGp9rFmO6VyD4WwmppITirenF1qpASDbDI=";
  };
  vendorHash = null;

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

 buildGoModule rec {
  pname = "scalingo";
-  version = "1.41.1";
+  version = "1.42.0";

  src = fetchFromGitHub {
    owner = pname;
    repo = "cli";
    rev = version;
-    hash = "sha256-1y5YDTeXsr1DPXVV01W6aLHlgr2O5sEBeZ8YW9O01w4=";
+    hash = "sha256-Ifrt3pvKw40f7lDwM2C2EVm/g6i4Dd+3fxVphAxU3as=";
  };

  vendorHash = null;
@@ -1,31 +1,54 @@
 {
+  autoPatchelfHook,
+  fetchzip,
  lib,
-  stdenv,
-  fetchurl,
-  deno,
-  makeWrapper,
  nixosTests,
+  stdenv,
+  stdenvNoCC,
 }:
-stdenv.mkDerivation (finalAttrs: {
+let
+  platformMap = {
+    "x86_64-linux" = {
+      os = "linux";
+      arch = "x86_64";
+      hash = "sha256-IGks7vmJd/xuJzqhogR5aLVM6eUUe6bACe5VuAWJOWA=";
+    };
+    "aarch64-linux" = {
+      os = "linux";
+      arch = "aarch64";
+      hash = "sha256-brqotISLIwD1t/2E2oyI7HSkfPpVgUODaNZJcc9o6zI=";
+    };
+    "x86_64-darwin" = {
+      os = "darwin";
+      arch = "x86_64";
+      hash = "sha256-n8GN2ZmeYEpZ0DB7zwEkXnSUZkAySNAGVn5BLw46fZI=";
+    };
+    "aarch64-darwin" = {
+      os = "darwin";
+      arch = "aarch64";
+      hash = "sha256-BISrkxLuxlo7KQiW9cUipJpEhOm94gL3GvyivO6LaBU=";
+    };
+  };
+  platform = platformMap.${stdenvNoCC.hostPlatform.system};
+in
+stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "silverbullet";
-  version = "2.0.0";
+  version = "2.3.0";

-  src = fetchurl {
-    url = "https://github.com/silverbulletmd/silverbullet/releases/download/${finalAttrs.version}/silverbullet.js";
-    hash = "sha256-O0QuzbY/ZdhOZvsUcgpZ55E+CSxbAsRxJmBQird5vCk=";
+  src = fetchzip {
+    url = "https://github.com/silverbulletmd/silverbullet/releases/download/${finalAttrs.version}/silverbullet-server-${platform.os}-${platform.arch}.zip";
+    hash = platform.hash;
+    stripRoot = false;
  };

-  dontUnpack = true;
+  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];

-  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ stdenv.cc.cc.lib ];

  installPhase = ''
    runHook preInstall
-    mkdir -p $out/{bin,lib}
-    cp $src $out/lib/silverbullet.js
-    makeWrapper ${lib.getExe deno} $out/bin/silverbullet \
-        --set DENO_NO_UPDATE_CHECK "1" \
-        --add-flags "run -A --unstable-kv --unstable-worker-options ${placeholder "out"}/lib/silverbullet.js"
+    mkdir -p $out/bin
+    cp $src/silverbullet $out/bin/
    runHook postInstall
  '';

@@ -40,6 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ aorith ];
    mainProgram = "silverbullet";
-    inherit (deno.meta) platforms;
+    platforms = builtins.attrNames platformMap;
  };
 })
@@ -10,14 +10,14 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "snac2";
-  version = "2.86";
+  version = "2.87";

  src = fetchFromGitea {
    domain = "codeberg.org";
    owner = "grunfink";
    repo = "snac2";
    tag = finalAttrs.version;
-    hash = "sha256-q2sdG8QGIZWCHpEM0MFaC6/K9Rcv2AW6W07c+40tFuM=";
+    hash = "sha256-CY4YfnIGQs7BcZrDRD8i+8Wq5eC1jbex6UR9bGgMw40=";
  };

  buildInputs = [
@@ -7,16 +7,16 @@

 buildGoModule (finalAttrs: {
  pname = "spiffe-helper";
-  version = "0.10.1";
+  version = "0.11.0";

  src = fetchFromGitHub {
    owner = "spiffe";
    repo = "spiffe-helper";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-rP0qXSut+9m8wCzByO0CO6IobC1lphK/3Y1OhPgiAOw=";
+    hash = "sha256-akuq5qqL+B4kyZ7EuBYOPYQ15/hUsUPTmewgQWYTXos=";
  };

-  vendorHash = "sha256-sAcmJNry3nuWyzt0Ee05JjROR/pDXxu2NVmltotSD0U=";
+  vendorHash = "sha256-32ArgWgQFHPyA/wqbcuIZ77HCCsh+V3QFw/8YrPJZww=";

  ldflags = [
    "-s"
@@ -10,31 +10,31 @@
 }:

 let
-  apexcharts = fetchurl {
-    url = "https://cdn.jsdelivr.net/npm/apexcharts@5.3.0/dist/apexcharts.min.js";
-    hash = "sha256-OtfH8igG4/XVMWV1155dCl8kGhruowISVUm7ZZF0VwU=";
+  apexcharts = {
+    url = "https://cdn.jsdelivr.net/npm/apexcharts@5.3.6/dist/apexcharts.min.js";
+    hash = "sha256-qNJtESJROYHRKwS/u3zdu4Fev69db17hKHZvrqGiqRs=";
  };
-  tablerCss = fetchurl {
+  tablerCss = {
    url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.4.0/dist/css/tabler.min.css";
    hash = "sha256-fvdQvRBUamldCxJ2etgEi9jz7F3n2u+xBn+dDao9HJo=";
  };
-  tomSelectCss = fetchurl {
+  tomSelectCss = {
    url = "https://cdn.jsdelivr.net/npm/tom-select@2.4.3/dist/css/tom-select.bootstrap5.css";
    hash = "sha256-vW5UjM/Ka9/jIY8I5s5KcudaTRWh/cCGE1ZUsrJvlI0=";
  };
-  tablerVendorsCss = fetchurl {
+  tablerVendorsCss = {
    url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.4.0/dist/css/tabler-vendors.min.css";
    hash = "sha256-/VPz9GtiH1Es1KGLY706UIayEEgG93B6aIBa3WzwKYc=";
  };
-  tablerJs = fetchurl {
+  tablerJs = {
    url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.4.0/dist/js/tabler.min.js";
    hash = "sha256-tgx2Fg6XYkV027jPEKvmrummSTtgCW/fwV3R3SvZnrk=";
  };
-  tablerIcons = fetchurl {
+  tablerIcons = {
    url = "https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.34.0/dist/tabler-sprite.svg";
    hash = "sha256-pCPkhrx0GnPg5/EthJ7pLdMxb7wbYMJ0R7WchDcffpg=";
  };
-  tomselect = fetchurl {
+  tomselect = {
    url = "https://cdn.jsdelivr.net/npm/tom-select@2.4.1/dist/js/tom-select.popular.min.js";
    hash = "sha256-Cb1Xmb9qQO8I1mMVkz4t2bT8l7HX+1JeKncGBSytSHQ=";
  };
@@ -42,41 +42,41 @@ in

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "sqlpage";
-  version = "0.40.0";
+  version = "0.41.0";

  src = fetchFromGitHub {
    owner = "lovasoa";
    repo = "SQLpage";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-CmsAImnySdXlPQGWNMkPYhVj0HsvCzFB2LXeqFnjWG4=";
+    hash = "sha256-rUij1nhXcLEwdUUVpKoUbgNqV47TvmMCEds4ihP9QL4=";
  };

  postPatch = ''
    substituteInPlace sqlpage/apexcharts.js \
-      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/apexcharts@5.3.0/dist/apexcharts.min.js */' \
-      "$(cat ${apexcharts})"
+      --replace-fail '/* !include ${apexcharts.url} */' \
+      "$(cat ${fetchurl apexcharts})"
    substituteInPlace sqlpage/sqlpage.css \
-      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.4.0/dist/css/tabler.min.css */' \
-      "$(cat ${tablerCss})" \
-      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.4.0/dist/css/tabler-vendors.min.css */' \
-      "$(cat ${tablerVendorsCss})" \
-      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/tom-select@2.4.3/dist/css/tom-select.bootstrap5.css */' \
-      "$(cat ${tomSelectCss})"
+      --replace-fail '/* !include ${tablerCss.url} */' \
+      "$(cat ${fetchurl tablerCss})" \
+      --replace-fail '/* !include ${tablerVendorsCss.url} */' \
+      "$(cat ${fetchurl tablerVendorsCss})" \
+      --replace-fail '/* !include ${tomSelectCss.url} */' \
+      "$(cat ${fetchurl tomSelectCss})"
    substituteInPlace sqlpage/sqlpage.js \
-      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.4.0/dist/js/tabler.min.js */' \
-      "$(cat ${tablerJs})"
+      --replace-fail '/* !include ${tablerJs.url} */' \
+      "$(cat ${fetchurl tablerJs})"
    substituteInPlace sqlpage/tabler-icons.svg \
-      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.34.0/dist/tabler-sprite.svg */' \
-      "$(cat ${tablerIcons})"
+      --replace-fail '/* !include ${tablerIcons.url} */' \
+      "$(cat ${fetchurl tablerIcons})"
    substituteInPlace sqlpage/tomselect.js \
-      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/tom-select@2.4.1/dist/js/tom-select.popular.min.js */' \
-      "$(cat ${tomselect})"
+      --replace-fail '/* !include ${tomselect.url} */' \
+      "$(cat ${fetchurl tomselect})"
    substituteInPlace build.rs \
-      --replace-fail "https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.35.0/dist/tabler-sprite.svg" "${tablerIcons}" \
+      --replace-fail "https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.35.0/dist/tabler-sprite.svg" "${fetchurl tablerIcons}" \
      --replace-fail "copy_url_to_opened_file(&client, sprite_url, &mut sprite_content).await;" "sprite_content = std::fs::read(sprite_url).unwrap();"
  '';

-  cargoHash = "sha256-CTJYFzSOLYFq7I9lJhD3JcO2PuqQjqtXnBCEk2VfLfI=";
+  cargoHash = "sha256-jyhvhViPz/tj76mvmaIih4LaCH+ODFa8gs0/MTYbuQg=";

  nativeBuildInputs = [ pkg-config ];

@@ -6,13 +6,13 @@

 buildGoModule rec {
  pname = "subfinder";
-  version = "2.11.0";
+  version = "2.12.0";

  src = fetchFromGitHub {
    owner = "projectdiscovery";
    repo = "subfinder";
    tag = "v${version}";
-    hash = "sha256-kgOI5/EA5ZAH7yColUdKdVoWwqm33qo5D9B8a26b+0w=";
+    hash = "sha256-AqXTK+1mK5EmK/6T2+VIDD8jYzafMUEduJ/gLTqaYv8=";
  };

  vendorHash = "sha256-ss1lcdqBni5SmHVLDQpFFVTQ3/nL8qPTl5zul1GQpBM=";
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
    x86_64-darwin.platform = "cocoa-macosx-x86_64";
    x86_64-darwin.hash = "sha256-Uns3fMoetbZAIrL/N0eVd42/3uygXakDdxpaxf5SWDI=";
    aarch64-darwin.platform = "cocoa-macosx-aarch64";
-    aarch64-darwin.hash = "sha256-Uns3fMoetbZAIrL/N0eVd42/3uygXakDdxpaxf5SWDI";
+    aarch64-darwin.hash = "sha256-jvxmoRFGquYClPgMqWi2ylw26YiGSG5bONnM1PcjlTM=";
  };
  passthru.srcMetadata =
    finalAttrs.passthru.srcMetadataByPlatform.${stdenv.hostPlatform.system} or null;
@@ -47,25 +47,29 @@ stdenv.mkDerivation (finalAttrs: {
      url = "https://archive.eclipse.org/eclipse/downloads/drops4/R-${finalAttrs.fullVersion}/swt-${finalAttrs.version}-${srcMetadata.platform}.zip";
      inherit (srcMetadata) hash;
      stripRoot = false;
-      postFetch = ''
-        mkdir "$unpackDir"
-        cd "$unpackDir"
+      postFetch =
+        # On Linux, extract and use only the sources from src.zip
+        lib.optionalString stdenv.hostPlatform.isLinux ''
+          mkdir "$unpackDir"
+          cd "$unpackDir"

-        renamed="$TMPDIR/src.zip"
-        mv -- "$out/src.zip" "$renamed"
-        unpackFile "$renamed"
-        rm -r -- "$out"
+          renamed="$TMPDIR/src.zip"
+          mv -- "$out/src.zip" "$renamed"
+          unpackFile "$renamed"
+          rm -r -- "$out"

-        mv -- "$unpackDir" "$out"
-      '';
+          mv -- "$unpackDir" "$out"
+        '';
    };

  nativeBuildInputs = [
    jdk
    stripJavaArchivesHook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
    pkg-config
  ];
-  buildInputs = [
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
    gtk3
    libGLU
  ];
@@ -76,14 +80,17 @@ stdenv.mkDerivation (finalAttrs: {
  OUTPUT_DIR = "${placeholder "out"}/lib";
  # GTK4 is not supported yet. See:
  # https://github.com/eclipse-platform/eclipse.platform.swt/issues/652
-  makeFlags = "gtk3";
-  preBuild = ''
+  makeFlags = lib.optionals stdenv.hostPlatform.isLinux [ "gtk3" ];
+
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isLinux "-std=gnu17";
+  postPatch = lib.optionalString stdenv.hostPlatform.isLinux "substituteInPlace library/make_linux.mak --replace-fail 'CFLAGS += -Werror' ''";
+  preBuild = lib.optionalString stdenv.hostPlatform.isLinux ''
    cd library
    mkdir -p ${finalAttrs.OUTPUT_DIR}
  '';

-  # Build the jar
-  postBuild = ''
+  # Build the jar (Linux only, Darwin uses prebuilt)
+  postBuild = lib.optionalString stdenv.hostPlatform.isLinux ''
    cd ../
    mkdir out
    find org/ -name '*.java' -type f -exec javac -encoding utf8 -d out/ {} +
@@ -97,9 +104,27 @@ stdenv.mkDerivation (finalAttrs: {
    runHook preInstall

    install -d -- "$out/jars"
+
+  ''
+  # On Darwin, use the prebuilt swt.jar which includes native libraries
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # Remove signature files to avoid validation errors after stripJavaArchivesHook modifies the jar
+    mkdir -p jar-temp
+    cd jar-temp
+    ${jdk}/bin/jar -xf ../swt.jar
+    rm -f META-INF/*.SF META-INF/*.RSA META-INF/*.DSA
+    ${jdk}/bin/jar -cf "$out/jars/swt.jar" *
+    cd ..
+    rm -rf jar-temp
+
+  ''
+  # On Linux, build from source
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
    install -m 644 -t out -- version.txt
    (cd out && jar -c *) > "$out/jars/swt.jar"

+  ''
+  + ''
    runHook postInstall
  '';

@@ -20,16 +20,16 @@ let
  television = rustPlatform.buildRustPackage (finalAttrs: {
    pname = "television";

-    version = "0.14.4";
+    version = "0.14.5";

    src = fetchFromGitHub {
      owner = "alexpasmantier";
      repo = "television";
      tag = finalAttrs.version;
-      hash = "sha256-OXWRJGfnNcZQMkmeCjNEsOTTDmvwYTCI8eyWNU4l8D4=";
+      hash = "sha256-Oa/5f8FQ0WIAWNviiL2OZ+mmac6xUqp0C7ixmU6nt6Q=";
    };

-    cargoHash = "sha256-yLv8Jw3buKg3s0yB+KrVSPM/s+LpBu0brz1U11B/dZg=";
+    cargoHash = "sha256-rKokOLm2IcUyHiQz+PwmdnpdGTGen2U4iqcY4wsTQl4=";

    strictDeps = true;
    nativeBuildInputs = [
@@ -13,22 +13,15 @@

 buildGoModule (finalAttrs: {
  pname = "VictoriaTraces";
-  version = "0.5.1";
+  version = "0.6.0";

  src = fetchFromGitHub {
    owner = "VictoriaMetrics";
    repo = "VictoriaTraces";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-RvP3hLM8SoDN91PATTI5RTKwnJsomBtWIakRlBprEPA=";
+    hash = "sha256-gXdOPRC3oxMAimMc4v0CjTb224qiocFY9/1PFH4hbRw=";
  };

-  postPatch = ''
-    substituteInPlace go.mod \
-      --replace-fail "go 1.25.4" "go 1.25.3"
-    substituteInPlace vendor/modules.txt \
-      --replace-fail "go 1.25.4" "go 1.25.3"
-  '';
-
  vendorHash = null;

  subPackages =
@@ -2,7 +2,6 @@
  lib,
  buildGoModule,
  wine64Packages,
-  fetchpatch,
  fetchFromGitHub,
  glib,
  makeBinaryWrapper,
@@ -24,8 +23,18 @@
  nix-update-script,
 }:
 let
+  # Based on wine 10.20
+  kombuchaPatches = fetchFromGitHub {
+    name = "kombucha";
+    owner = "vinegarhq";
+    repo = "kombucha";
+    rev = "80f87fdbaae2a42bd66e41319054798fdf30fbe6";
+    hash = "sha256-ePBJj1YyHVdlDzyE6dLVl6FMImw3SJFw04vP2o1Tk6M=";
+    meta.license = lib.licenses.unfree; # No license
+  };
+
  wine =
-    (wine64Packages.staging.override {
+    (wine64Packages.unstable.override {
      dbusSupport = true;
      embedInstallers = true;
      pulseaudioSupport = true;
@@ -33,7 +42,7 @@ let
      waylandSupport = true;
    }).overrideAttrs
      (oldAttrs: {
-        # https://github.com/flathub/org.vinegarhq.Vinegar/blob/a3c2f1249dec9548bd870027f55edcc58343b685/wine.yml#L31-L38
+        # https://github.com/vinegarhq/kombucha/blob/80f87fdbaae2a42bd66e41319054798fdf30fbe6/.github/workflows/wine.yml
        # --with-wayland is added by waylandSupport = true;
        configureFlags = oldAttrs.configureFlags or [ ] ++ [
          "--disable-tests"
@@ -42,33 +51,91 @@ let
          "--with-pulse"
          "--with-x"
          "--without-oss"
+          "--without-capi"
+          "--without-cups"
+          "--without-gphoto"
+          "--without-gssapi"
+          "--without-gstreamer"
+          "--without-krb5"
+          "--without-netapi"
+          "--without-opencl"
+          "--without-pcap"
+          "--without-sane"
+          "--without-v4l2"
        ];

-        patches = oldAttrs.patches or [ ] ++ [
-          (fetchpatch {
-            name = "loader-prefer-winedllpath.patch";
-            url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/3e07606350d803fa386eb4c358836a230819380d/patches/wine/loader-prefer-winedllpath.patch";
-            hash = "sha256-89wnr2rIbyw490hHwckB9g1GKCXm6BERnplfwEUlNOg=";
-          })
-        ];
+        patches =
+          oldAttrs.patches or [ ]
+          ++ map (name: "${kombuchaPatches}/patches/${name}") [
+            /*
+              We can't apply these because they have binary content:

-        postInstall = ''
-          cp $out/bin/wine $out/bin/wine64
-        '';
+              "0001-fonts-Add-Liberation-Sans-as-an-Arial-replacement.-v.patch"
+              "0002-fonts-Add-Liberation-Serif-as-an-Times-New-Roman-rep.patch"
+              "0003-fonts-Add-Liberation-Mono-as-an-Courier-New-replacem.patch"
+              "0004-fonts-Add-WenQuanYi-Micro-Hei-as-a-Microsoft-Yahei-r.patch"
+              "0005-Add-licenses-for-fonts-as-separate-files.patch"
+            */
+            "0006-winecfg-Add-staging-tab-for-CSMT.patch"
+            "0007-winecfg-Add-checkbox-to-enable-disable-vaapi-GPU-dec.patch"
+            "0008-winecfg-Add-checkbox-to-enable-disable-EAX-support.patch"
+            "0009-winecfg-Add-checkbox-to-enable-disable-HideWineExpor.patch"
+            "0010-winecfg-Add-option-to-enable-disable-GTK3-theming.patch"
+            "0011-winecfg-Move-input-config-options-to-a-dedicated-tab.patch"
+            "0012-winex11-Always-create-the-HKCU-configuration-registr.patch"
+            "0013-winex11-Write-supported-keyboard-layout-list-in-regi.patch"
+            "0014-winecfg-Add-a-keyboard-layout-selection-config-optio.patch"
+            "0015-winex11-Use-the-user-configured-keyboard-layout-if-a.patch"
+            "0016-winecfg-Add-a-keyboard-scancode-detection-toggle-opt.patch"
+            "0017-winex11-Use-scancode-high-bit-to-set-KEYEVENTF_EXTEN.patch"
+            "0018-winex11-Support-fixed-X11-keycode-to-scancode-conver.patch"
+            "0019-winex11-Disable-keyboard-scancode-auto-detection-by-.patch"
+            "0020-win32u-Update-the-window-client-surface-even-with-no.patch"
+            "0021-wined3d-Create-release-the-window-DCs-with-the-swapc.patch"
+            "0022-win32u-Avoid-a-crash-when-drawable-fails-to-be-creat.patch"
+            "0023-win32u-Check-internal-drawables-before-trying-to-cre.patch"
+            "0024-win32u-Update-window-state-after-setting-internal-pi.patch"
+            "0025-win32u-Fix-clipping-out-of-vulkan-and-other-process-.patch"
+            "0026-win32u-Don-t-set-window-pixel-format-if-drawable-cre.patch"
+            "0027-win32u-Iterate-the-client-surfaces-rather-than-the-t.patch"
+            "0028-wined3d-Remove-now-unnecessary-pixel-format-restorat.patch"
+            "0029-wined3d-Do-not-set-context_gl-needs_set-in-wined3d_c.patch"
+            "0030-wined3d-Get-rid-of-the-restore_pf-field-from-struct-.patch"
+            "0031-win32u-Remove-unnecessary-drawable-flush-in-context_.patch"
+            "0032-win32u-Don-t-load-bitmap-only-TTF-fonts-without-bitm.patch"
+            "0033-winex11-Move-Xfixes-extension-query-to-process_attac.patch"
+            "0034-winex11-Add-Xwayland-check.patch"
+            "0035-winex11-Use-XFixes-to-hide-cursor-before-warping-it.patch"
+            "0036-winex11-Always-ignore-MotionNotify-event-after-SetCu.patch"
+            "0037-Revert-winecfg-Allow-configuring-default-MIDI-device.patch"
+            "0038-wined3d-Update-the-context-DC-from-its-swapchain-if-.patch"
+            "0039-wined3d-Only-invalidate-enabled-clip-planes.patch"
+            "0040-wined3d-gl-Only-check-GL-context-when-accessing-onsc.patch"
+            "0041-winex11-Request-drawable-presentation-explicitly-on-.patch"
+            "0042-wined3d-Add-some-missing-states-to-wined3d_statebloc.patch"
+            "0043-wined3d-Avoid-some-invalidation-when-the-vertex-decl.patch"
+            "0044-wined3d-Avoid-some-invalidation-when-the-viewport-is.patch"
+            "0045-wined3d-Avoid-some-invalidation-when-texture-states-.patch"
+            "0046-wined3d-Invalidate-fog-constants-only-when-the-VS-is.patch"
+            "0047-wined3d-Avoid-some-invalidation-when-render-states-a.patch"
+            "0048-wined3d-gl-Split-UBOs-to-separate-chunks.patch"
+            "0049-winedbg-Disable.patch"
+            "0050-wine.inf-Disable-unused-services.patch"
+          ];
      });
 in
 buildGoModule (finalAttrs: {
  pname = "vinegar";
-  version = "1.8.1";
+  version = "1.9.3";

  src = fetchFromGitHub {
    owner = "vinegarhq";
    repo = "vinegar";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-7rc6LKZx0OOZDedtTpHIQT4grx1FejRiVnJnVDUddy4=";
+    hash = "sha256-0MNUkfhbsvOJdN89VGTuf3zHUFhimiCNuoY47V03Cgo=";
  };

-  vendorHash = "sha256-TZhdwHom4DTgLs4z/eADeoKakMtyFrvVljDg4JJp7dc=";
+  vendorHash = "sha256-gzy7Lw7AP1evPSDSzMQb/yzn+8uVtyk8TOBL2fjE3R8=";

  nativeBuildInputs = [
    glib
@@ -98,6 +165,9 @@ buildGoModule (finalAttrs: {

  postPatch = ''
    substituteInPlace Makefile --replace-fail 'gtk-update-icon-cache' '${lib.getExe' gtk4 "gtk4-update-icon-cache"}'
+    substituteInPlace internal/config/values.go \
+      --replace-fail 'return dirs.WinePath' 'return "${wine}"' \
+      --replace-fail '"github.com/vinegarhq/vinegar/internal/dirs"' ""
  '';

  buildPhase = ''
@@ -66,7 +66,7 @@

 stdenv.mkDerivation rec {
  pname = "vivaldi";
-  version = "7.7.3851.66";
+  version = "7.7.3851.67";

  suffix =
    {
@@ -79,8 +79,8 @@ stdenv.mkDerivation rec {
    url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb";
    hash =
      {
-        aarch64-linux = "sha256-xXhRTTieuoLXIVYgc0jAiUJrrSWfKmurstQqTDkfyPU=";
-        x86_64-linux = "sha256-kVD0aVfhqM1ZhFhyVcZ6teF3SM2GleY4BdsRXdxu1r4=";
+        aarch64-linux = "sha256-oNElLW9J010JIhvbocVd+mbK8w2oZVnbfmyi5DjjouQ=";
+        x86_64-linux = "sha256-bvc5QVt+Qcaw9Za36S6TugfXLAj75bu8F72nS6F0pvE=";
      }
      .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
  };
@@ -13,18 +13,18 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "vivify";
-  version = "0.11.0";
+  version = "0.12.0";

  src = fetchFromGitHub {
    owner = "jannis-baum";
    repo = "Vivify";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-LQX7HBTWDR43aMqJrogL9rDFL5qRF0Xzw/O35Uq7R3g=";
+    hash = "sha256-h36kI8Pglo6Mvngg1whjMVjI0bv0v0+yPJCZTZ0BpUA=";
  };

  yarnOfflineCache = fetchYarnDeps {
    yarnLock = "${finalAttrs.src}/yarn.lock";
-    hash = "sha256-rztQiOod7xI/gF9NQTCsfE7Wulm1eZHjyNLBI1YSNKk=";
+    hash = "sha256-RPi1yS1eKSwe/w0gzLhr0BGL00tHzpWAnaN3BEs7IWc=";
  };

  installPhase = ''
@@ -51,13 +51,13 @@
  },
  {
    "pname": "Microsoft.JavaScript.NodeApi",
-    "version": "0.9.17",
-    "hash": "sha256-mTJlmKIVLEJBsQcO0VFsitmLbpcGpI9SsJbIk3tI6jo="
+    "version": "0.9.18",
+    "hash": "sha256-FLpMBwfbLbyj+6LATS78WpvTfbpgWGhZZI6R53PKIYU="
  },
  {
    "pname": "Microsoft.JavaScript.NodeApi.Generator",
-    "version": "0.9.17",
-    "hash": "sha256-xF8J46OIr2+8FbppAdpMzm5GUV9SZ6RFN1AgIWr0pos="
+    "version": "0.9.18",
+    "hash": "sha256-I6sCIq5G6sfkxmaJnYpXY8w0Md6XuC39fDxy2yzTI9s="
  },
  {
    "pname": "Microsoft.NETCore.Platforms",
@@ -96,8 +96,8 @@
  },
  {
    "pname": "Microsoft.Win32.SystemEvents",
-    "version": "10.0.0",
-    "hash": "sha256-p0rfcBwM6pkVY+G49ujVcHwwFgrEq46FGPpGFOg0H5w="
+    "version": "10.0.1",
+    "hash": "sha256-fg806DoQzCBU9O6O9WId9he+Jk64YfaUIJfNAT9PXx8="
  },
  {
    "pname": "Newtonsoft.Json",
@@ -111,8 +111,8 @@
  },
  {
    "pname": "NLog",
-    "version": "6.0.6",
-    "hash": "sha256-vLtwZ32e1GWB93SGwmDAdUogQOf/5GuIcovO9Pn6qj8="
+    "version": "6.0.7",
+    "hash": "sha256-Le6ocjCN29rtgRiAroVfjUbMXCrjk0pSv2GEtZZy0qU="
  },
  {
    "pname": "runtime.any.System.Runtime",
@@ -181,8 +181,8 @@
  },
  {
    "pname": "System.CodeDom",
-    "version": "10.0.0",
-    "hash": "sha256-ffMXe35XVE49Gd6bbz2QRmTkCDeTuSnGYfKTZ6/MtS8="
+    "version": "10.0.1",
+    "hash": "sha256-ilpU2rkTepWP0e+DF4rEZJgz2UcNGrcTElGo4IGDTmM="
  },
  {
    "pname": "System.CodeDom",
@@ -231,8 +231,8 @@
  },
  {
    "pname": "System.Drawing.Common",
-    "version": "10.0.0",
-    "hash": "sha256-ZFneSifHbDj3O+IbwHSSs5YpDEunTeu9Hnz9APZKOA8="
+    "version": "10.0.1",
+    "hash": "sha256-tM5Cc45MJiR58yTSvcsC8oQ0xXSO4zIuKpCP/ozqFjw="
  },
  {
    "pname": "System.Drawing.Common",
@@ -241,13 +241,13 @@
  },
  {
    "pname": "System.IO.Pipelines",
-    "version": "10.0.0",
-    "hash": "sha256-0aeIxLFEBn9BoCa93UVNikdlqgPl3B1nmYCLQ9Yu9Ak="
+    "version": "10.0.1",
+    "hash": "sha256-3NHQjvO1mSPo8Hq9vMM5QeKJeS9/y3UpznideAf5pJA="
  },
  {
    "pname": "System.Management",
-    "version": "10.0.0",
-    "hash": "sha256-Nh3KOlsv6AxGkrWiHhuuTbRuIi2tp13NrbBwgQgKuSg="
+    "version": "10.0.1",
+    "hash": "sha256-CxFR8FycstzLJvNzbAcrO9CVftIAb3o6RekAEZgZqRE="
  },
  {
    "pname": "System.Memory",
@@ -326,13 +326,13 @@
  },
  {
    "pname": "System.Text.Encodings.Web",
-    "version": "10.0.0",
-    "hash": "sha256-OrsgqAPfEjjo+CzzrAzkKTXNv3VXw2dm3Wpn+uRHCM8="
+    "version": "10.0.1",
+    "hash": "sha256-dBN9Rpe+J1F8/cdzwNxLHYiqvzgSX1r9128YXyb2DKM="
  },
  {
    "pname": "System.Text.Json",
-    "version": "10.0.0",
-    "hash": "sha256-ZyAMIT3yQDJazYAObAlXmScGshGD9MVZgYmLqHyICq0="
+    "version": "10.0.1",
+    "hash": "sha256-WfSgOpRL4DKfIry/H+eHxJHHrj6ENZ3+P6Q2ol3R2XM="
  },
  {
    "pname": "System.Text.RegularExpressions",
@@ -16,18 +16,18 @@ let
 in
 buildNpmPackage (finalAttrs: {
  pname = "vrcx";
-  version = "2025.12.06";
+  version = "2026.01.04";

  src = fetchFromGitHub {
    repo = "VRCX";
    owner = "vrcx-team";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-eyw8zFtKVR85ao1/gO8qJOF5VcBkZd7L5AB1JB8qAv0=";
+    hash = "sha256-ibsmlNfW64mzJOhIkJydpJ9ys2PbPfyj2XBGwY5xuww=";
  };

  makeCacheWritable = true;
  npmFlags = [ "--ignore-scripts" ];
-  npmDepsHash = "sha256-WHxrIzZLktU6Jd6wm5VeGnZAbNT3pkNfqcxE6tdBoq8=";
+  npmDepsHash = "sha256-TUdzrEa2dW4rKA/9HGgF6c9JTMiBmNWvc/9R0kIKSls=";

  nativeBuildInputs = [
    makeWrapper
@@ -1,83 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Hana Kretzer <hanakretzer@gmail.com>
-#
-# SPDX-License-Identifier: MIT
-{
-  alsa-lib,
-  cargo-tauri,
-  fetchFromGitHub,
-  fetchNpmDeps,
-  gdk-pixbuf,
-  glib,
-  lib,
-  librsvg,
-  nodejs,
-  npmHooks,
-  openssl,
-  pkg-config,
-  pulseaudio,
-  rustPlatform,
-  webkitgtk_4_1,
-  wrapGAppsHook4,
-}:
-rustPlatform.buildRustPackage rec {
-  pname = "wayvr-dashboard";
-  version = "0.3.5";
-
-  src = fetchFromGitHub {
-    owner = "olekolek1000";
-    repo = "wayvr-dashboard";
-    tag = version;
-    hash = "sha256-C23O9EFOpGwamJuKjluBAMFF7YaNDqd61JVDkWyoy+E=";
-  };
-
-  cargoHash = "sha256-aljJ+N47rFSMAxdW4plqhHggLYHD+sJNUCcG/tWzUxU=";
-
-  npmDeps = fetchNpmDeps {
-    inherit src;
-    hash = "sha256-kyb4xzBkNTCIzOEUTuPeESDOAqfWseoouUkZjqI/NhQ=";
-  };
-
-  nativeBuildInputs = [
-    cargo-tauri.hook
-    nodejs
-    npmHooks.npmConfigHook
-    pkg-config
-    wrapGAppsHook4
-  ];
-
-  buildInputs = [
-    alsa-lib
-    gdk-pixbuf
-    glib
-    librsvg
-    openssl
-    webkitgtk_4_1
-  ];
-
-  preBuild = ''
-    # using sass-embedded fails at executing node_modules/sass-embedded-linux-x64/dart-sass/src/dart
-    rm -r node_modules/sass-embedded*
-  '';
-
-  postInstall = ''
-    gappsWrapperArgs+=(
-      --prefix PATH : "${lib.makeBinPath [ pulseaudio ]}}"
-    )
-    install -Dm644 wayvr-dashboard.svg $out/share/icons/hicolor/scalable/apps/wayvr-dashboard.svg
-  '';
-
-  cargoRoot = "src-tauri";
-  buildAndTestSubdir = cargoRoot;
-
-  meta = {
-    description = "Work-in-progress overlay application for launching various applications and games directly into a VR desktop environment";
-    homepage = "https://github.com/olekolek1000/wayvr-dashboard";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [
-      nanoyaki
-      Scrumplex
-    ];
-    platforms = lib.platforms.linux;
-    mainProgram = "wayvr-dashboard";
-  };
-}
@@ -0,0 +1,96 @@
+{
+  alsa-lib,
+  dbus,
+  fetchFromGitHub,
+  lib,
+  libX11,
+  libXext,
+  libXrandr,
+  libxcb,
+  libxkbcommon,
+  nix-update-script,
+  openssl,
+  openvr,
+  openxr-loader,
+  pipewire,
+  pkg-config,
+  procps,
+  pulseaudio,
+  rustPlatform,
+  shaderc,
+  stdenv,
+  testers,
+  wayvr,
+  withOpenVR ? !stdenv.hostPlatform.isAarch64,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "wayvr";
+  version = "26.1.2";
+
+  src = fetchFromGitHub {
+    owner = "wlx-team";
+    repo = "wayvr";
+    tag = "v${version}";
+    hash = "sha256-UZ5zcalez6B+212OqCaEXSoRfhaExuy0W8HX8b4flSU=";
+  };
+
+  cargoHash = "sha256-zqB2ybdpQEGdlkNin6mlUfaVRkpOtFl2CVCLAdKDMoQ=";
+
+  nativeBuildInputs = [
+    pkg-config
+    rustPlatform.bindgenHook
+  ];
+
+  buildInputs = [
+    alsa-lib
+    dbus
+    libX11
+    libXext
+    libXrandr
+    libxcb
+    libxkbcommon
+    openssl
+    openxr-loader
+    pipewire
+  ]
+  ++ lib.optionals withOpenVR [ openvr ];
+
+  env.SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib";
+
+  postPatch = ''
+    substituteAllInPlace dash-frontend/src/util/pactl_wrapper.rs \
+      --replace-fail '"pactl"' '"${lib.getExe' pulseaudio "pactl"}"'
+
+    # steam_utils also calls xdg-open as well as steam. Those should probably be pulled from the environment
+    substituteInPlace dash-frontend/src/util/steam_utils.rs \
+      --replace-fail '"pkill"' '"${lib.getExe' procps "pkill"}"'
+  '';
+
+  buildNoDefaultFeatures = true;
+  buildFeatures = [
+    "openxr"
+    "osc"
+    "x11"
+    "wayland"
+  ]
+  ++ lib.optionals withOpenVR [ "openvr" ];
+
+  passthru = {
+    tests.testVersion = testers.testVersion { package = wayvr; };
+
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Your way to enjoy VR on Linux! Access your Wayland/X11 desktop from SteamVR/Monado (OpenVR+OpenXR support)";
+    homepage = "https://github.com/wlx-team/wayvr";
+    license = with lib.licenses; [
+      gpl3Only
+      mit # wayvr-ipc
+    ];
+    maintainers = with lib.maintainers; [ Scrumplex ];
+    platforms = lib.platforms.linux;
+    broken = stdenv.hostPlatform.isAarch64 && withOpenVR;
+    mainProgram = "wayvr";
+  };
+}
@@ -1,106 +0,0 @@
-{
-  alsa-lib,
-  dbus,
-  fetchFromGitHub,
-  fontconfig,
-  lib,
-  libGL,
-  libX11,
-  libxcb,
-  libXext,
-  libXrandr,
-  libxkbcommon,
-  makeWrapper,
-  nix-update-script,
-  openvr,
-  openxr-loader,
-  pipewire,
-  pkg-config,
-  pulseaudio,
-  rustPlatform,
-  shaderc,
-  stdenv,
-  testers,
-  wayland,
-  wlx-overlay-s,
-  # openvr support is broken on aarch64-linux
-  withOpenVr ? !stdenv.hostPlatform.isAarch64,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "wlx-overlay-s";
-  version = "25.4.2";
-
-  src = fetchFromGitHub {
-    owner = "galister";
-    repo = "wlx-overlay-s";
-    rev = "v${version}";
-    hash = "sha256-lWUfhiHRxu72p9ZG2f2fZH6WZECm/fOKcK05MLZV+MI=";
-  };
-
-  cargoHash = "sha256-em5sWSty2/pZp2jTwBnLUIBgPOcoMpwELwj984XYf+k=";
-
-  # explicitly only add openvr if withOpenVr is set to true.
-  buildNoDefaultFeatures = true;
-  buildFeatures = [
-    "openxr"
-    "osc"
-    "x11"
-    "wayland"
-    "wayvr"
-  ]
-  ++ lib.optional withOpenVr "openvr";
-
-  nativeBuildInputs = [
-    makeWrapper
-    pkg-config
-    rustPlatform.bindgenHook
-  ];
-
-  buildInputs = [
-    alsa-lib
-    dbus
-    fontconfig
-    libGL
-    libX11
-    libxcb
-    libXext
-    libXrandr
-    libxkbcommon
-    openxr-loader
-    pipewire
-    wayland
-  ]
-  ++ lib.optional withOpenVr openvr;
-
-  env.SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib";
-
-  postPatch = ''
-    substituteAllInPlace src/res/watch.yaml \
-      --replace '"pactl"' '"${lib.getExe' pulseaudio "pactl"}"'
-    substituteInPlace wlx-overlay-s.desktop \
-      --replace 'Categories=Utility;' 'Categories=Utility;X-WiVRn-VR;'
-
-    # TODO: src/res/keyboard.yaml references 'whisper_stt'
-  '';
-  postInstall = ''
-    install -Dm644 wlx-overlay-s.desktop $out/share/applications/wlx-overlay-s.desktop
-    install -Dm644 wlx-overlay-s.svg $out/share/icons/hicolor/scalable/apps/wlx-overlay-s.svg
-  '';
-
-  passthru = {
-    tests.testVersion = testers.testVersion { package = wlx-overlay-s; };
-
-    updateScript = nix-update-script { };
-  };
-
-  meta = {
-    description = "Wayland/X11 desktop overlay for SteamVR and OpenXR, Vulkan edition";
-    homepage = "https://github.com/galister/wlx-overlay-s";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ Scrumplex ];
-    platforms = lib.platforms.linux;
-    broken = stdenv.hostPlatform.isAarch64 && withOpenVr;
-    mainProgram = "wlx-overlay-s";
-  };
-}
@@ -9,6 +9,7 @@
  harfbuzz,
  libheif,
  nixosTests,
+  optipng,
  x265,
  libde265,
  icu,
@@ -119,7 +120,9 @@ let
  qmakeFlags = [ ];
  dontStrip = false;

-  # Revisions that correspond to onlyoffice-documentserver 9.2.1
+  # x2t is not 'directly' versioned, so we version it after the version
+  # of documentserver it's pulled into as a submodule
+  version = "9.2.1";
  core-rev = "a22f0bfb6032e91f218951ef1c0fc29f6d1ceb36";
  core = fetchFromGitHub {
    owner = "ONLYOFFICE";
@@ -155,14 +158,23 @@ let
      autoconf
      automake
      grunt-cli
+      optipng
    ];

    dontNpmBuild = true;

+    preBuild = ''
+      export PRODUCT_VERSION=${version}
+    '';
+
    postBuild = ''
      chmod u+w ..
      mkdir ../deploy
      chmod u+w -R ../apps
+
+      mkdir -p ./node_modules/optipng-bin/vendor
+      ln -s ${optipng}/bin/optipng ./node_modules/optipng-bin/vendor/optipng
+
      grunt --force
    '';

@@ -171,6 +183,11 @@ let

      cp -r ../deploy/web-apps $out

+      ## see usr/bin/documentserver-flush-cache.sh
+      chmod u+w $out/apps/api/documents
+      substituteInPlace $out/apps/api/documents/api.js \
+        --replace-fail '{{HASH_POSTFIX}}' "$(basename $out | cut -d '-' -f 1)"
+
      runHook postInstall
    '';
  });
@@ -719,6 +736,32 @@ let
      runHook postInstall
    '';
  };
+  allthemesgen = buildCoreComponent "DesktopEditor/allthemesgen" {
+    buildInputs = [
+      unicodeConverter
+      kernel
+      graphics
+      network
+      doctrenderer
+      docxrenderer
+      pdffile
+      xpsfile
+      djvufile
+    ];
+    qmakeFlags = qmakeFlags ++ icuQmakeFlags;
+    preConfigure = ''
+      source ${fixIcu}
+    '';
+    dontStrip = true;
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out/bin
+      cp $BUILDRT/build/bin/*/* $BUILDRT/build/bin/*/*/* $out/bin
+
+      runHook postInstall
+    '';
+  };
  core-fonts = fetchFromGitHub {
    owner = "ONLYOFFICE";
    repo = "core-fonts";
@@ -741,9 +784,7 @@ let
 in
 buildCoreComponent "X2tConverter/build/Qt" {
  pname = "x2t";
-  # x2t is not 'directly' versioned, so we version it after the version
-  # of documentserver it's pulled into as a submodule
-  version = "9.2.1";
+  inherit version;

  buildInputs = [
    unicodeConverter
@@ -794,7 +835,7 @@ buildCoreComponent "X2tConverter/build/Qt" {
    mkdir -p $out/bin
    find $BUILDRT/build -type f -exec cp {} $out/bin \;

-    mkdir -p $out/etc
+    mkdir $out/etc
    cat >$out/etc/DoctRenderer.config <<EOF
          <Settings>
            <file>${sdkjs}/common/Native/native.js</file>
@@ -806,6 +847,11 @@ buildCoreComponent "X2tConverter/build/Qt" {
          </Settings>
    EOF

+    # TODO when allthemesgen invokes x2t as the converter, it
+    # hard-codes expecting DoctRenderer.config in the same dir
+    # the x2t binary is located:
+    ln -s $out/etc/DoctRenderer.config $out/bin/DoctRenderer.config
+
    runHook postInstall
  '';
  passthru.tests = {
@@ -824,7 +870,9 @@ buildCoreComponent "X2tConverter/build/Qt" {
  passthru.components = {
    inherit
      allfontsgen
+      allthemesgen
      allfonts
+      core-fonts
      unicodeConverter
      kernel
      graphics
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
    description = "XSnow for Wayland";
    homepage = "https://github.com/DarkVanityOfLight/ZSnoW";
    license = lib.licenses.cc-by-nc-sa-40;
-    maintainers = [ lib.maintainers.adamperkowski ];
+    maintainers = [ lib.maintainers.koi ];
    platforms = lib.platforms.linux;
    mainProgram = "zsnow";
  };
@@ -99,6 +99,15 @@ let
    "character" = [ "field" ];
    "all" = [ "character" ];
  };
+  meta = {
+    homepage = "https://math-comp.github.io/";
+    license = lib.licenses.cecill-b;
+    maintainers = with lib.maintainers; [
+      vbgl
+      jwiegley
+      cohencyril
+    ];
+  };

  mathcomp_ =
    package:
@@ -121,6 +130,7 @@ let
            releaseRev
            repo
            owner
+            meta
            ;

          mlPlugin = lib.versions.isLe "8.6" coq.coq-version;
@@ -147,16 +157,6 @@ let
            cd ${pkgpath} || cd ssreflect  # before 2.5, boot didn't exist, make it behave as ssreflect
          ''
          + lib.optionalString (package == "all") pkgallMake;
-
-          meta = {
-            homepage = "https://math-comp.github.io/";
-            license = lib.licenses.cecill-b;
-            maintainers = with lib.maintainers; [
-              vbgl
-              jwiegley
-              cohencyril
-            ];
-          };
        }
        // lib.optionalAttrs (package != "single") { passthru = lib.mapAttrs (p: _: mathcomp_ p) packages; }
        // lib.optionalAttrs withDoc {
@@ -244,4 +244,40 @@ let
    in
    patched-derivation5;
 in
-mathcomp_ (if single then "single" else "all")
+# this is just a wrapper for rocqPackages.mathcomp for Rocq >= 9.0
+if coq.rocqPackages ? mathcomp && version != "2.3.0" && version != "2.4.0" then
+  let
+    mc = coq.rocqPackages.mathcomp.override {
+      inherit version withDoc single;
+      inherit
+        ncurses
+        graphviz
+        lua
+        fetchzip
+        hierarchy-builder
+        ;
+      inherit (coq.rocqPackages) rocq-core;
+    };
+  in
+  mc
+  // {
+    ssreflect = mkCoqDerivation {
+      inherit
+        version
+        defaultVersion
+        release
+        releaseRev
+        repo
+        owner
+        meta
+        ;
+      pname = "mathcomp-ssreflect";
+      propagatedBuildInputs = [
+        mc.boot
+        mc.order
+      ];
+      preBuild = "cd ssreflect";
+    };
+  }
+else
+  mathcomp_ (if single then "single" else "all")
@@ -13,22 +13,15 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "wayqt";
-  version = "0.3.0";
+  version = "0.3.0-unstable-2026-01-05";

  src = fetchFromGitLab {
    owner = "desktop-frameworks";
    repo = "wayqt";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-FPyHm96LYCTqMZlPrZoSPMeyocDjaCnaYJETH/nazBU=";
+    rev = "2750cd93a3110bff6345f9e2a1a3090a3e3f7203";
+    hash = "sha256-WGIZ3OgeGkQWEzc/m0/Moo9Qgr3vg4dFfQhba2vx0do=";
  };

-  patches = [
-    # qmake get qtbase's path, but wayqt need qtwayland
-    (replaceVars ./fix-qtwayland-header-path.diff {
-      qtWaylandPath = "${qtwayland}/include";
-    })
-  ];
-
  nativeBuildInputs = [
    meson
    pkg-config
@@ -1,16 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 5c09644..fc65d37 100644
--- a/meson.build
-+++ b/meson.build
-@@ -39,9 +39,8 @@ elif get_option('use_qt_version') == 'qt6'
- 		private_headers: [ 'Gui', 'WaylandClient', 'WaylandGlobalPrivate' ],
- 	)
- 
-	qmake = find_program( [ 'qmake-qt6', 'qmake6' ], required: true )
-	ret = run_command( qmake, '-query', 'QT_INSTALL_HEADERS', check: true )
-	QtHeaderPath = ret.stdout().strip()
-+	qmake = find_program( [ 'qmake-qt6', 'qmake6' ], required: false )
-+	QtHeaderPath = '@qtWaylandPath@'
- 
- 	QtGlobal = '@0@/QtWaylandGlobal/@1@'.format( QtHeaderPath, QtDeps.version() )
- 
@@ -11,86 +11,67 @@
 }:

 let
-  defaultStdenv = stdenv;
-  params =
-    let
-      mkNewParam =
-        {
-          version,
-          sha256,
-          rev ? version,
-          stdenv ? defaultStdenv,
-        }:
-        {
-          inherit stdenv version;
-          src = fetchzip {
-            url = "https://github.com/garrigue/labltk/archive/${rev}.tar.gz";
-            inherit sha256;
-          };
-        };
-    in
-    rec {
-      "4.06" = mkNewParam {
-        version = "8.06.4";
-        rev = "labltk-8.06.4";
-        sha256 = "03xwnnnahb2rf4siymzqyqy8zgrx3h26qxjgbp5dh1wdl7n02c7g";
-        stdenv = gcc13Stdenv;
-      };
-      "4.07" = mkNewParam {
-        version = "8.06.5";
-        rev = "1b71e2c6f3ae6847d3d5e79bf099deb7330fb419";
-        sha256 = "02vchmrm3izrk7daldd22harhgrjhmbw6i1pqw6hmfmrmrypypg2";
-        stdenv = gcc13Stdenv;
-      };
-      _8_06_7 = mkNewParam {
-        version = "8.06.7";
-        sha256 = "1cqnxjv2dvw9csiz4iqqyx6rck04jgylpglk8f69kgybf7k7xk2h";
-        stdenv = gcc13Stdenv;
-      };
-      "4.08" = _8_06_7;
-      "4.09" = _8_06_7;
-      "4.10" = mkNewParam {
-        version = "8.06.8";
-        sha256 = "0lfjc7lscq81ibqb3fcybdzs2r1i2xl7rsgi7linq46a0pcpkinw";
-      };
-      "4.11" = mkNewParam {
-        version = "8.06.9";
-        sha256 = "1k42k3bjkf22gk39lwwzqzfhgjyhxnclslldrzpg5qy1829pbnc0";
-      };
-      "4.12" = mkNewParam {
-        version = "8.06.10";
-        sha256 = "06cck7wijq4zdshzhxm6jyl8k3j0zglj2axsyfk6q1sq754zyf4a";
-      };
-      "4.13" = mkNewParam {
-        version = "8.06.11";
-        sha256 = "1zjpg9jvs6i9jvbgn6zgispwqiv8rxvaszxcx9ha9fax3wzhv9qy";
-      };
-      "4.14" = mkNewParam {
-        version = "8.06.12";
-        sha256 = "sha256:17fmb13l18isgwr38hg9r5a0nayf2hhw6acj5153cy1sygsdg3b5";
-      };
-      "5.0" = mkNewParam {
-        version = "8.06.13";
-        sha256 = "sha256-Vpf13g3DEWlUI5aypiowGp2fkQPK0cOGv2XiRUY/Ip4=";
-      };
-      "5.2" = mkNewParam {
-        version = "8.06.14";
-        sha256 = "sha256-eVSQetk+i3KObjHfsvnD615cIsq3aZ7IxycX42cuPIU=";
-      };
-      "5.3" = mkNewParam {
-        version = "8.06.15";
-        sha256 = "sha256-I/y5qr5sasCtlrwxL/Lex79rg0o4tzDMBmQY7MdpU2w=";
-      };
+  params = {
+    "4.09" = {
+      version = "8.06.7";
+      sha256 = "1cqnxjv2dvw9csiz4iqqyx6rck04jgylpglk8f69kgybf7k7xk2h";
+      stdenv = gcc13Stdenv;
    };
-  param =
-    params.${lib.versions.majorMinor ocaml.version}
-    or (throw "labltk is not available for OCaml ${ocaml.version}");
+    "4.10" = {
+      version = "8.06.8";
+      sha256 = "0lfjc7lscq81ibqb3fcybdzs2r1i2xl7rsgi7linq46a0pcpkinw";
+      stdenv = gcc13Stdenv;
+    };
+    "4.11" = {
+      version = "8.06.9";
+      sha256 = "1k42k3bjkf22gk39lwwzqzfhgjyhxnclslldrzpg5qy1829pbnc0";
+      stdenv = gcc13Stdenv;
+    };
+    "4.12" = {
+      version = "8.06.10";
+      sha256 = "06cck7wijq4zdshzhxm6jyl8k3j0zglj2axsyfk6q1sq754zyf4a";
+    };
+    "4.13" = {
+      version = "8.06.11";
+      sha256 = "1zjpg9jvs6i9jvbgn6zgispwqiv8rxvaszxcx9ha9fax3wzhv9qy";
+    };
+    "4.14" = {
+      version = "8.06.12";
+      sha256 = "sha256:17fmb13l18isgwr38hg9r5a0nayf2hhw6acj5153cy1sygsdg3b5";
+    };
+    "5.0" = {
+      version = "8.06.13";
+      sha256 = "sha256-Vpf13g3DEWlUI5aypiowGp2fkQPK0cOGv2XiRUY/Ip4=";
+    };
+    "5.2" = {
+      version = "8.06.14";
+      sha256 = "sha256-eVSQetk+i3KObjHfsvnD615cIsq3aZ7IxycX42cuPIU=";
+    };
+    "5.3" = {
+      version = "8.06.15";
+      sha256 = "sha256-I/y5qr5sasCtlrwxL/Lex79rg0o4tzDMBmQY7MdpU2w=";
+    };
+  };
+  param = {
+    inherit stdenv;
+    # Dummy version to let the `meta` attribute set evaluate
+    version = "";
+    sha256 = lib.fakeSha256;
+  }
+  // (params."${lib.versions.majorMinor ocaml.version}" or {
+  }
+  );
 in

 param.stdenv.mkDerivation {
-  inherit (param) version src;
+  inherit (param) version;
  pname = "ocaml${ocaml.version}-labltk";

+  src = fetchzip {
+    url = "https://github.com/garrigue/labltk/archive/${param.version}.tar.gz";
+    inherit (param) sha256;
+  };
+
  strictDeps = true;

  nativeBuildInputs = [
@@ -9,35 +9,32 @@
  visitors,
 }:

-lib.throwIf (lib.versionAtLeast ocaml.version "5.4")
-  "morbig is not available for OCaml ${ocaml.version}"
+buildDunePackage rec {
+  pname = "morbig";
+  version = "0.11.0";

-  buildDunePackage
-  rec {
-    pname = "morbig";
-    version = "0.11.0";
+  src = fetchFromGitHub {
+    owner = "colis-anr";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-fOBaJHHP/Imi9UDLflI52OdKDcmMxpl+NH3pfofmv/o=";
+  };

-    src = fetchFromGitHub {
-      owner = "colis-anr";
-      repo = pname;
-      rev = "v${version}";
-      hash = "sha256-fOBaJHHP/Imi9UDLflI52OdKDcmMxpl+NH3pfofmv/o=";
-    };
+  nativeBuildInputs = [
+    menhir
+  ];

-    nativeBuildInputs = [
-      menhir
-    ];
+  propagatedBuildInputs = [
+    menhirLib
+    ppx_deriving_yojson
+    visitors
+  ];

-    propagatedBuildInputs = [
-      menhirLib
-      ppx_deriving_yojson
-      visitors
-    ];
-
-    meta = {
-      homepage = "https://github.com/colis-anr/${pname}";
-      description = "Static parser for POSIX Shell";
-      license = lib.licenses.gpl3Plus;
-      maintainers = with lib.maintainers; [ niols ];
-    };
-  }
+  meta = {
+    homepage = "https://github.com/colis-anr/${pname}";
+    description = "Static parser for POSIX Shell";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ niols ];
+    broken = lib.versionAtLeast ocaml.version "5.4";
+  };
+}
@@ -16,14 +16,14 @@

 buildPythonPackage rec {
  pname = "aiohomematic";
-  version = "2026.1.20";
+  version = "2026.1.27";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "SukramJ";
    repo = "aiohomematic";
    tag = version;
-    hash = "sha256-kMDkNd7Rm2MbGn//BOScZ3UhyO3142w6260+sMU4EUs=";
+    hash = "sha256-KS4mSmu0JY+X5pVrE4IvNjowrgq3CRww1mMmKR0Bedk=";
  };

  build-system = [ setuptools ];
@@ -1,19 +1,22 @@
 {
  buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
  lib,
  pytestCheckHook,
+  pythonAtLeast,
  setuptools,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "anyconfig";
  version = "0.14.0";
  format = "setuptools";

-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-LN9Ur12ujpF0Pe2CxU7Z2Krvo6lyL11F6bX3S2A+AU0=";
+  src = fetchFromGitHub {
+    owner = "ssato";
+    repo = "python-anyconfig";
+    tag = "RELEASE_${finalAttrs.version}";
+    hash = "sha256-ngXj/KzErz81T09j6tlV9OYDX3DqW5I8xo/ulLNokpQ=";
  };

  postPatch = ''
@@ -27,6 +30,11 @@ buildPythonPackage rec {
  disabledTests = [
    # OSError: /build/anyconfig-0.12.0/tests/res/cli/no_template/10/e/10.* should exists but not
    "test_runs_for_datasets"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.14") [
+    # Python 3.14: output format has changed
+    "test_dumps"
+    "test_dump"
  ];

  disabledTestPaths = [
@@ -44,4 +52,4 @@ buildPythonPackage rec {
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ tboerger ];
  };
-}
+})
@@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "backports-zstd";
-  version = "1.2.0";
+  version = "1.3.0";
  pyproject = true;

  src = fetchFromGitHub {
@@ -20,7 +20,7 @@ buildPythonPackage rec {
    postFetch = ''
      rm -r "$out/src/c/zstd"
    '';
-    hash = "sha256-qKobd0TSdZhaBJlitWkRF4zj3Td8fk97GhXp2gZM1Ic=";
+    hash = "sha256-AF2Id4U2++RMCFICxz0E3DrgEVgGNsph4sIZ9YC87fE=";
  };

  postPatch = ''
@@ -7,6 +7,7 @@
  setuptools,
  setuptools-scm,
  pytestCheckHook,
+  pythonAtLeast,
 }:

 buildPythonPackage rec {
@@ -33,6 +34,11 @@ buildPythonPackage rec {

  nativeCheckInputs = [ pytestCheckHook ];

+  disabledTests = lib.optionals (pythonAtLeast "3.14") [
+    # https://github.com/fox-it/dissect.evidence/issues/46
+    "test_ewf"
+  ];
+
  pythonImportsCheck = [ "dissect.evidence" ];

  meta = {
--- a/Show More
+++ b/Show More