Merge master into staging-nixos

2026-01-08 00:20:18 +00:00
parent 55a0c00389 a5d7ac11b6
commit 0b24890964
136 changed files with 6475 additions and 4894 deletions
@@ -57,6 +57,8 @@

 - `n8n` has been updated to version 2. You can find the breaking changes here: https://docs.n8n.io/2-0-breaking-changes/.

+- `gurk-rs` has been updated from `0.6.4` to `0.8.0`. Version `0.8.0` includes breaking changes. For more information read the [release notes for 0.8.0](https://github.com/boxdot/gurk-rs/releases/tag/v0.8.0).
+
 - `iroh` has been removed and split up into `iroh-dns-server` and `iroh-relay`.

 - `python3Packages.pygame` has been been renamed to `python3Packages.pygame-original`, the attribute `python3Packages.pygame` will from python 3.14 default to the more actively maintained `python3Packages.pygame-ce`
@@ -879,6 +879,12 @@
    github = "AimPizza";
    githubId = 64905268;
  };
+  aionescu = {
+    name = "Alex Ionescu";
+    email = "github@ionescu.sh";
+    github = "aionescu";
+    githubId = 48064242;
+  };
  aiotter = {
    email = "git@aiotter.com";
    github = "aiotter";
@@ -8,9 +8,16 @@ DEB_URL=https://sources.debian.org/data/main
 declare -a deb_patches
 mapfile -t deb_patches < $1

-# First letter
-deb_prefix="${deb_patches[0]:0:1}"
-prefix="${DEB_URL}/${deb_prefix}/${deb_patches[0]}/debian/patches"
+pkgname="${deb_patches[0]}"
+# See https://sources.debian.org/data/main/ for patterns of prefixes
+if [[ $pkgname == lib* ]]; then
+    sub_prefix="${pkgname:3:1}"
+    deb_prefix="lib${sub_prefix}"
+else
+    deb_prefix="${pkgname:0:1}"
+fi
+
+prefix="${DEB_URL}/${deb_prefix}/${pkgname}/debian/patches"

 if [[ -n "$2" ]]; then
    exec 1> $2
@@ -145,12 +145,12 @@
    };
    beancount = buildGrammar {
      language = "beancount";
-      version = "0.0.0+rev=b7a2557";
+      version = "0.0.0+rev=653cce3";
      src = fetchFromGitHub {
        owner = "polarmutex";
        repo = "tree-sitter-beancount";
-        rev = "b7a2557e6c8cf1dc70a52cece1861522ad3903fc";
-        hash = "sha256-E8FPmskJr1OQ55w52FUi9zub7BTZ6neX3VHypjEyRek=";
+        rev = "653cce316fbff8d212a2488ae13df648efb542a4";
+        hash = "sha256-SHEGsVac8HMl/PpdZ4GyRHzEti8HXBJrXnx0hoFd9qU=";
      };
      meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount";
    };
@@ -233,12 +233,12 @@
    };
    c3 = buildGrammar {
      language = "c3";
-      version = "0.0.0+rev=6b4e912";
+      version = "0.0.0+rev=805f776";
      src = fetchFromGitHub {
        owner = "c3lang";
        repo = "tree-sitter-c3";
-        rev = "6b4e9127f90fa35d39f5314211bc5f7e304304bb";
-        hash = "sha256-fkCW4RNyWaXuIy7SDGxqeUU2SLbJ+b5Jv/CY1RYiAsY=";
+        rev = "805f776dcfbfef5c9baf4270ec942b3e8dc7ff16";
+        hash = "sha256-XA0jEX4dxA6PmXMoLnaul1DKGn3NoeFm2J3qpkBuCXo=";
      };
      meta.homepage = "https://github.com/c3lang/tree-sitter-c3";
    };
@@ -476,12 +476,12 @@
    };
    desktop = buildGrammar {
      language = "desktop";
-      version = "0.0.0+rev=317de59";
+      version = "0.0.0+rev=c0279c1";
      src = fetchFromGitHub {
        owner = "ValdezFOmar";
        repo = "tree-sitter-desktop";
-        rev = "317de59070dd4f8bd0af03dd3dea5dda0e7a0449";
-        hash = "sha256-FX0uPZfefRLuFvBR3uVGAmBvukSjaN0/pN580edqxxs=";
+        rev = "c0279c1fb1e2e1f06f374437815d4abda02e30b2";
+        hash = "sha256-439O9Ef8BSUwHe7UL2/nPkJWZWwQtkmsacZbr3ylD+U=";
      };
      meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-desktop";
    };
@@ -610,12 +610,12 @@
    };
    editorconfig = buildGrammar {
      language = "editorconfig";
-      version = "0.0.0+rev=3d49942";
+      version = "0.0.0+rev=f8e8a4c";
      src = fetchFromGitHub {
        owner = "ValdezFOmar";
        repo = "tree-sitter-editorconfig";
-        rev = "3d4994215125087ffea228ccec3654d313968579";
-        hash = "sha256-F1T5VzjtXNeV7fgX47xMXY1M4f6yh6oUOnZzaxuIGBs=";
+        rev = "f8e8a4cefe4de5d7e87bd129f3a69bdcdf73eebe";
+        hash = "sha256-y4lclfgqlYDFmpEFC1OhbUu6VQ6wDW1PEwF/BmtDvr0=";
      };
      meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig";
    };
@@ -1437,12 +1437,12 @@
    };
    javadoc = buildGrammar {
      language = "javadoc";
-      version = "0.0.0+rev=5c6157f";
+      version = "0.0.0+rev=373fbd8";
      src = fetchFromGitHub {
        owner = "rmuir";
        repo = "tree-sitter-javadoc";
-        rev = "5c6157fe1c44e843f739e11b41c48c5918ec8709";
-        hash = "sha256-mbTqYzTr78UIyx7Z/x4M4CU841BafvXVMzq678LtqGU=";
+        rev = "373fbd84f35aff70031426ed6edf3cdf52b93532";
+        hash = "sha256-T63QTS1ZdTWMcX8dxkhYDsHN6Kp5lUHX7nwJOCzjZMM=";
      };
      meta.homepage = "https://github.com/rmuir/tree-sitter-javadoc";
    };
@@ -1593,15 +1593,26 @@
    };
    kitty = buildGrammar {
      language = "kitty";
-      version = "0.0.0+rev=2e9b602";
+      version = "0.0.0+rev=f821c16";
      src = fetchFromGitHub {
        owner = "OXY2DEV";
        repo = "tree-sitter-kitty";
-        rev = "2e9b602ca676cac63887cca5a4535106f3475c82";
-        hash = "sha256-9knYf4/0G8zX2grWJi6U/1TQmUWQCjdMK3Vd/fw93C0=";
+        rev = "f821c16397ffab5b776d8781245215811438a624";
+        hash = "sha256-vjfKJng2AkVfnpQsJM86XrbVT3s0JXkwWEqEQS57n0M=";
      };
      meta.homepage = "https://github.com/OXY2DEV/tree-sitter-kitty";
    };
+    kos = buildGrammar {
+      language = "kos";
+      version = "0.0.0+rev=5f11d41";
+      src = fetchFromGitHub {
+        owner = "kos-lang";
+        repo = "tree-sitter-kos";
+        rev = "5f11d41b3150b0837e8b3964151ebb7fc4f367e9";
+        hash = "sha256-tdiNHUUTvUpH2JSPxxgx7aw5XTeUmk0hoM9gI/c/WOk=";
+      };
+      meta.homepage = "https://github.com/kos-lang/tree-sitter-kos";
+    };
    kotlin = buildGrammar {
      language = "kotlin";
      version = "0.0.0+rev=57fb456";
@@ -1726,12 +1737,12 @@
    };
    lua = buildGrammar {
      language = "lua";
-      version = "0.0.0+rev=97db867";
+      version = "0.0.0+rev=e284fce";
      src = fetchFromGitHub {
        owner = "tree-sitter-grammars";
        repo = "tree-sitter-lua";
-        rev = "97db86785105b198a760c82f146e4b52d889f386";
-        hash = "sha256-hfCpTx4P+EcvHQrXPoEuP9J0VbhtI0ZIG9hz4tvsno4=";
+        rev = "e284fcec45ead0d477e326fccd2cd4a68a89dae4";
+        hash = "sha256-GCdVwRvAHANeRFpHK1On3xb8ThYDo1wO1VQDNen+rAM=";
      };
      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-lua";
    };
@@ -1894,12 +1905,12 @@
    };
    nginx = buildGrammar {
      language = "nginx";
-      version = "0.0.0+rev=989da76";
+      version = "0.0.0+rev=47ade64";
      src = fetchFromGitHub {
        owner = "opa-oz";
        repo = "tree-sitter-nginx";
-        rev = "989da760be05a3334af3ec88705cbf57e6a9c41d";
-        hash = "sha256-tIbwsh7cnpm1jkIKaXQ7NI/LXWzEOsZyNLfe/qTNkkM=";
+        rev = "47ade644d754cce57974aac44d2c9450e823d4f4";
+        hash = "sha256-exbjYJouZYcxC3suV7byqSEwu2r8hHj/wehPpf5Aecc=";
      };
      meta.homepage = "https://github.com/opa-oz/tree-sitter-nginx";
    };
@@ -2397,12 +2408,12 @@
    };
    query = buildGrammar {
      language = "query";
-      version = "0.0.0+rev=a4e379d";
+      version = "0.0.0+rev=6350ad7";
      src = fetchFromGitHub {
        owner = "tree-sitter-grammars";
        repo = "tree-sitter-query";
-        rev = "a4e379d4a4b77a09e91c1c9e12d4b898214f990e";
-        hash = "sha256-fChdW/PAE9wfUAliGr8HXBNRvKqNExAr9aD8WYUWHVo=";
+        rev = "6350ad724e7b17a7eea712d4860b4d2ae892e0b6";
+        hash = "sha256-/nibZKIEeZFL0k5NkSnYVP0Eujojge5Hsw2jSoI6ncw=";
      };
      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-query";
    };
@@ -2571,14 +2582,14 @@
      };
      meta.homepage = "https://github.com/Hubro/tree-sitter-robot";
    };
-    robots = buildGrammar {
-      language = "robots";
-      version = "0.0.0+rev=8e3a420";
+    robots_txt = buildGrammar {
+      language = "robots_txt";
+      version = "0.0.0+rev=0c06610";
      src = fetchFromGitHub {
        owner = "opa-oz";
        repo = "tree-sitter-robots-txt";
-        rev = "8e3a4205b76236bb6dbebdbee5afc262ce38bb62";
-        hash = "sha256-OePLE85CWbl0hnre4Apq5Ix2GA8juGV2TE891Py4AME=";
+        rev = "0c066107e3548de79316a6a4ec771e2f7cf7c468";
+        hash = "sha256-fQq5agJ/xHsWxEJAydGxED4Z0bmREfXJ1t/EspBkYC8=";
      };
      meta.homepage = "https://github.com/opa-oz/tree-sitter-robots-txt";
    };
@@ -2973,12 +2984,12 @@
    };
    swift = buildGrammar {
      language = "swift";
-      version = "0.0.0+rev=78d84ef";
+      version = "0.0.0+rev=82a239e";
      src = fetchFromGitHub {
        owner = "alex-pinkus";
        repo = "tree-sitter-swift";
-        rev = "78d84ef82c387fceeb6094038da28717ea052e39";
-        hash = "sha256-ApR65kRt1j1K5yngBEH1SxDDXzZaUF4gqVieducvkHU=";
+        rev = "82a239e4c164b0567fb99b80b53f99ba661f2168";
+        hash = "sha256-R2fslIoQ1D3QrbbTm9i5t7UFjMmVrrol+ECHUHZM22E=";
      };
      generate = true;
      meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
@@ -3074,12 +3085,12 @@
    };
    templ = buildGrammar {
      language = "templ";
-      version = "0.0.0+rev=3057cd4";
+      version = "0.0.0+rev=1c6db04";
      src = fetchFromGitHub {
        owner = "vrischmann";
        repo = "tree-sitter-templ";
-        rev = "3057cd485f7f23a8ad24107c6adc604f8c5ce3db";
-        hash = "sha256-iv5Egh0CcBEsD86IGESI5Bn0NcGji3wruD8UR1JNlk0=";
+        rev = "1c6db04effbcd7773c826bded9783cbc3061bd55";
+        hash = "sha256-n+TJLNB6AoFOjkqpb8vkxXsXno/vE8M8yRzVflRUVd0=";
      };
      meta.homepage = "https://github.com/vrischmann/tree-sitter-templ";
    };
@@ -3243,12 +3254,12 @@
    };
    typespec = buildGrammar {
      language = "typespec";
-      version = "0.0.0+rev=814c982";
+      version = "0.0.0+rev=395bef1";
      src = fetchFromGitHub {
        owner = "happenslol";
        repo = "tree-sitter-typespec";
-        rev = "814c98283fd92a248ba9d49ebfe61bc672a35875";
-        hash = "sha256-3/zNoawx1DsKmG0KFvJD+o80IMBsJd2VV2ng+fSrV1c=";
+        rev = "395bef1e1eb4dd18365401642beb534e8a244056";
+        hash = "sha256-N+clb40CgGzjyvC9b/qMhbSUZ6VsLJzK7N1k5iq2seY=";
      };
      meta.homepage = "https://github.com/happenslol/tree-sitter-typespec";
    };
@@ -3332,12 +3343,12 @@
    };
    v = buildGrammar {
      language = "v";
-      version = "0.0.0+rev=5f6c9c4";
+      version = "0.0.0+rev=9cf6a37";
      src = fetchFromGitHub {
        owner = "vlang";
        repo = "v-analyzer";
-        rev = "5f6c9c414f6e1ca3b991830c2d32b4cb83bef383";
-        hash = "sha256-dyiAqfc6I1FG+C0pLzUaKqEWesLqvdYZ9gL5rgkikAU=";
+        rev = "9cf6a37689f06b17d170dec644ace81eb8eab280";
+        hash = "sha256-rHqWpUgWgfHXGJzTfXcftbol7IU0RPVaFSsne+qcUa4=";
      };
      location = "tree_sitter_v";
      meta.homepage = "https://github.com/vlang/v-analyzer";
@@ -3388,12 +3399,12 @@
    };
    vim = buildGrammar {
      language = "vim";
-      version = "0.0.0+rev=8b8db7d";
+      version = "0.0.0+rev=78866ca";
      src = fetchFromGitHub {
        owner = "tree-sitter-grammars";
        repo = "tree-sitter-vim";
-        rev = "8b8db7d8e4db799ab6b0db25a7990c2890133c1e";
-        hash = "sha256-fMeDDK0pdpZ37mSGvvcw9PjxqyOMF6TVDib71GaWqO4=";
+        rev = "78866caaacf123f4d9d227fe1ab521cc62167a88";
+        hash = "sha256-5eNRU85XnB4NxnTRdJMuPnYh5FPhrxkxZIatbKyWgCM=";
      };
      meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-vim";
    };
@@ -3510,12 +3521,12 @@
    };
    xresources = buildGrammar {
      language = "xresources";
-      version = "0.0.0+rev=ff2b89e";
+      version = "0.0.0+rev=f60fb1e";
      src = fetchFromGitHub {
        owner = "ValdezFOmar";
        repo = "tree-sitter-xresources";
-        rev = "ff2b89e99d7760e77544b662125df84d7be1641d";
-        hash = "sha256-7vAW7ak7F21dkkKB58In4j8h0GGmNZBj3hoyTpNlSt8=";
+        rev = "f60fb1e661d85f35fb8e7b988a41d2a74f65bfd4";
+        hash = "sha256-+rwucV717Xn/S0VhPh4CxY8QfcqiRqZNBj0Vdd39ygs=";
      };
      meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources";
    };
@@ -4050,6 +4061,9 @@
    kitty = buildQueries {
      language = "kitty";
    };
+    kos = buildQueries {
+      language = "kos";
+    };
    kotlin = buildQueries {
      language = "kotlin";
    };
@@ -4311,8 +4325,8 @@
    robot = buildQueries {
      language = "robot";
    };
