Merge master into staging-nixos

2026-02-10 18:24:51 +00:00
parent 92a7ffa48c b0d3f69e45
commit 39d1a3a7cb
76 changed files with 716 additions and 542 deletions
@@ -862,7 +862,7 @@ in
    # but removing a subdirectory using file set functions
    difference
      (fromSource (lib.sources.sourceByRegex ./. [
-        "^README\.md$"
+        "^README\\.md$"
        # This regex includes everything in ./doc
        "^doc(/.*)?$"
      ])
@@ -200,7 +200,7 @@ let
    ## `sourceByRegex` usage example

    ```nix
-    src = sourceByRegex ./my-subproject [".*\.py$" "^database.sql$"]
+    src = sourceByRegex ./my-subproject [".*\\.py$" "^database\\.sql$"]
    ```

    :::
@@ -12790,7 +12790,7 @@
    email = "jokatzke@fastmail.com";
    github = "jokatzke";
    githubId = 46931073;
-    name = "Jonas Katzke";
+    name = "Josefine Katzke";
  };
  joko = {
    email = "ioannis.koutras@gmail.com";
@@ -27065,6 +27065,12 @@
    githubId = 67477750;
    name = "Tomkoid";
  };
+  TomMD = {
+    name = "Thomas M. DuBuisson";
+    email = "thomas.dubuisson@gmail.com";
+    github = "TomMD";
+    githubId = 137806;
+  };
  Tommimon = {
    name = "Tommaso Montanari";
    email = "sefymw7q8@mozmail.com";
@@ -27091,6 +27097,12 @@
    githubId = 27378358;
    name = "tony";
  };
