Merge staging-next into staging

2026-01-04 18:06:30 +00:00
parent ecf227788a 432065c140
commit 9d15e532a5
122 changed files with 1319 additions and 1748 deletions
@@ -18,6 +18,8 @@
  adding `pkg-config`, `xfce4-dev-tools`, and `wrapGAppsHook3` to your `nativeBuildInputs` and
  `--enable-maintainer-mode` to your `configureFlags`.

+- `cargo-codspeed` has been updated from `3.0.5` to `4.2.0`. Version `4.0.0` includes breaking changes. For more information read the [changelog for 4.0.0](https://github.com/CodSpeedHQ/codspeed-rust/releases/tag/v4.0.0).
+
 - `corepack_latest` has been removed, as Corepack is no longer distributed with Node.js.

 - `spoof` has been removed, as there are many issues upstream with it working on modern OS versions, and it appears to be unmaintained.
@@ -87,6 +89,8 @@
  If your SQLite database is corrupted, the migration might fail and require [manual intervention](https://github.com/louislam/uptime-kuma/issues/5281).
  See the [migration guide](https://github.com/louislam/uptime-kuma/wiki/Migration-From-v1-To-v2) for more information.

+- Switch inhibitors were introduced, which add a pre-switch check that compares a list of strings between the previous and the new generation, and refuses to switch into the new generation when there is a difference between the two lists. This allows to avoid switching into a system when for instance the systemd version changed by adding `config.systemd.package.version` to the switch inhibitors for your system. You can still forcefully switch into any generation by setting `NIXOS_NO_CHECK=1`.
+
 - The `services.nextcloud-spreed-signaling` NixOS module has been added to facilitate declarative management of a standalone Spreed signaling server ("High Performance Backend" for Nextcloud Talk).

 - `fetchPnpmDeps` and `pnpmConfigHook` were added as top-level attributes, replacing the now deprecated `pnpm.fetchDeps` and `pnpm.configHook` attributes.
@@ -140,6 +140,12 @@
    github = "0xd61";
    githubId = 8351869;
  };
+  _0xMillyByte = {
+    email = "emilia.daelman@gmail.com";
+    name = "Emilia Daelman";
+    github = "0xMillyByte";
+    githubId = 48217459;
+  };
  _0xMRTT = {
    email = "0xMRTT@proton.me";
    name = "0xMRTT";
@@ -16660,6 +16666,12 @@
    githubId = 396449;
    name = "Brandon Edens";
  };
+  mbinns = {
+    email = "mack@yourdata.rip";
+    github = "mbinns";
+    githubId = 14008591;
+    name = "Mack Binns";
+  };
  mbode = {
    email = "maxbode@gmail.com";
    github = "mbode";
@@ -19611,6 +19623,12 @@
    githubId = 14004859;
    name = "Ole Mussmann";
  };
+  olillin = {
+    email = "oli@olillin.com";
+    github = "olillin";
+    githubId = 55047947;
+    name = "Oli";
+  };
  oliver-koss = {
    email = "oliver.koss06@gmail.com";
    github = "oliver-koss";
@@ -0,0 +1,50 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.programs.mangowc;
+in
+{
+  options.programs.mangowc = {
+    enable = lib.mkEnableOption "MangoWC, a Wayland compositor based on dwl and scenefx";
+
+    package = lib.mkPackageOption pkgs "mangowc" {
+      default = [ "mangowc" ];
+      example = "pkgs.mangowc.override { enableXWayland = false; }";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = [ cfg.package ];
+
+    # Necessary Wayland plumbing
+    xdg.portal = {
+      enable = true;
+
+      extraPortals = with pkgs; [
+        xdg-desktop-portal-wlr
+        xdg-desktop-portal-gtk
+      ];
+
+      config.mango = {
+        default = [
+          "gtk"
+        ];
+
+        "org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
+        "org.freedesktop.impl.portal.ScreenCast" = [ "wlr" ];
+        "org.freedesktop.impl.portal.ScreenShot" = [ "wlr" ];
+
+        # wlr does not have this interface, let gtk handle
+        "org.freedesktop.impl.portal.Inhibit" = [ "gtk" ];
+      };
+    };
+
+    # Set up the session for Display Managers (GDM, SDDM, etc.)
+    services.displayManager.sessionPackages = [ cfg.package ];
+  };
+}
@@ -174,10 +174,6 @@ in
        permissions = "u+rx,g+rx,o-rx";
      };

-      system.switch.inhibitors = [
-        cfg.dbusPackage
-      ];
-
      systemd.services.dbus = {
        aliases = [
          # hack aiding to prevent dbus from restarting when switching from dbus-broker back to dbus
@@ -216,10 +212,6 @@ in
        cfg.brokerPackage
      ];

-      system.switch.inhibitors = [
-        cfg.brokerPackage
-      ];
-
      # Just to be sure we don't restart through the unit alias
      systemd.services.dbus.reloadIfChanged = true;
      systemd.user.services.dbus.reloadIfChanged = true;
@@ -567,10 +567,6 @@ in
      );
    };

-    system.switch.inhibitors = [
-      cfg.package
-    ];
-
    environment.systemPackages = [ cfg.package ];

    environment.etc =
@@ -30,9 +30,10 @@
  builderKeys ? [
    "152812300785C96444D3334D17565732E08E5E41" # achow101.gpg
    "9EDAFF80E080659604F4A76B2EBB056FD847F8A7" # Emzy.gpg
-    "71A3B16735405025D447E8F274810B012346C9A6" # laanwj.gpg
-    "6B002C6EA3F91B1B0DF0C9BC8F617F1200A6D25C" # glozow.gpg
+    # "6B002C6EA3F91B1B0DF0C9BC8F617F1200A6D25C" # glozow.gpg (not signed 30.1)
    "D1DBF2C4B96F2DEBF4C16654410108112E7EA81F" # hebasto.gpg
+    "71A3B16735405025D447E8F274810B012346C9A6" # laanwj.gpg
+    "67AA5B46E7AF78053167FE343B8F814A784218F8" # willcl-ark.gpg
  ],
 }:

@@ -45,14 +46,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = if withGui then "bitcoin" else "bitcoind";
-  version = "30.0";
+  version = "30.1";

  src = fetchurl {
    urls = [
      "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/bitcoin-${finalAttrs.version}.tar.gz"
    ];
    # hash retrieved from signed SHA256SUMS
-    sha256 = "9b472a4d51dfed9aa9d0ded2cb8c7bcb9267f8439a23a98f36eb509c1a5e6974";
+    sha256 = "5d5518782c3000f64717ec1b4291e7e609a1f900d9729ee83c982243779c3f43";
  };

  nativeBuildInputs = [
@@ -86,18 +87,18 @@ stdenv.mkDerivation (finalAttrs: {
      publicKeys = fetchFromGitHub {
        owner = "bitcoin-core";
        repo = "guix.sigs";
-        rev = "a788388207bd244d5ab07b31ecd6c126f213a6c6";
-        sha256 = "sha256-gbenuEWP6pqY9ywPd/yZy6QfWI7jvSObwto27DRXjGI=";
+        rev = "8427342623f66a98e4b2503e5e15eb41485200d2";
+        sha256 = "sha256-X1mA1iPAb0OE9RNP9O5rFe9rzsui+BWQ2zMcV7SghXE=";
      };

      checksums = fetchurl {
        url = "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/SHA256SUMS";
-        hash = "sha256-v/b1wTOreKifpWkIrUEJsGaSo7LFs4pn7YgBN88dO9o=";
+        hash = "sha256-WdOYSEbxmpecFpThNwxKTNXbbwQvqlUuCxmCbhfhW6k";
      };

      signatures = fetchurl {
        url = "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/SHA256SUMS.asc";
-        hash = "sha256-MK37HyHAqp/vWLjKm/3HF0LkTXtKQwqz6cL4hY2YUPU=";
+        hash = "sha256-yFPhf/tyotBtpx1lZAQR+C2YdZaAyaWCq/0OVdP2wR4=";
      };

      verifyBuilderKeys =
@@ -3,24 +3,23 @@
  stdenv,
  fetchurl,
  fetchFromGitHub,
-  autoreconfHook,
+  cmake,
  pkg-config,
  installShellFiles,
-  util-linux,
-  hexdump,
  autoSignDarwinBinariesHook,
  wrapQtAppsHook ? null,
  boost,
  libevent,
-  miniupnpc,
  zeromq,
  zlib,
  db53,
  sqlite,
  qrencode,
+  libsystemtap,
  qtbase ? null,
  qttools ? null,
  python3,
+  versionCheckHook,
  withGui ? false,
  withWallet ? true,
 }:
@@ -32,24 +31,22 @@ let
    sha256 = "0mxwq4jvcip44a796iwz7n1ljkhl3a4p47z7qlsxcfxw3zmm0k0k";
  };
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = if withGui then "groestlcoin" else "groestlcoind";
-  version = "28.0";
+  version = "29.0";

  src = fetchFromGitHub {
    owner = "Groestlcoin";
    repo = "groestlcoin";
-    rev = "v${version}";
-    sha256 = "0kl7nq62362clgzxwwd5c256xnaar4ilxcvbralazxg47zv95r11";
+    rev = "v${finalAttrs.version}";
+    sha256 = "17b83jch717d91srw1yc93p8ndl894ld9gx916wyy6jis07px6xh";
  };

  nativeBuildInputs = [
-    autoreconfHook
+    cmake
    pkg-config
    installShellFiles
  ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ]
  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
    autoSignDarwinBinariesHook
  ]
@@ -58,10 +55,10 @@ stdenv.mkDerivation rec {
  buildInputs = [
    boost
    libevent
-    miniupnpc
    zeromq
    zlib
  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libsystemtap ]
  ++ lib.optionals withWallet [
    db53
    sqlite
@@ -73,9 +70,10 @@ stdenv.mkDerivation rec {
  ];

  postInstall = ''
-    installShellCompletion --bash contrib/completions/bash/groestlcoin-cli.bash
-    installShellCompletion --bash contrib/completions/bash/groestlcoind.bash
-    installShellCompletion --bash contrib/completions/bash/groestlcoin-tx.bash
+      cd ..
+      installShellCompletion --bash contrib/completions/bash/groestlcoin-cli.bash
+      installShellCompletion --bash contrib/completions/bash/groestlcoind.bash
+      installShellCompletion --bash contrib/completions/bash/groestlcoin-tx.bash

    for file in contrib/completions/fish/groestlcoin-*.fish; do
      installShellCompletion --fish $file
@@ -89,16 +87,16 @@ stdenv.mkDerivation rec {
    install -Dm644 share/pixmaps/groestlcoin256.png $out/share/pixmaps/groestlcoin.png
  '';

-  configureFlags = [
-    "--with-boost-libdir=${boost.out}/lib"
-    "--disable-bench"
-  ]
-  ++ lib.optionals (!withWallet) [
-    "--disable-wallet"
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_BENCH" false)
+    (lib.cmakeBool "WITH_ZMQ" true)
+    (lib.cmakeBool "WITH_USDT" (stdenv.hostPlatform.isLinux))
+    (lib.cmakeBool "ENABLE_WALLET" (!withWallet))
+    (lib.cmakeBool "BUILD_GUI" (!withGui))
+    (lib.cmakeBool "ENABLE_WALLET" false)
  ]
  ++ lib.optionals withGui [
-    "--with-gui=qt5"
-    "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
+    (lib.cmakeBool "BUILD_GUI" true)
  ];

  nativeCheckInputs = [ python3 ];
@@ -112,6 +110,15 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

+  __darwinAllowLocalNetworking = true;
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgram = "${placeholder "out"}/bin/groestlcoin-cli";
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
  meta = {
    description = "Peer-to-peer electronic cash system";
    longDescription = ''
@@ -121,9 +128,10 @@ stdenv.mkDerivation rec {
      with each other, with the help of a P2P network to check for double-spending.
    '';
    homepage = "https://groestlcoin.org/";
-    downloadPage = "https://github.com/Groestlcoin/groestlcoin/releases/tag/v${version}/";
+    downloadPage = "https://github.com/Groestlcoin/groestlcoin/releases/tag/v${finalAttrs.version}/";
+    changelog = "https://github.com/Groestlcoin/groestlcoin/blob/${finalAttrs.version}.0/doc/release-notes/release-notes-${finalAttrs.version}.0.md";
    maintainers = with lib.maintainers; [ gruve-p ];
    license = lib.licenses.mit;
    platforms = lib.platforms.unix;
  };
-}
+})
@@ -15245,6 +15245,19 @@ final: prev: {
    meta.hydraPlatforms = [ ];
  };

+  telescope-hierarchy-nvim = buildVimPlugin {
+    pname = "telescope-hierarchy.nvim";
+    version = "0-unstable-2025-12-19";
+    src = fetchFromGitHub {
+      owner = "jmacadie";
+      repo = "telescope-hierarchy.nvim";
+      rev = "85fb67112daf99f3918531558ee85a36c1891f91";
+      hash = "sha256-Ck7xM+m8sRkkviXdXpeDYrxr3MNpavkW4/UCih0Ohc8=";
+    };
+    meta.homepage = "https://github.com/jmacadie/telescope-hierarchy.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
  telescope-live-grep-args-nvim = buildVimPlugin {
    pname = "telescope-live-grep-args.nvim";
    version = "1.1.0-unstable-2025-02-24";
@@ -3487,6 +3487,13 @@ assertNoAdditions {
    dependencies = [ self.telescope-nvim ];
  };

+  telescope-hierarchy-nvim = super.telescope-hierarchy-nvim.overrideAttrs {
+    dependencies = with self; [
+      telescope-nvim
+      plenary-nvim
+    ];
+  };
+
  telescope-live-grep-args-nvim = super.telescope-live-grep-args-nvim.overrideAttrs {
    dependencies = with self; [
      plenary-nvim
@@ -1170,6 +1170,7 @@ https://github.com/nvim-telescope/telescope-fzy-native.nvim/,,
 https://github.com/Snikimonkd/telescope-git-conflicts.nvim/,HEAD,
 https://github.com/nvim-telescope/telescope-github.nvim/,,
 https://github.com/alduraibi/telescope-glyph.nvim/,HEAD,
+https://github.com/jmacadie/telescope-hierarchy.nvim/,HEAD,
 https://github.com/nvim-telescope/telescope-live-grep-args.nvim/,HEAD,
 https://github.com/gbrlsnchs/telescope-lsp-handlers.nvim/,,
 https://github.com/nvim-telescope/telescope-media-files.nvim/,HEAD,
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
  core = "pcsx-rearmed";
-  version = "0-unstable-2025-12-28";
+  version = "0-unstable-2026-01-04";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "pcsx_rearmed";
-    rev = "a2640fe1a0e21729054cdb74db8a21e4bf6dde17";
-    hash = "sha256-HzgpqgTcFT0Dz0SIn4zW4oF4FxOTYzgg1/sFi3XDwQ4=";
+    rev = "32e2193bcc9d937d9b1a16db43258aef51cddae8";
+    hash = "sha256-enq5RqeTiOLGqi+Hsj3wFZ6EUWSl0gX7u4ymznOffsQ=";
  };

  dontConfigure = true;
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
  core = "stella";
-  version = "0-unstable-2025-12-28";
+  version = "0-unstable-2026-01-01";

  src = fetchFromGitHub {
    owner = "stella-emu";
    repo = "stella";
-    rev = "7f62c3e1390f629cbd56cbb5172f7e2143b30440";
-    hash = "sha256-IMrqBu7beSuJNfl2pyzRm5yExXaMkl+si0YVDeRbAcU=";
+    rev = "6efad98f0058e803ac675ead6dbe33c054db1492";
+    hash = "sha256-iwGDxd+xrxGgLZF9896OaYMMCo573l9lbnSZgNstHOQ=";
  };

  makefile = "Makefile";
@@ -30,14 +30,14 @@
 }:

 let
-  version = "6.0.5436";
+  version = "6.0.5504";

  subsurfaceSrc = (
    fetchFromGitHub {
      owner = "Subsurface";
      repo = "subsurface";
-      rev = "2d3f73c2e1dd5d1f42419708866e40d973989d24";
-      hash = "sha256-dB7KKXbQOmyzlzAKDlFTGJDa/XIKQeKsiCt+dPeP9EU=";
+      rev = "28ad7132d2283a3fc06872de6526bc19c077d203";
+      hash = "sha256-PQwBfm4oPGLU1HRFIcbgTYOYLeVhmEBgN5U8fnUMMlQ=";
      fetchSubmodules = true;
    }
  );
@@ -85,9 +85,9 @@ rec {

  nomad_1_11 = generic {
    buildGoModule = buildGo125Module;
-    version = "1.11.0";
-    hash = "sha256-ETC9zJVup/BLivsBWVez5/OLpl7cjdlIRACVK9ga3Io=";
-    vendorHash = "sha256-WqGWEjaPicpmkARSEQ/bqw8+GSemh1fcM3pb4BGjZpU=";
+    version = "1.11.1";
+    hash = "sha256-xP3wSxDo59hme9G4+ATfGD0LTdf11+c/cSfPoKfeBLc=";
+    vendorHash = "sha256-CXWaEwJCKzggyCrHsa+PrLnQNQKI8G14uWno2NAvOwU=";
    license = lib.licenses.bsl11;
    passthru.tests.nomad = nixosTests.nomad;
    preCheck = ''
@@ -13,13 +13,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "wxmaxima";
-  version = "25.04.0";
+  version = "26.01.0";

  src = fetchFromGitHub {
    owner = "wxMaxima-developers";
    repo = "wxmaxima";
    rev = "Version-${finalAttrs.version}";
-    hash = "sha256-AEy2a8BahV1yH67RIjcsVipuo5eUZcQZxR3HygSYGlU=";
+    hash = "sha256-RoFOmBro8Oo6P3gglaz8ofkrhwxnwy6Rf0po3jOY5D4=";
  };

  buildInputs = [
@@ -1,61 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  qt6,
-  wrapQtAppsHook,
-
-  # before that => zeal
-  sqlite,
-  json_c,
-  mecab,
-  libzip,
-  mpv,
-  yt-dlp,
-  # optional
-  makeWrapper,
-}:
-stdenv.mkDerivation (finalAttrs: {
-  pname = "memento";
-  version = "1.6.0";
-
-  src = fetchFromGitHub {
-    owner = "ripose-jp";
-    repo = "Memento";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-IvzvlToSyA20FWU0x+wgE3rT0dYbuY6xyaGgz1D1f6Q=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    makeWrapper
-    wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    qt6.qtbase
-    qt6.qtsvg
-    qt6.qtwayland
-    sqlite
-    json_c
-    libzip
-    mecab
-  ];
-
-  propagatedBuildInputs = [ mpv ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/memento" \
-      --prefix PATH : "${yt-dlp}/bin" \
-  '';
-
-  meta = {
-    description = "Mpv-based video player for studying Japanese";
-    homepage = "https://ripose-jp.github.io/Memento/";
-    license = lib.licenses.gpl2;
-    maintainers = with lib.maintainers; [ teto ];
-    platforms = lib.platforms.linux;
-    mainProgram = "memento";
-  };
-})
@@ -9,13 +9,13 @@

 stdenv.mkDerivation rec {
  pname = "obs-shaderfilter";
-  version = "2.5.1";
+  version = "2.6.0";

  src = fetchFromGitHub {
    owner = "exeldro";
    repo = "obs-shaderfilter";
    rev = version;
-    sha256 = "sha256-1RRGXAzP7BIwJJMmXSknPDtHxXZex9SqDDVbWOE43Yk=";
+    sha256 = "sha256-QMN2zMhT125sQ2bFAZ5oMcqfYaRo/wwyerCqGKNCszM=";
  };

  nativeBuildInputs = [ cmake ];
@@ -7,13 +7,13 @@

 buildGoModule (finalAttrs: {
  pname = "atlantis";
-  version = "0.38.0";
+  version = "0.39.0";

  src = fetchFromGitHub {
    owner = "runatlantis";
    repo = "atlantis";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-5V+2MgVcxq3DtMkBeA64mUaSL3zYG/+c1SbChaRbQ98=";
+    hash = "sha256-/p8NfggweRHz8+BBrD/d166HJmDLkDzWloWearfqwVg=";
  };

  ldflags = [
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
    "-X=main.date=1970-01-01T00:00:00Z"
  ];

-  vendorHash = "sha256-bdZn2cNSpmV1nngQWBFkf2G0uxlJF1UX50oMZYU7+i0=";
+  vendorHash = "sha256-d137hKsd1GrVW2fXZJTUCQmOayolSjNiJNmoOtj3ZkE=";

  subPackages = [ "." ];

@@ -29,6 +29,6 @@ buildDotnetModule rec {
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ anpin ];
    mainProgram = "CredentialProvider.Microsoft";
-    platforms = [ "x86_64-linux" ];
+    platforms = lib.platforms.unix;
  };
 }
@@ -21,16 +21,16 @@ let
 in
 buildNpmPackage' rec {
  pname = "balena-cli";
-  version = "23.2.12";
+  version = "23.2.14";

  src = fetchFromGitHub {
    owner = "balena-io";
    repo = "balena-cli";
    rev = "v${version}";
-    hash = "sha256-sJ2Kf2xslaztQhhPWioGEnQZVW0pBu5apcUOQrpkr+Y=";
+    hash = "sha256-sCzb6ZGpMwG6C66hMeuYmlnEj/ZNau8UieBTfCjdbXw=";
  };

-  npmDepsHash = "sha256-RC93b6mGPqqPPs6wqNuwyf3vE8wr/uGArA3wIFh+dO8=";
+  npmDepsHash = "sha256-oq7Lcn9yrtOGbIkyWDsoqlOzt6Dj6EvKKhZKwFlSF1k=";

  makeCacheWritable = true;

@@ -108,6 +108,7 @@ buildNpmPackage' rec {

  nativeBuildInputs = [
    cargo
+    dart-sass
    jq
    makeWrapper
    napi-rs-cli
@@ -131,12 +132,7 @@ buildNpmPackage' rec {
    fi

    # force our dart-sass executable
-    substituteInPlace node_modules/sass-embedded/dist/lib/src/compiler-path.js \
-      --replace-fail "dart-sass/src/sass.snapshot" "dart-sass/src/sass.snapshot.disabled"
-
-    for f in $(find node_modules/ -name sass -type f -executable); do
-      ln -sf ${lib.getExe dart-sass} $f
-    done
+    echo "export const compilerCommand = ['dart-sass'];" > node_modules/sass-embedded/dist/lib/src/compiler-path.js

    pushd apps/desktop/desktop_native/napi
    npm run build
@@ -194,6 +194,11 @@
    "version": "2.14.1",
    "hash": "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="
  },
+  {
+    "pname": "JetBrains.Annotations.Sources",
+    "version": "2025.2.2",
+    "hash": "sha256-9Aui689O6j0E34FSwTLGEwar5etuswWg3FU7+mIzpdU="
+  },
  {
    "pname": "libsodium",
    "version": "1.0.18.2",
@@ -8,13 +8,13 @@

 buildDotnetModule rec {
  pname = "btcpayserver";
-  version = "2.2.1";
+  version = "2.3.2";

  src = fetchFromGitHub {
    owner = "btcpayserver";
    repo = "btcpayserver";
    tag = "v${version}";
-    hash = "sha256-W6344r+Doz2aiYebeY3+UkFW7dq4aH/GUGqYyxnK4II=";
+    hash = "sha256-0R39jyQaHiei8jXS8gPmkpolC2EcLusLPIMj6Q5iycE=";
  };

  projectFile = "BTCPayServer/BTCPayServer.csproj";
@@ -1,26 +1,26 @@
 {
-  lib,
-  rustPlatform,
-  fetchFromGitHub,
  curl,
-  pkg-config,
+  fetchFromGitHub,
+  lib,
  libgit2,
  openssl,
+  pkg-config,
+  rustPlatform,
  zlib,
 }:

-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cargo-codspeed";
-  version = "3.0.5";
+  version = "4.2.0";

  src = fetchFromGitHub {
    owner = "CodSpeedHQ";
    repo = "codspeed-rust";
-    rev = "v${version}";
-    hash = "sha256-vQGPROaTkEwvKw+4aPpS1whUwfeqBcYWJTIKm4KnIiw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ofVgb+9YUNiCPhRZHY3Fm1nXRZK+9Uq8pc5XAm3P6oU=";
  };

-  cargoHash = "sha256-1bFd35JScS3x0ttfSyNUgtB9xgtVUMRl4oUOn2r+t5M=";
+  cargoHash = "sha256-xcLs2Tdi7wp7F5Jwl1QvEC1wQeK7pBjBZKxGVrzqzu0=";

  nativeBuildInputs = [
    curl
@@ -35,10 +35,17 @@ rustPlatform.buildRustPackage rec {
  ];

  cargoBuildFlags = [ "-p=cargo-codspeed" ];
-  cargoTestFlags = cargoBuildFlags;
+  cargoTestFlags = finalAttrs.cargoBuildFlags;
  checkFlags = [
    # requires an extra dependency, blit
    "--skip=test_package_in_deps_build"
+
+    # requires criteron, which requires additional dependencies
+    "--skip=test_cargo_config_rustflags"
+
+    # requires additional dependencies
+    "--skip=test_criterion_build_and_run_filtered_by_name"
+    "--skip=test_criterion_build_and_run_filtered_by_name_single"
  ];

  env = {
@@ -46,14 +53,14 @@ rustPlatform.buildRustPackage rec {
  };

  meta = {
+    changelog = "https://github.com/CodSpeedHQ/codspeed-rust/releases/tag/v${finalAttrs.version}";
    description = "Cargo extension to build & run your codspeed benchmarks";
    homepage = "https://github.com/CodSpeedHQ/codspeed-rust";
-    changelog = "https://github.com/CodSpeedHQ/codspeed-rust/releases/tag/${src.rev}";
    license = with lib.licenses; [
      mit
      asl20
    ];
-    maintainers = [ ];
    mainProgram = "cargo-codspeed";
+    maintainers = with lib.maintainers; [ hythera ];
  };
-}
+})
@@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "cdncheck";
-  version = "1.2.16";
+  version = "1.2.17";

  src = fetchFromGitHub {
    owner = "projectdiscovery";
    repo = "cdncheck";
    tag = "v${version}";
-    hash = "sha256-wwBVFADPjN1KydWDsZO5tea0aRJlyIU6zTEDXLXm6P8=";
+    hash = "sha256-9Xzmy5Q1VW32OYXkMwFyfhT5Tbm2SPn+STr9VFylWrw=";
  };

-  vendorHash = "sha256-0aaneqeIlp+vBRdR5REOq3JOvFS0DOSH6RBo+OmaytU=";
+  vendorHash = "sha256-02/aSv5YYA62I3Wc27OJyPWO9YxFG4dKokgEswu9fzg=";

  subPackages = [ "cmd/cdncheck/" ];

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

 buildGoModule rec {
  pname = "clair";
-  version = "4.8.0";
+  version = "4.9.0";

  src = fetchFromGitHub {
    owner = "quay";
    repo = "clair";
    rev = "v${version}";
-    hash = "sha256-itIjDdTKQ0PCfOkefXxqu6MpdWK3F1j6ArvaInQd/hc=";
+    hash = "sha256-YZ2r9hzTvsyTFqlXGcmdABtNuBkKclPLmDfMl5/vCug=";
  };

-  vendorHash = "sha256-CpIOQiEjQGC6qeoxRS/jFohUnELefAX0KOERudL6BGM=";
+  vendorHash = "sha256-W9ITDut+/QpFMO+c7fNHBfL83bD7ILBEMsF2G9kPYwQ=";

  nativeBuildInputs = [
    makeWrapper
@@ -9,21 +9,21 @@

 buildGoModule rec {
  pname = "crossplane-cli";
-  version = "2.0.2";
+  version = "2.1.3";

  src = fetchFromGitHub {
    owner = "crossplane";
    repo = "crossplane";
    rev = "v${version}";
-    hash = "sha256-EIDrBQmtMaHlapVNUYABKejIj1I02g5R5h4cADZvtAg=";
+    hash = "sha256-ODqNay4wmbo770ZBpGSH/Zm2Y2vVmUC6PfTzv9CyZns=";
  };

-  vendorHash = "sha256-8VqKtWbnDGbmgxT13v2d4+nXHouZ4hi2c2m66SAd1KM=";
+  vendorHash = "sha256-90TwfDBb5COEGqjDIoUrZVWS/N8A14ZxbrvvFVgMTNU=";

  ldflags = [
    "-s"
    "-w"
-    "-X github.com/crossplane/crossplane/internal/version.version=v${version}"
+    "-X github.com/crossplane/crossplane/v2/internal/version.version=v${version}"
  ];

  subPackages = [ "cmd/crank" ];
@@ -34,7 +34,7 @@ buildGoModule rec {

  passthru.tests.version = testers.testVersion {
    package = crossplane-cli;
-    command = "crossplane version || true";
+    command = "crossplane version --client || true";
    version = "v${version}";
  };

@@ -2,10 +2,10 @@

 buildDotnetGlobalTool {
  pname = "csharpier";
-  version = "1.2.4";
+  version = "1.2.5";
  executables = "csharpier";

-  nugetHash = "sha256-kgVQpFxQmMT/eoWkGyA8A0z//p7VponlyYF+CV7Txs8=";
+  nugetHash = "sha256-VevPiNTtfRJvmK/eYlJtJEJkYkiSvRoP7nTq7q9Bs9I=";

  meta = {
    description = "Opinionated code formatter for C#";
@@ -1,29 +1,51 @@
 {
  lib,
  stdenv,
-  fetchurl,
-  libusb-compat-0_1,
+  fetchFromGitHub,
+  autoreconfHook,
+  libusb1,
+  nix-update-script,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "dfu-programmer";
-  version = "0.7.2";
+  version = "1.1.0";

-  buildInputs = [ libusb-compat-0_1 ];
-
-  src = fetchurl {
-    url = "mirror://sourceforge/dfu-programmer/${pname}-${version}.tar.gz";
-    sha256 = "15gr99y1z9vbvhrkd25zqhnzhg6zjmaam3vfjzf2mazd39mx7d0x";
+  src = fetchFromGitHub {
+    owner = "dfu-programmer";
+    repo = "dfu-programmer";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-YhiBD8rpzEVVaP3Rdfq74lhZ0Mu7OEbrMsM3fBL1Kvk";
  };

-  configureFlags = [ "--disable-libusb_1_0" ];
+  buildInputs = [
+    libusb1
+  ];

-  env.NIX_CFLAGS_COMPILE = "-std=gnu17";
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+
+  # No build configured in source, automake requires ChangeLog to exist
+  preAutoreconf = ''
+    touch ChangeLog
+  '';
+
+  postPatch = ''
+    patchShebangs --build bootstrap.sh
+    patchShebangs --build update-bash-completion.sh
+  '';
+
+  passthru.updateScript = nix-update-script { };

  meta = {
    license = lib.licenses.gpl2;
    description = "Device Firmware Update based USB programmer for Atmel chips with a USB bootloader";
    mainProgram = "dfu-programmer";
-    homepage = "http://dfu-programmer.sourceforge.net/";
+    homepage = "https://github.com/dfu-programmer/dfu-programmer";
+    maintainers = with lib.maintainers; [
+      mbinns
+      cybardev
+    ];
    platforms = lib.platforms.unix;
  };
-}
+})
@@ -1,10 +1,12 @@
 {
+  stdenv,
  lib,
  fetchFromGitHub,
  buildGoModule,
  docker,
  gotestsum,
  versionCheckHook,
+  installShellFiles,
 }:

 buildGoModule (finalAttrs: {
@@ -20,6 +22,10 @@ buildGoModule (finalAttrs: {

  vendorHash = "sha256-ztA+/4l180UKTKrsqTyysDcD4oQSDgnBYUaiKDF6LvI=";

+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
  nativeCheckInputs = [
    docker
    gotestsum
@@ -53,6 +59,13 @@ buildGoModule (finalAttrs: {
  ];
  doInstallCheck = true;

+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd '${finalAttrs.meta.mainProgram}' \
+      --bash <("$out/bin/${finalAttrs.meta.mainProgram}" completion bash) \
+      --zsh <("$out/bin/${finalAttrs.meta.mainProgram}" completion zsh) \
+      --fish <("$out/bin/${finalAttrs.meta.mainProgram}" completion fish)
+  '';
+
  meta = {
    description = "Language server for providing language features for file types in the Docker ecosystem (Dockerfiles, Compose files, and Bake files)";
    homepage = "https://github.com/docker/docker-language-server";
@@ -6,13 +6,13 @@

 buildGoModule rec {
  pname = "amazon-ecs-agent";
-  version = "1.101.0";
+  version = "1.101.1";

  src = fetchFromGitHub {
    rev = "v${version}";
    owner = "aws";
    repo = "amazon-ecs-agent";
-    hash = "sha256-1+SWffCxmbYf8hUUazrRds7bRwPX11b1HumaCAizsOQ=";
+    hash = "sha256-bD+gA9uPtHNDcg/QC+O9sQk7G4und5dViqS6f7pV0rU=";
  };

  vendorHash = null;
@@ -95,6 +95,8 @@ stdenv.mkDerivation rec {
  configureFlags = [
    "--enable-dependency-reduction"
    "--disable-frontend"
+    # fix build with gcc 15
+    "CFLAGS=-std=gnu17"
  ];

  postConfigure = ''
@@ -6,13 +6,13 @@

 stdenv.mkDerivation {
  pname = "evhz";
-  version = "unstable-2021-09-20";
+  version = "unstable-2025-10-09";

  src = fetchFromSourcehut {
    owner = "~iank";
    repo = "evhz";
-    rev = "35b7526e0655522bbdf92f6384f4e9dff74f38a0";
-    hash = "sha256-lC0CeN9YVhkSiooC59Dbom811jHvPDQcYl+KADUwVdQ=";
+    rev = "189e6c22a9acb01b6eea26659f6944e60f6cb3d8";
+    hash = "sha256-p2KH5wpw8PpsICutUnwrKmKPtQ/MauWb+DY55WIJPkE=";
  };

  buildPhase = "gcc -o evhz evhz.c";
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
    repo = "f3d";
    tag = "v${version}";
    hash = "sha256-nZXz5FiGAcDqTi5hlSH7rq2QazhqYg1IoNDog35dygA=";
+    fetchLFS = true;
  };

  nativeBuildInputs = [
@@ -3,8 +3,9 @@
  stdenv,
  buildNpmPackage,
  fetchFromGitHub,
-  electron_38,
+  electron_39,
  dart-sass,
+  mpv,
  fetchPnpmDeps,
  pnpmConfigHook,
  pnpm,
@@ -14,16 +15,16 @@
 }:
 let
  pname = "feishin";
-  version = "1.0.2";
+  version = "1.2.0";

  src = fetchFromGitHub {
    owner = "jeffvli";
    repo = "feishin";
    tag = "v${version}";
-    hash = "sha256-otobV3bpANbhrAiscDxV1IGJ36i/37aPei6wdo5SDSw=";
+    hash = "sha256-acNUXvmj964pO8h2fsGfex2BeIshExMWe0w/QmtikkM=";
  };

-  electron = electron_38;
+  electron = electron_39;
 in
 buildNpmPackage {
  inherit pname version;
@@ -39,8 +40,8 @@ buildNpmPackage {
      version
      src
      ;
-    fetcherVersion = 2;
-    hash = "sha256-iZs2YtB0U8RpZXrIYHBc/cgFISDF/4tz+D13/+HlszU=";
+    fetcherVersion = 3;
+    hash = "sha256-gQooubVt2kDOGq4GEZIT+pQcPnzss9QmqTO9kD5Kx58=";
  };

  env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
@@ -97,6 +98,7 @@ buildNpmPackage {
    mkdir -p $out/{Applications,bin}
    cp -r dist/**/Feishin.app $out/Applications/
    makeWrapper $out/Applications/Feishin.app/Contents/MacOS/Feishin $out/bin/feishin \
+      --prefix PATH : "${lib.makeBinPath [ mpv ]}" \
      --set DISABLE_AUTO_UPDATES 1
  ''
  + lib.optionalString stdenv.hostPlatform.isLinux ''
@@ -110,6 +112,7 @@ buildNpmPackage {
    # Set ELECTRON_FORCE_IS_PACKAGED=1.
    # https://github.com/electron/electron/issues/35153#issuecomment-1202718531
    makeWrapper ${lib.getExe electron} $out/bin/feishin \
+      --prefix PATH : "${lib.makeBinPath [ mpv ]}" \
      --add-flags $out/share/feishin/resources/app.asar \
      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
      --set ELECTRON_FORCE_IS_PACKAGED 1 \
@@ -0,0 +1,79 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  openssl,
+  gzip,
+  gitMinimal,
+  deno,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "fresh";
+  version = "0.1.67";
+
+  src = fetchFromGitHub {
+    owner = "sinelaw";
+    repo = "fresh";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-OA5foQEAs01bAi78c6tEaLKaQHcRhRVtNkwpOjbPgEQ=";
+  };
+
+  cargoHash = "sha256-/sJ956ZqtI1xV0JW3RwRd0b5pYW2W/vQhb9ApF61eF0=";
+
+  passthru.updateScript = nix-update-script { };
+
+  nativeBuildInputs = [
+    pkg-config
+    gzip
+  ];
+
+  nativeCheckInputs = [
+    gitMinimal
+  ];
+
+  buildInputs = [
+    openssl
+  ];
+
+  # Tests create a local http server to check update functionality
+  __darwinAllowLocalNetworking = true;
+
+  # Due to issues with incorrect import paths with the actual app, I have disabled the checks below. Need to report upstream.
+  checkFlags = [
+    "--skip=e2e::"
+  ];
+  cargoTestFlags = [
+    "--lib"
+    "--bins"
+  ];
+
+  # The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem
+  # To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE
+  env.RUSTY_V8_ARCHIVE = deno.librusty_v8;
+  preBuild = ''
+    mkdir -p $out/share/fresh-editor/plugins/
+  '';
+
+  postInstall = ''
+    rm -rf $out/bin/fresh.dSYM
+  '';
+
+  meta = {
+    description = "Terminal-based text editor with LSP support and TypeScript plugins";
+    homepage = "https://github.com/sinelaw/fresh";
+    changelog = "https://github.com/sinelaw/fresh/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [
+      chillcicada
+      dwt
+    ];
+    mainProgram = "fresh";
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    sourceProvenance = with lib.sourceTypes; [
+      fromSource
+      binaryNativeCode # librusty_v8.a
+    ];
+  };
+})
@@ -14,14 +14,14 @@

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

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

  build-system = with python3Packages; [
@@ -0,0 +1,60 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+  versionCheckHook,
+  pkg-config,
+  openssl,
+  zlib,
+  git,
+  git-lfs,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "git-xet";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "huggingface";
+    repo = "xet-core";
+    tag = "git-xet-v${finalAttrs.version}";
+    hash = "sha256-XnCp9Dt4isFsT124ZVA/ID5y9l4bCSBQRrqrIPpv5Ow=";
+  };
+
+  cargoHash = "sha256-0xUik5zHO4T2PjFXrA0XHuy2892piE5Kiw2pcpa7xdY=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    openssl
+    zlib
+  ];
+
+  # Build only the git_xet package
+  buildAndTestSubdir = "git_xet";
+
+  nativeCheckInputs = [
+    git
+    git-lfs
+  ];
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Git LFS plugin that uploads and downloads using the Xet protocol";
+    homepage = "https://github.com/huggingface/xet-core/blob/main/git_xet/README.md";
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    mainProgram = "git-xet";
+    maintainers = with lib.maintainers; [
+      cybardev
+    ];
+  };
+})
@@ -5,14 +5,14 @@
 }:
 buildGoModule (finalAttrs: {
  pname = "gitea-mcp-server";
-  version = "0.5.0";
+  version = "0.6.0";

  src = fetchFromGitea {
    domain = "gitea.com";
    owner = "gitea";
    repo = "gitea-mcp";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Wrqy8RpDoK8GYldjGiTs8zwB3qzApKYJyK5Vhh0fMRg=";
+    hash = "sha256-3Lc9GJTg4W9Hz5wbOm2MkcCt0aBWneNc8OutIJsBRTg=";
  };

  vendorHash = "sha256-N1Ct479Q5RH4TCxcSbIBoGDP/atBlWkxwBLJLk82juM=";
@@ -1,9 +1,12 @@
 {
  lib,
-  buildGoModule,
+  # Build fails with Go 1.25, with the following error:
+  # 'vendor/golang.org/x/tools/internal/tokeninternal/tokeninternal.go:64:9: invalid array length -delta * delta (constant -256 of type int64)'
+  # Wait for upstream to update their vendored dependencies before unpinning.
+  buildGo124Module,
  fetchFromGitHub,
 }:
-buildGoModule rec {
+buildGo124Module rec {
  pname = "gorm-gentool";
  version = "0.0.1";

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

 buildGoModule (finalAttrs: {
  pname = "gotify-server";
-  version = "2.7.3";
+  version = "2.8.0";

  src = fetchFromGitHub {
    owner = "gotify";
    repo = "server";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-SPWJH5WELBNJpnGZdyMCJGi6m2WbV7BFOQAtT9ItZJ0=";
+    hash = "sha256-wLkJ7zBz89e+ECuaNDcbOzHsA9Xiuz9jrqujnd4Mdzc=";
  };

-  vendorHash = "sha256-bSU7Y+Hupdd8l7LTyVc3YMlZJRojNRqiogE17m/xpr8=";
+  vendorHash = "sha256-vcrMWCNVqDMlIgamb0fBekNrb8qMj2Cb0b7KZbqJ1yg=";

  # No test
  doCheck = false;
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {

  yarnOfflineCache = fetchYarnDeps {
    yarnLock = "${finalAttrs.src}/yarn.lock";
-    hash = "sha256-0OIxoT7iS7i3E1fD6E/6+WVYZcu2r+Qa7KBX56+CzIk=";
+    hash = "sha256-nU1K43ucv2DnDcIDee6I2t8fgz86NSyNvth2znlclsM=";
  };

  nativeBuildInputs = [
@@ -11,13 +11,13 @@
 }:
 buildNpmPackage (finalAttrs: {
  pname = "gridtracker2";
-  version = "2.251106.7";
+  version = "2.260101.3";

  src = fetchFromGitLab {
    owner = "gridtracker.org";
    repo = "gridtracker2";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-g1njDFodCHvILZZNrI/exAqWLZsbNBGHy3jlzo3uLJ8=";
+    hash = "sha256-Gtz5/caaDAIwG/vqtOO9w5ouysAIzQgD7GcTvXri8T8=";
  };

  npmDepsHash = "sha256-8bhOfLLsNSK+/mXku5ukLr65bfk+RwC3SyOGRHndqVQ=";
@@ -8,13 +8,13 @@

 perlPackages.buildPerlPackage {
  pname = "ham-unstable";
-  version = "2025-02-25";
+  version = "2025-11-12";

  src = fetchFromGitHub {
    owner = "kernkonzept";
    repo = "ham";
-    rev = "81b6f05fd91865c7d42b94a683388504489356dc";
-    hash = "sha256-a1JaUD/jrF7Yf+vyUoKQFjojxenmsCVw3Uo8u7RjPiQ=";
+    rev = "11c8b146f8b11e7f284050fe205ae8afb1715541";
+    hash = "sha256-SlraTVE03UEF5Spjy6ZEPbhS/INBR/9MaRLw4/AxZds=";
  };

  outputs = [ "out" ];
@@ -4,7 +4,7 @@
  lib,
 }:
 let
-  version = "0.17.4";
+  version = "0.17.6";
 in
 buildGoModule {
  pname = "heimdall-proxy";
@@ -15,10 +15,10 @@ buildGoModule {
    owner = "dadrus";
    repo = "heimdall";
    tag = "v${version}";
-    hash = "sha256-0/2q+ci6bvat8oI3MW/QfI747RDuk55LNciy7RSNLZE=";
+    hash = "sha256-1QnKOxn1m91zu2HOfMyVYFHaHFrw8qn8288tv5HEiiA=";
  };

-  vendorHash = "sha256-3ecwQ6CHPbOouDJzDZA0S/8aJ0lUbhVnZcGby/iCxDk=";
+  vendorHash = "sha256-iX6vt8e9oPPUqHvX6n3OqiafKlP/SmWkfUJBRev7VZQ=";

  tags = [ "sqlite" ];

@@ -9,6 +9,7 @@
  obfs4,
  iproute2,
  dnscrypt-proxy,
+  v2ray,
  iptables,
  gawk,
  util-linux,
@@ -37,25 +38,27 @@ buildGoModule (finalAttrs: {

  postPatch = ''
    substituteInPlace daemon/service/platform/platform_linux.go \
-      --replace 'openVpnBinaryPath = "/usr/sbin/openvpn"' \
+      --replace-fail 'openVpnBinaryPath = "/usr/sbin/openvpn"' \
      'openVpnBinaryPath = "${openvpn}/bin/openvpn"' \
-      --replace 'routeCommand = "/sbin/ip route"' \
+      --replace-fail 'routeCommand = "/sbin/ip route"' \
      'routeCommand = "${iproute2}/bin/ip route"'

    substituteInPlace daemon/netinfo/netinfo_linux.go \
-      --replace 'retErr := shell.ExecAndProcessOutput(log, outParse, "", "/sbin/ip", "route")' \
+      --replace-fail 'retErr := shell.ExecAndProcessOutput(log, outParse, "", "/sbin/ip", "route")' \
      'retErr := shell.ExecAndProcessOutput(log, outParse, "", "${iproute2}/bin/ip", "route")'

    substituteInPlace daemon/service/platform/platform_linux_release.go \
-      --replace 'installDir := "/opt/ivpn"' "installDir := \"$out\"" \
-      --replace 'obfsproxyStartScript = path.Join(installDir, "obfsproxy/obfs4proxy")' \
+      --replace-fail 'installDir := "/opt/ivpn"' "installDir := \"$out\"" \
+      --replace-fail 'obfsproxyStartScript = path.Join(installDir, "obfsproxy/obfs4proxy")' \
      'obfsproxyStartScript = "${lib.getExe obfs4}"' \
-      --replace 'wgBinaryPath = path.Join(installDir, "wireguard-tools/wg-quick")' \
+      --replace-fail 'wgBinaryPath = path.Join(installDir, "wireguard-tools/wg-quick")' \
      'wgBinaryPath = "${wireguard-tools}/bin/wg-quick"' \
-      --replace 'wgToolBinaryPath = path.Join(installDir, "wireguard-tools/wg")' \
+      --replace-fail 'wgToolBinaryPath = path.Join(installDir, "wireguard-tools/wg")' \
      'wgToolBinaryPath = "${wireguard-tools}/bin/wg"' \
-      --replace 'dnscryptproxyBinPath = path.Join(installDir, "dnscrypt-proxy/dnscrypt-proxy")' \
-      'dnscryptproxyBinPath = "${dnscrypt-proxy}/bin/dnscrypt-proxy"'
+      --replace-fail 'dnscryptproxyBinPath = path.Join(installDir, "dnscrypt-proxy/dnscrypt-proxy")' \
+      'dnscryptproxyBinPath = "${dnscrypt-proxy}/bin/dnscrypt-proxy"' \
+      --replace-fail 'v2rayBinaryPath = path.Join(installDir, "v2ray/v2ray")' \
+      'v2rayBinaryPath = "${v2ray}/bin/v2ray"'
  '';

  ldflags = [
@@ -82,6 +85,7 @@ buildGoModule (finalAttrs: {
          iptables
          gawk
          util-linux
+          iproute2
        ]
      }
  '';
@@ -6,13 +6,13 @@

 buildGoModule rec {
  pname = "ivy";
-  version = "0.3.4";
+  version = "0.4.0";

  src = fetchFromGitHub {
    rev = "v${version}";
    owner = "robpike";
    repo = "ivy";
-    hash = "sha256-/Q929ZXv3F6MZ+FdWKfbThNDT3JpvQw7WLGnbmitdOg=";
+    hash = "sha256-O+CQUS2EYPnRf8AbL2arhF7m5vhPUnDFXJsYst9/Eqg=";
  };

  vendorHash = null;
@@ -8,13 +8,13 @@
 }:
 buildGoModule rec {
  pname = "jump";
-  version = "0.51.0";
+  version = "0.67.0";

  src = fetchFromGitHub {
    owner = "gsamokovarov";
    repo = "jump";
    rev = "v${version}";
-    hash = "sha256-nlCuotEiAX2+xx7T8jWZo2p4LNLhWXDdcU6DxJprgx0=";
+    hash = "sha256-/vMQIbpfnEzBhyCUgSd4XpeC9cEX/+AYIRDTOqgmCec=";
  };

  vendorHash = "sha256-nMUqZWdq//q/DNthvpKiYLq8f95O0QoItyX5w4vHzSA=";
@@ -7,13 +7,39 @@
  libiconv,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "kakasi";
  version = "2.3.6";

+  src = fetchurl {
+    url = "http://kakasi.namazu.org/stable/kakasi-${finalAttrs.version}.tar.xz";
+    hash = "sha256-LuV7GwPHT9V2bnQcOBICjvxzvA4L+Tpuf/IOtHAfPuM=";
+  };
+
+  patches = [
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/kakasi/raw/4756771/f/kakasi-configure-c99.patch";
+      hash = "sha256-XPIp/+AR6K84lv606aRHPQwia/1K3rt/7KSo0V0ZQ5o=";
+    })
+    ./gettext-0.25.patch
+  ];
+
  nativeBuildInputs = [ autoreconfHook ];
  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];

+  env = lib.optionalAttrs (!stdenv.cc.isClang) {
+    NIX_CFLAGS_COMPILE = "-std=gnu17";
+  };
+
+  postPatch = ''
+    for a in tests/kakasi-* ; do
+      substituteInPlace $a \
+        --replace-quiet "/bin/echo" echo
+    done
+  '';
+
+  doCheck = false; # fails 1 of 6 tests
+
  meta = {
    description = "Kanji Kana Simple Inverter";
    longDescription = ''
@@ -25,27 +51,4 @@ stdenv.mkDerivation rec {
    license = lib.licenses.gpl2Plus;
    platforms = lib.platforms.unix;
  };
-
-  src = fetchurl {
-    url = "http://kakasi.namazu.org/stable/kakasi-${version}.tar.xz";
-    sha256 = "1qry3xqb83pjgxp3my8b1sy77z4f0893h73ldrvdaky70cdppr9f";
-  };
-
-  patches = [
-    (fetchpatch {
-      url = "https://src.fedoraproject.org/rpms/kakasi/raw/4756771/f/kakasi-configure-c99.patch";
-      hash = "sha256-XPIp/+AR6K84lv606aRHPQwia/1K3rt/7KSo0V0ZQ5o=";
-    })
-    ./gettext-0.25.patch
-  ];
-
-  postPatch = ''
-    for a in tests/kakasi-* ; do
-      substituteInPlace $a \
-        --replace-quiet "/bin/echo" echo
-    done
-  '';
-
-  doCheck = false; # fails 1 of 6 tests
-
-}
+})
@@ -8,16 +8,16 @@

 buildGoModule (finalAttrs: {
  pname = "kitex";
-  version = "0.15.3";
+  version = "0.15.4";

  src = fetchFromGitHub {
    owner = "cloudwego";
    repo = "kitex";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-ynWtLQjiBDPYQ8YgjdiGCR/dI5krLyFFdv4kyEcCRYI=";
+    hash = "sha256-JZsRT752RV3GGl6us4z0bC58kbkaZIkZHAgZL7gFnIY=";
  };

-  vendorHash = "sha256-CldQslLyPOr8b6Mskuvoe+5AyXNxyLOmIjCw0vi73xk=";
+  vendorHash = "sha256-pMPt1NC3dAI7EvEOPoGXf/Gex1Vuso5y8jxQh2nBVOI=";

  subPackages = [ "tool/cmd/kitex" ];

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

 buildNpmPackage rec {
  pname = "lasuite-meet-frontend";
-  version = "1.0.1";
+  version = "1.1.0";

  src = fetchFromGitHub {
    owner = "suitenumerique";
    repo = "meet";
    tag = "v${version}";
-    hash = "sha256-QtaP0b8Aj//tCS6uo4NJcK+IjyrSBTOZ+/ijG3T3ePE=";
+    hash = "sha256-wa0KhS/UeFbw9fJVuFLIPtsLaC5+7Euaew8n6p2jC5Q=";
  };

  sourceRoot = "source/src/frontend";
@@ -13,14 +13,14 @@ in

 python.pkgs.buildPythonApplication rec {
  pname = "lasuite-meet";
-  version = "1.0.1";
+  version = "1.1.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "suitenumerique";
    repo = "meet";
    tag = "v${version}";
-    hash = "sha256-QtaP0b8Aj//tCS6uo4NJcK+IjyrSBTOZ+/ijG3T3ePE=";
+    hash = "sha256-wa0KhS/UeFbw9fJVuFLIPtsLaC5+7Euaew8n6p2jC5Q=";
  };

  sourceRoot = "source/src/backend";
@@ -31,6 +31,20 @@ stdenv.mkDerivation {
      sha256 = "060mvqn9y8lsn4l20q9rhamkymzsgh0r1vzkjw78gnj8kjw67jl5";
    })
  ];
+
+  postPatch = ''
+    substituteInPlace src/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)"
+
+    # 'class lean::static_matrix<T, X>' has no member named 'get'
+    substituteInPlace src/util/lp/static_matrix.h \
+      --replace-fail "m_matrix.get(" "m_matrix.get_elem("
+
+    # 'const class lean::static_matrix<T, X>' has no member named 'get_value_of_column_cell'
+    substituteInPlace src/util/lp/static_matrix.cpp \
+     --replace-fail "A.get_value_of_column_cell(col)" "A[col]"
+  '';
+
  nativeBuildInputs = [
    cmake
    makeWrapper
@@ -8,7 +8,7 @@

 let
  pname = "lefthook";
-  version = "2.0.12";
+  version = "2.0.13";
 in
 buildGoModule {
  inherit pname version;
@@ -17,7 +17,7 @@ buildGoModule {
    owner = "evilmartians";
    repo = "lefthook";
    rev = "v${version}";
-    hash = "sha256-Th3a5zUBrWbWHiKnoEwTA0TyZrhIQNnA/xgUrXandn8=";
+    hash = "sha256-fGz/h4Di2cs7KVs+9sx6D3RWJxO4TkMdtzd3pKAp0SA=";
  };

  vendorHash = "sha256-4xCee6g7NowAIskatPtJQi6UnlIfQlg43Q26TryhqcE=";
@@ -18,13 +18,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "libpinyin";
-  version = "2.10.3";
+  version = "2.11.91";

  src = fetchFromGitHub {
    owner = "libpinyin";
    repo = "libpinyin";
    tag = finalAttrs.version;
-    hash = "sha256-g3DgRYmLrXqAGxbyiI96UKT1gsJxLlx14K+2HzWR7nI=";
+    hash = "sha256-MXM+iGCtF8gTpRnT0Xi8s+kqsOkGLXY06R8MME2icWo=";
  };

  postUnpack = ''
@@ -116,7 +116,6 @@ stdenv.mkDerivation (finalAttrs: {
      lzcunt
      prince213
      programmerlexi
-      surfaceflinger
      ryand56
    ];
  };
@@ -0,0 +1,104 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  qt6Packages,
+
+  sqlite,
+  json_c,
+  libzip,
+  mpv,
+  yt-dlp,
+  makeWrapper,
+  withOcr ? false,
+  python3,
+}:
+let
+  libmocr = stdenv.mkDerivation {
+    pname = "libmocr";
+    version = "0-unstable-2023-11-15";
+
+    src = fetchFromGitHub {
+      owner = "ripose-jp";
+      repo = "libmocr";
+      rev = "24ec081102208d0ff6954c3003df2fb691713bd5";
+      hash = "sha256-58W/LBJ+wIxQtutoXqq6TzpExbUBV3NfAfXTIl43ARg=";
+    };
+
+    nativeBuildInputs = [ cmake ];
+    buildInputs = [
+      qt6Packages.qtbase
+      python3
+    ];
+    dontWrapQtApps = true;
+    meta = {
+      description = "A library for Manga OCR";
+      homepage = "https://github.com/ripose-jp/libmocr";
+      license = lib.licenses.gpl2;
+      platforms = lib.platforms.linux;
+    };
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "memento";
+  version = "1.7.0";
+
+  src = fetchFromGitHub {
+    owner = "ripose-jp";
+    repo = "Memento";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-6ipzorykt9GoGTHTTLCyDf7vXx9mT5AITKA9pyQ3GwI=";
+  };
+
+  cmakeFlags = [
+    (lib.cmakeBool "SYSTEM_QCORO" true)
+    (lib.cmakeBool "SYSTEM_MOCR" true)
+  ]
+  ++ lib.optionals withOcr [
+    (lib.cmakeBool "OCR_SUPPORT" true)
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    makeWrapper
+    qt6Packages.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    qt6Packages.qtbase
+    qt6Packages.qtsvg
+    qt6Packages.qtwayland
+    sqlite
+    json_c
+    libzip
+    qt6Packages.qcoro
+  ]
+
+  ++ lib.optionals withOcr [ libmocr ];
+
+  propagatedBuildInputs = [ mpv ];
+
+  preFixup =
+    let
+      pyEnv = python3.withPackages (p: [
+        p.manga-ocr
+        p.jaconv
+      ]);
+    in
+    ''
+      wrapProgram "$out/bin/memento" \
+        --prefix PATH : "${yt-dlp}/bin" ${lib.optionalString withOcr "--suffix PYTHONPATH : \"${pyEnv}/${python3.sitePackages}\""}
+    '';
+
+  passthru.libmocr = libmocr;
+
+  meta = {
+    description = "Mpv-based video player for studying Japanese";
+    homepage = "https://ripose-jp.github.io/Memento/";
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ teto ];
+    platforms = lib.platforms.linux;
+    mainProgram = "memento";
+  };
+})
@@ -181,8 +181,12 @@ stdenv.mkDerivation (finalAttrs: {
      --replace "-m 4755 -o root" " "
  '';

-  env = lib.optionalAttrs stdenv.cc.isClang {
-    NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion -Wno-error=incompatible-function-pointer-types";
+  env = {
+    NIX_CFLAGS_COMPILE =
+      (lib.optionalString stdenv.cc.isClang "-Wno-error=int-conversion -Wno-error=incompatible-function-pointer-types ")
+      # GCC15 defaults to C23 which is stricter about prototypes
+      # There are upstream fixes, but they are not in 3.9.4 release
+      + (lib.optionalString stdenv.cc.isGNU " -std=c17 ");
  };

  configureFlags = [
@@ -247,5 +251,7 @@ stdenv.mkDerivation (finalAttrs: {
    ];
    platforms = lib.platforms.all;
    mainProgram = desktopBinary;
+    # https://github.com/arakiken/mlterm/issues/157
+    broken = stdenv.hostPlatform.isDarwin;
  };
 })
@@ -12,13 +12,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "n64recomp";
-  version = "0-unstable-2025-12-11";
+  version = "0-unstable-2025-12-31";

  src = fetchFromGitHub {
    owner = "N64Recomp";
    repo = "N64Recomp";
-    rev = "98bf104b1b5ed83126af8bcab0cc964782617dbf";
-    hash = "sha256-qDV52g04tOCQW+Nqzm8pnXwqs4q027TnHyuGYsGzIhU=";
+    rev = "2b6f05688de2abc7d86da5b4a89b84c2c6acbabe";
+    hash = "sha256-nf1O4Q6ewNbXG4EuFlY+ckP8335ZAUgpH/ckaB9aEZg=";
    fetchSubmodules = true;
  };

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

 buildDotnetModule rec {
  pname = "nbxplorer";
-  version = "2.5.30-1";
+  version = "2.6.0";

  src = fetchFromGitHub {
    owner = "dgarage";
    repo = "NBXplorer";
    tag = "v${version}";
-    hash = "sha256-FVSoFvWwMpuMbH7xFE5aSkLPzROaufbPZL09OWabbus=";
+    hash = "sha256-X1+UdsKVOC3QpES22p0MG1Rz1oresilBM+b/4I1nCyI=";
  };

  projectFile = "NBXplorer/NBXplorer.csproj";
  nugetDeps = ./deps.json;

-  dotnet-sdk = dotnetCorePackages.sdk_8_0;
-  dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;
+  dotnet-sdk = dotnetCorePackages.sdk_10_0;
+  dotnet-runtime = dotnetCorePackages.aspnetcore_10_0;

  # macOS has a case-insensitive filesystem, so these two can be the same file
  postFixup = ''
@@ -66,13 +66,13 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "noctalia-shell";
-  version = "3.8.0";
+  version = "3.8.2";

  src = fetchFromGitHub {
    owner = "noctalia-dev";
    repo = "noctalia-shell";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Bh4XcEyG6XRQugahL/2Vd42k/YeGK0f+yW3+Oc74Rp4=";
+    hash = "sha256-ZjtdQbVPHJeWP8VHWZmSwPwD6fC7Dqmknx1KErzfDks=";
  };

  nativeBuildInputs = [
@@ -0,0 +1,43 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+buildGoModule (finalAttrs: {
+  pname = "nvcat";
+  version = "0.1.5";
+
+  src = fetchFromGitHub {
+    owner = "brianhuster";
+    repo = "nvcat";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-F23trNMmoifPyOVp5hK+xUM3m96PIBniO9mmyfTMnFE=";
+  };
+
+  vendorHash = "sha256-IZ1+RAKKYG9TblT30FmqMGswnUrzLdrK+haNmqGdGSk=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "v(.+)"
+    ];
+  };
+
+  meta = {
+    description = "`cat` but with syntax highlighting powered by Neovim";
+    homepage = "https://github.com/brianhuster/nvcat";
+    changelog = "https://github.com/brianhuster/nvcat/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    longDescription = ''
+      A command-line utility that displays files with Neovim's syntax highlighting in the terminal.
+    '';
+    mainProgram = "nvcat";
+    maintainers = with lib.maintainers; [ olillin ];
+  };
+})
@@ -12,13 +12,13 @@

 buildGoModule rec {
  pname = "orbiton";
-  version = "2.70.0";
+  version = "2.70.4";

  src = fetchFromGitHub {
    owner = "xyproto";
    repo = "orbiton";
    tag = "v${version}";
-    hash = "sha256-3EAYPCNVQiED8qHyLbwyYU7gXJn2TFgiJ2/JyxyD7+M=";
+    hash = "sha256-cdaYD6PyOjgBo83eWD2+YWQj5uJzmeHDo67dlA7Pj1g=";
  };

  vendorHash = null;
@@ -33,9 +33,14 @@ buildGoModule rec {

  preBuild = "cd v2";

-  checkFlags = [
-    "-skip=TestPBcopy" # Requires impure pbcopy and pbpaste
-  ];
+  checkFlags =
+    let
+      skippedTests = [
+        "TestPBcopy" # Requires impure pbcopy and pbpaste
+        "TestPkill" # error: no process named "sleep" found
+      ];
+    in
+    [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];

  postInstall = ''
    cd ..
@@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "papeer";
-  version = "0.8.5";
+  version = "0.8.7";

  src = fetchFromGitHub {
    owner = "lapwat";
    repo = "papeer";
    rev = "v${version}";
-    hash = "sha256-9cHbXo/kpe9S6MQE4wzgCZ4+m9gwGmckRmNhI+1zrS8=";
+    hash = "sha256-Qe+3rHEV+Env5sr9acdDqEzAi3PeN8/7fLoDz/B6GWo=";
  };

-  vendorHash = "sha256-ZPkaS2obfeWS5/tWSkDe+Lua95mvoNXeNx3JEXrx/Es=";
+  vendorHash = "sha256-yGoRvPwlXA6FN67nQH/b0QpGQ2xXTCmXWNLInlcVk7k=";

  doCheck = false; # uses network

@@ -2,9 +2,9 @@

 buildDotnetGlobalTool {
  pname = "pbm";
-  version = "1.4.6";
+  version = "1.5.0";

-  nugetHash = "sha256-Rx7L1Bl2VwsAZMGudsFA7K++WuhJpjqlRsHMuBebo6Y=";
+  nugetHash = "sha256-MDsu9+EtgiDXPHKDMkbfzekPts064g39tbGJj9vSGMc=";

  meta = {
    description = "CLI for managing Akka.NET applications and Akka.NET Clusters";
@@ -8,13 +8,13 @@

 stdenvNoCC.mkDerivation rec {
  pname = "pfetch";
-  version = "1.9.4";
+  version = "1.10.0";

  src = fetchFromGitHub {
    owner = "Un1q32";
    repo = "pfetch";
    tag = version;
-    hash = "sha256-lEtRPM/uSt3vb/zhAx8Jiz3F2BhvOr17DHXaCPQlddA=";
+    hash = "sha256-0EI5D33lVm/lJ0m47wDBE5fGmx/7tDRAC/AE58nJ2ao=";
  };

  dontBuild = true;
@@ -10,13 +10,13 @@ let
 in
 buildGoModule (finalAttrs: {
  pname = "process-compose";
-  version = "1.85.0";
+  version = "1.87.0";

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

    # populate values that require us to use git. By doing this in postFetch we
    # can delete .git afterwards and maintain better reproducibility of the src.
@@ -46,7 +46,7 @@ buildGoModule (finalAttrs: {
    installShellFiles
  ];

-  vendorHash = "sha256-uZFwiYTkx9TE6T0UJ+EUF8zqP4/8vWYoN+frD6KvQC0=";
+  vendorHash = "sha256-KfvZYcw8tiqgHVzNhW1DWHWs0S8Mlrs16MCmPXySvRo=";

  doCheck = false;

@@ -14,13 +14,13 @@

 stdenv.mkDerivation {
  pname = "projectm-sdl-cpp";
-  version = "0-unstable-2025-10-17";
+  version = "0-unstable-2025-12-27";

  src = fetchFromGitHub {
    owner = "projectM-visualizer";
    repo = "frontend-sdl-cpp";
-    rev = "72e5632897c9d9bef452c679d3cbe8c7b4bb4157";
-    hash = "sha256-uO2+CX2DqVn6NdcZhBlKFIPuUQpz6N8LazG3ALJTSx0=";
+    rev = "0231108c9574c7ba04490fe0036b314f7f37ca6e";
+    hash = "sha256-NSwy0pJeJpqRxQI451J2kdevNt5EWUF4REhsmF0HS3w=";
    fetchSubmodules = true;
  };

@@ -0,0 +1,94 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  autoPatchelfHook,
+  curl,
+  common-updater-scripts,
+  jq,
+  keyutils,
+  libgcc,
+  versionCheckHook,
+  writeShellScript,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "proton-pass-cli";
+  version = "1.3.2";
+
+  src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system};
+
+  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    autoPatchelfHook
+  ];
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    keyutils
+    libgcc
+  ];
+
+  dontUnpack = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 $src $out/bin/pass-cli
+
+    runHook postInstall
+  '';
+
+  nativeCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgram = "${placeholder "out"}/bin/pass-cli";
+  versionCheckProgramArg = "--version";
+
+  passthru = {
+    sources = {
+      "aarch64-darwin" = fetchurl {
+        url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-aarch64";
+        hash = "sha256-B+hmxagP5Ls+Jc8DZN8Y9fvdrTq+HkMICUzMVsd8aU4=";
+      };
+      "aarch64-linux" = fetchurl {
+        url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-aarch64";
+        hash = "sha256-w5mwbYQgqAU07T4+vUaYkcVp8XtMFNynGTV3jJQjAFw=";
+      };
+      "x86_64-darwin" = fetchurl {
+        url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-x86_64";
+        hash = "sha256-VmkTLyHNZ8p8wgvzHOYiQsbDTjzKsjyGDShcQZlAH7A=";
+      };
+      "x86_64-linux" = fetchurl {
+        url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-x86_64";
+        hash = "sha256-X7FK1t0+SuBGgSsBuhYUCkcR8LtCQMjbplo5B1LSuh0=";
+      };
+    };
+    updateScript = writeShellScript "update-proton-pass-cli" ''
+      set -o errexit
+      export PATH="${
+        lib.makeBinPath [
+          curl
+          jq
+          common-updater-scripts
+        ]
+      }"
+      NEW_VERSION=$(curl --silent https://proton.me/download/pass-cli/versions.json | jq '.passCliVersions.version' --raw-output)
+      if [[ "${finalAttrs.version}" = "$NEW_VERSION" ]]; then
+          echo "No update available."
+          exit 0
+      fi
+      for platform in ${lib.escapeShellArgs finalAttrs.meta.platforms}; do
+        update-source-version "proton-pass-cli" "$NEW_VERSION" --ignore-same-version --source-key="sources.$platform"
+      done
+    '';
+  };
+
+  meta = {
+    description = "Command-line interface for managing your Proton Pass vaults, items, and secrets";
+    homepage = "https://github.com/protonpass/pass-cli";
+    license = lib.licenses.unfree;
+    mainProgram = "pass-cli";
+    maintainers = with lib.maintainers; [ delafthi ];
+    platforms = lib.attrNames finalAttrs.passthru.sources;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  };
+})
@@ -7,7 +7,7 @@
  rainfrog,
 }:
 let
-  version = "0.3.12";
+  version = "0.3.13";
 in
 rustPlatform.buildRustPackage {
  inherit version;
@@ -17,10 +17,10 @@ rustPlatform.buildRustPackage {
    owner = "achristmascarl";
    repo = "rainfrog";
    tag = "v${version}";
-    hash = "sha256-4Zc8r6Sf4iE/fYiYwa8gXoCzEnCuarYzF1AzaXhdpHg=";
+    hash = "sha256-0+zlEBjyQLauaLyojdo1mIaauHNyRW9x32yPrpgb4qE=";
  };

-  cargoHash = "sha256-Ziqs6F3XaWY0ugdpE096/SYmNEeKK4KdrhOkJcKUxZs=";
+  cargoHash = "sha256-EJWhs9oVMBT5qRPAbiaW5sG52cSLXDmbntWpBKVORyM=";

  passthru = {
    tests.version = testers.testVersion {
@@ -2,20 +2,21 @@
  lib,
  buildGoModule,
  fetchFromGitHub,
+  nix-update-script,
 }:

 buildGoModule rec {
  pname = "routedns";
-  version = "0.1.51";
+  version = "0.1.128";

  src = fetchFromGitHub {
    owner = "folbricht";
    repo = "routedns";
    rev = "v${version}";
-    hash = "sha256-9H/l6EAbrNwD2DnweBqjmcoaJEnTH9BdGn2x/ZC3us4=";
+    hash = "sha256-jUk0wa+hw0MIXnV1K/n19rGRKKolEf6q+dtKHmnuj3I=";
  };

-  vendorHash = "sha256-yOYeMYAXa1jok8QwGtYsvuUGgIXEjZGo6+FiDQkZwUU=";
+  vendorHash = "sha256-woInU618JPwVxGDJDZQ6+j9wY6qNSB5Xu8wXf7s2qvQ=";

  subPackages = [ "./cmd/routedns" ];

@@ -24,6 +25,8 @@ buildGoModule rec {
    "-w"
  ];

+  passthru.updateScript = nix-update-script { };
+
  meta = {
    homepage = "https://github.com/folbricht/routedns";
    description = "DNS stub resolver, proxy and router";
@@ -19,6 +19,9 @@ rustPlatform.buildRustPackage (finalAttrs: {

  cargoHash = "sha256-ZIRwp5AJugMDxg3DyFIH5VlD0m4Si2tJdspKE5QEB4M=";

+  # Fix build with gcc 15
+  env.NIX_CFLAGS_COMPILE = "-std=gnu17";
+
  nativeInstallCheckInputs = [ versionCheckHook ];
  doInstallCheck = true;

@@ -30,8 +33,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
    homepage = "https://git.sr.ht/~ireas/rusty-man";
    changelog = "https://git.sr.ht/~ireas/rusty-man/tree/v${finalAttrs.version}/item/CHANGELOG.md";
    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [
-      defelo
-    ];
+    maintainers = with lib.maintainers; [ defelo ];
  };
 })
@@ -26,14 +26,14 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "s7";
-  version = "11.7-unstable-2025-12-27";
+  version = "11.7-unstable-2025-12-31";

  src = fetchFromGitLab {
    domain = "cm-gitlab.stanford.edu";
    owner = "bil";
    repo = "s7";
-    rev = "3cccb2a354966fc4b7e30182b1b0956a8a84523c";
-    hash = "sha256-uLo/DvTfOU615wMm/Qgp89wdqTeSlAt0Vqv99fUPwjw=";
+    rev = "6d5a3fcf7c62653c6fa7e611b74338cd38b75794";
+    hash = "sha256-9MnxpUe148O3FbvbE9sBElmZU42mNb6d5vVs7coJNo4=";
  };

  buildInputs =
@@ -0,0 +1,42 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitea,
+  pkg-config,
+  openssl,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "sc2-smurf-detector";
+  version = "0.1.2";
+
+  src = fetchFromGitea {
+    domain = "git.kittycloud.eu";
+    owner = "mizule";
+    repo = "sc2-smurf-detector";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-9vpbnp+q5QAOn+EpuwXG4LfruB999v2SEvYLhfMg8II=";
+  };
+
+  cargoHash = "sha256-Wm4/KmuAz9lno9vAsSwVykL2kQNf88kE3+zao3keRWI=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    openssl
+  ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  meta = {
+    description = "CLI tool to detect smurfs in StarCraft II by analyzing opponent match history via SC2 Pulse";
+    homepage = "https://git.kittycloud.eu/mizule/sc2-smurf-detector";
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ _0xMillyByte ];
+    mainProgram = "sc2-smurf-detector";
+  };
+})
@@ -13,7 +13,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "sdl3-shadercross";
-  version = "0-unstable-2025-12-24";
+  version = "0-unstable-2025-12-30";

  outputs = [
    "out"
@@ -24,8 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
  src = fetchFromGitHub {
    owner = "libsdl-org";
    repo = "SDL_shadercross";
-    rev = "feec623003c01a9fff5b30e114c38f550255b511";
-    hash = "sha256-AGfuUYUGbea3LDgGiwxq6XBMgLeatsdWDpciL4JeTWU=";
+    rev = "7b7365a86611b2a7b6462e521cf1c43a037d0970";
+    hash = "sha256-4HAdX2+yqk5a+UfpCdAaF0o0Dxv2PTtxPU7I205KfXk=";
  };

  strictDeps = true;
@@ -7,12 +7,12 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "sfeed";
-  version = "2.2";
+  version = "2.3";

  src = fetchgit {
    url = "git://git.codemadness.org/sfeed";
    tag = finalAttrs.version;
-    hash = "sha256-ULCYZYRTdrsUaL0XJd5Dxa9Cd0Hc6PVNMnnLTGs4pIo=";
+    hash = "sha256-VvPBRc2mRuDXaCz0Ds8012wSbcRo+2bZ4n7KKwDmvhw=";
  };

  buildInputs = [ ncurses ];
@@ -5,7 +5,7 @@
  p7zip,
 }:
 let
-  version = "1.022";
+  version = "1.024";

  source =
    with lib.attrsets;
@@ -18,10 +18,10 @@ let
        })
      )
      {
-        Mono = "sha256-kRUnhNXTcU6DCgM0yDVZTzr+2SooANoSkj5bJ1zK+YI=";
-        Round = "sha256-5VJsgTSOGNW87ybKtu55rn+1wp7aUBBC3IPwZopcb9o=";
-        Sans = "sha256-Bss244+gG00tnWUt6hri3BO11tBMWB3+VUEuWqHqr6Y=";
-        Serif = "sha256-PYuqBGxU/T6dlVpa5gqaxe5BShiaIlVisRGtPamlykE=";
+        Mono = "sha256-JSGr3/q5Ca0AphQlfWYKOnKYt2Nr0CtNmv/j27WxBz8=";
+        Round = "sha256-DDMGf+QK8MIRfGFb7QY4sycyGUGmoZAq1OhMQ2VgBbY=";
+        Sans = "sha256-V+fabg4yC1TBVePs4+mpv6LBqq5bH6dTSHtX+SWFR3E=";
+        Serif = "sha256-z55QTCtpVljW+JMdGJJLAm6TIq70maRiegehxoTvhWI=";
      };

  extraOutputs = builtins.attrNames source;
@@ -12,18 +12,18 @@

 buildGoModule rec {
  pname = "shellhub-agent";
-  version = "0.21.3";
+  version = "0.21.4";

  src = fetchFromGitHub {
    owner = "shellhub-io";
    repo = "shellhub";
    rev = "v${version}";
-    hash = "sha256-C6ez20eTMGGvORqB00F3mSciExlOmcG7iKvz9F3Sls8=";
+    hash = "sha256-Q53xxBclPH8oF+MS3gm99bOBhby7HQ+AqI6QeFTcmFc=";
  };

  modRoot = "./agent";

-  vendorHash = "sha256-sXyM9tPsIW+x5zjiah1sr+iGq2JC2VcLHKvoFW6yr3M=";
+  vendorHash = "sha256-PiDciFxMevdWBww49+xTvZkYdyml5VmxoGG+E0PL658=";

  ldflags = [
    "-s"
@@ -1,23 +1,30 @@
 {
  lib,
  fetchFromGitHub,
+  fetchurl,
  buildGoModule,
  fuse,
+  runCommand,
+  jq,
+  gnused,
+  gawk,
+  gnugrep,
 }:

 let
+  fuseftpVersion = "0.6.9";
  fuseftp = buildGoModule rec {
    pname = "go-fuseftp";
-    version = "0.6.6";
+    version = fuseftpVersion;

    src = fetchFromGitHub {
      owner = "datawire";
      repo = "go-fuseftp";
      rev = "v${version}";
-      hash = "sha256-70VmT8F+RNiDk6fnrzDktdfNhZk20sXF+b3TBTAkNHo=";
+      hash = "sha256-iJTVcOsaDICQWqIsMTHWg/MDb++ZIfKnnAPrcumcRWk=";
    };

-    vendorHash = "sha256-wp4jOmeVdfuRwdclCzBonNCkhgsNUBOBL6gxlrznC1A=";
+    vendorHash = "sha256-ZQUlgrC80gwIGTepNXI67Y9SYtarey3Y63eCqZAXXao=";

    buildInputs = [ fuse ];

@@ -28,6 +35,12 @@ let

    subPackages = [ "pkg/main" ];
  };
+
+  k8sVersion = "v1.34.2";
+  k8sDefsJson = fetchurl {
+    url = "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/${k8sVersion}-standalone/_definitions.json";
+    hash = "sha256-IMEXD8MeTgAhBn6dnElp7uKtVLv4UcuDI51pQ4o953Q=";
+  };
 in
 buildGoModule rec {
  pname = "telepresence2";
@@ -44,23 +57,87 @@ buildGoModule rec {
    fuseftp
  ];

+  nativeBuildInputs = [
+    jq
+  ];
+
  # telepresence depends on fuseftp existing as a built binary, as it gets embedded
  # CGO gets disabled to match their build process as that is how it's done upstream
  preBuild = ''
    cp ${fuseftp}/bin/main ./pkg/client/remotefs/fuseftp.bits
+
+    mkdir -p charts/telepresence-oss
+    cp ${k8sDefsJson} charts/telepresence-oss/k8s-defs.json
+
    export CGO_ENABLED=0
  '';

  vendorHash = "sha256-Zroh9/FKG+wm8nX+t+TpJQeT2nFi8UrzxAWnNAaMt8Q=";

+  # ldflags copied from Makefile
+  # ref: https://github.com/telepresenceio/telepresence/blob/7a2b9f553fb51ef252df957916c7b831bd65c1ce/build-aux/main.mk#L250-L251
  ldflags = [
    "-s"
    "-w"
    "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}"
  ];

+  preConfigure = ''
+    HELM_VERSION=$(go mod edit -json | jq -r '.Require[] | select(.Path == "helm.sh/helm/v3") | .Version')
+    ldflags="$ldflags -X github.com/telepresenceio/telepresence/v2/pkg/version.HelmVersion=$HELM_VERSION"
+  '';
+
  subPackages = [ "cmd/telepresence" ];

+  passthru.tests = {
+    k8s-version-matches =
+      runCommand "telepresence2-k8s-version-test"
+        {
+          nativeBuildInputs = [
+            gnugrep
+            gnused
+            gawk
+          ];
+        }
+        ''
+          # ref: https://github.com/telepresenceio/telepresence/blob/7a2b9f553fb51ef252df957916c7b831bd65c1ce/build-aux/main.mk#L545
+          actual_version=$(grep 'k8s.io/client-go' ${src}/go.mod | awk '{print $2}' | sed -e 's/v0\./v1./')
+          expected_version="${k8sVersion}"
+
+          if [ "$actual_version" != "$expected_version" ]; then
+            echo "FAIL: k8s version mismatch in telepresence2" >&2
+            echo "  Hardcoded in Nix: $expected_version" >&2
+            echo "  Found in go.mod:  $actual_version" >&2
+            echo "  Update k8sVersion variable & hash in telepresence2 package" >&2
+            exit 1
+          fi
+
+          echo "PASS: k8s version $actual_version matches" | tee $out
+        '';
+    fuseftp-version-matches =
+      runCommand "telepresence2-fuseftp-version-test"
+        {
+          nativeBuildInputs = [
+            gnugrep
+            gawk
+          ];
+        }
+        ''
+          actual_version=$(grep 'github.com/telepresenceio/go-fuseftp/rpc' ${src}/go.mod | awk '{print $2}')
+          expected_version="v${fuseftpVersion}"
+
+          if [ "$actual_version" != "$expected_version" ]; then
+            echo "FAIL: fuseftp version mismatch in telepresence2" >&2
+            echo "  Hardcoded in Nix: $expected_version" >&2
+            echo "  Found in go.mod:  $actual_version" >&2
+            echo "  Update fuseftpVersion variable & hash in telepresence2 package" >&2
+            exit 1
+          fi
+
+          echo "PASS: fuseftp version $actual_version matches" | tee $out
+        '';
+  };
+
  meta = {
    description = "Local development against a remote Kubernetes or OpenShift cluster";
    homepage = "https://telepresence.io";
@@ -69,6 +146,7 @@ buildGoModule rec {
      mausch
      vilsol
      wrbbz
+      thesn
    ];
    mainProgram = "telepresence";
  };
@@ -0,0 +1,20 @@
+--- vendor/modernc.org/libc/honnef.co/go/netdb/netdb.go
+++ vendor/modernc.org/libc/honnef.co/go/netdb/netdb.go
+@@ -696,7 +696,7 @@ func init() {
+ 	// Load protocols
+ 	data, err := ioutil.ReadFile("/etc/protocols")
+ 	if err != nil {
+-		if !os.IsNotExist(err) {
+		if !os.IsNotExist(err) && !os.IsPermission(err) {
+ 			panic(err)
+ 		}
+ 
+@@ -732,7 +732,7 @@ func init() {
+ 	// Load services
+ 	data, err = ioutil.ReadFile("/etc/services")
+ 	if err != nil {
+-		if !os.IsNotExist(err) {
+		if !os.IsNotExist(err) && !os.IsPermission(err) {
+ 			panic(err)
+ 		}
+ 
@@ -5,20 +5,28 @@
  nixosTests,
  testers,
  temporal,
+  versionCheckHook,
 }:

-buildGoModule rec {
+buildGoModule (finalAttrs: {
  pname = "temporal";
  version = "1.29.2";

  src = fetchFromGitHub {
    owner = "temporalio";
    repo = "temporal";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
    hash = "sha256-WiiezZ/2FgRte4BStIGHQhb5bHtfldi3TaIRG0xFtW0=";
  };

-  vendorHash = "sha256-HW2j8swbaWwU1i3udqlT8VyFreML6ZH14zWxF8L5NTQ=";
+  vendorHash = "sha256-CdzcOE/J0gqUbq7BXPpLFyNPNbFTziR5j9GPdYPzv50=";
+
+  overrideModAttrs = old: {
+    # netdb.go allows /etc/protocols and /etc/services to not exist and happily proceeds, but it panic()s if they exist but return permission denied.
+    postBuild = ''
+      patch -p0 < ${./darwin-sandbox-fix.patch}
+    '';
+  };

  excludedPackages = [ "./build" ];

@@ -47,6 +55,12 @@ buildGoModule rec {
    runHook postInstall
  '';

+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
  passthru.tests = {
    inherit (nixosTests) temporal;
    version = testers.testVersion {
@@ -57,9 +71,9 @@ buildGoModule rec {
  meta = {
    description = "Microservice orchestration platform which enables developers to build scalable applications without sacrificing productivity or reliability";
    homepage = "https://temporal.io";
-    changelog = "https://github.com/temporalio/temporal/releases/tag/v${version}";
+    changelog = "https://github.com/temporalio/temporal/releases/tag/v${finalAttrs.version}";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ jpds ];
    mainProgram = "temporal-server";
  };
-}
+})
@@ -0,0 +1,42 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "tsshd";
+  version = "0.1.5";
+
+  src = fetchFromGitHub {
+    owner = "trzsz";
+    repo = finalAttrs.pname;
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-JNuLN0eA+HSG/Uv5kTgYmOVBSTIBDAJ6vqPa7z+JYTg=";
+  };
+
+  vendorHash = "sha256-XjPXbhrMUYObgw0BBYT4BxDoE6THEYXnAZ5y5rUKgh4=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  doInstallCheck = true;
+  nativeCheckInputs = [
+    versionCheckHook
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Server for `trzsz-ssh`(`tssh`) that supports connection migration for roaming";
+    homepage = "https://github.com/trzsz/tsshd";
+    changelog = "https://github.com/trzsz/tsshd/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ljxfstorm ];
+    mainProgram = "tsshd";
+  };
+})
@@ -8,16 +8,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "typstyle";
-  version = "0.14.0";
+  version = "0.14.1";

  src = fetchFromGitHub {
    owner = "typstyle-rs";
    repo = "typstyle";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-L6MmXipkpTfSvSzuUmE6/hUqDoLbe3+2/bHgFbTfLpo=";
+    hash = "sha256-YAMC1IMs3TioTx3rnb5CdYgviR3gP89b2rfOuZVVg3M=";
  };

-  cargoHash = "sha256-xGGuZw87CjS/tA74SiIyMqM6PS0OJt00axiI3jyAAr0=";
+  cargoHash = "sha256-nmIDgt6KRYAEWmJxufj/TyYWuVGG6/tiYA8iTneKnVc=";

  # Disabling tests requiring network access
  checkFlags = [
@@ -1,301 +0,0 @@
-A shameless merge of many patches floating around; indeed it was made by reading
-and applying them manually.
-
-diff -Naur ventoy-1.0.81-old/CreatePersistentImg.sh ventoy-1.0.81-new/CreatePersistentImg.sh
--- ventoy-1.0.81-old/CreatePersistentImg.sh	2022-10-25 08:26:21.000000000 -0300
-+++ ventoy-1.0.81-new/CreatePersistentImg.sh	2022-11-02 10:29:07.355891607 -0300
-@@ -119,17 +119,13 @@
- sync
- 
- if [ -n "$config" ]; then
-    if [ -d ./persist_tmp_mnt ]; then
-        rm -rf ./persist_tmp_mnt
-    fi
-    
-    mkdir ./persist_tmp_mnt
-    if mount $freeloop ./persist_tmp_mnt; then
-        echo '/ union' > ./persist_tmp_mnt/$config
-+    path_to_persist_mnt="`mktemp -d`"
-+    if mount $freeloop "$path_to_persist_mnt"; then
-+        echo '/ union' > "$path_to_persist_mnt"/$config
-         sync
-        umount ./persist_tmp_mnt
-+        umount "$path_to_persist_mnt"
-     fi
-    rm -rf ./persist_tmp_mnt
-+    rm -rf "$path_to_persist_mnt"
- fi
- 
- if [ ! -z "$passphrase" ]; then
-diff -Naur ventoy-1.0.81-old/tool/ventoy_lib.sh ventoy-1.0.81-new/tool/ventoy_lib.sh
--- ventoy-1.0.81-old/tool/ventoy_lib.sh	2022-10-25 08:26:21.000000000 -0300
-+++ ventoy-1.0.81-new/tool/ventoy_lib.sh	2022-11-02 09:46:29.764568349 -0300
-@@ -6,6 +6,8 @@
- VENTOY_SECTOR_SIZE=512
- VENTOY_SECTOR_NUM=65536
- 
-+LOGFILE="/var/log/ventoy.log"
-+
- ventoy_false() {
-     [ "1" = "2" ]
- }
-@@ -29,7 +31,7 @@
- }
- 
- vtdebug() {
-    echo "$*" >> ./log.txt
-+    echo "$*" >> $LOGFILE
- }
- 
- vtoy_gen_uuid() {
-@@ -51,31 +53,7 @@
- }
- 
- check_tool_work_ok() {
-    
-    if echo 1 | hexdump > /dev/null; then
-        vtdebug "hexdump test ok ..."
-    else
-        vtdebug "hexdump test fail ..."
-        ventoy_false
-        return
-    fi
-   
-    if mkexfatfs -V > /dev/null; then
-        vtdebug "mkexfatfs test ok ..."
-    else
-        vtdebug "mkexfatfs test fail ..."
-        ventoy_false
-        return
-    fi
-    
-    if vtoycli fat -T; then
-        vtdebug "vtoycli fat test ok ..."
-    else
-        vtdebug "vtoycli fat test fail ..."
-        ventoy_false
-        return
-    fi
-    
-+
-     vtdebug "tool check success ..."
-     ventoy_true
- }
-@@ -311,7 +289,7 @@
-     else
-     vtdebug "format disk by fdisk ..."
-     
-fdisk $DISK >>./log.txt 2>&1 <<EOF
-+fdisk $DISK >>$LOGFILE 2>&1 <<EOF
- o
- n
- p
-diff -Naur ventoy-1.0.81-old/tool/VentoyWorker.sh ventoy-1.0.81-new/tool/VentoyWorker.sh
--- ventoy-1.0.81-old/tool/VentoyWorker.sh	2022-10-25 08:26:21.000000000 -0300
-+++ ventoy-1.0.81-new/tool/VentoyWorker.sh	2022-11-02 10:33:25.813135227 -0300
-@@ -106,7 +106,7 @@
- if check_tool_work_ok; then
-     vtdebug "check tool work ok"
- else
-    vterr "Some tools can not run on current system. Please check log.txt for details."
-+    vterr "Some tools can not run on current system. Please check $LOGFILE for details."
-     exit 1
- fi
- 
-@@ -159,19 +159,6 @@
-     exit 1
- fi
- 
-
-#check tmp_mnt directory
-if [ -d ./tmp_mnt ]; then
-    vtdebug "There is a tmp_mnt directory, now delete it."
-    umount ./tmp_mnt >/dev/null 2>&1
-    rm -rf ./tmp_mnt
-    if [ -d ./tmp_mnt ]; then
-        vterr "tmp_mnt directory exists, please delete it first."
-        exit 1
-    fi
-fi
-
-
- if [ "$MODE" = "install" -a -z "$NONDESTRUCTIVE" ]; then
-     vtdebug "install Ventoy ..."
- 
-@@ -567,16 +554,16 @@
-     PART1_TYPE=$(dd if=$DISK bs=1 count=1 skip=450 status=none | hexdump -n1 -e  '1/1 "%02X"')
- 
-     #reserve disk uuid
-    rm -f ./diskuuid.bin
-    dd status=none conv=fsync if=${DISK} skip=384 bs=1 count=16 of=./diskuuid.bin
-+    path_to_diskuuid="`mktemp`"
-+    dd status=none conv=fsync if=${DISK} skip=384 bs=1 count=16 of="$path_to_diskuuid"
- 
-     dd status=none conv=fsync if=./boot/boot.img of=$DISK bs=1 count=440
-    dd status=none conv=fsync if=./diskuuid.bin of=$DISK bs=1 count=16 seek=384
-    rm -f ./diskuuid.bin
-+    dd status=none conv=fsync if="$path_to_diskuuid" of=$DISK bs=1 count=16 seek=384
-+    rm -f "$path_to_diskuuid"
- 
-     #reserve data
-    rm -f ./rsvdata.bin
-    dd status=none conv=fsync if=${DISK} skip=2040 bs=512 count=8 of=./rsvdata.bin
-+    path_to_rsvdata="`mktemp`"
-+    dd status=none conv=fsync if=${DISK} skip=2040 bs=512 count=8 of="$path_to_rsvdata"
- 
-     if [ "$PART1_TYPE" = "EE" ]; then
-         vtdebug "This is GPT partition style ..."
-@@ -598,8 +585,8 @@
-         xzcat ./boot/core.img.xz | dd status=none conv=fsync of=$DISK bs=512 count=2047 seek=1
-     fi
- 
-    dd status=none conv=fsync if=./rsvdata.bin seek=2040 bs=512 count=8 of=${DISK}
-    rm -f ./rsvdata.bin
-+    dd status=none conv=fsync if="$path_to_rsvdata" seek=2040 bs=512 count=8 of=${DISK}
-+    rm -f "$path_to_rsvdata"
- 
-     check_umount_disk "$DISK"
-     
-diff -Naur ventoy-1.0.81-old/Ventoy2Disk.sh ventoy-1.0.81-new/Ventoy2Disk.sh
--- ventoy-1.0.81-old/Ventoy2Disk.sh	2022-10-25 08:26:21.000000000 -0300
-+++ ventoy-1.0.81-new/Ventoy2Disk.sh	2022-11-02 09:50:17.649369332 -0300
-@@ -32,48 +32,4 @@
- echo '**********************************************'
- echo ''
- 
-
-if ! [ -f ./boot/boot.img ]; then
-    if [ -d ./grub ]; then
-        echo "Don't run Ventoy2Disk.sh here, please download the released install package, and run the script in it."
-    else
-        echo "Please run under the correct directory!" 
-    fi
-    exit 1
-fi
-
-echo "############# Ventoy2Disk $* [$TOOLDIR] ################" >> ./log.txt
-date >> ./log.txt
-
-#decompress tool
-echo "decompress tools" >> ./log.txt
-cd ./tool/$TOOLDIR
-
-ls *.xz > /dev/null 2>&1
-if [ $? -eq 0 ]; then
-    [ -f ./xzcat ] && chmod +x ./xzcat
-
-    for file in $(ls *.xz); do
-        echo "decompress $file" >> ./log.txt
-        xzcat $file > ${file%.xz}
-        [ -f ./${file%.xz} ] && chmod +x ./${file%.xz}
-        [ -f ./$file ] && rm -f ./$file
-    done
-fi
-
-cd ../../
-chmod +x -R ./tool/$TOOLDIR
-
-
-if [ -f /bin/bash ]; then
-    /bin/bash ./tool/VentoyWorker.sh $*
-else
-    ash ./tool/VentoyWorker.sh $*
-fi
-
-if [ -n "$OLDDIR" ]; then 
-    CURDIR=$(pwd)
-    if [ "$CURDIR" != "$OLDDIR" ]; then
-        cd "$OLDDIR"
-    fi
-fi
-+./tool/VentoyWorker.sh $*
-diff -Naur ventoy-1.0.81-old/VentoyPlugson.sh ventoy-1.0.81-new/VentoyPlugson.sh
--- ventoy-1.0.81-old/VentoyPlugson.sh	2022-10-25 08:26:21.000000000 -0300
-+++ ventoy-1.0.81-new/VentoyPlugson.sh	2022-11-02 09:51:36.758360872 -0300
-@@ -43,39 +43,6 @@
-     exit 1
- fi
- 
-
-if ! [ -f "$OLDDIR/tool/plugson.tar.xz" ]; then
-    echo "Please run under the correct directory!" 
-    exit 1
-fi
-
-echo "############# VentoyPlugson $* [$TOOLDIR] ################" >> ./VentoyPlugson.log
-date >> ./VentoyPlugson.log
-
-echo "decompress tools" >> ./VentoyPlugson.log
-cd ./tool/$TOOLDIR
-
-ls *.xz > /dev/null 2>&1
-if [ $? -eq 0 ]; then
-    [ -f ./xzcat ] && chmod +x ./xzcat
-
-    for file in $(ls *.xz); do
-        echo "decompress $file" >> ./VentoyPlugson.log
-        xzcat $file > ${file%.xz}
-        [ -f ./${file%.xz} ] && chmod +x ./${file%.xz}
-        [ -f ./$file ] && rm -f ./$file
-    done
-fi
-
-cd ../../
-chmod +x -R ./tool/$TOOLDIR
-
-if ! [ -f "$OLDDIR/tool/$TOOLDIR/Plugson" ]; then
-    echo "$OLDDIR/tool/$TOOLDIR/Plugson does not exist!" 
-    exit 1
-fi
-
-
- PATH=./tool/$TOOLDIR:$PATH
- 
- HOST="127.0.0.1"
-@@ -217,11 +184,3 @@
- 
-     wait $wID
- fi
-
-
-if [ -n "$OLDDIR" ]; then 
-    CURDIR=$(pwd)
-    if [ "$CURDIR" != "$OLDDIR" ]; then
-        cd "$OLDDIR"
-    fi
-fi
-diff -Naur ventoy-1.0.81-old/VentoyWeb.sh ventoy-1.0.81-new/VentoyWeb.sh
--- ventoy-1.0.81-old/VentoyWeb.sh	2022-10-25 08:26:21.000000000 -0300
-+++ ventoy-1.0.81-new/VentoyWeb.sh	2022-11-02 09:53:13.773791254 -0300
-@@ -15,12 +15,6 @@
-     echo ""
- }
- 
-uid=$(id -u)
-if [ $uid -ne 0 ]; then
-    print_err "Please use sudo or run the script as root."
-    exit 1
-fi
-
- OLDDIR=$(pwd)
- 
- if uname -m | egrep -q 'aarch64|arm64'; then
-@@ -85,8 +79,8 @@
-     exit 1
- fi
- 
-LOGFILE=log.txt
-#delete the log.txt if it's more than 8MB
-+LOGFILE=/var/log/ventoy.log
-+#delete the logfile if it's more than 8MB
- if [ -f $LOGFILE ]; then
-     logsize=$(stat -c '%s' $LOGFILE)
-     if [ $logsize -gt 8388608 ]; then
-@@ -94,7 +88,6 @@
-     fi
- fi
- 
-
- if [ -f ./tool/$TOOLDIR/V2DServer.xz ]; then
-     xz -d ./tool/$TOOLDIR/V2DServer.xz
-     chmod +x ./tool/$TOOLDIR/V2DServer
@@ -59,17 +59,13 @@ stdenv.mkDerivation (finalAttrs: {
    "ventoy"
    + optionalString (defaultGuiType == "gtk3") "-gtk3"
    + optionalString (defaultGuiType == "qt5") "-qt5";
-  version = "1.1.07";
+  version = "1.1.10";

  src = fetchurl {
    url = "https://github.com/ventoy/Ventoy/releases/download/v${finalAttrs.version}/ventoy-${finalAttrs.version}-linux.tar.gz";
-    hash = "sha256-T/q85GiwPWNXzl9FlOIJcU0VCdBl2hApOAltrWZUw24=";
+    hash = "sha256-EROr5uG7cSg0/ldKlmYhqRKFgAT0/v1wFmbsl8W+sgg=";
  };

-  patches = [
-    ./000-nixos-sanitization.patch
-  ];
-
  postPatch = ''
    # Fix permissions.
    find -type f -name \*.sh -exec chmod a+x '{}' \;
@@ -8,13 +8,13 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "wavelog";
-  version = "2.2.1";
+  version = "2.2.2";

  src = fetchFromGitHub {
    owner = "wavelog";
    repo = "wavelog";
    tag = finalAttrs.version;
-    hash = "sha256-9lrEWhGnGq4BWl57qaJ9eqWqRYfzjlATXZvP0TafJxw=";
+    hash = "sha256-Ujk0SgMLdG+bEqP5++dkMzW4oaKXfIVvHGiAdZ3szqc=";
  };

  installPhase = ''
@@ -16,7 +16,7 @@
 }:
 let
  pname = "wl-kbptr";
-  version = "0.4.0";
+  version = "0.4.1";
 in
 stdenv.mkDerivation {
  inherit pname version;
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
    owner = "moverest";
    repo = "wl-kbptr";
    tag = "v${version}";
-    hash = "sha256-4ZxiRlIcVpYT9AzMguqzuZ5p7lZbH/m7ZX839tsCgMU=";
+    hash = "sha256-Z0ECLxkJChGe2ggwFRuKJj+J6+KcTAlZclqdvBzZDzs=";
  };

  depsBuildBuild = [ pkg-config ];
@@ -10,16 +10,16 @@

 buildGoModule (finalAttrs: {
  pname = "yay";
-  version = "12.5.3";
+  version = "12.5.7";

  src = fetchFromGitHub {
    owner = "Jguer";
    repo = "yay";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Nsno5oUVUCqt5tn+qUFoDj/n1oHyMwWTAUBG/OU11SA=";
+    hash = "sha256-ampSNPa/PkYM6zEbukToDDmLQ5Bq9gmxwgD3RsnX3vU=";
  };

-  vendorHash = "sha256-7y7Kb9770LiZxE0HOefh8T3+i36VcjsElo3GE+GdWeg=";
+  vendorHash = "sha256-Lkqrtb37bq1uwIZ4PzJdSM7QOZ28JMyDx68huxHHuGg=";

  nativeBuildInputs = [ installShellFiles ];

@@ -65,6 +65,10 @@ stdenv.mkDerivation rec {
    ./CVE-2016-8605.patch
  ];

+  env = {
+    NIX_CFLAGS_COMPILE = "-std=gnu17";
+  };
+
  preBuild = ''
    sed -e '/lt_dlinit/a  lt_dladdsearchdir("'$out/lib'");' -i libguile/dynl.c
  '';
@@ -116,6 +116,10 @@ builder rec {
    "--without-threads"
  ];

+  env = {
+    NIX_CFLAGS_COMPILE = "-std=gnu17";
+  };
+
  postInstall = ''
    wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
  ''
@@ -26,7 +26,7 @@ buildPythonPackage rec {
    owner = "aws";
    repo = "aws-lambda-python-runtime-interface-client";
    tag = version;
-    sha256 = "sha256-pUVWd4zpmTygndPIy76uVk7+sLCmwQqulLaUI7B0fQc=";
+    sha256 = "sha256-gwbEDo/LewCb0wTtkw/bF3XSAiSu1ITYHAnuvpNsfs0=";
  };

  propagatedBuildInputs = [
@@ -16,14 +16,14 @@

 buildPythonPackage rec {
  pname = "dataclass-wizard";
-  version = "0.38.2";
+  version = "0.39.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "rnag";
    repo = "dataclass-wizard";
    tag = "v${version}";
-    hash = "sha256-/Afw7O7BNKUyg7lGP5CgkkOijaLfQsEqhDkBU7z8l+o=";
+    hash = "sha256-9Orr1+3uZFYqMAuCLswXe71iK16aiMPvcDRCFzI9HUo=";
  };

  build-system = [ setuptools ];
@@ -13,13 +13,11 @@
  merge3,
  paramiko,
  pytestCheckHook,
-  pythonOlder,
  rich,
  rustPlatform,
  rustc,
  setuptools,
  setuptools-rust,
-  typing-extensions,
  urllib3,
 }:

@@ -28,8 +26,6 @@ buildPythonPackage rec {
  version = "0.24.1";
  pyproject = true;

-  disabled = pythonOlder "3.9";
-
  src = fetchFromGitHub {
    owner = "jelmer";
    repo = "dulwich";
@@ -55,9 +51,6 @@ buildPythonPackage rec {

  dependencies = [
    urllib3
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [
-    typing-extensions
  ];

  optional-dependencies = {
@@ -88,17 +81,17 @@ buildPythonPackage rec {
    "test_file_win"
    # dulwich.errors.NotGitRepository: No git repository was found at .
    "WorktreeCliTests"
-    # 'SwiftPackData' object has no attribute '_file'
-    "test_iterobjects_subset_all_present"
-    "test_iterobjects_subset_missing_allowed"
-    "test_iterobjects_subset_missing_not_allowed"
    # Adding a symlink to a directory outside the repo doesn't raise
    "test_add_symlink_absolute_to_system"
+    # Depends on setuid which is not available in sandboxed environments
+    "SharedRepositoryTests"
+    # TypeError: pack index v1 only supports SHA-1 names
+    "test_pack_index_v1_with_sha256"
  ];

  disabledTestPaths = [
-    # requires swift config file
-    "tests/contrib/test_swift_smoke.py"
+    # "Code [in contrib] is not an official part of Dulwich, and may no longer work"
+    "tests/contrib"
  ];

  __darwinAllowLocalNetworking = true;
@@ -117,6 +110,9 @@ buildPythonPackage rec {
      asl20
      gpl2Plus
    ];
-    maintainers = with lib.maintainers; [ koral ];
+    maintainers = with lib.maintainers; [
+      koral
+      sarahec
+    ];
  };
 }
@@ -4,28 +4,25 @@
  buildPythonPackage,
  fetchFromGitHub,
  pytestCheckHook,
-  pythonOlder,
  rustPlatform,
  libiconv,
 }:

 buildPythonPackage rec {
  pname = "evtx";
-  version = "0.8.9";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.7";
+  version = "0.11.0";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "omerbenamram";
    repo = "pyevtx-rs";
    tag = version;
-    hash = "sha256-rxE3Srm+5L9r6uNIeOPBnpQAbS89WCel/U7xgLc2ZDU=";
+    hash = "sha256-06pRNGEUmk2llD5CPbgHiJSHTR8tm/nv0eJL1UKHPEM=";
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit pname version src;
-    hash = "sha256-IqV4BsLE+5Dk3ey4M+h5wxR/SToZTLf8vU0BlWU5e8c=";
+    hash = "sha256-POEqKRJ/g0bWYs89yrVyD4RFhc7iq+5J67P0rowB2/g=";
  };

  nativeBuildInputs = with rustPlatform; [
@@ -42,8 +39,8 @@ buildPythonPackage rec {
  meta = {
    description = "Bindings for evtx";
    homepage = "https://github.com/omerbenamram/pyevtx-rs";
-    changelog = "https://github.com/omerbenamram/pyevtx-rs/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
+    changelog = "https://github.com/omerbenamram/pyevtx-rs/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ fab ];
  };
 }
@@ -3,6 +3,7 @@
  stdenv,
  buildPythonPackage,
  fetchFromGitHub,
+  pythonAtLeast,
  flit-core,
  nix-update-script,
  httpx,
@@ -17,6 +18,7 @@ buildPythonPackage rec {
  pname = "gotify";
  version = "0.6.0";
  pyproject = true;
+  disabled = pythonAtLeast "3.14";

  src = fetchFromGitHub {
    owner = "d-k-bo";
@@ -0,0 +1,37 @@
+{
+  lib,
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+}:
+
+buildPythonPackage rec {
+  pname = "hdfury";
+  version = "1.3.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "glenndehaan";
+    repo = "python-hdfury";
+    tag = version;
+    hash = "sha256-cV9cqZ0ogxXF2IHtywV5EyC0aIsgzRQOIQHfOT1uq8c=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [ aiohttp ];
+
+  pythonImportsCheck = [ "hdfury" ];
+
+  # Module no tests
+  doCheck = false;
+
+  meta = {
+    description = "Python client for HDFury devices";
+    homepage = "https://github.com/glenndehaan/python-hdfury";
+    changelog = "https://github.com/glenndehaan/python-hdfury/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
@@ -10,14 +10,14 @@

 buildPythonPackage rec {
  pname = "hyper-connections";
-  version = "0.2.1";
+  version = "0.3.4";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "lucidrains";
    repo = "hyper-connections";
    tag = version;
-    hash = "sha256-9dMiyxzrZBlDxKeehXjoIjbzAkGSkAFxQZZX3LJJAig=";
+    hash = "sha256-GRP4ODCs/MMx9S/6LYFMpIoZNJinkcMeY73x4aFacsg=";
  };

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

 buildPythonPackage rec {
  pname = "iamdata";
-  version = "0.1.202601021";
+  version = "0.1.202601031";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "cloud-copilot";
    repo = "iam-data-python";
    tag = "v${version}";
-    hash = "sha256-rZzsiaoFoeTL5tv0nPSw8f6p/M4IIh7jJvny1W/wwM4=";
+    hash = "sha256-01PMwJ7F7quyZPHUWVtTe9dkAktZ3j8MbIysIcb+BD4=";
  };

  __darwinAllowLocalNetworking = true;
@@ -5,20 +5,17 @@
  fetchPypi,
  hatchling,
  llama-index-core,
-  pythonOlder,
 }:

 buildPythonPackage rec {
  pname = "llama-index-vector-stores-chroma";
-  version = "0.5.3";
+  version = "0.5.5";
  pyproject = true;

-  disabled = pythonOlder "3.8";
-
  src = fetchPypi {
    pname = "llama_index_vector_stores_chroma";
    inherit version;
-    hash = "sha256-oGa57j3FEQoOE7nf6x9K4LSJMcBGRMp/U0ppBDwpFJo=";
+    hash = "sha256-gjhlBpvOpNnekVECca4DzW6o6wEGpbXqQ//OwD7Cpwg=";
  };

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