-    robots = buildQueries {
-      language = "robots";
+    robots_txt = buildQueries {
+      language = "robots_txt";
    };
    roc = buildQueries {
      language = "roc";
@@ -796,7 +796,7 @@ assertNoAdditions {
    };

  codewindow-nvim = super.codewindow-nvim.overrideAttrs {
-    dependencies = [ self.nvim-treesitter ];
+    dependencies = [ self.nvim-treesitter-legacy ];
  };

  colorful-menu-nvim = super.colorful-menu-nvim.overrideAttrs {
@@ -1365,10 +1365,13 @@ assertNoAdditions {
  };

  go-nvim = super.go-nvim.overrideAttrs {
+    dependencies = with self; [
+      nvim-treesitter
+      guihua-lua
+    ];
    checkInputs = with self; [
      luasnip
      null-ls-nvim
-      nvim-treesitter
    ];
    nvimSkipModules = [
      "init"
@@ -1399,6 +1402,25 @@ assertNoAdditions {
    dependencies = [ self.guard-nvim ];
  };

+  guihua-lua = super.guihua-lua.overrideAttrs {
+    dependencies = [ self.nvim-treesitter ];
+
+    buildPhase = ''
+      runHook preBuild
+
+      pushd lua/fzy
+      make
+      popd
+
+      runHook postBuild
+    '';
+
+    nvimSkipModules = [
+      # lua module '.init' not found
+      "fzy.fzy-lua-native"
+    ];
+  };
+
  gx-nvim = super.gx-nvim.overrideAttrs {
    patches = lib.optionals stdenv.hostPlatform.isLinux [
      (replaceVars ./patches/gx-nvim/fix-paths.patch {
@@ -1543,7 +1565,7 @@ assertNoAdditions {
  };

  iswap-nvim = super.iswap-nvim.overrideAttrs {
-    dependencies = [ self.nvim-treesitter ];
+    dependencies = [ self.nvim-treesitter-legacy ];
  };

  jdd-nvim = super.jdd-nvim.overrideAttrs {
@@ -1684,7 +1706,7 @@ assertNoAdditions {
  leap-ast-nvim = super.leap-ast-nvim.overrideAttrs {
    dependencies = with self; [
      leap-nvim
-      nvim-treesitter
+      nvim-treesitter-legacy
    ];
  };

@@ -2677,6 +2699,8 @@ assertNoAdditions {
    checkInputs = [
      # Optional telescope picker
      self.telescope-nvim
+      # Optional fzf-lua integration
+      self.fzf-lua
    ];
  };

@@ -2953,6 +2977,7 @@ assertNoAdditions {
      # Optional integration
      neotest
      toggleterm-nvim
+      nodejs
      nvim-dap
    ];
    checkPhase = ''
@@ -318,7 +318,7 @@ https://github.com/Shougo/ddc-source-lsp/,HEAD,
 https://github.com/Shougo/ddc-ui-native/,HEAD,
 https://github.com/Shougo/ddc-ui-pum/,HEAD,
 https://github.com/Shougo/ddc.vim/,HEAD,
-https://github.com/miroshQa/debugmaster.nvim/,HEAD,
+https://github.com/MironPascalCaseFan/debugmaster.nvim/,HEAD,
 https://github.com/andrewferrier/debugprint.nvim/,HEAD,
 https://github.com/Verf/deepwhite.nvim/,,
 https://github.com/kristijanhusak/defx-git/,,
@@ -476,6 +476,7 @@ https://github.com/ellisonleao/gruvbox.nvim/,,
 https://github.com/nvimdev/guard-collection/,HEAD,
 https://github.com/nvimdev/guard.nvim/,HEAD,
 https://github.com/nmac427/guess-indent.nvim/,HEAD,
+https://github.com/ray-x/guihua.lua/,HEAD,
 https://github.com/sjl/gundo.vim/,,
 https://github.com/junegunn/gv.vim/,,
 https://github.com/chrishrb/gx.nvim/,HEAD,
@@ -1427,7 +1428,7 @@ https://github.com/tpope/vim-git/,,
 https://github.com/itchyny/vim-gitbranch/,,
 https://github.com/airblade/vim-gitgutter/,,
 https://github.com/junegunn/vim-github-dashboard/,,
-https://github.com/tikhomirov/vim-glsl/,,
+https://github.com/stykhomyrov/vim-glsl/,,
 https://github.com/JafarDakhan/vim-gml/,HEAD,
 https://github.com/jamessan/vim-gnupg/,,
 https://github.com/fatih/vim-go/,,
@@ -279,8 +279,8 @@ let
        mktplcRef = {
          name = "icons-carbon";
          publisher = "antfu";
-          version = "0.2.8";
-          hash = "sha256-9ZU6xZxoT+z/hy+HAbrf52rbSdrA448Ph5/N7A3QB2A=";
+          version = "0.2.9";
+          hash = "sha256-GSK12dIrtMnz4O77G6Rg/YBGxmlQrm+4+XodM6MbBs0=";
        };
        meta = {
          license = lib.licenses.mit;
@@ -15,25 +15,24 @@ let
  vsix = stdenv.mkDerivation (finalAttrs: {
    name = "gitlens-${finalAttrs.version}.vsix";
    pname = "gitlens-vsix";
-    version = "17.7.1";
+    version = "17.8.1";

    src = fetchFromGitHub {
      owner = "gitkraken";
      repo = "vscode-gitlens";
      tag = "v${finalAttrs.version}";
-      hash = "sha256-9XEv50WIG1BJenY9MswES6d72Ead2VqW5dgBr7Eu8ek=";
+      hash = "sha256-ma+2HusIdhQ2Xy9rKs9fzJYSZ2YKa0taqv7ZzitNEUo=";
    };

    pnpmDeps = fetchPnpmDeps {
      inherit (finalAttrs) pname version src;
      fetcherVersion = 2;
-      hash = "sha256-QHITHoaz/lzZ3Th/YPlQayFMU9rtlnAZWEYkLyBuAkc=";
+      hash = "sha256-MosT/2dmYomhRXtAeAZS2AMljiVDx+K3t5lLNii2a64=";
    };

    postPatch = ''
      substituteInPlace scripts/generateLicenses.mjs --replace-fail 'https://raw.githubusercontent.com/microsoft/vscode/refs/heads/main/LICENSE.txt' '${pkgs.vscode-json-languageserver.src}/LICENSE.txt'
-      substituteInPlace webpack.config.mjs --replace-fail 'minify: TerserPlugin.swcMinify' 'minify: TerserPlugin.terserMinify'
-      substituteInPlace webpack.config.mjs --replace-fail 'env.skipLint' 'true'
+      substituteInPlace package.json --replace-fail '"vscode:prepublish": "pnpm run bundle"' '"vscode:prepublish": "pnpm run bundle:turbo"'
    '';

    nativeBuildInputs = [
@@ -42,6 +41,10 @@ let
      pnpm
    ];

+    strictDeps = true;
+
+    env.npm_config_manage_package_manager_versions = "false";
+
    # Error: spawn /build/source/node_modules/.pnpm/sass-embedded-linux-x64@1.77.8/node_modules/sass-embedded-linux-x64/dart-sass/src/dart ENOENT
    # Remove both node_modules/.pnpm/sass-embedded and node_modules/.pnpm/sass-embedded-linux-x64
    preBuild = ''
@@ -93,7 +96,6 @@ vscode-utils.buildVscodeExtension (finalAttrs: {
    downloadPage = "https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens";
    homepage = "https://gitlens.amod.io/";
    license = lib.licenses.mit;
-    sourceProvenance = with lib.sourceTypes; [ fromSource ];
    maintainers = with lib.maintainers; [
      xiaoxiangmoe
      ratsclub
@@ -8,13 +8,13 @@
 }:
 mkLibretroCore {
  core = "mednafen-psx" + lib.optionalString withHw "-hw";
-  version = "0-unstable-2025-12-28";
+  version = "0-unstable-2026-01-02";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "beetle-psx-libretro";
-    rev = "b923925b4ec924d3b2051298ae9eb3ae654d99db";
-    hash = "sha256-zwCDU94vixCQwVK7fLCdLobizt0nCf/0ZzkUaQLnYDs=";
+    rev = "3ca0580ec7b49260559eb8d5dd771f7a8924cdbd";
+    hash = "sha256-JRyEV4yGiu3Xkinvte88U3gHYeHvlyMTJFXdVah9ocs=";
  };

  extraBuildInputs = lib.optionals withHw [
@@ -580,13 +580,13 @@
    "vendorHash": "sha256-8VP8ryM4VBpCfsEi7KPiSnCcfLy9xgNFETRdbdTM3Gg="
  },
  "hashicorp_google-beta": {
-    "hash": "sha256-BQ5AjO1SrODFyEzM6WTpqUqGURusNRQ/4W4fttoc0Rk=",
+    "hash": "sha256-rgN9FJGz5BxYkVqmDLQH+Sw4HRwOs+PbBB4hMmYmTTU=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
    "owner": "hashicorp",
    "repo": "terraform-provider-google-beta",
-    "rev": "v7.14.1",
+    "rev": "v7.15.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-7sM6Rvs0zzXesT6uW335Q3JcYKBqU942voOa1i3H4ds="
+    "vendorHash": "sha256-FcKZHfUWzJj8unXxhCsuw3131uyWFYzJyALv1vSGCsQ="
  },
  "hashicorp_helm": {
    "hash": "sha256-S4Fe65f+gEWWxRMC+/i93dwwe7QigPccx4wiqNBpcL8=",
@@ -6,7 +6,7 @@
 }:
 stdenvNoCC.mkDerivation rec {
  pname = "0xproto";
-  version = "2.500";
+  version = "2.501";

  src =
    let
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
    in
    fetchzip {
      url = "https://github.com/0xType/0xProto/releases/download/${version}/0xProto_${underscoreVersion}.zip";
-      hash = "sha256-AmD5lUV341222gu/cCLnKWO87mjPn7gFkeklrV3OlOs=";
+      hash = "sha256-l1+fRPMo3k9EEGXiMw+8Z78KxjO3AGgvyqSfsN188vQ=";
      stripRoot = false;
    };

@@ -87,7 +87,7 @@ rustPlatform.buildRustPackage {
    makeWrapper
  ];

-  RUSTC_BOOTSTRAP = 1; # We need rust unstable features
+  env.RUSTC_BOOTSTRAP = 1; # We need rust unstable features

  postInstall = ''
    install -Dm444 -t "$out/share/applications" "client/assets/net.veloren.airshipper.desktop"
@@ -0,0 +1,12 @@
+{
+  python3Packages,
+}:
+
+let
+  pythonPackages = python3Packages.overrideScope (
+    self: super: {
+      sqlalchemy = self.sqlalchemy_1_4;
+    }
+  );
+in
+pythonPackages.toPythonApplication pythonPackages.androguard
@@ -8,11 +8,11 @@

 stdenv.mkDerivation rec {
  pname = "bftools";
-  version = "6.3.0";
+  version = "7.3.0";

  src = fetchzip {
    url = "http://downloads.openmicroscopy.org/bio-formats/${version}/artifacts/bftools.zip";
-    sha256 = "02nvvmpfglpah1ihd08aw65g1794w588c988cdar1hfl4s80qwhb";
+    hash = "sha256-EQ7P07d53e6Q/9Wt2Pa1h0TfuYblOZeByGW30oE3i6M=";
  };

  installPhase = ''
@@ -39,6 +39,7 @@ stdenv.mkDerivation rec {

  meta = {
    description = "Bundle of scripts for using Bio-Formats on the command line with bioformats_package.jar already included";
+    mainProgram = "showinf";
    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
    license = lib.licenses.gpl2;
    platforms = lib.platforms.all;
@@ -13,13 +13,13 @@ in

 llvmPackages.stdenv.mkDerivation {
  pname = "c2ffi-${c2ffiBranch}";
-  version = "0-unstable-2024-04-20";
+  version = "0-unstable-2026-01-04";

  src = fetchFromGitHub {
    owner = "rpav";
    repo = "c2ffi";
-    rev = "0de81efb64acc82c08c5eee4a7108ddcb1b00d86";
-    hash = "sha256-q81Vxq/6h/5jgQ1Leq15klN/8L+UiavlxkARGo2SrJ0=";
+    rev = "d6eba0d91dfd58831e5c3133e868c62892595680";
+    hash = "sha256-9bRHsVdj0VOeJyEE9sdN4xKIRSrB05viAOoxjeqWW2Q=";
  };

  passthru.updateScript = unstableGitUpdater {
@@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec {
      --replace-warn 'edition = "2021"' 'edition = "2024"'
  '';

-  RUSTC_BOOTSTRAP = 1;
+  env.RUSTC_BOOTSTRAP = 1;

  nativeBuildInputs = [
    just
@@ -83,31 +83,30 @@
  "@oxlint/linux-x64-musl@npm:1.22.0": "3cdd5e965f2d09eae04967aeb26cb11d10412a93b80fef4951cff2310154e592e21ce5605e0503eb7924adb59f6c65fb79ee4378e5518cfb258b4038efe0d34a",
  "@oxlint/win32-arm64@npm:1.22.0": "0a08744d207894c30ec9a89e5225805e3270ed988b4b7fdba4a3ff1bb74a5121293bd2c8ea3d3e5a6e4899e0b8e166a8fceb6a2ad4a1ddbec7070d33303212a6",
  "@oxlint/win32-x64@npm:1.22.0": "7bb9839d0272891372023a7e80a649e761a2246e6f6737859fe4897b36dcbcc22a95696ed024d80211da9aa39abf27fbd360f3cb2c883eaf092628abd95e9156",
-  "@rolldown/binding-android-arm64@npm:1.0.0-beta.34": "98334e08fe3f9acafa1e0c337d74138a93892dbb2b03e53b79ab3fff5cecb34406493af97e454b3c76e27ac1f9f65496d54cf7c904a2cdba4bf1eabddb5bbd50",
-  "@rolldown/binding-darwin-arm64@npm:1.0.0-beta.34": "d753421b3ee4da8ed6b67072064947a17122e138609652ce5534e97aff420e63a463c2fab0a678a1b0483b1e323c8392d671e5c8b415ade92f54e98235ebde62",
+  "@rolldown/binding-android-arm64@npm:1.0.0-beta.53": "e2972fe9399066bb418f659c24e7589e87d8373a3b4ec7dd01c06f516c90cd04ea2dc801f2739f05e714f002bd4ef8d505dabbb9ab55437ed3d5f8395db91df5",
+  "@rolldown/binding-darwin-arm64@npm:1.0.0-beta.53": "79587c0686dc0ee54368e4eeb0b8e8cc6f5786c3d55c3b0acd2ccea067b6ba21faffe82140268e7de7126192c3e54fa33742346d82ceaebf5d4c33a94c3575fc",
  "@rolldown/binding-darwin-arm64@npm:1.0.0-beta.9-commit.d91dfb5": "a4636b96d36bfaccc655f9de258cef17daedd025463309657ed213b63b4226aeb6901eaa05d00d577e486bfb4d4ef99ee1457d8d7a8b5170afe07c86d2a5c18d",
-  "@rolldown/binding-darwin-x64@npm:1.0.0-beta.34": "cf850d66c40157d49976ee646096d4979b6c8c50aed67375936d3e485bafaadc694df232293bcbd2bcad247e983dac6ed0d26bb756e0abaa685c0e04282ed806",
+  "@rolldown/binding-darwin-x64@npm:1.0.0-beta.53": "4b855c7208400453f29aac138c8c050fee3e3f08ff7d36afb3efd705abfc67b11e55bb12ead5d845ae9c464b9855c02380772592ed09e43434ade8dd4e32f703",
  "@rolldown/binding-darwin-x64@npm:1.0.0-beta.9-commit.d91dfb5": "a7b89d92f33ad9a718de70c56452dc481962e5396b32d66cbc08e588f45fa090ed6e3b7d8fc2ec641acf3de2a550b6d05416b14179ed4fcc8d336fdbd697d40b",
-  "@rolldown/binding-freebsd-x64@npm:1.0.0-beta.34": "3c0585c8ca34a77631f7606c15e653db95b3f56bdeb1a656f350d0ae82b1d136d4b74cc2d87e4efd1994571b59710b349ca373b2c3a6880fc7294cb39febc5cf",
+  "@rolldown/binding-freebsd-x64@npm:1.0.0-beta.53": "98672b2ececbcab5bf8732033b9e38553f75a37d0c8198762af5609ea57b9809bc8d9c8ec3e5cc6df7c9535c1a08d063d106b984fa1dfda066dc71ae6e70350d",
  "@rolldown/binding-freebsd-x64@npm:1.0.0-beta.9-commit.d91dfb5": "7da382e43eeada73dec31bb63680432f129fa17efed7ed211da0c9915a89c9dfa2e8ec35aa7f07a4be99a36eb14df67059a375ac4bc5e6a5cdc16e02f7a9bd3c",
-  "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-beta.34": "69d123591deefdc017ac863cc95c37186eec31fe92fd9e7b2fe5080fa569bb201ae1f0c42bdd57fb0561f9210e296bc83a0e82df6d21a1ea419af0b47620db70",
+  "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-beta.53": "0760612704b1381580c337eef6b0ef096902b81dca1ff2b536a8a4f529335465d9739ea3c0883d3f7b1548089d237e18a485f0ee2e3d2d9191b0a788f95c81f9",
  "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-beta.9-commit.d91dfb5": "cb5a7635fc2c39049c1fba8376d3b23f58240dbe2cbdc127d0dc8f2b8900537298bb8b52abde5b6e941cf22d8f69466433048db573c683947bf797f92f28baee",
-  "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-beta.34": "4cdea4f975d4424c488a83d0cf8027091b639a2b5ce9f11d5792c83f19906fdb63f4f162750b3406b3cd82b2c19dd7035d25c1ac4ca897b44f071a1a8dfc4251",
+  "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-beta.53": "a4e4e59a5d316f72c691360027e4a843db4fad1ccf9ddac736890f4182f59612c5bcb4286420b88454658a0735ca63d0692fbba93c2fcc8009e15b3126e62266",
  "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-beta.9-commit.d91dfb5": "8ff267e66b1f59e9317d5b9d89e00a3e11172ae5b5cca17985e92cd52672ef59cd2d6292263700ff8edb02b53420865f655e6ed7f4b4ad8680e4ee0d99dcf5a7",
-  "@rolldown/binding-linux-arm64-musl@npm:1.0.0-beta.34": "bd8369aa12b55ea1be91b0bd6a392861dbb1fe59db6ff2f346a15336ae42abf4627e4f875b57057421a72e1e47b785f70a912050f9fe780905d9603b203b8fc1",
+  "@rolldown/binding-linux-arm64-musl@npm:1.0.0-beta.53": "4f465651c516cc78513fa2b6685667acf248b076a19809252063644512ad7949faf46a64738024c266a39c411cb4be15142aa4a352dcd01e1c65486f9f623578",
  "@rolldown/binding-linux-arm64-musl@npm:1.0.0-beta.9-commit.d91dfb5": "7b320fbdc870cb7f2f75e89058ac50a675c05236df12739b98ce287ad07cce53474699bf19b729577c3de62d80c2fbd988cbbb8bc29e06c88fc42a8ece176b19",
-  "@rolldown/binding-linux-x64-gnu@npm:1.0.0-beta.34": "7308f80b58203ba3e10e7a6a1354f684f8961f1ffb1cfbb6a110c245b855ae8d762ee796986b86b0de0fd4b4b1572e09dceb256234866f1d4727a457d2702cdf",
+  "@rolldown/binding-linux-x64-gnu@npm:1.0.0-beta.53": "702a095a2c4b59a48da26be306172585ee01d284900984c56e663cd15b82748e90b7fa96c0d894651d98ca456ac59fe3e70ff88680a636b6c23353919a04d762",
  "@rolldown/binding-linux-x64-gnu@npm:1.0.0-beta.9-commit.d91dfb5": "99679e1c7e290c7d747d6deb420357522fb0fab1fd022cf79f84534243af2eac15988c8ef5d1b50c679fdc915788360bf744c4e0c9e47952aa0985f23ee58e80",
-  "@rolldown/binding-linux-x64-musl@npm:1.0.0-beta.34": "27154a7af28f34f97f1c325727c1caf97c6270ea812f349720333aa5eb8ec1379741ab2705758a55f52891b1d79f4b68892078f290b36aa5edb8bc3679f36435",
+  "@rolldown/binding-linux-x64-musl@npm:1.0.0-beta.53": "b410d862c88ec59e8e8a31934ab78ed81b31ed00ed69057038a232d44ee9b7942d1f29ee48991e3a0b2fbcbec889d7819166f77679c907271e7f9a381414d1db",
  "@rolldown/binding-linux-x64-musl@npm:1.0.0-beta.9-commit.d91dfb5": "2ce172ea44980ca6b86636a13cce7d70104e25f75caaa0c4d6d9199721825a896a74b11bc32fecbc2756aa829d7e10f4701b2f3544b77cfa4da3c2cea0d72e1c",
-  "@rolldown/binding-openharmony-arm64@npm:1.0.0-beta.34": "00d2a12a4984502ed5ed6950562cded24cde56ed615c6ac5c198880fb72c86506e1f4b7743443da5480d7f268b9d74e7eb789d429749f416f3ab6b4bb5ba167c",
-  "@rolldown/binding-wasm32-wasi@npm:1.0.0-beta.34": "8bb90733a13691de5315fc3924b0ce6cb96ece6c8b24406c0818c931a880b9d55c3e5c66a5e707382a4329c406878400fd041098b42d0921035efca2a163e96a",
+  "@rolldown/binding-openharmony-arm64@npm:1.0.0-beta.53": "3dd98fa2c676472bfcf825ee561ac3e8046d48d87d4beab5cc312c871be65387e5b527977b9ac7e2c2d4c8f0e7249d2d536c7cd5124b5550e37bf295cb91729d",
+  "@rolldown/binding-wasm32-wasi@npm:1.0.0-beta.53": "3645fc9eac2f4e8b6f5f1552154a8ae1ed5c1975a37f0da22bb4ec9d8dcd4b8d346feb013a927e9254c33bea7b2b4fc2ff5cfebe3c791f215663ac983bf03306",
  "@rolldown/binding-wasm32-wasi@npm:1.0.0-beta.9-commit.d91dfb5": "3516b21ab1982990435d550a23c153393ce1a2c9308b6df6614438c14ef1206d50c5e7dd214c403a42c9f4e695b574122abc8009df5171ebb79e685da14e7562",
-  "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-beta.34": "9feac1757ce2724d289be23539b497bb206cc5582d69397626d40ac1d1831c6bbcc68498502921489990ffcb879036528d130a0969d3b4608b207d9dedd5ae0a",
+  "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-beta.53": "d0ecd1a1fe4388ae11d7bacace91694ad0135cf25a0200f7b7ae3ce9fac637ff079c5140a680288d3f7fc35eea0100d1a176ed43db4d88c86429804cb6a800e1",
  "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-beta.9-commit.d91dfb5": "17086030865bbfb6668d04f882926035fc1f72db81c3415a8f81e6196b9f849eabd6f2a62066e83f87255fcec106fe274353c8f5ff9c782417b6eddc664a129c",
-  "@rolldown/binding-win32-ia32-msvc@npm:1.0.0-beta.34": "0302a7fbe7d77352545ad3970e2b7f1c091f7fbd02d278d07e7c825377291a435eef84d67bc3a1e0e8e3fdfef3b6c59d8b9670318e683df08758f5ba7a801c5a",
  "@rolldown/binding-win32-ia32-msvc@npm:1.0.0-beta.9-commit.d91dfb5": "ecd226ec05f9f863d97de98ca4d7cb9026bcb0cd2fff12e325209664eaca1fa131744ad72d1352b522567adfe4967ca73e50987f96ab475b50e9b96456dd50cf",
-  "@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.34": "70bbbc04e01c437a58c89f7b8ec249a9e43eb7b4336323efaf7abf46fa6445f087ee1286edb454658b9f4f4e54daf906059cc8484613be2d5b174c905dc44518",
+  "@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.53": "bbc80dbfb97a1780f0666ffd111f1fbe2b6b2cc1d60102cf41bb0fd03788e020552c94a5e82f95dc75b3696fe0f986a1a362fc7c62bcd899892986a4391fc63a",
  "@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.9-commit.d91dfb5": "9e50f65fb7ad451a6eb4f9305650605e7a4efdd6873ad9412520edb8fd4c7f0bb67aa9922dbf1bad055c01a0de677eace73abf4285409cb9defae93956a83b24",
  "@rollup/rollup-linux-x64-gnu@npm:4.45.1": "baf9081b367a5f557cfcd17ae60b196c00a933e87c5b16045efa312cb142518c91706ae3e6a4be1d09f7fbf2b133d386fc4ff3f6dd2d5b7149ac139af4a63391",
  "@swc/core-darwin-arm64@npm:1.13.3": "f3cdf75ccc7b66d8c4b2bb7a5664542a904821bd7f08f91e3e399112dcb4436ee9a7df306a80e58a80a31b20b9b69f830a2dca91d74e62bbe6c72cde84c75d66",
@@ -141,14 +140,25 @@
  "@typescript/native-preview-win32-x64@npm:7.0.0-dev.20250915.1": "6df4add8a206102964baf252953444ef21861d89eeba7936311e8bd4ac2c37b01e3a870fcb1fe6bed6b2b402ed80cc229bdf11e4c13bf32b6fe942e4f11abf10",
  "dmg-license@npm:1.0.11": "feef35cfb45270a72daadcca9584be5cb840f924448b9d4e543fcd61f1b6d471151049f277c91de1d8b003fad6203d0176066a5f427a01df5fb073402cb8c8b7",
  "iconv-corefoundation@npm:1.1.7": "bc6f08ac421e5e92ed20f3825f123fd705e036612b2b6aa687958de753c06f32e54f0203ef55540869e3ee189eaea15e43a2757f3a90e555c4dd512c9422da43",
+  "lightningcss-android-arm64@npm:1.30.2": "7b8a62c7aa787251381e9e082fc19991e8bca696f17be4dad0a5c3a31483d1452e6f8b04713b9c9221ef8d9b011510ee10d69c34005294be92ba2e57ad075a90",
  "lightningcss-darwin-arm64@npm:1.30.1": "bbdce4ee14b3952699e6d07c539cf4bd678853bfd974e3107742198dac38dfa6d40c6ea80163a7026aff662dd7d3a462a2bee9a18448c75c788659ceebe2746a",
+  "lightningcss-darwin-arm64@npm:1.30.2": "fe4f6eb4af66f95a0f83a9b4970f863417ae9ac394b5c963a20cda24ae08ae0ce6ebdc6f8e664d8b53717afb936242b9a73394584b55ecf2978babab50364e93",
  "lightningcss-darwin-x64@npm:1.30.1": "6b88c182be0de82858983ec374093c2cb13cd58139456e25be215fc55a7a8cbfcd6f7487bee1507fc024988a1f324d7cb26b3f195893d5a69ccaf252dc9094eb",
+  "lightningcss-darwin-x64@npm:1.30.2": "b2d82add63e88d77dbd08508a32c1c28a12de826d4dd70f6ec17ffae9d3c5bf1be7a7c35f154bf98bca4164b7390ba515202884e4cabaa83ed7f1727baaa08fa",
  "lightningcss-freebsd-x64@npm:1.30.1": "731a96282db6afff3f57e8cbb73f51d06455231868b3b311a772ee11ead9c57538fc217d0956df4f177dbb805fa4fc761734440f6d2bb8965963b21f06bf63c1",
+  "lightningcss-freebsd-x64@npm:1.30.2": "cea6113555ed6fd69e10c67a8616d3b4c743eacd817e93d290b7d85d1c2eb29386466e55f61890f4aee87cafe062ef037b92824160418dd1c299bb7d15796cec",
  "lightningcss-linux-arm-gnueabihf@npm:1.30.1": "fcf07f54c4d7d056f9b57d39e6df1c6f60c02ef4ebd51eda76056d35d89b1307af8737e44076d2b1f85348d2b1b9c61bf2220c5347389a6d40ad8bb12f34b5cf",
+  "lightningcss-linux-arm-gnueabihf@npm:1.30.2": "93119a9476759aff2a1a3fe35dfdfd39b0eab320b76725b36bddfc11f258f80140831169ed10f5528349863f7c6497358ec73d3c13054e6dc72ef5b26a22bd26",
  "lightningcss-linux-arm64-gnu@npm:1.30.1": "bc82ce2e96ffab4b0ba1f9adacf63f461c3f6221bcbc955104c05e6e8c2c6ed8863421663e0e4148a682b143868d07190c38e9f990915a80ce9692f963132320",
+  "lightningcss-linux-arm64-gnu@npm:1.30.2": "c52236dd9777f150b849e0ed4ec1a4d17dc2bbe1ffa802286483d9c71e868eef16b54e348e410d44921262beb4474d2b4c90c268aa2c1109e55899d7cf8294c8",
  "lightningcss-linux-arm64-musl@npm:1.30.1": "2ae25a764b8ed9fcc1977dc1786011e68db23bf3343168fa2d4a9a4bcbb73c7aae258cdcb879d68a3a28e22343705ee435517d3f045e49b15fbb65816d74a91d",
+  "lightningcss-linux-arm64-musl@npm:1.30.2": "85b54252172367c9b15be312c55f982d0541063b0626faa370c26d5eb8bedc36e036b6081374aba35f68d9e82c729239fb7af52f997004df715b09a6f7c5d453",
  "lightningcss-linux-x64-gnu@npm:1.30.1": "190ac9ba1b9a4bf658a9e5b3c5702546ec779a7a5ccf5a4e06e5d46012ce6cad1842a9b1e717498bc759e103ba7390f42c9b8ba3e67157adec8e7162225633b4",
+  "lightningcss-linux-x64-gnu@npm:1.30.2": "658f54482728885541331184a5fefc3df76e1f4d691ad28d70b559dc391d552837bc95676449e48cbdcda8d63165f0f56c921a09ec2c6fc591b427c566e0b9ed",
  "lightningcss-linux-x64-musl@npm:1.30.1": "fab6ed75d747024fcf46212b9edc7d1daccfbe4e7a06dcd0f9e841c6a023e61e716751747f9e8aecba18495adc9ef6bc20b24616d5c15c87f5dc1ff9ce1fd859",
+  "lightningcss-linux-x64-musl@npm:1.30.2": "6b046d57dab2237729953f1350a922844fafd16bdbae3a9ee17b04abdc2e2d2392ccd61932e7210276bf18938165d900517d2079ec57d866fd288b8bba28dbd4",
  "lightningcss-win32-arm64-msvc@npm:1.30.1": "2cc285e89f66323ecae5ec41a6b1a57500d74a549fb392829c99708d5a5254d709c0ccd2d8fef4f6c1fc9a55c5bd51eca633fa1f2228563f884545668adc1b17",
-  "lightningcss-win32-x64-msvc@npm:1.30.1": "60bd930e71fab0fbf0250406d4791bf27f0b9c8daf095c8d5fce9f3e120d24753e309eb6fed956043fc6a6cbb6d1da30fb0862acb54fa046b5f9a2e69908b6f9"
+  "lightningcss-win32-arm64-msvc@npm:1.30.2": "f8383d06fe81494ba34b9bd7eb713ad91dbd84d4f321526b5190d7908e95591e462159acf71f6d3a0c33ea1251d5e80c012d255d94e9aa4187a476a810a249bc",
+  "lightningcss-win32-x64-msvc@npm:1.30.1": "60bd930e71fab0fbf0250406d4791bf27f0b9c8daf095c8d5fce9f3e120d24753e309eb6fed956043fc6a6cbb6d1da30fb0862acb54fa046b5f9a2e69908b6f9",
+  "lightningcss-win32-x64-msvc@npm:1.30.2": "ab86748b46ca851d29c387cb349cd35ca9da6fc73082b759ef84d358ec08ece6491e0eb137ea8b30b85419c20075c59f44620ab026d9a0aa0e86d3e0a610a960"
 }
@@ -4,7 +4,8 @@
  fetchFromGitHub,
  yarn-berry_4,
  nodejs,
-  electron_37,
+  electron_38,
+  cctools,
  autoPatchelfHook,
  makeWrapper,
  writableTmpDirAsHomeHook,
@@ -14,18 +15,18 @@
 }:

 let
-  electron = electron_37;
+  electron = electron_38;
  yarn-berry = yarn-berry_4;
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "cherry-studio";
-  version = "1.7.6";
+  version = "1.7.9";

  src = fetchFromGitHub {
    owner = "CherryHQ";
    repo = "cherry-studio";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-RxvdGeIHXdrAg0RAYrzvR5D1Siin9me7BmQNddO3iCs=";
+    hash = "sha256-q/heW5o2IWFjsDed/SaMv5Xfm5kAP14RD1hALkipu+Q=";
  };

  postPatch = ''
@@ -42,19 +43,24 @@ stdenv.mkDerivation (finalAttrs: {

  offlineCache = yarn-berry.fetchYarnBerryDeps {
    inherit (finalAttrs) src missingHashes;
-    hash = "sha256-3j49i1HlqpYaOQeagB8D/RgcwVMa66fEp7c5GCP45nI=";
+    hash = "sha256-AYKgGe9iTcXJqS019D064TRb5aY/XTS8u847LcYisa4=";
  };

  nativeBuildInputs = [
    yarn-berry.yarnBerryConfigHook
    yarn-berry
-    autoPatchelfHook
    makeWrapper
    writableTmpDirAsHomeHook
    copyDesktopItems
    nodejs
    (nodejs.python.withPackages (ps: with ps; [ setuptools ]))
-  ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools.libtool ]
+  ++ lib.optionals stdenv.hostPlatform.isElf [ autoPatchelfHook ];
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isElf [ stdenv.cc.cc.lib ];
+
+  strictDeps = true;

  env = {
    YARN_ENABLE_SCRIPTS = "false";
@@ -11,14 +11,14 @@

 python3Packages.buildPythonApplication {
  pname = "chirp";
-  version = "0.4.0-unstable-2025-12-30";
+  version = "0.4.0-unstable-2026-01-03";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "kk7ds";
    repo = "chirp";
-    rev = "412685c82eecd3b05d43ffbd09b34466238d3e6e";
-    hash = "sha256-bYpJrYQHP+/pXzikBJ0ZxQYThLeGo4UE88leJKbzVNo=";
+    rev = "7eff3fe2d19ff581d7154dafabe72bf3decbd6e9";
+    hash = "sha256-05k/52l5QLA56bs+l2WJKjJKLOVBip6Lfl/eSeLR/vU=";
  };

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

 buildGoModule rec {
  pname = "cirrus-cli";
-  version = "0.158.0";
+  version = "0.159.0";

  src = fetchFromGitHub {
    owner = "cirruslabs";
    repo = "cirrus-cli";
    rev = "v${version}";
-    hash = "sha256-VrF5Mp+InnStjEQaNXNvveImubxysRlRjrIq+SN6h3o=";
+    hash = "sha256-8xtGfmQWgZRKDc0vlJ1cMuk1IXvosSocgmf0kNtpk2Y=";
  };

-  vendorHash = "sha256-+3EWlbOr6MGx5M8IP28ZbTZYp+9lpmi+q5bBmnTDGoA=";
+  vendorHash = "sha256-n2Bmx4EJ+L6+rlvfG/2FD4Ua9bG9GVcnvD+QPfQg/HE=";

  ldflags = [
    "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}"
@@ -1,6 +1,6 @@
 import ./generic.nix {
-  version = "25.8.13.73-lts";
-  rev = "2dbc61a9bb88108b1e83b11113f24e68f7c211f7";
-  hash = "sha256-rWAX3dBo4/Uq9o6oKbTQQZu3R6iod7AHQnzJuKnGFOk=";
+  version = "25.8.14.17-lts";
+  rev = "85bdcee459593cd55faef3154a5e487b60119ff4";
+  hash = "sha256-Ydx46Y7uFHVUzsqY8dBExg2r78Y+PeJUkMSIVAn6eXQ=";
  lts = true;
 }
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: {

  passthru.updateScript = ./update.sh;

-  RUSTC_BOOTSTRAP = true;
+  env.RUSTC_BOOTSTRAP = true;
  buildInputs = [ sqlite ];

  meta = {
@@ -44,7 +44,7 @@
 # $ conda-shell
 # $ conda install spyder
 let
-  version = "25.9.1-3";
+  version = "25.11.1-1";

  src =
    let
@@ -60,8 +60,8 @@ let
    fetchurl {
      url = "https://repo.anaconda.com/miniconda/Miniconda3-py313_${version}-Linux-${arch}.sh";
      hash = selectSystem {
-        x86_64-linux = "sha256-a+xl/LDGZZalBYxnZ9JdiaU364PuhGhOwPpaT7+zJkc=";
-        aarch64-linux = "sha256-A2BT5+blhmQ1vBoRcRtBKT5b8HdrtKqafqRtAfMO2jE=";
+        x86_64-linux = "sha256-4LEOBQ6JKOLrmq0sUi7jtdMdMASLipmXZjqKRg1TjO8=";
+        aarch64-linux = "sha256-nznMjEbKN6/tXlY8wjSzrdNP6i8RGeB23K56N3ymuO4=";
      };
    };

@@ -6,14 +6,14 @@

 python3Packages.buildPythonApplication rec {
  pname = "contact";
-  version = "1.4.7";
+  version = "1.4.10";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "pdxlocations";
    repo = "contact";
    tag = version;
-    hash = "sha256-tsqnuofmQ5DqW5+Hepx2zUlTH/rk04s5SzL4cc64pDk=";
+    hash = "sha256-Zn0aODPVgzrZdnW1IkUNyjz+PEtTVqiur+qT9I2tcj4=";
  };

  dependencies = [ python3Packages.meshtastic ];
@@ -24,8 +24,8 @@
 assert region == "Global" || region == "EU";

 let
-  kyodialog_version = "9.3";
-  date = "20230720";
+  kyodialog_version = "9.4";
+  date = "20240521";
 in
 stdenv.mkDerivation rec {
  pname = "cups-kyodialog";
@@ -40,9 +40,9 @@ stdenv.mkDerivation rec {
    # 3. Locate e.g. "Linux Print Driver (9.3)" in the list
    urls = [
      "https://www.kyoceradocumentsolutions.us/content/download-center-americas/us/drivers/drivers/KyoceraLinuxPackages_${date}_tar_gz.download.gz"
-      "https://web.archive.org/web/20231021143259/https://www.kyoceradocumentsolutions.us/content/download-center-americas/us/drivers/drivers/KyoceraLinuxPackages_${date}_tar_gz.download.gz"
+      "https://web.archive.org/web/20260107200228/https://www.kyoceradocumentsolutions.us/content/download-center-americas/us/drivers/drivers/KyoceraLinuxPackages_${date}_tar_gz.download.gz"
    ];
-    hash = "sha256-3h2acOmaQIiqe2Fd9QiqEfre5TrxzRrll6UlUruwj1o=";
+    hash = "sha256-H9n4KpaLGNk5du4+BAmMjRyLmXaHap8HdNZlX/Kia4E=";
    extension = "tar.gz";
    stripRoot = false;
    postFetch = ''
@@ -84,6 +84,8 @@ let
  python = python3.override {
    self = python;
    packageOverrides = final: prev: {
+      # version 2 breaks dataset and thus androguard
+      sqlalchemy = prev.sqlalchemy_1_4;
      # version 4 or newer would log the following error but tests currently don't fail because radare2 is disabled
      # ValueError: argument TNULL is not a TLSH hex string
      tlsh = prev.tlsh.overridePythonAttrs (
@@ -9,16 +9,16 @@

 buildGoModule (finalAttrs: {
  pname = "dnscontrol";
-  version = "4.29.0";
+  version = "4.30.0";

  src = fetchFromGitHub {
    owner = "StackExchange";
    repo = "dnscontrol";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-0MwDp2wu/K402It8nqMV+ihVg2eLAyb33Ceo9XLz4EQ=";
+    hash = "sha256-SLcOG42Pd0RgDT98qNgceovDYbBvF0N7/ItkjBlEtLY=";
  };

-  vendorHash = "sha256-zeai1PySgsAK1zkV0Z4JIDTGU/mfqfOwmVdu34wd9w0=";
+  vendorHash = "sha256-OsBVyWCPoVKBXmE/NH3r7KUH4TFCNkKu3LGJlW7dNqI=";

  nativeBuildInputs = [ installShellFiles ];

@@ -8,7 +8,7 @@

 let
  themeName = "Dracula";
-  version = "4.0.0-unstable-2025-12-26";
+  version = "4.0.0-unstable-2026-01-04";
 in
 stdenvNoCC.mkDerivation {
  pname = "dracula-theme";
@@ -17,8 +17,8 @@ stdenvNoCC.mkDerivation {
  src = fetchFromGitHub {
    owner = "dracula";
    repo = "gtk";
-    rev = "d4163a5e6e598053567038c53777bf7682ecd17f";
-    hash = "sha256-FalI8DvTCVzCHlZFh9j+CD0WMtELd174JaUWvuBHRRY=";
+    rev = "58fa433480d8a14fb5a7149b4dfada3d883b0937";
+    hash = "sha256-XJTieez5Vx8NC1V6jKSjkAnf7YM/P/g0fau3e6VPYgs=";
  };

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

 stdenv.mkDerivation (finalAttrs: {
  pname = "dumpvdl2";
-  version = "2.5.0";
+  version = "2.5.1";

  src = fetchFromGitHub {
    owner = "szpajder";
    repo = "dumpvdl2";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-g8WpKbkxG4EBBfKw4YY1XPCo4DQntVvqSCGeQREpTRk=";
+    hash = "sha256-7UAw48BQttF+6J/nhg9zpoplRCtpTwjM1XB7DxM7Ymg=";
  };

  buildInputs = [
@@ -0,0 +1,29 @@
+{
+  fetchFromGitHub,
+  lib,
+  stdenvNoCC,
+  ...
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "emacs-anywhere";
+  version = "0-unstable-2025-12-29";
+
+  src = fetchFromGitHub {
+    owner = "nohzafk";
+    repo = "emacs-anywhere";
+    rev = "58fcdd5565a41555092c0801029d46f5f48b7814";
+    sha256 = "sha256-ZHzJfABFnpquIsP6UknusPeYmx20p090JyvVMhJ/OOs=";
+  };
+
+  installPhase = ''
+    cp -R EmacsAnywhere.spoon/ $out/
+  '';
+
+  meta = {
+    description = "Edit text from any macOS application in Emacs";
+    homepage = finalAttrs.src.meta.homepage;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ DamienCassou ];
+  };
+})
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec {
  cargoTestFlags = cargoBuildFlags;

  # requires unstable rust features
-  RUSTC_BOOTSTRAP = 1;
+  env.RUSTC_BOOTSTRAP = 1;

  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
    installShellCompletion --cmd eww \
@@ -2,13 +2,19 @@
  lib,
  fetchFromGitLab,
  python3Packages,
-  python3,
  fetchPypi,
  apksigner,
  installShellFiles,
 }:

-python3Packages.buildPythonApplication rec {
+let
+  pythonPackages = python3Packages.overrideScope (
+    self: super: {
+      sqlalchemy = self.sqlalchemy_1_4;
+    }
+  );
+in
+pythonPackages.buildPythonApplication rec {
  pname = "fdroidserver";
  version = "2.4.3";

@@ -37,7 +43,7 @@ python3Packages.buildPythonApplication rec {
  '';

  preConfigure = ''
-    ${python3.pythonOnBuildForHost.interpreter} setup.py compile_catalog
+    ${pythonPackages.python.pythonOnBuildForHost.interpreter} setup.py compile_catalog
  '';

  postInstall = ''
@@ -49,12 +55,12 @@ python3Packages.buildPythonApplication rec {

  nativeBuildInputs = [ installShellFiles ];

-  build-system = with python3Packages; [
+  build-system = with pythonPackages; [
    setuptools
    babel
  ];

-  dependencies = with python3Packages; [
+  dependencies = with pythonPackages; [
    androguard
    biplist
    clint
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
  cargoHash = "sha256-LKltHVig33zUSWoRgCb1BgeKiJsDnlYEuPfQfrnhafI=";

  # freshfetch depends on rust nightly features
-  RUSTC_BOOTSTRAP = 1;
+  env.RUSTC_BOOTSTRAP = 1;

  meta = {
    description = "Fresh take on neofetch";
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: {

  cargoHash = "sha256-OoTWGeF96BpPDx1Y9AEVOIBK7kCz6pjw24pLiNcKmOc=";

-  RUSTC_BOOTSTRAP = 1;
+  env.RUSTC_BOOTSTRAP = 1;

  cargoBuildFlags = [
    "--workspace"
@@ -7,14 +7,14 @@

 python3Packages.buildPythonApplication rec {
  pname = "git-delete-merged-branches";
-  version = "7.5.0";
+  version = "7.5.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "hartwork";
    repo = "git-delete-merged-branches";
    tag = version;
-    sha256 = "sha256-2MSdUpToOiurtiL0Ws2dLEWqd6wj4nQ2RsEepBytgAk=";
+    sha256 = "sha256-wy5SLaw6QBvbmcFFgtIQ9MhGliW2/ZmCozEa2ZF0Lnc=";
  };

  build-system = with python3Packages; [ setuptools ];
@@ -170,11 +170,11 @@ let

  linux = stdenvNoCC.mkDerivation (finalAttrs: {
    inherit pname meta passthru;
-    version = "143.0.7499.169";
+    version = "143.0.7499.192";

    src = fetchurl {
      url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-j9eDgZfP9Ii6B3XhLYF6t6oZq8zWRpl0Tkm4GuCDPKE=";
+      hash = "sha256-ZITChtyAifDrQdEkuW4+9MTLD/KJ3A+GmOHxuFH7yDQ=";
    };

    # With strictDeps on, some shebangs were not being patched correctly
@@ -272,11 +272,11 @@ let

  darwin = stdenvNoCC.mkDerivation (finalAttrs: {
    inherit pname meta passthru;
-    version = "143.0.7499.170";
+    version = "143.0.7499.193";

    src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/mhjgbmlx5vzoqorxvxcf4zts4y_143.0.7499.170/GoogleChrome-143.0.7499.170.dmg";
-      hash = "sha256-WoT/+dTPh3YVcMoKmmuRb0+9E3N91ffPiw0fkMlaR5o=";
+      url = "http://dl.google.com/release2/chrome/negywdvxiridhsd2tz7neakcju_143.0.7499.193/GoogleChrome-143.0.7499.193.dmg";
+      hash = "sha256-Sl32kUBXkiQzhw7rga8+nGp9WDddxD3NuZBwMTfYZFo=";
    };

    dontPatch = true;
@@ -14,20 +14,20 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "gurk-rs";
-  version = "0.6.4";
+  version = "0.8.0";

  src = fetchFromGitHub {
    owner = "boxdot";
    repo = "gurk-rs";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-1vnyzKissOciLopWzWN2kmraFevYW/w32KVmP8qgUM4=";
+    hash = "sha256-m7oZM2uCGENrADh+qrNODvYWxgbh1ahthkWjFnAVXjw=";
  };

  postPatch = ''
    rm .cargo/config.toml
  '';

-  cargoHash = "sha256-PCeiJYeIeMgKoQYiDI6DPwNgJcSxw4gw6Ra1YmqsNys=";
+  cargoHash = "sha256-15z4jKKGfSH1LXX1cXpwRjWI/ITaj3dzlscE7Vrh9Xw=";

  nativeBuildInputs = [
    protobuf
@@ -58,6 +58,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
    mainProgram = "gurk";
    homepage = "https://github.com/boxdot/gurk-rs";
    license = lib.licenses.agpl3Only;
-    maintainers = with lib.maintainers; [ devhell ];
+    maintainers = with lib.maintainers; [
+      devhell
+      mattkang
+    ];
  };
 })
@@ -26,13 +26,13 @@

 stdenv.mkDerivation rec {
  pname = "gvm-libs";
-  version = "22.34.1";
+  version = "22.34.2";

  src = fetchFromGitHub {
    owner = "greenbone";
    repo = "gvm-libs";
    tag = "v${version}";
-    hash = "sha256-qvcQml3XnGraCwa2iY+QGshzdsNUwQH3+HXLPwq6+M4=";
+    hash = "sha256-naCk99ZxupBx590MRBorvsNxlYCuKC/B8fufGnZDH1A=";
  };

  postPatch = ''
@@ -5,18 +5,18 @@
  coreutils,
 }:

-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
  pname = "heatseeker";
-  version = "1.7.3";
+  version = "1.10.0";

  src = fetchFromGitHub {
    owner = "rschmitt";
    repo = "heatseeker";
-    rev = "v${version}";
-    sha256 = "sha256-ZKwRXtfIYEblsGjSSiVCl9XztM43rzBofQpPNGMPu+w=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Hfx2QTfSJ6lh/K3ZdJzXqgxGOVbC2i2ZqZKH8Wtj/6k=";
  };

-  cargoHash = "sha256-X4OTzgInh0D+EYCPkN2qyizzhARIOGwxJ2N9ZcrX/Ak=";
+  cargoHash = "sha256-8ZrPHm+W4lxVzupgeLcCQmpNRJS3aEaSWWKPkGVZVTg=";

  # https://github.com/rschmitt/heatseeker/issues/42
  # I've suggested using `/usr/bin/env stty`, but doing that isn't quite as simple
@@ -25,9 +25,11 @@ rustPlatform.buildRustPackage rec {
    substituteInPlace src/screen/unix.rs --replace "/bin/stty" "${coreutils}/bin/stty"
  '';

-  # some tests require a tty, this variable turns them off for Travis CI,
-  # which we can also make use of
-  TRAVIS = "true";
+  # skip the TTY-only test
+  checkFlags = [
+    "--skip"
+    "screen::unix::tests::winsize_test"
+  ];

  meta = {
    description = "General-purpose fuzzy selector";
@@ -37,4 +39,4 @@ rustPlatform.buildRustPackage rec {
    mainProgram = "hs";
    platforms = lib.platforms.unix;
  };
-}
+})
@@ -7,11 +7,11 @@
 }:
 let
  pname = "heynote";
-  version = "2.6.2";
+  version = "2.7.0";

  src = fetchurl {
    url = "https://github.com/heyman/heynote/releases/download/v${version}/Heynote_${version}_x86_64.AppImage";
-    sha256 = "sha256-nA1FRjh9lKdTZXUfuECl5BlW5phYaoh7HOOCKDQuOGQ=";
+    sha256 = "sha256-g96Vs9fCYRQc3vmQZd3N2jJSU4TQanLUa/Grb+71eW4=";
  };

  appimageContents = appimageTools.extractType2 {
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
  cargoHash = "sha256-egrxcnDVKKgk1sL5WNMIR2FPwQbjjMy20VWizcTBEtM=";

  # requires nightly features
-  RUSTC_BOOTSTRAP = 1;
+  env.RUSTC_BOOTSTRAP = 1;

  meta = {
    description = "Tool for unit testing tree sitter highlights for nvim-treesitter";
@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "hl-log-viewer";
-  version = "0.33.2";
+  version = "0.34.1";

  src = fetchFromGitHub {
    owner = "pamburus";
    repo = "hl";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-DJqOohJ+TKP4l+ySyOTRrBFZU3rn16kI4CGbFHm1rE4=";
+    hash = "sha256-WUapXgmgshoziNviaKMGs+uKw6E8/sWCIJkleygfACk=";
  };

-  cargoHash = "sha256-c4cS5lx6aZ11YgXb6jqNkjn+tSwJC0lRvT10wvSanTE=";
+  cargoHash = "sha256-DtYGGe0ot54q2A/W3sUigNoYwf2LiDwxj+AI5VovOTE=";

  nativeBuildInputs = [ installShellFiles ];

@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };

  # Use rust nightly features
-  RUSTC_BOOTSTRAP = 1;
+  env.RUSTC_BOOTSTRAP = 1;

  nativeBuildInputs = [
    cmake
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
  cargoHash = "sha256-YZ2c6W6CCqgyN+6i7Vh5fWLKw8L4pUqvq/tDO/Q/kf0=";

  # Use rust nightly features
-  RUSTC_BOOTSTRAP = 1;
+  env.RUSTC_BOOTSTRAP = 1;

  nativeBuildInputs = [
    cmake
@@ -9,13 +9,13 @@

 buildGo124Module rec {
  pname = "hubble";
-  version = "1.18.3";
+  version = "1.18.5";

  src = fetchFromGitHub {
    owner = "cilium";
    repo = "hubble";
    tag = "v${version}";
-    hash = "sha256-9TY7at4k3IrxJJ4HmAW9oeQX3Wg0V/LGVDNGYfBOvSA=";
+    hash = "sha256-0R9Bm+8eiCOfsCs2oCBjZQR/N8z0DmkGBC/6Fy4JNyM=";
  };

  nativeBuildInputs = [
@@ -13,13 +13,14 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-AD8mv47m4E6H8BVkxTExyhrR7VEnuB/KxnRl2puPnX4=";
  };

-  # Insert empty line in expected output of rust panic in a test
-  postPatch = ''
-    sed -i '6G' tests/snapshots/run__file@empty.hvm.snap
-  '';
-
  cargoHash = "sha256-nLcT+o6xrxPmQqK7FQpCqTlxOOUA1FzqRGQIypcq4fo=";

+  # Skip snapshot tests with non-deterministic thread IDs and environment differences
+  checkFlags = [
+    "--skip=test_run_examples"
+    "--skip=test_run_programs"
+  ];
+
  meta = {
    description = "Massively parallel, optimal functional runtime in Rust";
    mainProgram = "hvm";
@@ -6,16 +6,16 @@
 }:
 buildGoModule rec {
  pname = "hyprls";
-  version = "0.11.0";
+  version = "0.12.0";

  src = fetchFromGitHub {
    owner = "hyprland-community";
    repo = "hyprls";
    rev = "v${version}";
-    hash = "sha256-oKI5+SolS9fsgPcP8tTK8YVsnkC5YQSKO3dwMDlMwYo=";
+    hash = "sha256-5JOJ93XPJ3hFThpLQmQ+EL0wkn+nrq15pwGhZrhc2h0=";
  };

-  vendorHash = "sha256-1oarMEG7kHxCPAg4oPTSJRjnrF0QmXShVQpTUnN9fFQ=";
+  vendorHash = "sha256-xSDIGlvJjr2IF04X3uoiVvHN2qgcBSNSDHIkTUxW9eM=";

  checkFlags = [
    # Not yet implemented
@@ -8,16 +8,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "ianny";
-  version = "2.1.1";
+  version = "2.1.3";

  src = fetchFromGitHub {
    owner = "zefr0x";
    repo = "ianny";
    rev = "v${version}";
-    hash = "sha256-XwwfBOx+5l5KjthL69nLpIVc7ilA4rKGBeRvE9BEQPU=";
+    hash = "sha256-CPtVk8sG3LcJBgmPc/kYZZXW0Lt2OPJGzkLKac+/1ZI=";
  };

-  cargoHash = "sha256-A5ZInR6gXvDPpa2azF1ZmVANzm3v1YAvxJjJ7h32J2A=";
+  cargoHash = "sha256-R8NEsGKaoYMssl1OkHXGV+1/oVPkZsbfdgLfRHp+ApA=";

  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ dbus.dev ];
@@ -34,8 +34,10 @@ rustPlatform.buildRustPackage rec {

  cargoHash = "sha256-UcS2gAoa2fzPu6hh8I5sXSHHbAmzsecT44Ju2CVsK0Q=";

-  RUSTC_BOOTSTRAP = 1;
-  RUSTFLAGS = "--cfg=web_sys_unstable_apis";
+  env = {
+    RUSTC_BOOTSTRAP = 1;
+    RUSTFLAGS = "--cfg=web_sys_unstable_apis";
+  };

  nativeBuildInputs = [
    wasm-bindgen-cli_0_2_100
@@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "jq-lsp";
-  version = "0.1.15";
+  version = "0.1.16";

  src = fetchFromGitHub {
    owner = "wader";
    repo = "jq-lsp";
    tag = "v${version}";
-    hash = "sha256-5z5CTamk13QL50Hof2XeQ02NqRWMh4cECDhD6egGcnE=";
+    hash = "sha256-tuB5RxJSYGHLPPd3v0xrmqX6Ywxw6V8BQEHkkiAsBTA=";
  };

-  vendorHash = "sha256-oiy80U6WmpG0lHl5yTF017gZbiB2cWuM+cQJB0bs+RU=";
+  vendorHash = "sha256-pGXFuyYJPNcMEd0vPrmbdY/CeOF0AXwrNJEfrBBe4I0=";

  # based on https://github.com/wader/jq-lsp/blob/master/.goreleaser.yml
  env.CGO_ENABLED = 0;
@@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "kafkactl";
-  version = "5.16.0";
+  version = "5.17.0";

  src = fetchFromGitHub {
    owner = "deviceinsight";
    repo = "kafkactl";
    tag = "v${version}";
-    hash = "sha256-99VPjcO2LJFXiffzPV75UcLDX7N7P0RgdEEcV7seomY=";
+    hash = "sha256-nZkIAlvQ3jsXWJXLYbaZWJYOgxF7okRY//BZdGPNU0s=";
  };

-  vendorHash = "sha256-OXB+6911gNLCo+6WMnyZNGAWcTkRj2NkzaoUh9j79wI=";
+  vendorHash = "sha256-oiN1nMln8oXy/e7gt0JtynCQxcxi0rwcdVthaWhjBWQ=";

  doCheck = false;

@@ -24,11 +24,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "keycloak";
-  version = "26.4.7";
+  version = "26.5.0";

  src = fetchzip {
    url = "https://github.com/keycloak/keycloak/releases/download/${finalAttrs.version}/keycloak-${finalAttrs.version}.zip";
-    hash = "sha256-F214k6kCb+O6LH8bgsImkfPt8XAezuPEBpRS0TUeOy0=";
+    hash = "sha256-0FxCukp7G3AR+Q2XTmJ/6Yj/IkWBXGaAsiqZncUY35E=";
  };

  nativeBuildInputs = [
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
  '';

  # requires nightly features
-  RUSTC_BOOTSTRAP = true;
+  env.RUSTC_BOOTSTRAP = true;

  meta = {
    description = "Functional programming language and proof assistant";
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
  version = "0.6.1";

  # kord depends on nightly features
-  RUSTC_BOOTSTRAP = 1;
+  env.RUSTC_BOOTSTRAP = 1;

  src = fetchFromGitHub {
    owner = "twitchax";
@@ -3,25 +3,31 @@
  stdenv,
  buildGoModule,
  fetchFromGitHub,
+  installShellFiles,
+  writableTmpDirAsHomeHook,
  pkg-config,
  btrfs-progs,
  gpgme,
+  xen,
+  yajl,
  nix-update-script,
 }:

 buildGoModule rec {
  pname = "kraftkit";
-  version = "0.11.6";
+  version = "0.12.5";

  src = fetchFromGitHub {
    owner = "unikraft";
    repo = "kraftkit";
    rev = "v${version}";
-    hash = "sha256-a6c7g2cxrawE7BRpcrsefCQ7xQ56wVOGjFexdkOKnv0=";
+    hash = "sha256-/ReHXxvn/6dDJVxk5BOvxSZrlkDkZEfr+qM5raf2a3A=";
  };

  nativeBuildInputs = [
    pkg-config
+    installShellFiles
+    writableTmpDirAsHomeHook
  ];

  buildInputs = [
@@ -29,17 +35,57 @@ buildGoModule rec {
  ]
  ++ lib.optionals stdenv.hostPlatform.isLinux [
    btrfs-progs
+    xen
+    yajl
  ];

-  vendorHash = "sha256-lwgxedKLcuV6RucbU26sDO+9j+8uWkignJDomFHaSXU=";
+  vendorHash = "sha256-1rdpyOJVeyzYT0WHJbeqO3aH15FN1/9iQ9bEsjWwn4c=";

  ldflags = [
    "-s"
    "-w"
+    "-X kraftkit.sh/internal/cli/kraft.sentryDsn="
+    "-X kraftkit.sh/internal/version.buildTime=1970-01-01T00:00:00Z"
+    "-X kraftkit.sh/internal/version.commit=nixpkgs"
    "-X kraftkit.sh/internal/version.version=${version}"
  ];

-  subPackages = [ "cmd/kraft" ];
+  tags = [
+    "containers_image_storage_stub"
+    "containers_image_openpgp"
+    "netgo"
+    "osusergo"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    "xen"
+  ];
+
+  subPackages = [
+    "cmd/kraft"
+  ]
+  ++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ "tools/genman" ];
+
+  excludedPackages = [
+    "test/e2e"
+    "initrd"
+    "tools"
+  ];
+
+  preCheck = ''
+    # Run all tests.
+    unset subPackages
+  '';
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    $out/bin/genman generate ./docs/man/
+    rm $out/bin/genman
+    installManPage ./docs/man/*
+
+    installShellCompletion --cmd kraft \
+      --bash <($out/bin/kraft completion bash) \
+      --fish <($out/bin/kraft completion fish) \
+      --zsh <($out/bin/kraft completion zsh)
+  '';

  passthru = {
    updateScript = nix-update-script {
@@ -10,13 +10,13 @@

 buildGoModule rec {
  pname = "kubelogin";
-  version = "0.2.13";
+  version = "0.2.14";

  src = fetchFromGitHub {
    owner = "Azure";
    repo = "kubelogin";
    rev = "v${version}";
-    sha256 = "sha256-Vy3HRNBYP+q/DWVib47jolg4W2HgdAAqjcFghfpapSE=";
+    sha256 = "sha256-s9W5wvA4L0Qbn5vimLU03oqx10XqCybE3YvC9gV3y7A=";
  };

  patches = [
@@ -0,0 +1,91 @@
+{
+  autoPatchelfHook,
+  fetchgit,
+  lib,
+  libfprint-tod,
+  openssl,
+  patchelfUnstable,
+  stdenv,
+}:
+
+let
+  pname = "libfprint-2-tod1-broadcom-cv3plus";
+  version = "6.3.299-6.3.040.0";
+
+  src = fetchgit {
+    url = "git://git.launchpad.net/~oem-solutions-engineers/pc-enablement/+git/libfprint-2-tod1-broadcom-cv3plus/";
+    branchName = "ubuntu/latest";
+    rev = "ac7a8ab2318216e603c8c23b279bbad28a301d3";
+    hash = "sha256-4JwoUuvskj8GqTUQpKBECCL+jkSfxpaukqRTTVTmSLk=";
+  };
+
+  wrapperLibName = "wrapper-lib.so";
+  wrapperLibSource = "wrapper-lib.c";
+
+  # wraps `fopen()` for finding firmware files
+  wrapperLib = stdenv.mkDerivation {
+    pname = "${pname}-wrapper-lib";
+    inherit version;
+
+    src = builtins.path {
+      name = "${pname}-wrapper-lib-source";
+      path = ./.;
+      filter = path: type: baseNameOf path == wrapperLibSource;
+    };
+
+    postPatch = ''
+      substitute ${wrapperLibSource} lib.c \
+        --subst-var-by to "${src}/var/lib/fprint/.broadcomCv3plusFW"
+      cc -fPIC -shared lib.c -o ${wrapperLibName}
+    '';
+
+    installPhase = ''
+      runHook preInstall
+      install -D -t $out/lib ${wrapperLibName}
+      runHook postInstall
+    '';
+  };
+in
+stdenv.mkDerivation {
+  inherit src pname version;
+
+  buildInputs = [
+    libfprint-tod
+    openssl
+    wrapperLib
+  ];
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    patchelfUnstable # have to use patchelfUnstable to support --rename-dynamic-symbols
+  ];
+
+  installPhase = ''
+    runHook preInstall
+    install -D -t "$out/lib/libfprint-2/tod-1/" -m 644 -v usr/lib/x86_64-linux-gnu/libfprint-2/tod-1/libfprint-2-tod-1-broadcom-cv3plus.so
+    install -D -t "$out/lib/udev/rules.d/"      -m 644 -v lib/udev/rules.d/60-libfprint-2-device-broadcom-cv3plus.rules
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    echo fopen64 fopen_wrapper > fopen_name_map
+    patchelf \
+      --rename-dynamic-symbols fopen_name_map \
+      --add-needed ${wrapperLibName} \
+      "$out/lib/libfprint-2/tod-1/libfprint-2-tod-1-broadcom-cv3plus.so"
+  '';
+
+  passthru.driverPath = "/lib/libfprint-2/tod-1";
+
+  meta = with lib; {
+    description = "Broadcom driver module for libfprint-2-tod Touch OEM Driver for Dell ControlVault v3+";
+    homepage = "https://git.launchpad.net/~oem-solutions-engineers/pc-enablement/+git/libfprint-2-tod1-broadcom-cv3plus/";
+    license = licenses.unfree;
+    maintainers = with maintainers; [
+      aionescu
+      pitkling
+    ];
+    platforms = [ "x86_64-linux" ];
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+  };
+}
@@ -0,0 +1,23 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static const char from[] =  "/var/lib/fprint/.broadcomCv3plusFW";
+static const char to[]   = "@to@";
+
+FILE* fopen_wrapper(const char* fn, const char* mode) {
+    size_t fn_len = strlen(fn);
+    size_t from_len = strlen(from);
+    if (fn_len > from_len && memcmp(fn, from, from_len) == 0) {
+        size_t to_len = strlen(to);
+        char* rewritten = calloc(fn_len + (to_len - from_len) + 1, 1);
+        memcpy(rewritten, to, to_len);
+        memcpy(rewritten + to_len, fn + from_len, fn_len - from_len);
+
+        printf("fopen_wrapper.c: Replacing path '%s' with '%s'\n", fn, rewritten);
+        FILE* result = fopen(rewritten, mode);
+        free(rewritten);
+        return result;
+    }
+    return fopen(fn, mode);
+}
@@ -1,10 +1,10 @@
 {
  autoPatchelfHook,
-  fetchzip,
+  fetchgit,
  lib,
  libfprint-tod,
  openssl,
-  patchelfUnstable, # have to use patchelfUnstable to support --rename-dynamic-symbols
+  patchelfUnstable,
  stdenv,
 }:

@@ -13,13 +13,13 @@
 #   * https://github.com/NixOS/nixpkgs/pull/260715
 let
  pname = "libfprint-2-tod1-broadcom";
-  version = "5.12.018";
+  version = "5.15.285-5.15.010.0";

-  src = fetchzip {
-    url = "http://dell.archive.canonical.com/updates/pool/public/libf/${pname}/${pname}_${version}.orig.tar.gz";
-    hash = "sha256-0C2PpYpEJNrU+8NT95w4QV0J5nHQisMY94Czw3jQOzw=";
-    pname = "${pname}-unpacked";
-    inherit version;
+  src = fetchgit {
+    url = "git://git.launchpad.net/~oem-solutions-engineers/libfprint-2-tod1-broadcom/";
+    branchName = "ubuntu/latest";
+    rev = "4372071d7296f40050b67e62ab256db71bd9ea30";
+    hash = "sha256-zJiRos0SrU1FxX8SfEnIv0cVy3snkRuTWaLy+MywF+Q=";
  };

  wrapperLibName = "wrapper-lib.so";
@@ -60,7 +60,7 @@ stdenv.mkDerivation {

  nativeBuildInputs = [
    autoPatchelfHook
-    patchelfUnstable
+    patchelfUnstable # have to use patchelfUnstable to support --rename-dynamic-symbols
  ];

  installPhase = ''
@@ -81,10 +81,13 @@ stdenv.mkDerivation {
  passthru.driverPath = "/lib/libfprint-2/tod-1";

  meta = {
-    description = "Broadcom driver module for libfprint-2-tod Touch OEM Driver (from Dell)";
-    homepage = "http://dell.archive.canonical.com/updates/pool/public/libf/libfprint-2-tod1-broadcom/";
+    description = "Broadcom driver module for libfprint-2-tod Touch OEM Driver for Dell ControlVault v3";
+    homepage = "https://git.launchpad.net/~oem-solutions-engineers/libfprint-2-tod1-broadcom/";
    license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ pitkling ];
+    maintainers = with lib.maintainers; [
+      aionescu
+      pitkling
+    ];
    platforms = [ "x86_64-linux" ];
    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
  };
@@ -15,21 +15,29 @@

 buildGoModule rec {
  pname = "mautrix-meta";
-  version = "0.5.3";
+  version = "25.12";
+  tag = "v0.2512.0";

  subPackages = [ "cmd/mautrix-meta" ];

  src = fetchFromGitHub {
    owner = "mautrix";
    repo = "meta";
-    rev = "v${version}";
-    hash = "sha256-k23ygwKQjKFov/8TJ6BKlcgIv5Jsy7oSBjcCCS5YVm4=";
+    inherit tag;
+    hash = "sha256-S5vPAuie0BrRXaDNgSpXUI1V0C3P/CihgzGK1V7iU7w=";
  };

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

-  vendorHash = "sha256-xibBQNwXzpbvS9nVBBRyJK95I5EqF1Xde1TL1BEZmnA=";
+  vendorHash = "sha256-aANrYWhIAXQxpe/rtMMkHfhTtuRs5fgJxNUQK29pdvM=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X"
+    "main.Tag=${tag}"
+  ];

  passthru = {
    tests = {
@@ -44,7 +52,7 @@ buildGoModule rec {

  meta = {
    homepage = "https://github.com/mautrix/meta";
-    description = "Matrix <-> Facebook and Matrix <-> Instagram hybrid puppeting/relaybot bridge";
+    description = "Matrix-Meta puppeting bridge";
    license = lib.licenses.agpl3Plus;
    maintainers = with lib.maintainers; [
      eyjhb
@@ -1,30 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  rustPlatform,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "mdbook-alerts";
-  version = "0.8.0";
-
-  src = fetchFromGitHub {
-    owner = "lambdalisue";
-    repo = "rs-mdbook-alerts";
-    rev = "v${version}";
-    hash = "sha256-82WbO/j9F0WKGkSkTf27dGdxdHF3OONFvn68ujWMwSM=";
-  };
-
-  cargoHash = "sha256-A+jodjynhQ6WFp/Ci5Jk0+baDx6QzJ8u+UMmLugtJUc=";
-
-  meta = {
-    description = "Preprocessor for mdbook to support the inclusion of Markdown alerts";
-    mainProgram = "mdbook-alerts";
-    homepage = "https://github.com/lambdalisue/rs-mdbook-alerts";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [
-      brianmcgillion
-      matthiasbeyer
-    ];
-  };
-}
@@ -19,14 +19,18 @@ rustPlatform.buildRustPackage (finalAttrs: {
  };

  cargoHash = "sha256-U8U70nzTmpY6r8J661EJ4CGjx6vWrGovu5m25dvz5sY=";
-  # Requires nightly features
-  env.RUSTC_BOOTSTRAP = 1;

-  # Without -headerpad, the following error occurs on x86_64-darwin
-  # error: install_name_tool: changing install names or rpaths can't be redone for: ... because larger updated load commands do not fit (the program must be relinked, and you may need to use -headerpad or -headerpad_max_install_names)
-  NIX_LDFLAGS = lib.optionals (with stdenv.hostPlatform; isDarwin && isx86_64) [
-    "-headerpad_max_install_names"
-  ];
+  # Requires nightly features
+  env = {
+    RUSTC_BOOTSTRAP = 1;
+    # Without -headerpad, the following error occurs on x86_64-darwin
+    # error: install_name_tool: changing install names or rpaths can't be redone for: ... because larger updated load commands do not fit (the program must be relinked, and you may need to use -headerpad or -headerpad_max_install_names)
+    NIX_LDFLAGS = toString (
+      lib.optionals (with stdenv.hostPlatform; isDarwin && isx86_64) [
+        "-headerpad_max_install_names"
+      ]
+    );
+  };

  buildInputs = [
    icu
@@ -16,13 +16,13 @@
 }:

 let
-  version = "5.11.32";
+  version = "5.12.21";

  src = fetchFromGitHub {
    owner = "d99kris";
    repo = "nchat";
    tag = "v${version}";
-    hash = "sha256-iDy3h1km7Xg6hzkRg3bO8lNSe3CPBk6JOJV8Ph/Rm2w=";
+    hash = "sha256-WofBqdUX88USnCA4iyDVMDXyx4Bxz/ZV0FqDUeAOe4Q=";
  };

  libcgowm = buildGoModule {
@@ -30,7 +30,7 @@ let
    inherit version src;

    sourceRoot = "${src.name}/lib/wmchat/go";
-    vendorHash = "sha256-f6UGMP+IASvII82XZR8GIRG2tEx9ejf6WgCkKnicnD0=";
+    vendorHash = "sha256-4jn2CDWqg0GqZ7QTTaZh+9GDUH7L6WllfTONkxnfKEU=";

    buildPhase = ''
      runHook preBuild
@@ -11,16 +11,16 @@

 buildGoModule (finalAttrs: {
  pname = "nesting";
-  version = "0.4.0";
+  version = "0.5.0";

  src = fetchFromGitLab {
    owner = "gitlab-org/fleeting";
    repo = "nesting";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-W4Pv990X3R4ksHGfwycdTYvUfjwm5sxh0AeoG9EZ/0A=";
+    hash = "sha256-Cdn01R1Jr2npqeKrA8CiC6r85LNfQvq0EONrmMPY0ds=";
  };

-  vendorHash = "sha256-YYHiyNg15VdijyrR5t1PwIjHWXmofHcVD6YMrbwn4Qk=";
+  vendorHash = "sha256-PjsS+lTEuReA+alzZsrx6c7JIPaZldgGi/a/Xh4k5w4=";

  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ];

@@ -21,8 +21,10 @@ rustPlatform.buildRustPackage rec {

  hardeningDisable = [ "stackprotector" ];

-  NIX_SYSTEM = stdenv.system;
-  RUSTC_BOOTSTRAP = "1";
+  env = {
+    NIX_SYSTEM = stdenv.system;
+    RUSTC_BOOTSTRAP = "1";
+  };

  preCheck = ''
    export NIX_LD=${stdenv.cc.bintools.dynamicLinker}
@@ -9,16 +9,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "numbat";
-  version = "1.16.0";
+  version = "1.18.0";

  src = fetchFromGitHub {
    owner = "sharkdp";
    repo = "numbat";
    tag = "v${version}";
-    hash = "sha256-1CAUl9NB1QjduXgwOIcMclXA6SpaTP+kd3j25BK5Q/8=";
+    hash = "sha256-uRzjaDYPvAQwvUeE6NI1QKNFqBVUFcXK3gm3dRkyWw0=";
  };

-  cargoHash = "sha256-EBfhi7puB2To/1GLbXW6Tz1zazDswvh+NqqBkeqRtAI=";
+  cargoHash = "sha256-wKY/StWKiTK8/oFV0tlqNakk+zqqTFVAEauBrGar2bY=";

  env.NUMBAT_SYSTEM_MODULE_PATH = "${placeholder "out"}/share/numbat/modules";

@@ -2,6 +2,7 @@
  lib,
  SDL2,
  SDL2_mixer,
+  SDL2_image,
  callPackage,
  cmake,
  pkg-config,
@@ -9,40 +10,35 @@
  fetchFromGitHub,
  fetchpatch,
  libpng,
+  libjpeg,
  stdenv,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "nxengine-evo";
-  version = "2.6.4";
+  version = "2.6.5-1";

  src = fetchFromGitHub {
    owner = "nxengine";
    repo = "nxengine-evo";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-krK2b1E5JUMxRoEWmb3HZMNSIHfUUGXSpyb4/Zdp+5A=";
+    hash = "sha256-UufvtfottD9DrnjN9xhAlkNdW5Ha+vZwf/4uKDtF5ho=";
  };

  patches = [
-    # Fix building by adding SDL_MIXER to include path
-    (fetchpatch {
-      url = "https://github.com/nxengine/nxengine-evo/commit/1890127ec4b4b5f8d6cb0fb30a41868e95659840.patch";
-      hash = "sha256-wlsIdN2RugOo94V3qj/AzYgrs2kf0i1Iw5zNOP8WQqI=";
-    })
-    # Fix buffer overflow
-    (fetchpatch {
-      url = "https://github.com/nxengine/nxengine-evo/commit/75b8b8e3b067fd354baa903332f2a3254d1cc017.patch";
-      hash = "sha256-fZVaZAOHgFoNakOR2MfsvRJjuLhbx+5id/bcN8w/WWo=";
-    })
    # Add missing include
    (fetchpatch {
      url = "https://github.com/nxengine/nxengine-evo/commit/0076ebb11bcfec5dc5e2e923a50425f1a33a4133.patch";
      hash = "sha256-8j3fFFw8DMljV7aAFXE+eA+vkbz1HdFTMAJmk3BRU04=";
    })
+    # Update minimum CMake version to 3.10
+    (fetchpatch {
+      url = "https://github.com/nxengine/nxengine-evo/commit/7e228063441da50f65a78bf2213e85b7fceffae9.patch";
+      hash = "sha256-Vi8nE7IdvQbMDrXycw9hLsuHQwbpu1eiUTLSaIcRoUQ=";
+    })
  ];

  nativeBuildInputs = [
-    SDL2
    cmake
    ninja
    pkg-config
@@ -51,7 +47,9 @@ stdenv.mkDerivation (finalAttrs: {
  buildInputs = [
    SDL2
    SDL2_mixer
+    SDL2_image
    libpng
+    libjpeg
  ];

  strictDeps = true;
@@ -64,9 +62,8 @@ stdenv.mkDerivation (finalAttrs: {
  installPhase = ''
    runHook preInstall

-    cd ..
    mkdir -p $out/bin/ $out/share/nxengine/
-    install bin/* $out/bin/
+    install nxengine-evo $out/bin/
  ''
  + ''
    cp -r ${finalAttrs.finalPackage.assets}/share/nxengine/data $out/share/nxengine/data
@@ -87,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
    license = with lib.licenses; [
      gpl3Plus
    ];
-    mainProgram = "nx";
+    mainProgram = "nxengine-evo";
    maintainers = [ ];
    platforms = lib.platforms.linux;
  };
@@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "patch2pr";
-  version = "0.39.0";
+  version = "0.40.0";

  src = fetchFromGitHub {
    owner = "bluekeyes";
    repo = "patch2pr";
    rev = "v${version}";
-    hash = "sha256-uIDC/bt0rjZD+5whKi0VIu3s2WiSCkYsLFlJi/K8+XY=";
+    hash = "sha256-o8+Br3gSpB2FoyXfmn2ZnGLm0zIaPx0mgzlLNdFo9sc=";
  };

-  vendorHash = "sha256-vzyv6yStG7KnMljF/B5mro37G7T0XGEh4UAtcRHNQFg=";
+  vendorHash = "sha256-lEIBGuRaCkinBN2aQqXgH95Ql7GSCP0bpOsjZLLK6Jo=";

  ldflags = [
    "-X main.version=${version}"
@@ -13,14 +13,14 @@

 python3Packages.buildPythonApplication rec {
  pname = "plattenalbum";
-  version = "2.4.0";
+  version = "2.4.1";
  pyproject = false;

  src = fetchFromGitHub {
    owner = "SoongNoonien";
    repo = "plattenalbum";
    tag = "v${version}";
-    hash = "sha256-zk0Cs+ZR5JEiuVgjcj2ykVbRBzp0p5VioZmHgcAHq/s=";
+    hash = "sha256-k2rrXTYYrk8I8Rsy/vCiAkkcwP5LHcxzRLJrp2QAOpk=";
  };

  nativeBuildInputs = [
@@ -2,10 +2,20 @@
  lib,
  fetchFromGitHub,
  gitMinimal,
-  python3,
+  python3Packages,
 }:

-python3.pkgs.buildPythonApplication rec {
+let
+  pythonPackages = python3Packages.overrideScope (
+    self: super: {
+      pytest-randomly = super.pytest-randomly.overridePythonAttrs {
+        doCheck = false;
+      };
+      sqlalchemy = self.sqlalchemy_1_4;
+    }
+  );
+in
+pythonPackages.buildPythonApplication rec {
  pname = "quark-engine";
  version = "25.6.1";
  pyproject = true;
@@ -17,9 +27,9 @@ python3.pkgs.buildPythonApplication rec {
    hash = "sha256-DAD37fzswY3c0d+ubOCYImxs4qyD4fhC3m2l0iD977A=";
  };

-  build-system = with python3.pkgs; [ setuptools ];
+  build-system = with pythonPackages; [ setuptools ];

-  dependencies = with python3.pkgs; [
+  dependencies = with pythonPackages; [
    androguard
    click
    colorama
@@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "railway";
-  version = "4.16.1";
+  version = "4.17.0";

  src = fetchFromGitHub {
    owner = "railwayapp";
    repo = "cli";
    rev = "v${version}";
-    hash = "sha256-ylmSsBGmYFLQExwFtI7gFwGmZeuIJy+QXQeCRdL669Y=";
+    hash = "sha256-QMwVqNqJysohjYAXjXY3AVjK44/U3/GcIwN4EgDaZEY=";
  };

-  cargoHash = "sha256-Fk+2QRNJr2zFIKHOuEjoZbnwloGPCXP0Ilc26iKNI64=";
+  cargoHash = "sha256-z92GOQkbPIeEjZVE9g8pdTVp1s1e7oYLZeTUF7t/FkQ=";

  nativeBuildInputs = [ pkg-config ];

@@ -5,16 +5,16 @@
  python3,
 }:

-python3.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication (finalAttrs: {
  pname = "responder";
-  version = "3.1.7.0";
+  version = "3.2.0.0";
  format = "other";

  src = fetchFromGitHub {
    owner = "lgandx";
    repo = "Responder";
-    tag = "v${version}";
-    hash = "sha256-ZC74VFnixSc97fRkRSOJmc39YLIP95qAUFydIcyzNdo=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-2E1V5rnIvshSYV7F1iMr/1yGdSGQRCUdEwsTzJvVhaw=";
  };

  nativeBuildInputs = [
@@ -55,4 +55,4 @@ python3.pkgs.buildPythonApplication rec {
    maintainers = with lib.maintainers; [ fab ];
    mainProgram = "responder";
  };
-}
+})
@@ -7,13 +7,13 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "rime-wanxiang";
-  version = "13.9.3";
+  version = "14.1.1";

  src = fetchFromGitHub {
    owner = "amzxyz";
    repo = "rime_wanxiang";
    tag = "v" + finalAttrs.version;
-    hash = "sha256-MxbReUD9PaU4CIPCHx7QA5n1wRSBgjW6NROLK0Ko0Q8=";
+    hash = "sha256-eer09CPni8dBI0jZJYeMIBzNfRFJN0K5XjTA3vV37Ho=";
  };

  installPhase = ''
@@ -20,13 +20,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "rocksdb";
-  version = "10.7.5";
+  version = "10.9.1";

  src = fetchFromGitHub {
    owner = "facebook";
    repo = "rocksdb";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-kKMwgRcjELla/9aak5gZbUHg1bkgGhlobr964wdatxI=";
+    hash = "sha256-AdYt97tcZdj4Kyq0mGl+JreOybKn04tSVvdyaFQWuy4=";
  };

  patches = lib.optional (
@@ -21,13 +21,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "rtorrent";
-  version = "0.16.5";
+  version = "0.16.6";

  src = fetchFromGitHub {
    owner = "rakshasa";
    repo = "rtorrent";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-zncal17A4/+WGU3L8iJVSMJtKTKNmMHCXJ2O7Za2VOE=";
+    hash = "sha256-Y8LFysyfOsgsMmbLFcf+SjKKDdTFBwDPQU0hW6hiXII=";
  };

  outputs = [
@@ -1,5 +0,0 @@
-{
-  "links": [],
-  "version": "0.2.20240718-145624+f4e9df48",
-  "versionHash": "7014953821350190751"
-}
@@ -1,69 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i python3 -p cargo -p "python3.withPackages (ps: with ps; [ requests ])"
-import json
-import pathlib
-import re
-import tempfile
-import os
-import shutil
-from hashlib import sha1
-from struct import unpack
-from subprocess import run
-import subprocess
-
-from requests import get
-
-# Fetch the latest stable release metadata from GitHub
-releaseMetadata = get("https://api.github.com/repos/facebook/sapling/releases/latest").json()
-latestTag = releaseMetadata["tag_name"]
-latestTarballURL = releaseMetadata["tarball_url"]
-
-[_tarballHash, sourceDirectory] = run(
-    ["nix-prefetch-url", "--print-path", "--unpack", latestTarballURL],
-    check=True,
-    text=True,
-    stdout=subprocess.PIPE,
-).stdout.rstrip().splitlines()
-
-def updateCargoLock():
-    with tempfile.TemporaryDirectory() as tempDir:
-        tempDir = pathlib.Path(tempDir)
-
-        # NOTE(strager): We cannot use shutil.tree because it copies the
-        # read-only permissions.
-        for dirpath, dirnames, filenames in os.walk(sourceDirectory):
-            relativeDirpath = os.path.relpath(dirpath, sourceDirectory)
-            for filename in filenames:
-                shutil.copy(os.path.join(dirpath, filename), tempDir / relativeDirpath / filename)
-            for dirname in dirnames:
-                os.mkdir(tempDir / relativeDirpath / dirname)
-
-        run(["cargo", "fetch"], check=True, cwd=tempDir / "eden" / "scm")
-        shutil.copy(tempDir / "eden" / "scm" / "Cargo.lock", "Cargo.lock")
-
-updateCargoLock()
-
-def nixPrefetchUrl(url):
-    return run(
-        ["nix-prefetch-url", "--type", "sha256", url],
-        check=True,
-        text=True,
-        capture_output=True,
-    ).stdout.rstrip()
-
-
-# Fetch the `setup.py` source and look for instances of assets being downloaded
-# from files.pythonhosted.org.
-setupPy = (pathlib.Path(sourceDirectory) / "eden/scm/setup.py").read_text()
-foundUrls = re.findall(r'(https://files\.pythonhosted\.org/packages/[^\s]+)"', setupPy)
-
-dataDeps = {
-    "links": [{"url": url, "sha256": nixPrefetchUrl(url)} for url in foundUrls],
-    "version": latestTag,
-    # Find latest's git tag which corresponds to the Sapling version. Also
-    # needed is a hash of the version, so calculate that here. Taken from
-    # Sapling source `$root/eden/scm/setup_with_version.py`.
-    "versionHash": str(unpack(">Q", sha1(latestTag.encode("ascii")).digest()[:8])[0]),
-}
-
-open("deps.json", "w").write(json.dumps(dataDeps, indent=2, sort_keys=True) + "\n")
@@ -1,11 +1,12 @@
 {
  lib,
  stdenv,
-  python311Packages,
+  python312Packages,
  fetchFromGitHub,
-  fetchurl,
  cargo,
  curl,
+  gettext,
+  libclang,
  pkg-config,
  openssl,
  rustPlatform,
@@ -16,12 +17,14 @@
  fixup-yarn-lock,
  glibcLocales,
  libiconv,
+  versionCheckHook,

  enableMinimal ? false,
 }:

 let
-  inherit (lib.importJSON ./deps.json) links version versionHash;
+  version = "0.2.20250521-115337+25ed6ac4";
+
  # Sapling sets a Cargo config containing lines like so:
  # [target.aarch64-apple-darwin]
  # rustflags = ["-C", "link-args=-Wl,-undefined,dynamic_lookup"]
@@ -41,8 +44,8 @@ let
  src = fetchFromGitHub {
    owner = "facebook";
    repo = "sapling";
-    rev = version;
-    hash = "sha256-4pOpJ91esTSH90MvvMu74CnlLULLUawqxcniUeqnLwA=";
+    tag = version;
+    hash = "sha256-NvfSx6BMbwOFY+y6Yb/tyUNYeuL8WCoc+HSVys8Ko0Y=";
  };

  addonsSrc = "${src}/addons";
@@ -50,7 +53,7 @@ let
  # Fetches the Yarn modules in Nix to to be used as an offline cache
  yarnOfflineCache = fetchYarnDeps {
    yarnLock = "${addonsSrc}/yarn.lock";
-    sha256 = "sha256-jCtrflwDrwql6rY1ff1eXLKdwmnXhg5bCJPlCczBCIk=";
+    sha256 = "sha256-9l4lSzFTF5rSByO388tosJCxOb65Nnua6HaDD7F62No=";
  };

  # Builds the NodeJS server that runs with `sl web`
@@ -78,7 +81,7 @@ let
      substituteInPlace build-tar.py \
        --replace-fail 'run(yarn + ["--cwd", src_join(), "install", "--prefer-offline"])' 'pass'

-      ${python311Packages.python}/bin/python3 build-tar.py \
+      ${python312Packages.python}/bin/python3 build-tar.py \
        --output isl-dist.tar.xz \
        --yarn 'yarn --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress'

@@ -96,7 +99,7 @@ let
  };
 in
 # Builds the main `sl` binary and its Python extensions
-python311Packages.buildPythonApplication {
+python312Packages.buildPythonApplication {
  format = "setuptools";
  pname = "sapling";
  inherit src version;
@@ -108,14 +111,19 @@ python311Packages.buildPythonApplication {
    lockFile = ./Cargo.lock;
    outputHashes = {
      "abomonation-0.7.3+smallvec1" = "sha256-AxEXR6GC8gHjycIPOfoViP7KceM29p2ZISIt4iwJzvM=";
-      "cloned-0.1.0" = "sha256-2BaNR/pQmR7pHtRf6VBQLcZgLHbj2JCxeX4auAB0efU=";
-      "fb303_core-0.0.0" = "sha256-PDGdKjR6KPv1uH1JSTeoG5Rs0ZkmNJLqqSXtvV3RWic=";
-      "fbthrift-0.0.1+unstable" = "sha256-J4REXGuLjHyN3SHilSWhMoqpRcn1QnEtsTsZF4Z3feU=";
-      "serde_bser-0.4.0" = "sha256-Su1IP3NzQu/87p/+uQaG8JcICL9hit3OV1O9oFiACsQ=";
+      "cloned-0.1.0" = "sha256-026OKsszbF2aPWpA8JBc6KwZHxEqwnKIluzDjO/opgc=";
+      "fb303_core-0.0.0" = "sha256-IJKAWgBLrLnWItw6UTNdwjuTDO6dUfqyKsVv2aW6Kyo=";
+      "fbthrift-0.0.1+unstable" = "sha256-FuUo1cZG7Ed+TAXY53MpylBPGzFruIsWaxKPR26TxVk=";
+      "serde_bser-0.4.0" = "sha256-OY+IZh4nz5ICrDKYr8pPfORW4i8KBULhGC5YyXb5Ulg=";
+      "watchman_client-0.9.0" = "sha256-OY+IZh4nz5ICrDKYr8pPfORW4i8KBULhGC5YyXb5Ulg=";
    };
  };
+
  postPatch = ''
    cp ${./Cargo.lock} Cargo.lock
+
+    substituteInPlace sapling/thirdparty/pysocks/setup.py \
+      --replace-fail 'os.path.dirname(__file__)' "\"$out/lib/${python312Packages.python.libPrefix}/site-packages/sapling/thirdparty/pysocks\""
  ''
  + lib.optionalString (!enableMinimal) ''
    # If asked, we optionally patch in a hardcoded path to the
@@ -125,17 +133,6 @@ python311Packages.buildPythonApplication {
      --replace '"#);' $'[web]\nnode-path=${nodejs}/bin/node\n"#);'
  '';

-  # Since the derivation builder doesn't have network access to remain pure,
-  # fetch the artifacts manually and link them. Then replace the hardcoded URLs
-  # with filesystem paths for the curl calls.
-  postUnpack = ''
-    mkdir $sourceRoot/hack_pydeps
-    ${lib.concatStrings (
-      map (li: "ln -s ${fetchurl li} $sourceRoot/hack_pydeps/${baseNameOf li.url}\n") links
-    )}
-    sed -i "s|https://files.pythonhosted.org/packages/[[:alnum:]]*/[[:alnum:]]*/[[:alnum:]]*/|file://$NIX_BUILD_TOP/$sourceRoot/hack_pydeps/|g" $sourceRoot/setup.py
-  '';
-
  postInstall = ''
    install ${isl}/isl-dist.tar.xz $out/lib/isl-dist.tar.xz
  '';
@@ -151,7 +148,8 @@ python311Packages.buildPythonApplication {
    myCargoSetupHook
    cargo
    rustc
-  ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ gettext ];

  buildInputs = [
    openssl
@@ -162,26 +160,27 @@ python311Packages.buildPythonApplication {
  ];

  HGNAME = "sl";
+  LIBCLANG_PATH = "${lib.getLib libclang}/lib";
  SAPLING_OSS_BUILD = "true";
-  SAPLING_VERSION_HASH = versionHash;
+  SAPLING_VERSION = version;
+  SAPLING_VERSION_HASH =
+    let
+      sha1Hash = builtins.hashString "sha1" version;
+      hexSubstring = builtins.substring 0 16 sha1Hash;
+    in
+    lib.trivial.fromHexString hexSubstring;

-  # Python setuptools version 66 and newer does not support upstream Sapling's
-  # version numbers (e.g. "0.2.20230124-180750-hf8cd450a"). Change the version
-  # number to something supported by setuptools (e.g. "0.2.20230124").
-  # https://github.com/facebook/sapling/issues/571
-  SAPLING_VERSION = builtins.elemAt (builtins.split "-" version) 0;
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "version";
+  doInstallCheck = true;

-  # just a simple check phase, until we have a running test suite. this should
-  # help catch issues like lack of a LOCALE_ARCHIVE setting (see GH PR #202760)
-  doCheck = true;
-  installCheckPhase = ''
-    echo -n "testing sapling version; should be \"$SAPLING_VERSION\"... "
-    $out/bin/sl version | grep -qw "$SAPLING_VERSION"
-    echo "OK!"
-  '';
-
-  # Expose isl to nix repl as sapling.isl.
-  passthru.isl = isl;
+  passthru = {
+    # Expose isl to nix repl as sapling.isl.
+    isl = isl;
+    updateScript = ./update.sh;
+  };

  meta = {
    description = "Scalable, User-Friendly Source Control System";
@@ -0,0 +1,98 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq git gnused nix-prefetch-github rustup python3 nix prefetch-yarn-deps coreutils nix-prefetch-git
+
+set -euo pipefail
+
+# Some Facebook package make use of nightly Rust features
+rustup toolchain install nightly --force
+
+# Paths
+nixpkgs="$(git rev-parse --show-toplevel)"
+pkgdir="$nixpkgs/pkgs/by-name/sa/sapling"
+pkgfile="$pkgdir/package.nix"
+latest_json="$(curl -s https://api.github.com/repos/facebook/sapling/releases/latest)"
+latest_tag="$(jq -r .tag_name <<<"$latest_json")"
+tarball_url="$(jq -r .tarball_url <<<"$latest_json")"
+
+# Update version
+sed -i -e 's|^  version = "[^"]*";|  version = "'"$latest_tag"'";|' "$pkgfile"
+
+# Prefetch source tarball and get unpacked path
+mapfile -t tarball_lines < <(nix-prefetch-url --print-path --unpack "$tarball_url")
+source_dir="${tarball_lines[1]}"
+
+# Update Cargo.lock by running cargo fetch in a writable copy of the source
+tmpdir="$(mktemp -d)"
+trap 'rm -rf "$tmpdir"' EXIT
+cp -R "$source_dir" "$tmpdir/src"
+chmod -R u+w "$tmpdir/src"
+rustup run nightly cargo fetch --manifest-path "$tmpdir/src/eden/scm/Cargo.toml"
+cp "$tmpdir/src/eden/scm/Cargo.lock" "$pkgdir/Cargo.lock"
+
+# Parse Cargo.lock and prefetch git sources
+cargo_output_hashes="$(python3 -c '
+import json
+import subprocess
+import sys
+import tomllib
+
+cargo_lock_path = sys.argv[1]
+
+allowed_packages = {
+    "abomonation",
+    "cloned",
+    "fb303_core",
+    "fbthrift",
+    "serde_bser",
+    "watchman_client"
+}
+
+with open(cargo_lock_path, "rb") as f:
+    lock = tomllib.load(f)
+
+for pkg in lock.get("package", []):
+    source = pkg.get("source", "")
+    if source.startswith("git+"):
+        name = pkg["name"]
+        if name not in allowed_packages:
+            continue
+        version = pkg["version"]
+        # source format: git+https://url?rev#hash
+        parts = source.split("#")
+        if len(parts) == 2:
+            rev = parts[1]
+            url_part = parts[0][4:] # remove git+
+            if "?" in url_part:
+                url = url_part.split("?")[0]
+            else:
+                url = url_part
+            out = subprocess.check_output(
+                ["nix-prefetch-git", "--url", url, "--rev", rev, "--quiet"],
+                text=True
+            )
+            data = json.loads(out)
+            hash_val = data["hash"]
+            print(f"      \"{name}-{version}\" = \"{hash_val}\";")
+' "$pkgdir/Cargo.lock")"
+
+# First clear existing hashes
+sed -i '/outputHashes = {/,/};/ {
+  /outputHashes = {/n
+  /};/!d
+}' "$pkgfile"
+
+# Then insert new hashes
+echo "$cargo_output_hashes" > "$tmpdir/hashes.txt"
+sed -i '/outputHashes = {/r '"$tmpdir/hashes.txt" "$pkgfile"
+
+# Prefetch source hash for fetchFromGitHub
+src_hash="$(nix-prefetch-github facebook sapling --rev "$latest_tag" | jq -r '.hash')"
+
+# Update the fetchFromGitHub src block's hash
+sed -i -e '/src = fetchFromGitHub {/,/}/{s|hash = "[^"]*";|hash = "'"$src_hash"'";|}' "$pkgfile"
+
+# Compute yarn offline cache hash without building
+yarn_lock="$source_dir/addons/yarn.lock"
+yarn_hash_raw="$(prefetch-yarn-deps "$yarn_lock")"
+yarn_hash_sri="$(nix hash convert --hash-algo sha256 --to sri "$yarn_hash_raw")"
+sed -i -e '/yarnOfflineCache = fetchYarnDeps {/,/};/{s|sha256 = "[^"]*";|sha256 = "'"$yarn_hash_sri"'";|}' "$pkgfile"
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {

  cargoHash = "sha256-1oJCdqBa1pWpQ7QvZ0vZaOd73R+SzR9OPf+yoI+RwCY=";

-  RUSTC_BOOTSTRAP = 1;
+  env.RUSTC_BOOTSTRAP = 1;

  # network required
  doCheck = false;
@@ -14,13 +14,13 @@

 stdenv.mkDerivation rec {
  pname = "signalbackup-tools";
-  version = "20251214";
+  version = "20260105-2";

  src = fetchFromGitHub {
    owner = "bepaald";
    repo = "signalbackup-tools";
    tag = version;
-    hash = "sha256-/XmrlobVbbSN94cCj/HDLLd6x2sB7A3IF/cBAvX7rSY=";
+    hash = "sha256-xGHrzG1ssb16x4xwWyY3kevmrWCxsGygF7Kn1VgRHWs=";
  };

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

 buildGoModule (finalAttrs: {
  pname = "sing-box";
-  version = "1.12.14";
+  version = "1.12.15";

  src = fetchFromGitHub {
    owner = "SagerNet";
    repo = "sing-box";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-mm6MnCYNCIOBmn53QxGnGB6ftLf2T0Z1EBtBFeoDE6I=";
+    hash = "sha256-3YUeRV2WmWXSd6oKluWOorDkENy7xLu0aGzqS3AvaxE=";
  };

  vendorHash = "sha256-mSQHW8QwXA6TmpXexhWlgY0BWsNRPOnmGAGvPvnX8wU=";
@@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "smtprelay";
-  version = "1.13.0";
+  version = "1.13.1";

  src = fetchFromGitHub {
    owner = "decke";
    repo = "smtprelay";
    tag = "v${version}";
-    hash = "sha256-8xDyJFSBCHRYVfJ5xDjSHVV3f4nSyW/2DUqQlARS1ns=";
+    hash = "sha256-vuK+05+xCO5Bkfs+21a+oqLFHehj1qUvh16ggZQdnrI=";
  };

-  vendorHash = "sha256-LZZubLD+uQz6o0SW0bqbcU/VO7jOhsWB9MrQ0KrebI0=";
+  vendorHash = "sha256-jriQMYFczhJNbufazWAUFFOrHRnLbo9zzpIrnI0zBkA=";

  subPackages = [
    "."
@@ -6,13 +6,13 @@

 buildGoModule rec {
  pname = "sqlboiler";
-  version = "4.19.6";
+  version = "4.19.7";

  src = fetchFromGitHub {
    owner = "volatiletech";
    repo = "sqlboiler";
    tag = "v${version}";
-    hash = "sha256-A0NHGq5yVlHqKpu/4KIVj/EJYOrN/oFRaCkOBm5h4i8=";
+    hash = "sha256-I67MRrsFCLVdslMFwFnrx1EvyR4eUsupRsqD0T9ZCQg=";
  };

  vendorHash = "sha256-ULoyMN54RIFST6P91V3MnRrfiC7+o3LmUFdc0pIqj90=";
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
  ];
  buildInputs = [ openssl ];

-  RUSTC_BOOTSTRAP = 1;
+  env.RUSTC_BOOTSTRAP = 1;

  doCheck = false;
  doInstallCheck = true;
@@ -0,0 +1,42 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  versionCheckHook,
+}:
+buildGoModule (finalAttrs: {
+  pname = "tailsnitch";
+  version = "1.4.0";
+
+  src = fetchFromGitHub {
+    owner = "Adversis";
+    repo = "tailsnitch";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-LvAOIDM1YIB4LmOm6zXrzr5SOH7tyF4t79XCLDg6p2Q=";
+  };
+
+  vendorHash = "sha256-khw9K4sKhubhkccoC4f923Aw2Cj9eKpVqLHZICdkTXw=";
+
+  ldflags = [
+    "-w"
+    "-s"
+    "-X=github.com/Adversis/tailsnitch/cmd.Version=${finalAttrs.version}"
+    "-X=github.com/Adversis/tailsnitch/cmd.BuildID=${finalAttrs.version}"
+    "-X=github.com/Adversis/tailsnitch/cmd.BuildDate=1970-01-01T00:00:00Z"
+  ];
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
+  meta = {
+    homepage = "https://github.com/Adversis/tailsnitch";
+    changelog = "https://github.com/Adversis/tailsnitch/releases/tag/v${finalAttrs.version}";
+    description = "Security auditor for Tailscale configurations. Scans your tailnet for misconfigurations, overly permissive access controls, and security best practice violations";
+    mainProgram = "tailsnitch";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      yethal
+    ];
+  };
+})
@@ -9,13 +9,13 @@

 buildGoModule (finalAttrs: {
  pname = "talhelper";
-  version = "3.0.44";
+  version = "3.0.45";

  src = fetchFromGitHub {
    owner = "budimanjojo";
    repo = "talhelper";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-CAeUoh+JPlQswcZPNwQD/LNEGVJDqSZWg9aF6zIiSRc=";
+    hash = "sha256-9oZM6vIyJH8Vw/QhE9SIbrMa4r2LCZdIDRFztFYVVk0=";
  };

  vendorHash = "sha256-jn5zwEvFqasjQt6FTQpcX8qJ11lM03aMhGyapOOjclA=";
@@ -9,16 +9,16 @@

 buildGoModule rec {
  pname = "tbls";
-  version = "1.92.2";
+  version = "1.92.3";

  src = fetchFromGitHub {
    owner = "k1LoW";
    repo = "tbls";
    tag = "v${version}";
-    hash = "sha256-pdbUQ9Zds/z1tSIU9R4njF/Ls3DwoRteY7sI7yMv9+I=";
+    hash = "sha256-/1yulnT+HDZGO8S8xk59sKXxoFaw5Hoa1XXAwp5z7eM=";
  };

-  vendorHash = "sha256-mQE1ZGNKbD9XQMoVBU3JVBjEIt0V0+PiC5yps4aj+kQ=";
+  vendorHash = "sha256-DnXftqcjk2fKWytmqdg9eWjsofaOTsHOpxTeIbXqMlw=";

  excludedPackages = [ "scripts/jsonschema" ];

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

 buildGoModule rec {
  pname = "terramate";
-  version = "0.15.2";
+  version = "0.15.3";

  src = fetchFromGitHub {
    owner = "terramate-io";
    repo = "terramate";
    rev = "v${version}";
-    hash = "sha256-NPMcAVv994KGkKUGeqSuuwRQThcYkmojKbUSy5G+lq4=";
+    hash = "sha256-oiumUA8uYEbE27PYedqme4oLTzJpuRXkqGhlmvYu8g8=";
  };

  vendorHash = "sha256-o2MNmJmYMq2mQBLslOtRyRH9euEhcJyIhohJ3CKp6kg=";
@@ -7,16 +7,16 @@

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

  src = fetchFromGitHub {
    owner = "konkitoman";
    repo = "autoclicker";
    tag = finalAttrs.version;
-    hash = "sha256-KhPSsLb5lg93WOI2JAbwSsM6x0A7t4ZNq2yGYg1Sqy0=";
+    hash = "sha256-iD9v0HY/2Q0oeUmJwyfXNuEsmIJDV2M+dzpJ1z6TaF0=";
  };

-  cargoHash = "sha256-H0S1nP7EaNEougscmmelsY5CC7yHwXGhHGkY4vOZqho=";
+  cargoHash = "sha256-YdeAG6+p/8MzvqEAyfzGktmnxw7hGvV/gGFg6uMwD5A=";

  nativeInstallCheckInputs = [ versionCheckHook ];
  doInstallCheck = true;
@@ -8,11 +8,11 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "twilio-cli";
-  version = "6.2.2";
+  version = "6.2.3";

  src = fetchzip {
    url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz";
-    hash = "sha256-de4LGEuBxuCeySpsUi6iIIf4asJLdR7HcqflnSD7jyw=";
+    hash = "sha256-a5eTxtcC3cGZ+8MMMfE9UKrxAQ7pfivWMss4NMKbf9s=";
  };

  buildInputs = [ nodejs-slim ];
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {

  cargoHash = "sha256-jRe1lgzfhzBUsS6wwwlqxxomap2TIDOyF3YBv20GJ14=";

-  RUSTC_BOOTSTRAP = 1;
+  env.RUSTC_BOOTSTRAP = 1;

  postInstall = ''
    install -D -m 0444 ../../README* -t "$out/share/doc/${pname}"
@@ -16,18 +16,18 @@

 buildGoModule rec {
  pname = "v2ray-core";
-  version = "5.42.0";
+  version = "5.43.0";

  src = fetchFromGitHub {
    owner = "v2fly";
    repo = "v2ray-core";
    rev = "v${version}";
-    hash = "sha256-arYP29MH5DXMLK0hdX/JfYYMYF8Hf5r0Uirk2zUhtI0=";
+    hash = "sha256-MVcli2lxjLPDgv/1vBJP8xnM5HUj8RuL4RGN/LQgvjE=";
  };

  # `nix-update` doesn't support `vendorHash` yet.
  # https://github.com/Mic92/nix-update/pull/95
-  vendorHash = "sha256-cl3av1mgV8H0IAm/Y2ZEckqUmx+ih0N1e8pIcARUw+g=";
+  vendorHash = "sha256-vjhajKxkdO5toLmVcSK07fjp0JE2VykqXSrew4WigwU=";

  ldflags = [
    "-s"
@@ -787,24 +787,24 @@
   "jar": "sha256-Yq4oGH7SsGKBPaap1We/7nM8NBWCaZti3ZgCMHKaAxM=",
   "pom": "sha256-NYRJ1sc1OFhFCN2K5s/eVrr0o0t2e3HZzEZE8PH0IRo="
  },
-  "net/kyori#adventure-api/4.25.0": {
-   "jar": "sha256-jigb8TV/+Rr5eDpsJCdrSD2BVKezyrWwTpCea/XnLJ0=",
-   "module": "sha256-BjX3/6StwHdpvwspz563yZXxKZujomtzPCTdf3Oor5M=",
-   "pom": "sha256-b3Z3Bs6f0+j5f8LKtz2lWlr+f10Z1ajK1tObp2Flgcg="
+  "net/kyori#adventure-api/4.26.1": {
+   "jar": "sha256-VR5Ta56oaPMOcseQCjCbNRJO59SIn6OzrtCRApl1GiY=",
+   "module": "sha256-+XWMFoAnCGyZ2aJmc3ZOqLgNU28gwmxZjcFwUrE6yvo=",
+   "pom": "sha256-nHaC7LSU1b7CVpD2VkJ4Jh9HfTUdGrRPL5AB6kAIqBg="
  },
-  "net/kyori#adventure-bom/4.25.0": {
-   "module": "sha256-ZXB+cllrTsIQtPlc51rMzGiTygCpTCxGutBZTRNMnac=",
-   "pom": "sha256-ehLL6JgsuuaSAmmusLzSwPb3JqMq4O5WpiHxpGINDxM="
+  "net/kyori#adventure-bom/4.26.1": {
+   "module": "sha256-mNH1y89agGdyYrwrxwX8TAtSNl6YukwgRzs5Y7E2bHE=",
+   "pom": "sha256-KWshlV/2W4tQiYtKfVnLGDcDAHqjG/dhfVKRMuUnUiM="
  },
-  "net/kyori#adventure-key/4.25.0": {
-   "jar": "sha256-zsjwq/ZC3w5ie/Wp//bxfLtiDqb+BfIWK5bK0VZNiFc=",
-   "module": "sha256-x3iPHqcXJE05SOzGhubp3Be62mnVmqN1ZtNtjHv72eo=",
-   "pom": "sha256-oD8SgnVBVxGKPVppORHZIzZdCDMaghHg3MEwvQgrWOY="
+  "net/kyori#adventure-key/4.26.1": {
+   "jar": "sha256-7sFy1j23e0Drer7rJfZe7eqJvTAmTQV7aLEv7Lcxvl4=",
+   "module": "sha256-o73U11zwxeU8f4seYbGJ+O9KrlnRMbX5fU7ylDgzexA=",
+   "pom": "sha256-UyMAkH0veoQYwywtiJlK2+ZKovETAzb59R6A0dEMvKk="
  },
-  "net/kyori#adventure-nbt/4.25.0": {
-   "jar": "sha256-jubaYh9JbxbGGd5uxcC5wUDOrJuJwqWzN3k429VaFi4=",
-   "module": "sha256-Bb/MN2LBUR22GDlRju2vhWf524kFO/jTuHOU19R1nFU=",
-   "pom": "sha256-6sqxf2Nongrb9IHs3/bgPiOmRHC6XSGWb/BimmC0fj0="
+  "net/kyori#adventure-nbt/4.26.1": {
+   "jar": "sha256-8m72v/X83YF5ArTf01NWHZjLExtOy2c0H/AO8u0TNvg=",
+   "module": "sha256-mb9lcD9G2mjFbd5sMBQg26Fc+OhAN+s/XsMmhRBH60w=",
+   "pom": "sha256-VX6DLc2gsbN3/YQQrfCrxYf4wxjDkqvQ+0MBnq0LB60="
  },
  "net/kyori#adventure-platform-api/4.3.4": {
   "jar": "sha256-7GBGKMK3wWXqdMH8s6LQ8DNZwsd6FJYOOgvC43lnCsI=",
@@ -816,50 +816,50 @@
   "module": "sha256-VYXzbUzK6MaYbW4tmAjZs5ywl28CLK8sANPP5v1HTQQ=",
   "pom": "sha256-wP6w6syf5B8iL5iXsS4lrDw0Ub3VYWwUhclppgBO2eE="
  },
-  "net/kyori#adventure-text-logger-slf4j/4.25.0": {
-   "jar": "sha256-ux6XEd+J/JTRJyzJfdytnBEISk3tBBqObJ72rioaFcw=",
-   "module": "sha256-fs6A5RPgpK1nv+LU6v361yzT1wrhdCZCUmxXoG7/SDY=",
-   "pom": "sha256-zBsHR4P9abfyqFUTcuMfDjR0+DlsWPFIKuoAgO+oObE="
+  "net/kyori#adventure-text-logger-slf4j/4.26.1": {
+   "jar": "sha256-AJqZUY2bTw7FRmXyCXJIE7+YosH/AgrqvPNKNpn9Hfo=",
+   "module": "sha256-4oZ3rlJEmHup6sDxIzOGRmUHqPU+zArAHEdg6wZ+dYo=",
+   "pom": "sha256-LpgSt+02k9mGBeQv/mIdQuHjtF5EwvNxXtiKKs0TTmI="
  },
-  "net/kyori#adventure-text-minimessage/4.25.0": {
-   "jar": "sha256-GY8nxvkeXjJxZAZQhp/v3WgW17MQtIz6UptfWOSpKaQ=",
-   "module": "sha256-dhPZ10ZYM1pj2mYRH2vf30w4dX/GIwR50N4fxT1bhRs=",
-   "pom": "sha256-cyzIAKcimO4b575KW9UWQBJhezWI0UF7UuQkbUdoly4="
+  "net/kyori#adventure-text-minimessage/4.26.1": {
+   "jar": "sha256-HUNFHpr0cyUtyK8+gIQjjVzmitQ68OO3OD6z1LY//58=",
+   "module": "sha256-GjsjhMRxBMgvJ+7rejj/A887A+UH4cewUoOHu8E9FJ4=",
+   "pom": "sha256-I8/VHJcSj6jNuMdxFhOSTMA4f46YZJh43Ie4SFaC+Og="
  },
-  "net/kyori#adventure-text-serializer-ansi/4.25.0": {
-   "jar": "sha256-ocrnCOKiZdJbHto/4wLG1ibeX4O66PdmQTzb3661E+Y=",
-   "module": "sha256-h99JBH9Uv1QGhdHA57zzVukn4V0rHu8CkXt7om3NDoI=",
-   "pom": "sha256-9Cm5DCEnJB02hmpUq5bDUun5UXVoXklAsQNCs172+eU="
+  "net/kyori#adventure-text-serializer-ansi/4.26.1": {
+   "jar": "sha256-eVB8NmhZMhZmiUI74nnqeW20K5XZbaKnlM+WJCgMsUU=",
+   "module": "sha256-NSSXxmsJ0RJmRGqj92D782iO+Vlot4+M/71qFKnquAg=",
+   "pom": "sha256-fdiSu6ByT3wOvdsn9PKW7JA+Cb6Y4OElrrAf5lAskls="
  },
-  "net/kyori#adventure-text-serializer-commons/4.25.0": {
-   "jar": "sha256-DMytf1Tbmh3cgWSygsG0xJwunHb2gsviyWVBYdya05U=",
-   "module": "sha256-3sAWk3vnQQ97iY58kB+jXQWDQTrRE7QOm7i/egSU8xs=",
-   "pom": "sha256-EiVWRe5+egaTN4jJvo7OFetflVHj4nQgUYbSVXvOhaY="
+  "net/kyori#adventure-text-serializer-commons/4.26.1": {
+   "jar": "sha256-ZlJ/71WdpNkc2mkkkQNPkD1bAeg13hsJHt+7a1HO5aI=",
+   "module": "sha256-PH1zGXBAAHttiOr3bVgtyggsQLaYSZRUcpcU3/KKbwc=",
+   "pom": "sha256-3VJcA1RfZxRWXy+LDVCNydxgc9tp14/zIi55qoyrRTs="
  },
-  "net/kyori#adventure-text-serializer-gson/4.25.0": {
-   "jar": "sha256-kx9nlZ1G4P5Vtkq5Fk4xtXi3kjV4f2nUcrYoZfl7ckU=",
-   "module": "sha256-mShJEiK1WIC26DkBj8EFrpwiZNMgiQMjS7o9rtVgX0w=",
-   "pom": "sha256-iakLX3YZMvXNCptIL2Rut7TsF8dIlnv/k5i591juAyA="
+  "net/kyori#adventure-text-serializer-gson/4.26.1": {
+   "jar": "sha256-5KkI3txKy0MFCD2RbTYt3Csh7PRS1XegvmZSgL3a6fw=",
+   "module": "sha256-CiEWKUFuNW29H9ARckrrkJi0wLzzoFJf04/LIav0eLA=",
+   "pom": "sha256-08rRApPx95VLmlYJRGnDVmPuoIdtuwlgUUQfczau95U="
  },
-  "net/kyori#adventure-text-serializer-json-legacy-impl/4.25.0": {
-   "jar": "sha256-OCfqC0HsbDc/kT2CTmAnYS5QFLlJf775jEsaFVmw/Ds=",
-   "module": "sha256-7DKxMynoAJk6SRpo1aFGBYtTGiU6mPqY7OTzQbvaT9M=",
-   "pom": "sha256-m+mk7xIrHn5rNeL8BjBmSV3uCvwPmqChHzvDBT54/2w="
+  "net/kyori#adventure-text-serializer-json-legacy-impl/4.26.1": {
+   "jar": "sha256-y+YY4uxVpOd5Va/etyov8B3DCXkMlWKuTFOb8w/li5E=",
+   "module": "sha256-e6tASr/8xmENfdUU729WI06wqRnGTwwh+N3aWC0wT3k=",
+   "pom": "sha256-ag7DsWK1/gLbOVKRgdHGuwcRgUssdqzIHKQox30jwh8="
  },
-  "net/kyori#adventure-text-serializer-json/4.25.0": {
-   "jar": "sha256-SCtKohjXyHn89X5dD5zATbS01LVnnrmbcn9hBO1/uYI=",
-   "module": "sha256-guKd0oBJaMnF/pspbxDsUrpFT6AsKytFwSgUXqPXfAY=",
-   "pom": "sha256-p9M2cSIfPqHWpJry4f49Vw6OCEMPYt8VCHyTm9IjhZE="
+  "net/kyori#adventure-text-serializer-json/4.26.1": {
+   "jar": "sha256-VcZLQzPV0paKASW48p2ufPuhU5LV+Z94266nEcsNTcI=",
+   "module": "sha256-cl5HkQqwG0pZ0pqTw/8tCkexdgwMG2w4T4bCqVmzB5I=",
+   "pom": "sha256-V2t6GjAzfixlFtXlsg4OMZ874IuH6234Iqdnh1OpFoI="
  },
-  "net/kyori#adventure-text-serializer-legacy/4.25.0": {
-   "jar": "sha256-BvFSXr8X+080w08bUmKt5nJwXBFj9qSLaKTgMU36ahM=",
-   "module": "sha256-AVec+FDUBBQ3GCV9cym3/KODgXBEP8oWnowgPwMnMU4=",
-   "pom": "sha256-NXbSfnn4+yAZfpr0oo9b/YrI6BQJlnlMArI1rd37YxM="
+  "net/kyori#adventure-text-serializer-legacy/4.26.1": {
+   "jar": "sha256-chEHvCE1ckVN8b++Q426Yw4wRXVQx1C3oVSzXcMmSqg=",
+   "module": "sha256-Uedmd9M5pW4rj7N+NwR3X/Pi/+rDAj5U5bayhixYmb0=",
+   "pom": "sha256-JC4/tXRmwrW3lcvMPi6C7ICXNselyvPzACLf0IpFQLA="
  },
-  "net/kyori#adventure-text-serializer-plain/4.25.0": {
-   "jar": "sha256-lFN1egpsDdnktfzSVOgqfqhn9MvkA3cWf0QMQexgUu4=",
-   "module": "sha256-mVude/RMSiHELTPFr3eK9X7rJH40fRUy5HtwmsVBsfg=",
-   "pom": "sha256-FaJA8MaaBORkMop+Wa+LK28hhWL63+2fIFa7t+G1gR4="
+  "net/kyori#adventure-text-serializer-plain/4.26.1": {
+   "jar": "sha256-Obm/5XkPZFYF/1RkOCwOBiR29I+b+yVIgB8nXxL69AU=",
+   "module": "sha256-yNM2HeweZVGFqyqocSiNePZ0n/JPN3zKKvK4K25htIs=",
+   "pom": "sha256-uhg5th3wyaMs9OLwm0vBvSDSNHfCMsxX67wCC6nfGso="
  },
  "net/kyori#ansi/1.1.1": {
   "jar": "sha256-tsVp4aCSW57rNJ4S2zXiI3VWEH4zNmV+Cy694mHYr9c=",
@@ -34,13 +34,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "velocity";
-  version = "3.4.0-unstable-2025-12-07";
+  version = "3.4.0-unstable-2025-12-27";

  src = fetchFromGitHub {
    owner = "PaperMC";
    repo = "Velocity";
-    rev = "8f65a8142029717d3af09ecf82792f7345dc873a";
-    hash = "sha256-51n5ztuvGzWqvIfFOteV/CsvcInE7/aZmEeLCGonfLE=";
+    rev = "4bc3f00424380da339dae3be346c0b84f0fbd1c3";
+    hash = "sha256-n7h3WI7xnhowJdYOzuqJKXIYfFBBXNyukagh5NvN/LY=";
  };

  nativeBuildInputs = [
@@ -1,5 +1,10 @@
 {
  lib,
+  stdenv,
+  dnsmasq,
+  makeWrapper,
+  installShellFiles,
+  writableTmpDirAsHomeHook,
  buildGoModule,
  fetchFromGitHub,
 }:
@@ -25,6 +30,23 @@ buildGoModule rec {
    "-X github.com/LINBIT/virter/cmd.githash=builtByNix"
  ];

+  nativeBuildInputs = [
+    makeWrapper
+    installShellFiles
+    writableTmpDirAsHomeHook
+  ];
+
+  postInstall = ''
+    wrapProgram $out/bin/virter \
+      --prefix PATH ":" ${lib.makeBinPath [ dnsmasq ]}
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd virter \
+      --bash <($out/bin/virter completion bash) \
+      --fish <($out/bin/virter completion fish) \
+      --zsh <($out/bin/virter completion zsh)
+  '';
+
  # requires network access
  doCheck = false;

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

 stdenv.mkDerivation rec {
  pname = "vokoscreen-ng";
-  version = "4.7.0";
+  version = "4.8.1";

  src = fetchFromGitHub {
    owner = "vkohaupt";
    repo = "vokoscreenNG";
    tag = version;
-    hash = "sha256-GMiiO+uKaf87X3dLmkEbFd2GdfHf5wFAyhe9wd8NQeI=";
+    hash = "sha256-3tyAJxWspyvFmy1Ye1FUSCE4Pbo0cSGux8r0qFmA+NM=";
  };

  qmakeFlags = [ "src/vokoscreenNG.pro" ];
@@ -13,13 +13,13 @@

 stdenv.mkDerivation {
  pname = "wdt";
-  version = "1.27.1612021-unstable-2025-11-18";
+  version = "1.27.1612021-unstable-2026-01-05";

  src = fetchFromGitHub {
    owner = "facebook";
    repo = "wdt";
-    rev = "635f8fd8658bd1b9149d22a61edc956c93049dfd";
-    sha256 = "sha256-laNTFuFXFHzyfVVHe0iNeFHSnBU+Trakugoino7rk0Y=";
+    rev = "a09a9bb72a55789ca686d7242b1095f27e820da7";
+    sha256 = "sha256-6mJ4qC+ggghJX+MTVIqEQK0Gm7Fgp49i9OT8xAJfsr8=";
  };

  nativeBuildInputs = [ cmake ];
--- a/Show More
+++ b/Show More