+  tonybutt = {
+    email = "anthony@abutt.io";
+    github = "tonybutt";
+    githubId = 38566841;
+    name = "Anthony Butt";
+  };
  toonn = {
    email = "nixpkgs@toonn.io";
    matrix = "@toonn:matrix.org";
@@ -27993,8 +28005,9 @@
  };
  vinetos = {
    name = "vinetos";
-    email = "vinetosdev@gmail.com";
+    email = "contact+git@vinetos.fr";
    github = "vinetos";
+    matrix = "@vinetos:matrix.org";
    githubId = 10145351;
  };
  vinnymeller = {
@@ -386,7 +386,6 @@ with lib.maintainers;
    members = [
      leona
      theCapypara
-      thiagokokada
      jamesward
    ];
    shortName = "Jetbrains";
@@ -74,7 +74,6 @@ in
 {
  meta.maintainers = with lib.maintainers; [
    romildo
-    thiagokokada
  ];

  imports = [
@@ -679,13 +679,13 @@
    "vendorHash": "sha256-OvotUEh+P2b3ngaD/8lVbemnM3lrtwqduPXPjF/bqVA="
  },
  "hashicorp_vault": {
-    "hash": "sha256-7vcggk2Sh4z/6CCyeL8XAzk82K5jaFjiDGBEG+5ftEg=",
+    "hash": "sha256-Rg18X+VFDA9p3Dx/fA/C982X4XEvSRPU0+Zkq8HWqas=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/vault",
    "owner": "hashicorp",
    "repo": "terraform-provider-vault",
-    "rev": "v5.6.0",
+    "rev": "v5.7.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-4ak7PkjQi6Nq/Xv8j3iKV8qB9tEfl1YxDbwlzTs8xBY="
+    "vendorHash": "sha256-XnyEPnB0995S7LzGAlkB/O3VKWXAm1rp9NQcDvIhRVw="
  },
  "hashicorp_vsphere": {
    "hash": "sha256-vRO6vxzi4d0hNc0MmQLhN7roONnsjxPBtFt0fyvxWd8=",
@@ -75,7 +75,7 @@ let
    "9.0.1".sha256 = "sha256-gRgQhFiYvGR/Z46TmTl1bgN9O32nifxQGdrzfw0WHrk=";
    "9.1.0".sha256 = "sha256-+QL7I1/0BfT87n7lSaOmpHj2jJuDB4idWhAxwzvVQOE=";
    "9.1.1".sha256 = "sha256-aFsGsFzexyDnOVarHPKs35HjiV8uUCpeOKSl15wXZ4s=";
-    "9.2+rc1".sha256 = "sha256-zKVhnBid5LOcd7uHWFGmUdHpyNLxIyB7RNNz5btz0mI=";
+    "9.2+rc2".sha256 = "sha256-L6V9Vyv8Q0IWpGfXqL/YKcpx/gLBa7k9rnPvRGvAO+M=";
  };
  releaseRev = v: "V${v}";
  fetched =
@@ -28,7 +28,7 @@ let
    "9.0.1".sha256 = "sha256-gRgQhFiYvGR/Z46TmTl1bgN9O32nifxQGdrzfw0WHrk=";
    "9.1.0".sha256 = "sha256-+QL7I1/0BfT87n7lSaOmpHj2jJuDB4idWhAxwzvVQOE=";
    "9.1.1".sha256 = "sha256-aFsGsFzexyDnOVarHPKs35HjiV8uUCpeOKSl15wXZ4s=";
-    "9.2+rc1".sha256 = "sha256-zKVhnBid5LOcd7uHWFGmUdHpyNLxIyB7RNNz5btz0mI=";
+    "9.2+rc2".sha256 = "sha256-L6V9Vyv8Q0IWpGfXqL/YKcpx/gLBa7k9rnPvRGvAO+M=";
  };
  releaseRev = v: "V${v}";
  fetched =
@@ -76,9 +76,9 @@ let
  virtualboxSubVersion = "";
  virtualboxSha256 = "c58443a0e6fcc7fc7e84c1011a10823b3540c6a2b8f2e27c4d8971272baf09f7";

-  kvmPatchVboxVersion = "7.2.4";
-  kvmPatchVersion = "20251103";
-  kvmPatchHash = "sha256-VhSuRYiZLg8hIGatf27u/nBBBtB1zz4ePxtiRYy84Hw=";
+  kvmPatchVboxVersion = "7.2.6";
+  kvmPatchVersion = "20260201";
+  kvmPatchHash = "sha256-pq4DPLwHRRAMJjmfXympDxJK9+d+LwTOxBqxAm0pl3o=";

  # The KVM build is not compatible to VirtualBox's kernel modules. So don't export
  # modsrc at all.
@@ -22,14 +22,14 @@

 python3Packages.buildPythonApplication rec {
  pname = "bcc";
-  version = "0.36.0";
+  version = "0.36.1";
  pyproject = false;

  src = fetchFromGitHub {
    owner = "iovisor";
    repo = "bcc";
    tag = "v${version}";
-    hash = "sha256-J00GRIM9AemLkKHoyKqLR2U2aEBwNy/a5hbGjLRrO8w=";
+    hash = "sha256-+XBFENCAKP8Z+5dviBervDXHOM2qY3lfDFsDKVjzMbM=";
  };

  patches = [
@@ -39,13 +39,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "cinnamon-session";
-  version = "6.6.1";
+  version = "6.6.2";

  src = fetchFromGitHub {
    owner = "linuxmint";
    repo = "cinnamon-session";
    tag = finalAttrs.version;
-    hash = "sha256-zPfyPBKN9Qqs2UndW0vYzBqmeFla3ytvdcv/X2dv1zs=";
+    hash = "sha256-5Cbx0SNBcTovRvxwPSqR4SM/FBLXrfkS5RZGXeU1ULY=";
  };

  buildInputs = [
@@ -74,13 +74,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "cinnamon";
-  version = "6.6.6";
+  version = "6.6.7";

  src = fetchFromGitHub {
    owner = "linuxmint";
    repo = "cinnamon";
    tag = finalAttrs.version;
-    hash = "sha256-yOgDajTZFC566uhf9pvenAIMdDTU1JOF+ahtgPp6kTY=";
+    hash = "sha256-UP/8FIgTCdQrE+kvG0nLo+oqYo8x/lm3RPKOXnTFJaE=";
  };

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

 buildGoModule (finalAttrs: {
  pname = "cloudlist";
-  version = "1.3.0";
+  version = "1.4.0";

  src = fetchFromGitHub {
    owner = "projectdiscovery";
    repo = "cloudlist";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Tm2gqRZxfeu5gOndVeeFU9HCePpXyx/G73VzVuJRRzY=";
+    hash = "sha256-SxrCkaHhlf/+rYcYjuE7UecQWoAhgVy+keRbc0py36k=";
  };

-  vendorHash = "sha256-LkjJrxrK1N+6v6ilMT68lu21B3NemxdquMIA5e8r1a0=";
+  vendorHash = "sha256-V+2ByID1/2yaxuy7OL21ZBzYgZchszMOblL0bNglcEY=";

  subPackages = [ "cmd/cloudlist/" ];

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

 stdenvNoCC.mkDerivation rec {
  pname = "cloudlog";
-  version = "2.8.6";
+  version = "2.8.7";

  src = fetchFromGitHub {
    owner = "magicbug";
    repo = "Cloudlog";
    rev = version;
-    hash = "sha256-k+/KajRRKsfEFk8ApEJ154pT4cR54ZnavSrk8U4Azso=";
+    hash = "sha256-/zMZbM9TvFMZTUkAN4wqutZ+YQA9sVtdXZwEGISm6NA=";
  };

  postPatch = ''
@@ -6,18 +6,18 @@

 buildGoModule rec {
  pname = "cnquery";
-  version = "12.20.1";
+  version = "12.22.0";

  src = fetchFromGitHub {
    owner = "mondoohq";
    repo = "cnquery";
    tag = "v${version}";
-    hash = "sha256-zsmu/PKsmqpG1TwK8VKY7F4YFQ89bmzFSNvI54Gy/gA=";
+    hash = "sha256-RauEf78cTRPHSmisDus/5XoROZp5VpZL0mKPXbRoPCw=";
  };

  subPackages = [ "apps/cnquery" ];

-  vendorHash = "sha256-cJCd8cXZa5JgY91D4+RnLOONZM/lj2Fbb3bU5pCbbbs=";
+  vendorHash = "sha256-Hh6dsxelPuuU7ISa2E396iUUrYdttG2HdxnBxYlXcis=";

  ldflags = [
    "-w"
@@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "codex-acp";
-  version = "0.9.1";
+  version = "0.9.2";

  src = fetchFromGitHub {
    owner = "zed-industries";
    repo = "codex-acp";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-QQye6H5XCHDsqypXK5ROQ27PYk/W0Cip61sjECZDQo4=";
+    hash = "sha256-UtfvuejBnciksytIkTE2yFLTTy5gIB/kbOg7abTBGqQ=";
  };

-  cargoHash = "sha256-pHJhzPSLX9lKa9FXuauF0brwgFSQgPIHOVo6l+PqnnI=";
+  cargoHash = "sha256-pCHmYa+5xkON2BoAh7RRe5lQeUqSNgqemt0stHQly6c=";

  nativeBuildInputs = [
    pkg-config
@@ -0,0 +1,40 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "color-lsp";
+  version = "0.2.2";
+
+  src = fetchFromGitHub {
+    owner = "huacnlee";
+    repo = "color-lsp";
+    rev = "v${version}";
+    hash = "sha256-U0pTzW2PCgMxVsa1QX9MC249PXXL2KvRSN1Em2WvIeI=";
+  };
+
+  cargoHash = "sha256-etK+9fcKS+y+0C36vJrMkQ0yyVSpCW/DLKg4nTw3LrE=";
+
+  # Only build the color-lsp binary, not the zed extension
+  cargoBuildFlags = [
+    "-p"
+    "color-lsp"
+  ];
+  cargoTestFlags = [
+    "-p"
+    "color-lsp"
+  ];
+
+  meta = {
+    description = "A document color language server supporting HEX, RGB, HSL, and named colors";
+    homepage = "https://github.com/huacnlee/color-lsp";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      tonybutt
+      matthiasbeyer
+    ];
+    mainProgram = "color-lsp";
+  };
+}
@@ -2,10 +2,10 @@

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

-  nugetHash = "sha256-VevPiNTtfRJvmK/eYlJtJEJkYkiSvRoP7nTq7q9Bs9I=";
+  nugetHash = "sha256-SaBHGaaeg/1c4okHN1Pn8caGZgfLJ/KsGRqgUiAqKlQ=";

  meta = {
    description = "Opinionated code formatter for C#";
@@ -8,18 +8,18 @@

 php.buildComposerProject2 (finalAttrs: {
  pname = "drupal";
-  version = "11.3.2";
+  version = "11.3.3";

  src = fetchFromGitLab {
    domain = "git.drupalcode.org";
    owner = "project";
    repo = "drupal";
    tag = finalAttrs.version;
-    hash = "sha256-RrBnVDjB6aKW6btmX604saXfPKo18oRka+SdlNmFqUo=";
+    hash = "sha256-QD/vk19OLrI8whxZ9dJROL/v90U4QuCfeONs0OX4qS4=";
  };

  composerNoPlugins = false;
-  vendorHash = "sha256-c3pqPnyeuSqpMhh1an1NAnDC+IyeRVUT+dCN19/nrMQ=";
+  vendorHash = "sha256-YsNg5l72htLoJgBhQ+RYxWYK5nB5Nq7Js6tf8L+BE7E=";

  passthru = {
    tests = {
@@ -83,13 +83,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal";
-  version = "3.12.1";
+  version = "3.12.2";

  src = fetchFromGitHub {
    owner = "OSGeo";
    repo = "gdal";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-vs9qun9Z8o4KPxWjKOV9Lp/GgAsYW7gseYv4G7+liso=";
+    hash = "sha256-W9MSZP+qmG7r2SzjOXbeYebY5vx8z8cpySv/sGyj42Y=";
  };

  nativeBuildInputs = [
@@ -6,15 +6,15 @@
 }:
 buildGoModule (finalAttrs: {
  pname = "ghw";
-  version = "0.21.2";
+  version = "0.22.0";

  src = fetchFromGitHub {
    owner = "jaypipes";
    repo = "ghw";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-WZGEhrgHmJ/4puvDPYLq3iU+Ddf1PnptRj0ehcDbjZQ=";
+    hash = "sha256-W3a6hKX8vsWe02uLUx9zIOmJiivIOa4Ja++iXVd8J3E=";
  };
-  vendorHash = "sha256-lItNgi65HQASNQufUdhvEoNtrltkW+0hBHUlFZjfneE=";
+  vendorHash = "sha256-REgtByhTlYQ3XyYleWAcrCymIWtWmltjx21tr2mtF7k=";

  subPackages = [ "cmd/..." ];
  doCheck = false; # wants to read from /sys and other places not allowed
@@ -8,27 +8,28 @@
  python3,
  cacert,
  versionCheckHook,
+  nodejs_22,
 }:

-buildNpmPackage (finalAttrs: {
+buildNpmPackage.override { nodejs = nodejs_22; } (finalAttrs: {
  pname = "homebridge-config-ui-x";
-  version = "5.14.0";
+  version = "5.16.0";

  src = fetchFromGitHub {
    owner = "homebridge";
    repo = "homebridge-config-ui-x";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-CAdzkFuVuJtHoUUDBIRRzxRJiOtGUJFzS/lczYXTfRw=";
+    hash = "sha256-LXOfpOmYEeHDL0uMvRSG4q51k00tyKBEU6XP6UFm/RY=";
  };

  # Deps hash for the root package
-  npmDepsHash = "sha256-73Xt2R3COL0WPgtqn3ZwGTmOHrNqHONrX3hQCU/v5y0=";
+  npmDepsHash = "sha256-MUfDMHxnwEBjv76NoJ6CYP3YJ+us0Nn/MUFcR1NFQAE=";

  # Deps src and hash for ui subdirectory
  npmDeps_ui = fetchNpmDeps {
    name = "npm-deps-ui";
    src = "${finalAttrs.src}/ui";
-    hash = "sha256-xtXAeTBryQt4FMvK3oXHJ3DdB/3umrSrmqZ3IIDgq2s=";
+    hash = "sha256-GB17rJ2D1yXl/lxM8pQl2e2xnakgA8JLX7sbbdk3P5M=";
  };

  # Need to also run npm ci in the ui subdirectory
@@ -59,6 +60,8 @@ buildNpmPackage (finalAttrs: {
  ];
  doInstallCheck = true;

+  passthru.updateScript = ./update.sh;
+
  meta = {
    description = "Configure Homebridge, monitor and backup from a browser";
    homepage = "https://github.com/homebridge/homebridge-config-ui-x";
@@ -0,0 +1,77 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -I nixpkgs=./. -i bash -p curl jq gnugrep gnused git nix
+# shellcheck shell=bash
+set -euo pipefail
+
+nixpkgs="$(pwd)"
+cd "$(readlink -e "$(dirname "${BASH_SOURCE[0]}")")"
+
+pkg="(import $nixpkgs/default.nix {}).homebridge-config-ui-x"
+
+nix_eval() {
+  nix eval --json --impure --expr "$pkg.$1" | jq -r
+}
+
+# Build a fixed-output derivation with an empty hash to get the correct one
+nix_prefetch() {
+  local attr="$1"
+  local expr="let src = $pkg.$attr; in (src.overrideAttrs or (f: src // f src)) (_: { outputHash = \"\"; outputHashAlgo = \"sha256\"; })"
+  nix-build --impure --no-out-link --expr "$expr" 2>&1 | tr -s ' ' | grep -oP 'got:\s+\K\S+' || true
+}
+
+update_src_hash() {
+  echo "Updating source hash..."
+  local old_hash new_hash
+  old_hash=$(nix_eval "src.outputHash")
+  new_hash=$(nix_prefetch "src")
+  if [ -z "$new_hash" ]; then
+    echo "ERROR: Failed to determine new source hash"
+    exit 1
+  fi
+  sed -i "s|$old_hash|$new_hash|g" package.nix
+}
+
+update_npm_deps_hash() {
+  echo "Updating npm dependencies hash..."
+  local old_hash new_hash
+  old_hash=$(nix_eval "npmDeps.outputHash")
+  new_hash=$(nix_prefetch "npmDeps")
+  if [ -z "$new_hash" ]; then
+    echo "ERROR: Failed to determine new npm deps hash"
+    exit 1
+  fi
+  sed -i "s|$old_hash|$new_hash|g" package.nix
+}
+
+update_npm_deps_ui_hash() {
+  echo "Updating ui npm dependencies hash..."
+  local old_hash new_hash
+  old_hash=$(nix_eval "npmDeps_ui.outputHash")
+  new_hash=$(nix_prefetch "npmDeps_ui")
+  if [ -z "$new_hash" ]; then
+    echo "ERROR: Failed to determine new npm deps ui hash"
+    exit 1
+  fi
+  sed -i "s|$old_hash|$new_hash|g" package.nix
+}
+
+LATEST_VERSION=$(curl -fsSL ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/homebridge/homebridge-config-ui-x/releases/latest" \
+  | jq -r '.tag_name' \
+  | sed 's/^v//')
+
+CURRENT_VERSION=$(nix_eval "version")
+
+if [ "$CURRENT_VERSION" = "$LATEST_VERSION" ]; then
+  echo "homebridge-config-ui-x is already up to date at version $CURRENT_VERSION"
+  exit 0
+fi
+
+echo "Updating homebridge-config-ui-x from $CURRENT_VERSION to $LATEST_VERSION"
+
+sed -i "s/version = \"$CURRENT_VERSION\"/version = \"$LATEST_VERSION\"/" package.nix
+
+update_src_hash
+update_npm_deps_hash
+update_npm_deps_ui_hash
+
+echo "Successfully updated homebridge-config-ui-x from $CURRENT_VERSION to $LATEST_VERSION"
@@ -48,7 +48,7 @@ in

 stdenv.mkDerivation (finalAttrs: {
  pname = "ipxe";
-  version = "1.21.1-unstable-2026-01-10";
+  version = "1.21.1-unstable-2026-01-30";

  nativeBuildInputs = [
    mtools
@@ -66,8 +66,8 @@ stdenv.mkDerivation (finalAttrs: {
  src = fetchFromGitHub {
    owner = "ipxe";
    repo = "ipxe";
-    rev = "9c01c5a5dacb54167132d9a27259b23acdf091d6";
-    hash = "sha256-7Gsczc6jcUT0jDHNrgYWycqTs2/x3eqzbFwEwz8Z8kU=";
+    rev = "74e0551ac2f66760430e69407a4f7ed0dfe9feab";
+    hash = "sha256-7Guts4js1pM/Vse58XCjr7K8qHbJU5oiFFuqojwXTC4=";
  };

  # Calling syslinux on a FAT image isn't going to work on Aarch64.
@@ -24,11 +24,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "keycloak";
-  version = "26.5.2";
+  version = "26.5.3";

  src = fetchzip {
    url = "https://github.com/keycloak/keycloak/releases/download/${finalAttrs.version}/keycloak-${finalAttrs.version}.zip";
-    hash = "sha256-SXoHnwk/hepSV5BIsmZvCXOPn5UfVKwbNZ4D9zSlaz0=";
+    hash = "sha256-OMx2E4Q1Pob73iqWo/sfYI14+IMW0cp/22wMUKcqQvg=";
  };

  nativeBuildInputs = [
@@ -19,6 +19,8 @@ stdenv.mkDerivation (finalAttrs: {
  makeFlags = [
    "CC=${stdenv.cc.targetPrefix}cc"
    "ENABLE_ARCH_DETECTION=0"
+    "HAS_AVX512=0"
+    "HAS_AVX2=0"
  ];

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

 stdenv.mkDerivation (finalAttrs: {
  pname = "livi";
-  version = "0.3.2";
+  version = "0.4.0";

  src = fetchFromGitLab {
    owner = "guidog";
    repo = "livi";
    domain = "gitlab.gnome.org";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-cLvSK50RnXCYoXwpp+unTVnxqCkPa3Zr4dZT0TpYFpE=";
+    hash = "sha256-2hDQS5f+KAWal8AbtB4IV4/B6Rq+n1vAcWA9eoDS3y4=";
  };
  nativeBuildInputs = [
    meson
@@ -8,7 +8,7 @@
  wayland-protocols,
 }:
 let
-  pname = "LycheeSlicer";
+  pname = "lycheeslicer";
  version = "7.6.1";

  src = fetchurl {
@@ -28,7 +28,7 @@ let
    ;
 in
 stdenv.mkDerivation (finalAttrs: {
-  pname = "melonDS";
+  pname = "melonds";
  version = "1.1-unstable-2026-02-02";

  src = fetchFromGitHub {
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
  version = "25.11";

  src = fetchFromGitHub {
-    owner = "YaLTeR";
+    owner = "niri-wm";
    repo = "niri";
    tag = "v${finalAttrs.version}";
    hash = "sha256-FC9eYtSmplgxllCX4/3hJq5J3sXWKLSc7at8ZUxycVw=";
@@ -118,7 +118,7 @@ rustPlatform.buildRustPackage (finalAttrs: {

    # Upstream recommends setting the commit hash manually when in a
    # build environment where the Git repository is unavailable.
-    # See https://github.com/YaLTeR/niri/wiki/Packaging-niri#version-string
+    # See https://github.com/niri-wm/niri/wiki/Packaging-niri#version-string
    NIRI_BUILD_COMMIT = "Nixpkgs";
  };

@@ -133,8 +133,8 @@ rustPlatform.buildRustPackage (finalAttrs: {

  meta = {
    description = "Scrollable-tiling Wayland compositor";
-    homepage = "https://github.com/YaLTeR/niri";
-    changelog = "https://github.com/YaLTeR/niri/releases/tag/v${finalAttrs.version}";
+    homepage = "https://github.com/niri-wm/niri";
+    changelog = "https://github.com/niri-wm/niri/releases/tag/v${finalAttrs.version}";
    license = lib.licenses.gpl3Only;
    maintainers = with lib.maintainers; [
      sodiboo
@@ -6,16 +6,16 @@

 buildGoModule (finalAttrs: {
  pname = "nkeys";
-  version = "0.4.12";
+  version = "0.4.15";

  src = fetchFromGitHub {
    owner = "nats-io";
    repo = "nkeys";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-uNvRzljA6c6ppFtZLpFmwz/c9fmDzQz44Ekys0rBZ+o=";
+    hash = "sha256-hlVPfL3ecEmqXRsV3skiOD7B1s2a0ZZ5RX6LV6ISEWI=";
  };

-  vendorHash = "sha256-yZc2qG61VsUDXr1uxF/BK7WFI6a7xOsjAxnw6G+JpeQ=";
+  vendorHash = "sha256-3gyWzCYpkXnEURKB05GtGJxDMk6oIzWS4u3U5OUd3p4=";

  meta = {
    description = "Public-key signature system for NATS";
@@ -0,0 +1,32 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  installShellFiles,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "octorus";
+  version = "0.3.1";
+
+  src = fetchFromGitHub {
+    owner = "ushironoko";
+    repo = "octorus";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-20HVES8XgZEgKIijTzo9rV5IRfhyZlY1noX6yHSUf8g=";
+  };
+
+  cargoHash = "sha256-4HHl3SIXqfWOeKFmGqXLTC9veglMAFo1MLJIR/BYr0M=";
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  meta = {
+    description = "TUI PR review tool for GitHub";
+    homepage = "https://github.com/ushironoko/octorus";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      matthiasbeyer
+    ];
+    mainProgram = "octorus";
+  };
+})
@@ -3,6 +3,7 @@
  python3Packages,
  fetchFromSourcehut,
  file,
+  gettext,
  installShellFiles,
  less,
  offpunk,
@@ -14,19 +15,22 @@

 python3Packages.buildPythonApplication (finalAttrs: {
  pname = "offpunk";
-  version = "2.8";
+  version = "3.0";
  pyproject = true;

  src = fetchFromSourcehut {
    owner = "~lioploum";
    repo = "offpunk";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-s/pEN7n/g9o8a/hYTC39PgbBLyCUwN5LIggqUSMKRS4=";
+    hash = "sha256-5SoMa93QbwbsryeHGc3pkkDA8v9eonZvuflSuDV2hmI=";
  };

  build-system = with python3Packages; [ hatchling ];

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

  dependencies = [
    file
@@ -21,17 +21,17 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "pdns-recursor";
-  version = "5.3.4";
+  version = "5.3.5";

  src = fetchurl {
    url = "https://downloads.powerdns.com/releases/pdns-recursor-${finalAttrs.version}.tar.xz";
-    hash = "sha256-+1CoWH9LPVf4jcrMImpkxRVJkrDa/SD1uwNDVeNiRSQ=";
+    hash = "sha256-dEl65iAWfYV84tVwK9FAGOX0yEjoePKc71FYGnSw0F4=";
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit (finalAttrs) src;
    sourceRoot = "pdns-recursor-${finalAttrs.version}/rec-rust-lib/rust";
-    hash = "sha256-g0Mu1+ZRQyzC4nG5ueISaDzFtmFfy+CGt063/V5lo30=";
+    hash = "sha256-h1xVW80Uv9sX+ykW5SFqQSpmAuRbM9aCzmxRUKABPwI=";
  };

  cargoRoot = "rec-rust-lib/rust";
@@ -1,33 +1,43 @@
 {
+  lib,
+
+  fetchFromGitHub,
+  nix-update-script,
+  stdenv,
+
+  # nativeBuildInputs
+  cmake,
+  doxygen,
+  pkg-config,
+
+  # propagatedBuildInputs
  boost,
  casadi,
-  casadiSupport ? true,
-  cmake,
-  collisionSupport ? true,
-  console-bridge,
-  ctestCheckHook,
-  doxygen,
-  eigen,
-  example-robot-data,
-  fetchFromGitHub,
-  fetchpatch,
  coal,
+  console-bridge,
+  eigen,
  jrl-cmakemodules,
-  lib,
-  pkg-config,
-  stdenv,
  urdfdom,
+
+  # nativeCheckInputs
+  ctestCheckHook,
+
+  # checkInputs = [
+  example-robot-data,
+
+  casadiSupport ? true,
+  collisionSupport ? true,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "pinocchio";
-  version = "3.8.0";
+  version = "3.9.0";

  src = fetchFromGitHub {
    owner = "stack-of-tasks";
    repo = "pinocchio";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-2oMP653fJ7Msk+IB8whRk2L8xkAmRdDeMLPJyyD99OQ=";
+    hash = "sha256-k2lT1I0wb3N/o95ol2oO6HSYHf4wKJ0SFEg8JNxZmpI=";
  };

  outputs = [
@@ -35,19 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
    "doc"
  ];

-  patches = [
-    # ref. https://github.com/stack-of-tasks/pinocchio/pull/2771
-    (fetchpatch {
-      name = "fix-viser-path.patch";
-      url = "https://github.com/stack-of-tasks/pinocchio/commit/36a04bddb6980a7bcd28ebcc55d4e442f7920d87.patch";
-      hash = "sha256-9oENiMmRqJLU4ZiyGojm7suqdwTDGfk56aS2kcZiGaI=";
-    })
-  ];
-
  postPatch = ''
-    # allow package:// uri use in examples
-    export ROS_PACKAGE_PATH=${example-robot-data}/share
-
    # silence matplotlib warning
    export MPLCONFIGDIR=$(mktemp -d)
  '';
@@ -99,9 +97,12 @@ stdenv.mkDerivation (finalAttrs: {

  doCheck = true;

+  passthru.updateScript = nix-update-script { };
+
  meta = {
    description = "Fast and flexible implementation of Rigid Body Dynamics algorithms and their analytical derivatives";
    homepage = "https://github.com/stack-of-tasks/pinocchio";
+    changelog = "https://github.com/stack-of-tasks/pinocchio/blob/devel/CHANGELOG.md";
    license = lib.licenses.bsd2;
    maintainers = with lib.maintainers; [
      nim65s
@@ -8,11 +8,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "quarkus-cli";
-  version = "3.31.1";
+  version = "3.31.2";

  src = fetchurl {
    url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz";
-    hash = "sha256-wKNFWIm/BDkGyerafKskekhfgn5QBcxecUDSw4hhwCY=";
+    hash = "sha256-gWaU/038550xRIigXEOfQe2ZdlTxpjzWH0DbJo8FTLQ=";
  };

  nativeBuildInputs = [ makeWrapper ];
@@ -7,11 +7,13 @@
 }:

 let
-  name = "service-wrapper-${version}";
+  pname = "service-wrapper";
  version = "19.04"; # Akin to Ubuntu Release
 in
-runCommand name
+runCommand "${pname}-${version}"
  {
+    inherit pname version;
+
    script = replaceVarsWith {
      src = ./service-wrapper.sh;
      isExecutable = true;
@@ -21,13 +21,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "shader-slang";
-  version = "2026.1.1";
+  version = "2026.1.2";

  src = fetchFromGitHub {
    owner = "shader-slang";
    repo = "slang";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-QYnhFIp4516qrokdTXvE+owLVcCzPpAT9W0yUJRs5vM=";
+    hash = "sha256-PaxE6C6pjLQ5rBeJDZBILvbQf2buYGWjTyZZaxG6/cI=";
    fetchSubmodules = true;
  };

@@ -0,0 +1,49 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 0194c34ed2..0d58655f70 100644
+--- a/Cargo.lock
+++ b/Cargo.lock
+@@ -1419,14 +1419,14 @@ dependencies = [
+ 
+ [[package]]
+ name = "crossbeam-epoch"
+-version = "0.9.5"
+-source = "git+https://github.com/anza-xyz/crossbeam?rev=fd279d707025f0e60951e429bf778b4813d1b6bf#fd279d707025f0e60951e429bf778b4813d1b6bf"
+version = "0.9.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d2fe95351b870527a5d09bf563ed3c97c0cffb87cf1c78a591bf48bb218d9aa"
+ dependencies = [
+ "autocfg",
+  "cfg-if 1.0.0",
+  "crossbeam-utils",
+- "lazy_static",
+- "memoffset 0.6.4",
+- "scopeguard",
+ "memoffset 0.9.0",
+ ]
+ 
+ [[package]]
+@@ -3118,15 +3118,6 @@ dependencies = [
+  "libc",
+ ]
+ 
+-[[package]]
+-name = "memoffset"
+-version = "0.6.4"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
+-dependencies = [
+- "autocfg",
+-]
+-
+ [[package]]
+ name = "memoffset"
+ version = "0.7.1"
+diff --git a/Cargo.toml b/Cargo.toml
+index 2ff2094d67..a3ace4459a 100644
+--- a/Cargo.toml
+++ b/Cargo.toml
+@@ -665,4 +665,4 @@
+ [patch.crates-io]
+ # for details, see https://github.com/anza-xyz/crossbeam/commit/fd279d707025f0e60951e429bf778b4813d1b6bf
+-crossbeam-epoch = { git = "https://github.com/anza-xyz/crossbeam", rev = "fd279d707025f0e60951e429bf778b4813d1b6bf" }
+# crossbeam-epoch = { git = "https://github.com/anza-xyz/crossbeam", rev = "fd279d707025f0e60951e429bf778b4813d1b6bf" }
@@ -0,0 +1,103 @@
+{
+  lib,
+  stdenv,
+  buildPackages,
+  fetchFromGitHub,
+  rustPlatform,
+  rustfmt,
+  installShellFiles,
+  pkg-config,
+  apple-sdk_15,
+  udev,
+  openssl,
+  libz,
+  protobuf,
+  cmake,
+  gnumake,
+  clang,
+  llvm,
+  llvmPackages,
+  rocksdb,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "solana-agave";
+  version = "2.3.12";
+
+  src = fetchFromGitHub {
+    owner = "anza-xyz";
+    repo = "agave";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-25UgiC5jAnlNE8Z7WrQRIviCuFp4zg57ddYA4h0qJ6U=";
+  };
+
+  cargoHash = "sha256-SVngabz9mrYNn7DlL7Rh7llvO4GmJdt5vpXVcjwqtNg=";
+
+  # For the same reason as discussed in solana-cli derivation (crossbeam softlink), the no_atomic file is missing
+  # and either must somehow be rendered unneeded (using an upstream package) or replaced. A cleaner, non-behavior-changing,
+  # solution would be to commit the file to the repo fork (replacing the softlink).
+  cargoPatches = [
+    ./crossbeam-epoch.patch
+  ];
+
+  nativeBuildInputs = [
+    installShellFiles
+    protobuf
+    cmake
+    gnumake
+    clang
+    llvm
+    llvmPackages.bintools
+    openssl.dev
+    pkg-config
+    rustfmt
+  ];
+  buildInputs = [
+    openssl
+    libz
+    rustPlatform.bindgenHook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ];
+
+  doInstallCheck = false;
+
+  env = {
+    # If set, always finds OpenSSL in the system, even if the vendored feature is enabled.
+    OPENSSL_NO_VENDOR = 1;
+    # Agave uses deny(warnings) which breaks when nixpkgs updates rustc.
+    # Cap lints to warnings so the build doesn't fail on new compiler lints.
+    RUSTFLAGS = "--cap-lints warn";
+    # Use the pre-built rocksdb from nixpkgs instead of compiling from source.
+    # This avoids GCC 13+ compatibility issues with missing <cstdint> includes.
+    ROCKSDB_LIB_DIR = "${rocksdb}/lib";
+  };
+
+  # Disabling tests because:
+  #
+  # ```
+  # running 3 tests
+  # test args::tests::test_max_genesis_archive_unpacked_size_constant ... ok
+  # test bigtable::tests::test_missing_blocks ... ok
+  # error: test failed, to rerun pass `-p agave-ledger-tool --bin agave-ledger-tool`
+  #
+  # Caused by:
+  #   process didn't exit successfully: `/build/source/target/x86_64-unknown-linux-gnu/release/deps/agave_ledger_tool-b8aca978c218ed51` (signal: 4, SIGILL: illegal instruction)
+  # ```
+  #
+  # Almost certainly caused by the ledger-tool test calling `Command::cargo_bin` which assumes a good bit about the current environment.
+  doCheck = false;
+
+  meta = {
+    description = "Solana Network Validator";
+    homepage = "https://github.com/anza-xyz/agave";
+    changelog = "https://github.com/anza-xyz/agave/releases/tag/${finalAttrs.version}";
+    license = with lib.licenses; [
+      asl20
+    ];
+    maintainers = with lib.maintainers; [
+      TomMD
+    ];
+    mainProgram = "agave";
+  };
+})
@@ -1,48 +0,0 @@
-# The Nix expression is a 1:1 mapping of the spacevim toml config which you can find on their website: spacevim.org/quick-start-guide/#configuration
-
-{
-  custom_plugins = [
-    {
-      merged = false;
-      name = "lilydjwg/colorizer";
-    }
-  ];
-  layers = [
-    { name = "default"; }
-    {
-      enable = true;
-      name = "colorscheme";
-    }
-    { name = "fzf"; }
-    {
-      default_height = 30;
-      default_position = "top";
-      name = "shell";
-    }
-    { name = "edit"; }
-    { name = "VersionControl"; }
-    { name = "git"; }
-    {
-      auto-completion-return-key-behavior = "complete";
-      auto-completion-tab-key-behavior = "cycle";
-      autocomplete_method = "coc";
-      name = "autocomplete";
-    }
-    { name = "lang#ruby"; }
-    { name = "lang#nix"; }
-    { name = "lang#java"; }
-    { name = "lang#kotlin"; }
-    { name = "lang#sh"; }
-    { name = "lang#html"; }
-  ];
-  options = {
-    buffer_index_type = 4;
-    colorscheme = "gruvbox";
-    colorscheme_bg = "dark";
-    enable_guicolors = true;
-    enable_statusline_mode = true;
-    enable_tabline_filetype_icon = true;
-    statusline_separator = "fire";
-    timeoutlen = 500;
-  };
-}
@@ -1,82 +0,0 @@
-{
-  fetchFromGitHub,
-  formats,
-  fzf,
-  git,
-  lib,
-  makeWrapper,
-  neovim,
-  nix-update-script,
-  ripgrep,
-  runCommand,
-  stdenv,
-  vim-full,
-  spacevim_config ? import ./init.nix,
-}:
-
-let
-  format = formats.toml { };
-  spacevimdir = runCommand "SpaceVim.d" { } ''
-    mkdir -p $out
-    cp ${format.generate "init.toml" spacevim_config} $out/init.toml
-  '';
-in
-stdenv.mkDerivation (finalAttrs: {
-  pname = "spacevim";
-  version = "2.4.0";
-  src = fetchFromGitHub {
-    owner = "SpaceVim";
-    repo = "SpaceVim";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-qiNadhQJjU9RY14X8+pd4Ul+NLoNqbxuh3Kenw1dHDc=";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-  dontBuild = true;
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/bin
-
-    cp -r $(pwd) $out/SpaceVim
-
-    # trailing slash very important for SPACEVIMDIR
-    makeWrapper "${vim-full}/bin/vim" "$out/bin/spacevim" \
-        --add-flags "-u $out/SpaceVim/vimrc" --set SPACEVIMDIR "${spacevimdir}/" \
-        --prefix PATH : ${
-          lib.makeBinPath [
-            fzf
-            git
-            ripgrep
-          ]
-        }
-    makeWrapper "${neovim}/bin/nvim" "$out/bin/spacenvim" \
-        --add-flags "-u $out/SpaceVim/init.vim" --set SPACEVIMDIR "${spacevimdir}/" \
-        --prefix PATH : ${
-          lib.makeBinPath [
-            fzf
-            git
-            ripgrep
-          ]
-        }
-    runHook postInstall
-  '';
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = {
-    description = "Modular Vim/Neovim configuration";
-    longDescription = ''
-      SpaceVim is a modular configuration of Vim and Neovim. It's inspired by
-      spacemacs. It manages collections of plugins in layers, which help to
-      collect related packages together to provide features. This approach
-      helps keep the configuration organized and reduces overhead for the user
-      by keeping them from having to think about what packages to install.
-    '';
-    homepage = "https://spacevim.org/";
-    license = lib.licenses.gpl3Plus;
-    maintainers = [ lib.maintainers.PerchunPak ];
-    platforms = lib.platforms.all;
-    mainProgram = "spacevim";
-  };
-})
@@ -11,13 +11,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "tail-tray";
-  version = "0.2.28";
+  version = "0.2.29";

  src = fetchFromGitHub {
    owner = "SneWs";
    repo = "tail-tray";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-UhJyrlY9S3CRK3TgFf7nUGF6drj4Zx/yirZ0z4jpqtE=";
+    hash = "sha256-X2NYzUUP7zuQ+JIeLviOvfGpGlKqrtj5tOszX6gDYTc=";
  };

  nativeBuildInputs = with kdePackages; [
@@ -2,7 +2,6 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  fetchpatch,
  cmake,
  zlib,
  lz4,
@@ -24,7 +23,10 @@
  runCommand,
  curl,
  capnproto,
+  nlohmann_json,
+  c-blosc2,
  useAVX2 ? stdenv.hostPlatform.avx2Support,
+  libpqxx,
 }:

 let
@@ -33,45 +35,23 @@ let
    chmod -R +w $out
    cp -r ${rapidcheck.dev}/* $out
  '';
-  catch2 = catch2_3;
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "tiledb";
-  version = "2.28.1";
+  version = "2.30.0";

  src = fetchFromGitHub {
    owner = "TileDB-Inc";
    repo = "TileDB";
    tag = finalAttrs.version;
-    hash = "sha256-Cs3Lr8I/Mu02x78d7IySG0XX4u/VAjBs4p4b00XDT5k=";
+    hash = "sha256-wzeWLwwsZXtrKsmlglZG7YvIki/ba7IwsDBq+40ltcg=";
  };

-  patches = [
-    # capnproto was updated to 1.2 in Nixpkgs, bring TileDB codebase up to speed
-    # patch only affects serialization related code, extracted from https://github.com/TileDB-Inc/TileDB/pull/5616
-    (fetchpatch {
-      url = "https://github.com/TileDB-Inc/TileDB/pull/5616.patch";
-      relative = "tiledb/sm/serialization";
-      extraPrefix = "tiledb/sm/serialization/";
-      hash = "sha256-5z/eJEHl+cnWRf1sMULodJyhmNh5KinDLlL1paMNiy4=";
-    })
+  patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./generate_embedded_data_header.patch ];

-    # Fix build with gcc15
-    # https://github.com/TileDB-Inc/TileDB/pull/5612
-    (fetchpatch {
-      name = "tiledb-set-c-version-to-c99.patch";
-      url = "https://github.com/TileDB-Inc/TileDB/commit/4f946ad57fe823c3f53c06bf29dc18799ec6395a.patch";
-      hash = "sha256-chdaa6Ysqeb3p+FcWp7GTnAzgShoPGSCErmIGn+Q4tA=";
-    })
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./generate_embedded_data_header.patch ];
-
-  # libcxx (as of llvm-19) does not yet support `stop_token` and `jthread`
-  # without the -fexperimental-library flag. Tiledb adds its own
-  # implementations in the std namespace which conflict with libcxx. This
-  # test can be re-enabled once libcxx supports stop_token and jthread.
-  postPatch = lib.optionalString (stdenv.cc.libcxx != null) ''
-    truncate -s0 tiledb/stdx/test/CMakeLists.txt
+  postPatch = ''
+    substituteInPlace tiledb/sm/misc/test/unit_parse_argument.cc \
+      --replace-fail '"catch.hpp"' '<catch2/catch_all.hpp>'
  '';

  env.TILEDB_DISABLE_AUTO_VCPKG = "1";
@@ -89,37 +69,39 @@ stdenv.mkDerivation (finalAttrs: {
  ++ lib.optional (!useAVX2) "-DCOMPILER_SUPPORTS_AVX2=FALSE";

  nativeBuildInputs = [
-    catch2
    clang-tools
    cmake
    python3
    doxygen
-    # Required for serialization
-    curl
-    capnproto
  ]
  ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;

  buildInputs = [
-    zlib
-    lz4
+    boost
    bzip2
-    zstd
-    spdlog
+    c-blosc2
+    capnproto
+    catch2_3
+    curl
+    file
+    libpng
+    libpqxx
+    lz4
+    nlohmann_json
    onetbb
    openssl
-    boost
-    libpng
-    file
    rapidcheck'
-    catch2
+    spdlog
+    zlib
+    zstd
  ];

  nativeCheckInputs = [
    gtest
-    catch2
  ];

+  strictDeps = true;
+
  # test commands taken from
  # https://github.com/TileDB-Inc/TileDB/blob/dev/.github/workflows/unit-test-runs.yml
  checkPhase = ''
@@ -9,13 +9,13 @@

 buildGoModule (finalAttrs: {
  pname = "tsgolint";
-  version = "0.11.4";
+  version = "0.11.5";

  src = fetchFromGitHub {
    owner = "oxc-project";
    repo = "tsgolint";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-/1od2yijBSTi5PFhEQ95KTjQJYYgXRX4v6M/lIfQXtM=";
+    hash = "sha256-XPx8yU3K2v5+FTANwXX9xs+d/WEz6L19suf1QED/Mbs=";
    fetchSubmodules = true;
  };

@@ -49,7 +49,7 @@ buildGoModule (finalAttrs: {
    '';

  proxyVendor = true;
-  vendorHash = "sha256-pCmPL0OVwclCV5riL8wozCiQA2zRDafBKTxdkt/q3ns=";
+  vendorHash = "sha256-5NX+rjdPz/ZSVmykOc5ffFg1rplF1pznIWKiydl6kKY=";

  subPackages = [ "cmd/tsgolint" ];

@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
    description = "Free MASM-compatible assembler based on JWasm";
    mainProgram = "uasm";
    platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ thiagokokada ];
+    maintainers = [ ];
    license = lib.licenses.watcom;
    broken = stdenv.hostPlatform.isDarwin;
  };
@@ -11,12 +11,12 @@
 let
  sources = {
    x86_64-linux = fetchurl {
-      url = "https://api.snapcraft.io/api/v1/snaps/download/XXzVIXswXKHqlUATPqGCj2w2l7BxosS8_85.snap";
-      hash = "sha256-77lcQFFP0eXuaxN2UdsEjFXJt22L6Mp6Fe3ZYPpKVwM=";
+      url = "https://api.snapcraft.io/api/v1/snaps/download/XXzVIXswXKHqlUATPqGCj2w2l7BxosS8_82.snap";
+      hash = "sha256-G9RcOuFjkLDJUNlw2G8GiONpWHYvyTnv3Nr0JSdW0As=";
    };
    aarch64-linux = fetchurl {
-      url = "https://api.snapcraft.io/api/v1/snaps/download/XXzVIXswXKHqlUATPqGCj2w2l7BxosS8_85.snap";
-      hash = "sha256-77lcQFFP0eXuaxN2UdsEjFXJt22L6Mp6Fe3ZYPpKVwM=";
+      url = "https://api.snapcraft.io/api/v1/snaps/download/XXzVIXswXKHqlUATPqGCj2w2l7BxosS8_83.snap";
+      hash = "sha256-6XMdH4dnvYB1FaJLMi/MFnTzkelmOHMedVcIg/Fh7h4=";
    };
  };
 in
@@ -1,33 +1,36 @@
 {
  lib,
-  fetchFromGitHub,
-  buildDotnetModule,
-  dotnetCorePackages,
-  buildNpmPackage,
+  stdenv,
+  nodejs_22,
  electron_39,
  makeWrapper,
-  copyDesktopItems,
+  fetchFromGitHub,
+  buildNpmPackage,
  makeDesktopItem,
-  stdenv,
+  copyDesktopItems,
+  buildDotnetModule,
+  dotnetCorePackages,
 }:
 let
+  node = nodejs_22;
  electron = electron_39;
  dotnet = dotnetCorePackages.dotnet_9;
 in
 buildNpmPackage (finalAttrs: {
  pname = "vrcx";
-  version = "2026.01.04";
+  version = "2026.01.28";

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

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

  nativeBuildInputs = [
    makeWrapper
@@ -75,11 +78,11 @@ buildNpmPackage (finalAttrs: {
  desktopItems = [
    (makeDesktopItem {
      name = "vrcx";
-      desktopName = "VRCX";
-      comment = "Friendship management tool for VRChat";
      icon = "vrcx";
      exec = "vrcx";
      terminal = false;
+      desktopName = "VRCX";
+      comment = "Friendship management tool for VRChat";
      categories = [
        "Utility"
        "Application"
@@ -90,8 +93,8 @@ buildNpmPackage (finalAttrs: {

  passthru = {
    backend = buildDotnetModule {
-      pname = "${finalAttrs.pname}-backend";
      inherit (finalAttrs) version src;
+      pname = "${finalAttrs.pname}-backend";

      dotnet-sdk = dotnet.sdk;
      dotnet-runtime = dotnet.runtime;
@@ -25,16 +25,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "wayvr";
-  version = "26.1.2";
+  version = "26.2.0";

  src = fetchFromGitHub {
    owner = "wlx-team";
    repo = "wayvr";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-UZ5zcalez6B+212OqCaEXSoRfhaExuy0W8HX8b4flSU=";
+    hash = "sha256-RjZ9CmTHacw50TVxl53z4E2Yp/XW/sgf4WjYL6pd1s8=";
  };

-  cargoHash = "sha256-zqB2ybdpQEGdlkNin6mlUfaVRkpOtFl2CVCLAdKDMoQ=";
+  cargoHash = "sha256-xv6l+zCp3tkJs0c10f+omcwY8/wd2HWlZeFHDiUfkso=";

  nativeBuildInputs = [
    pkg-config
@@ -21,6 +21,7 @@
  libxcb-image,
  libxcb,
  zlib,
+  dbus,
  metaCommon ? { },
 }:

@@ -54,6 +55,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
    libxcb-render-util
    libxcb-wm
    zlib
+    dbus
  ];

  installPhase = ''
@@ -5,7 +5,7 @@
 }:
 let
  pname = "winbox";
-  version = "4.0beta44";
+  version = "4.0rc3";

  metaCommon = {
    description = "Graphical configuration utility for RouterOS-based devices";
@@ -23,13 +23,13 @@ let
  x86_64-zip = callPackage ./build-from-zip.nix {
    inherit pname version metaCommon;

-    hash = "sha256-LPq7KPOj59NUhoQCxpAVW8qbjXJGxRw8fRJT7/qDtZM=";
+    hash = "sha256-BbdKrGMfHhm9DHCmQwfZhsjpJXamNYJ4Mh4z/fwDFlM=";
  };

  x86_64-dmg = callPackage ./build-from-dmg.nix {
    inherit pname version metaCommon;

-    hash = "sha256-96lb8a70dmqieKn5Nr61sZg/aVDLz0sY64sfN83rU+0=";
+    hash = "sha256-KBKl4KAOeXlZIW5NtFV2k/yf6Evbwf02viX4Z73Jub8=";
  };
 in
 (if stdenvNoCC.hostPlatform.isDarwin then x86_64-dmg else x86_64-zip).overrideAttrs (oldAttrs: {
@@ -82,7 +82,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
    ];
    mainProgram = "wl-clip";
    maintainers = with lib.maintainers; [
-      thiagokokada
      donovanglover
    ];
  };
@@ -8,13 +8,13 @@

 buildGoModule (finalAttrs: {
  pname = "wpprobe";
-  version = "0.10.12";
+  version = "0.10.14";

  src = fetchFromGitHub {
    owner = "Chocapikk";
    repo = "wpprobe";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-fIPgWHPAjMQcKvH8fJhQUx08JfUfhOZAHSQCZ4YKK3k=";
+    hash = "sha256-+Q/TMlZ3VNsuiVDCJ1UbF+pJS3RA8cJOX/3vcQ5jNPk=";
  };

  vendorHash = "sha256-pAKFrdja+rH0kiJH6hToZwLjE8lLBHFAUCjnCLbgxVo=";
@@ -4,12 +4,13 @@
  buildPythonPackage,
  fetchFromGitHub,
  requests,
+  setuptools,
 }:

-buildPythonPackage {
+buildPythonPackage (finalAttrs: {
  pname = "acunetix";
  version = "0.0.7";
-  format = "setuptools";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "hikariatama";
@@ -19,7 +20,9 @@ buildPythonPackage {
    hash = "sha256-ycdCz8CNSP0USxv657jf6Vz4iF//reCeO2tG+und86A=";
  };

-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
    aiofiles
    requests
  ];
@@ -35,4 +38,4 @@ buildPythonPackage {
    license = lib.licenses.agpl3Only;
    maintainers = with lib.maintainers; [ fab ];
  };
-}
+})
@@ -1,143 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  nix-update-script,
-  pythonAtLeast,
-  pythonOlder,
-  stdenv,
-
-  # build-system
-  setuptools,
-  types-psutil,
-  types-setuptools,
-
-  # propagates
-  basedtyping,
-  mypy-extensions,
-  tomli,
-  typing-extensions,
-
-  # optionals
-  lxml,
-  psutil,
-
-  # tests
-  attrs,
-  filelock,
-  pytest-xdist,
-  pytestCheckHook,
-}:
-
-buildPythonPackage (finalAttrs: {
-  pname = "basedmypy";
-  version = "2.10.1";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "KotlinIsland";
-    repo = "basedmypy";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-IzRKOReSgio5S5PG8iD9VQF9R1GEqBAIDeeCtq+ZVXg=";
-  };
-
-  postPatch = ''
-    substituteInPlace \
-      pyproject.toml \
-      --replace-warn 'types-setuptools==' 'types-setuptools>='
-  ''
-  # __closed__ returns None at runtime (not a bool)
-  + ''
-    substituteInPlace test-data/unit/lib-stub/typing_extensions.pyi \
-      --replace-fail "__closed__: bool" "__closed__: None"
-  '';
-
-  build-system = [
-    basedtyping
-    mypy-extensions
-    types-psutil
-    types-setuptools
-    typing-extensions
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
-
-  dependencies = [
-    basedtyping
-    mypy-extensions
-    typing-extensions
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ tomli ];
-
-  optional-dependencies = {
-    dmypy = [ psutil ];
-    reports = [ lxml ];
-  };
-
-  # Compile mypy with mypyc, which makes mypy about 4 times faster. The compiled
-  # version is also the default in the wheels on Pypi that include binaries.
-  # is64bit: unfortunately the build would exhaust all possible memory on i686-linux.
-  env.MYPY_USE_MYPYC = stdenv.buildPlatform.is64bit;
-
-  # when testing reduce optimisation level to reduce build time by 20%
-  env.MYPYC_OPT_LEVEL = 1;
-
-  pythonImportsCheck = [
-    "mypy"
-    "mypy.api"
-    "mypy.fastparse"
-    "mypy.types"
-    "mypyc"
-    "mypyc.analysis"
-  ]
-  ++ lib.optionals (!stdenv.hostPlatform.isi686) [
-    # ImportError: cannot import name 'map_instance_to_supertype' from partially initialized module 'mypy.maptype' (most likely due to a circular import)
-    "mypy.report"
-  ];
-
-  nativeCheckInputs = [
-    attrs
-    filelock
-    pytest-xdist
-    pytestCheckHook
-    setuptools
-    tomli
-  ]
-  ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
-
-  disabledTests = lib.optionals (pythonAtLeast "3.12") [
-    # cannot find distutils, and distutils cannot find types
-    # https://github.com/NixOS/nixpkgs/pull/364818#discussion_r1895715378
-    "test_c_unit_test"
-  ];
-
-  disabledTestPaths = [
-    # fails to find typing_extensions
-    "mypy/test/testcmdline.py"
-    "mypy/test/testdaemon.py"
-    # fails to find setuptools
-    "mypyc/test/test_commandline.py"
-    # fails to find hatchling
-    "mypy/test/testpep561.py"
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isi686 [
-    # https://github.com/python/mypy/issues/15221
-    "mypyc/test/test_run.py"
-  ]
-  ++
-    lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64 && pythonOlder "3.13")
-      [
-        # mypy/test/testsolve.py::SolveSuite::test_simple_constraints_with_dynamic_type: [Any | A] != [Any]
-        "mypy/test/testsolve.py"
-      ];
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = {
-    description = "Based Python static type checker with baseline, sane default settings and based typing features";
-    homepage = "https://kotlinisland.github.io/basedmypy/";
-    changelog = "https://github.com/KotlinIsland/basedmypy/blob/${finalAttrs.src.tag}/CHANGELOG.md";
-    license = lib.licenses.mit;
-    mainProgram = "mypy";
-    maintainers = with lib.maintainers; [ PerchunPak ];
-  };
-})
@@ -1,56 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  nix-update-script,
-
-  # build-system
-  poetry-core,
-
-  # propagates
-  typing-extensions,
-
-  # tests
-  pytestCheckHook,
-}:
-
-buildPythonPackage (finalAttrs: {
-  pname = "basedtyping";
-  version = "0.1.10";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "KotlinIsland";
-    repo = "basedtyping";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-IpIMO75jqJDzDgRPVEi6g7AprGeBeKbVH99XPDYUzTM=";
-  };
-
-  build-system = [
-    poetry-core
-  ];
-
-  dependencies = [
-    typing-extensions
-  ];
-
-  pythonImportsCheck = [
-    "basedtyping"
-    "basedtyping.runtime_only"
-    "basedtyping.transformer"
-  ];
-
-  nativeCheckInputs = [
-    pytestCheckHook
-  ];
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = {
-    description = "Utilities for basedmypy";
-    homepage = "https://github.com/KotlinIsland/basedtyping";
-    changelog = "https://github.com/KotlinIsland/basedtyping/releases/tag/${finalAttrs.src.tag}";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ PerchunPak ];
-  };
-})
@@ -13,14 +13,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "claude-agent-sdk";
-  version = "0.1.27";
+  version = "0.1.33";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "anthropics";
    repo = "claude-agent-sdk-python";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-ydzgpdHa6mHwKUrgL7Odh4V7b3H2zUmHF+Og4LTxI2I=";
+    hash = "sha256-AnwkyP5qTL+pYfrFvjCNPsy15whfj8dJjZC9Qma03+c=";
  };

  build-system = [ hatchling ];
@@ -21,10 +21,9 @@ buildPythonPackage rec {

  build-system = [ setuptools ];

-  nativeCheckInputs = [
-    pytestCheckHook
-    typing-extensions
-  ];
+  dependencies = [ typing-extensions ];
+
+  nativeCheckInputs = [ pytestCheckHook ];

  pythonImportsCheck = [ "cron_descriptor" ];

@@ -0,0 +1,88 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  # build
+  hatchling,
+  # runtime
+  cassandra-driver,
+  motor,
+  numpy,
+  pybloomfilter3,
+  redis,
+  scipy,
+  # check
+  pytestCheckHook,
+  aiounittest,
+  mock,
+  pymongo,
+  pytest-asyncio,
+  pytest-rerunfailures,
+
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "datasketch";
+  version = "1.9.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "ekzhu";
+    repo = "datasketch";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ijBkbY6OioK5RP8zAeCnwlbrwE0OHa4tbEnCOabLTqs=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "--cov-report=xml" ""
+  '';
+
+  build-system = [ hatchling ];
+
+  dependencies = [
+    numpy
+    scipy
+  ];
+
+  optional-dependencies = rec {
+    cassandra = [ cassandra-driver ];
+    redis = [ redis ];
+    experimental_aio = [
+      motor
+      aiounittest
+    ];
+    bloom = [ pybloomfilter3 ];
+    all = cassandra ++ redis ++ experimental_aio ++ bloom;
+  };
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    cassandra-driver
+    mock
+    motor
+    redis
+    pybloomfilter3
+    pymongo
+    pytest-rerunfailures
+    pytest-asyncio
+  ];
+
+  disabledTestPaths = [
+    # these tests import mockredis, which has been abandoned for many years
+    "test/test_lsh.py"
+    "test/test_lshensemble.py"
+  ];
+  disabledTests = [
+    # flaky
+    "test_soft_remove_and_pop_and_clean"
+  ];
+
+  meta = {
+    changelog = "https://github.com/ekzhu/datasketch/releases/tag/v${finalAttrs.version}";
+    description = "MinHash, LSH, LSH Forest, Weighted MinHash, HyperLogLog, HyperLogLog++, LSH Ensemble and HNSW";
+    homepage = "https://ekzhu.com/datasketch/";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jokatzke ];
+  };
+})
@@ -62,14 +62,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "litestar";
-  version = "2.19.0";
+  version = "2.20.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "litestar-org";
    repo = "litestar";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-ZKvHsHkGEqDEDUz1JosBd3Thc+9D/gZmcACkyOWN8As=";
+    hash = "sha256-a72CUCwxeBluJI7kYShg0RuPEA58j52AkgHnokI4E28=";
  };

  build-system = [ hatchling ];
@@ -9,6 +9,7 @@
  coal,
  casadi,
  matplotlib,
+  pybind11,
  python,

  buildStandalone ? true,
@@ -35,6 +36,7 @@ toPythonModule (

    checkInputs = super.checkInputs ++ [
      matplotlib
+      pybind11
    ];

    nativeCheckInputs = super.nativeCheckInputs ++ [
@@ -0,0 +1,44 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  # build
+  setuptools,
+  cython,
+  # check
+  pytest,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "pybloomfilter3";
+  version = "0.7.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "cavoq";
+    repo = "pybloomfiltermmap3";
+    rev = "237631c181423c42043ba8003a305dd1d8e0b700"; # repo has no tags or branches
+    hash = "sha256-vUaU0U5Smmm+k+i54uKu/R2qpoCbdq3LrjU4/BBEMq8=";
+  };
+
+  build-system = [
+    setuptools
+    cython
+  ];
+
+  # tests are not discovered by pytestCheckHook
+  nativeCheckInputs = [ pytest ];
+  checkPhase = ''
+    runHook preCheck
+    python -m unittest discover -s tests -p "*.py"
+    runHook postCheck
+  '';
+
+  meta = {
+    changelog = "https://github.com/prashnts/pybloomfilter3/blob/${finalAttrs.src.rev}/CHANGELOG";
+    description = "Fast Python Bloom Filter using Mmap";
+    homepage = "https://github.com/prashnts/pybloomfilter3";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jokatzke ];
+  };
+})
@@ -9,12 +9,12 @@

 buildPythonPackage (finalAttrs: {
  pname = "pyexploitdb";
-  version = "0.3.12";
+  version = "0.3.13";
  pyproject = true;

  src = fetchPypi {
    inherit (finalAttrs) pname version;
-    hash = "sha256-WTu7Oq4I+3gTXxJ5djIF+/TDFvlvsEFz59wz+4GnUdc=";
+    hash = "sha256-fZCdH29PGU8GSo+JHWLqiaJj5zWIDmxTQTSf0UbLdmo=";
  };

  build-system = [ setuptools ];
@@ -27,7 +27,7 @@

 buildPythonPackage rec {
  pname = "pypdf";
-  version = "6.6.2";
+  version = "6.7.0";
  pyproject = true;

  src = fetchFromGitHub {
@@ -36,7 +36,7 @@ buildPythonPackage rec {
    tag = version;
    # fetch sample files used in tests
    fetchSubmodules = true;
-    hash = "sha256-5XgxfVtSh4Q8FksGp7dXk+RCGQi0oqg0jpdn9K/gFq8=";
+    hash = "sha256-Kd5jBsq6sE5qWdIieVWdAKFA3QiDRsTBwoFerNY9ZRU=";
  };

  outputs = [
@@ -85,6 +85,9 @@ buildPythonPackage rec {
    # AssertionError:
    # clip: Could not set clip rect SDL_Rect(x=2, y=2, w=0, h=0)
    "test_SDL_GetSetClipRect"
+
+    # AssertionError: That operation is not supported
+    "test_SDL_GetSetWindowMouseRect"
  ];

  meta = {
@@ -44,6 +44,10 @@ buildPythonPackage (finalAttrs: {
    hash = "sha256-CEz1v4e4NadSZ+qhotFtLB4y/KdhDZbDOohN8D9FB30=";
  };

+  patches = [
+    ./fix-pyproject.patch
+  ];
+
  env.PBR_VERSION = finalAttrs.version;

  build-system = [
@@ -75,11 +79,22 @@ buildPythonPackage (finalAttrs: {
  checkPhase = ''
    runHook preCheck
    stestr run -E \
-      "openstackclient.tests.unit.(volume.v3.test_volume.(TestVolumeCreate|TestVolumeShow)|common.test_module.TestModuleList)"
+      "openstackclient.tests.unit.common.test_module.TestModuleList.(test_module_list_no_options|test_module_list_all)"
    runHook postCheck
  '';

-  pythonImportsCheck = [ "openstackclient" ];
+  pythonImportsCheck = [
+    "openstackclient"
+    "openstackclient.api"
+    "openstackclient.common"
+    "openstackclient.compute"
+    "openstackclient.identity"
+    "openstackclient.image"
+    "openstackclient.network"
+    "openstackclient.object"
+    "openstackclient.volume"
+    "openstackclient.tests"
+  ];

  optional-dependencies = {
    # See https://github.com/openstack/python-openstackclient/blob/master/doc/source/contributor/plugins.rst
@@ -0,0 +1,18 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index 37fb8d0c..21571714 100644
+--- a/pyproject.toml
+++ b/pyproject.toml
+@@ -730,10 +730,9 @@ volume_transfer_request_show = "openstackclient.volume.v3.volume_transfer_reques
+ volume_summary = "openstackclient.volume.v3.volume:VolumeSummary"
+ volume_revert = "openstackclient.volume.v3.volume:VolumeRevertToSnapshot"
+ 
+-[tool.setuptools]
+-packages = [
+-    "openstackclient"
+-]
+[tool.setuptools.packages.find]
+where = ["."]
+include = ["openstackclient*"]
+ 
+ [tool.mypy]
+ python_version = "3.10"
@@ -38,8 +38,8 @@ let
    pyyaml
  ];

-  mysqlShellVersion = "8.4.6";
-  mysqlServerVersion = "8.4.6";
+  mysqlShellVersion = "8.4.8";
+  mysqlServerVersion = "8.4.8";
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "mysql-shell";
@@ -48,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: {
  srcs = [
    (fetchurl {
      url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz";
-      hash = "sha256-oeUj3IvpbRilreEGmYZhKFygG29bRsCLJlQRDkDfL7c=";
+      hash = "sha256-vp2Wzfh/J2lSos3ZYPEGuWCohg5GwRXtOcG18uA4eiA=";
    })
    (fetchurl {
      url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz";
-      hash = "sha256-IUmWUW5rZcRvmolE+LjMaGPFa5abv1osIhTzm9BKt/w=";
+      hash = "sha256-0mNO/uJVvVHRSDalOIuvQOOsDR6OukfJuov8Uasr0tE=";
    })
  ];

@@ -38,8 +38,8 @@ let
    pyyaml
  ];

-  mysqlShellVersion = "9.4.0";
-  mysqlServerVersion = "9.4.0";
+  mysqlShellVersion = "9.6.0";
+  mysqlServerVersion = "9.6.0";
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "mysql-shell-innovation";
@@ -48,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: {
  srcs = [
    (fetchurl {
      url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz";
-      hash = "sha256-a7UJxU5YtUq776SeKW5yIPXnz+RGkUujYV9ZSWfPqSE=";
+      hash = "sha256-JABh2GnVrhiMmjM4RZKImenZY8y9Z4Zaii5Lb8tnF4w=";
    })
    (fetchurl {
      url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz";
-      hash = "sha256-BpiDGA3Lxf/MrKqtPSA+apFNZx9N805PYYVa+2vQxPE=";
+      hash = "sha256-WnCr/poMsxtaS9k7/6QZDkFPOZlf7WAELsqFGpnUwf4=";
    })
  ];

@@ -11,6 +11,7 @@
  libuv,
  lief,
  llhttp,
+  merve,
  nghttp2,
  nghttp3,
  ngtcp2,
@@ -126,6 +127,7 @@ let

  useSharedAdaAndSimd = !stdenv.hostPlatform.isStatic && lib.versionAtLeast version "22.2";
  useSharedLief = !stdenv.hostPlatform.isStatic && lib.versionAtLeast version "25.6";
+  useSharedMerve = !stdenv.hostPlatform.isStatic && lib.versionAtLeast version "25.6.1";
  useSharedSQLite = !stdenv.hostPlatform.isStatic && lib.versionAtLeast version "22.5";
  useSharedZstd = !stdenv.hostPlatform.isStatic && lib.versionAtLeast version "22.15";

@@ -166,6 +168,9 @@ let
    // (lib.optionalAttrs useSharedLief {
      inherit lief;
    })
+    // (lib.optionalAttrs useSharedMerve {
+      inherit merve;
+    })
    // (lib.optionalAttrs useSharedZstd {
      inherit zstd;
    });
@@ -25,8 +25,8 @@ let
 in
 buildNodejs {
  inherit enableNpm;
-  version = "25.6.0";
-  sha256 = "9db6848c802b1981c0faeb71a5b8cc79913f82a747f7f1d50260c6d2f781ef7e";
+  version = "25.6.1";
+  sha256 = "cf756781c8b4dc5ee030f87ddf9d51b8d5bf219ad56cbd9855c4a3bdc832c78e";
  patches =
    (
      if (stdenv.hostPlatform.emulatorAvailable buildPackages) then
@@ -1,5 +1,5 @@
 import ./generic.nix {
-  version = "1.8.5";
-  hash = "sha256-lJX/eObXi468iFOzeFjAnNkPiQ8VbBnfqD1518LDm2s=";
-  cargoHash = "sha256-LjlXd2zJ2eXr/dyCsbwlzv3Qntg2b0mudtWGtc0V7Lc=";
+  version = "1.8.6";
+  hash = "sha256-+NZs8HHHmWGmlNNymIlbV7E28RiaGLmvtZkCWZJQvMk=";
+  cargoHash = "sha256-NKCQRIxvWAT5saMO85noYZtm7h0OPFhWFqudvkQPYTE=";
 }
@@ -353,6 +353,7 @@ mapAliases {
  banking = saldo; # Added 2025-08-29
  barrier = throw "'barrier' has been removed as it is unmaintained. Consider 'deskflow' or 'input-leap' instead."; # Added 2025-09-29
  base16-builder = throw "'base16-builder' has been removed due to being unmaintained"; # Added 2025-06-03
+  basedmypy = throw "basedmypy has been deprecated by upstream. Use instead 'basedpyright' or 'ty'"; # added 2026-02-03
  baserow = throw "baserow has been removed, due to lack of maintenance"; # Added 2025-08-02
  bazel_5 = throw "bazel_5 has been removed as it is EOL"; # Added 2025-08-09
  bazel_6 = throw "bazel_6 has been removed as it will be EOL by the release of Nixpkgs 25.11"; # Added 2025-08-19
@@ -1226,6 +1227,7 @@ mapAliases {
  lxde.lxsession = throw "'lxsession' has been moved to top-level. Use 'lxsession' directly"; # Added 2025-08-31
  lxde.lxtask = throw "'lxtask' has been moved to top-level. Use 'lxtask' directly"; # Added 2025-08-31
  lxdvdrip = throw "'lxdvdrip' has been removed due to lack of upstream maintenance."; # Added 2025-06-09
+  LycheeSlicer = warnAlias "'LycheeSlicer' has been renamed to 'lycheeslicer'" lycheeslicer; # Added 2026-02-08
  mac = throw "'mac' has been renamed to/replaced by 'monkeysAudio'"; # Converted to throw 2025-10-27
  MACS2 = throw "'MACS2' has been renamed to/replaced by 'macs2'"; # Converted to throw 2025-10-27
  magma_2_6_2 = throw "'magma_2_6_2' has been removed, use the latest 'magma' package instead."; # Added 2025-07-20
@@ -1256,6 +1258,7 @@ mapAliases {
  mediastreamer-openh264 = throw "'mediastreamer-openh264' has been moved to 'linphonePackages.msopenh264'"; # Added 2025-09-20
  meilisearch_1_11 = throw "'meilisearch_1_11' has been removed, as it is no longer supported"; # Added 2025-10-03
  melmatcheq.lv2 = melmatcheq-lv2; # Added 2025-09-27
+  melonDS = warnAlias "'melonDS' has been renamed to 'melonds'" melonds; # Added 2026-02-08
  meshlab-unstable = throw "meshlab-unstable has been removed, as it was behind meshlab"; # Added 2025-09-21
  meteo = throw "'meteo' has been removed as it was unmaintained and depends on deprecated webkitgtk_4_0"; # Added 2025-10-09
  microcodeAmd = throw "'microcodeAmd' has been renamed to/replaced by 'microcode-amd'"; # Converted to throw 2025-10-27
@@ -1744,6 +1747,7 @@ mapAliases {
  sourcehut = throw "'sourcehut.*' has been removed due to being broken and unmaintained"; # Added 2025-06-15
  SP800-90B_EntropyAssessment = throw "'SP800-90B_EntropyAssessment' has been renamed to/replaced by 'sp800-90b-entropyassessment'"; # Converted to throw 2025-10-27
  space-orbit = throw "'space-orbit' has been removed because it is unmaintained; Debian upstream stopped tracking it in 2011."; # Added 2025-06-08
+  spacevim = throw "'spacevim' has been removed due to being archived upstream."; # Added 2026-02-10
  SPAdes = throw "'SPAdes' has been renamed to/replaced by 'spades'"; # Converted to throw 2025-10-27
  spago = spago-legacy; # Added 2025-09-23, pkgs.spago should become spago@next which hasn't been packaged yet
  spark2014 = throw "'spark2014' has been renamed to/replaced by 'gnatprove'"; # Converted to throw 2025-10-27
@@ -501,7 +501,13 @@ with pkgs;
        protobuf = protobuf_25.override {
          abseil-cpp = abseil-cpp_202407;
        };
-        stdenv = if stdenv.cc.isClang then llvmPackages_19.stdenv else stdenv;
+        stdenv =
+          if stdenv.cc.isClang then
+            llvmPackages_19.stdenv
+          else if stdenv.cc.isGNU then
+            gcc14Stdenv
+          else
+            stdenv;
      };
    })
    mysql-shell_8
@@ -513,7 +519,13 @@ with pkgs;
    protobuf = protobuf_25.override {
      abseil-cpp = abseil-cpp_202407;
    };
-    stdenv = if stdenv.cc.isClang then llvmPackages_19.stdenv else stdenv;
+    stdenv =
+      if stdenv.cc.isClang then
+        llvmPackages_19.stdenv
+      else if stdenv.cc.isGNU then
+        gcc14Stdenv
+      else
+        stdenv;
  };

  # this is used by most `fetch*` functions
@@ -6219,8 +6231,6 @@ with pkgs;

  mypy-protobuf = with python3Packages; toPythonApplication mypy-protobuf;

-  basedmypy = with python3Packages; toPythonApplication basedmypy;
-
  ### DEVELOPMENT / LIBRARIES

  abseil-cpp_202103 = callPackage ../development/libraries/abseil-cpp/202103.nix { };
@@ -79,6 +79,8 @@ mapAliases {
  Babel = throw "'Babel' has been renamed to/replaced by 'babel'"; # Converted to throw 2025-10-29
  backports-functools-lru-cache = throw "'backports-functools-lru-cache' has been removed from nixpkgs as it was not longer used in python2"; # Added 2026-01-14
  backports_shutil_get_terminal_size = throw "'backports_shutil_get_terminal_size' has been renamed to/replaced by 'backports-shutil-get-terminal-size'"; # Converted to throw 2025-10-29
+  basedmypy = throw "basedmypy has been deprecated by upstream. Use instead 'basedpyright' or 'ty'"; # added 2026-02-03
+  basedtyping = throw "basedtyping has been deprecated by upstream."; # added 2026-02-03
  basewood-av = throw "'basewood-av' has been removed due to being archived upstream and unused"; # added 2025-11-26
  bash_kernel = throw "'bash_kernel' has been renamed to/replaced by 'bash-kernel'"; # Converted to throw 2025-10-29
  beancount_docverif = throw "'beancount_docverif' has been renamed to/replaced by 'beancount-docverif'"; # Converted to throw 2025-10-29
@@ -1806,10 +1806,6 @@ self: super: with self; {

  base64io = callPackage ../development/python-modules/base64io { };

-  basedmypy = callPackage ../development/python-modules/basedmypy { };
-
-  basedtyping = callPackage ../development/python-modules/basedtyping { };
-
  baseline = callPackage ../development/python-modules/baseline { };

  baselines = callPackage ../development/python-modules/baselines { };
@@ -3603,6 +3599,8 @@ self: super: with self; {

  datashaper = callPackage ../development/python-modules/datashaper { };

+  datasketch = callPackage ../development/python-modules/datasketch { };
+
  datauri = callPackage ../development/python-modules/datauri { };

  datefinder = callPackage ../development/python-modules/datefinder { };
@@ -13134,6 +13132,8 @@ self: super: with self; {

  pybloom-live = callPackage ../development/python-modules/pybloom-live { };

+  pybloomfilter3 = callPackage ../development/python-modules/pybloomfilter3 { };
+
  pyblu = callPackage ../development/python-modules/pyblu { };

  pybluez = callPackage ../development/python-modules/pybluez { inherit (pkgs) bluez; };