Merge master into staging-next

2026-07-21 08:01:31 +00:00 · 2026-07-07 12:49:45 +00:00
parent 5ab418dde1 1350febcfa
commit ef2a4dc291
30 changed files with 146 additions and 83 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -169,11 +169,6 @@
    githubId = 791309;
    name = "Jan Hrnko";
  };
-  _1000teslas = {
-    name = "Kevin Tran";
-    github = "sledgehammervampire";
-    githubId = 47207223;
-  };
  _13621 = {
    name = "13621";
    github = "13621";
@@ -14599,6 +14594,12 @@
    github = "kiranshila";
    githubId = 6305359;
  };
+  KirCK = {
+    email = "Arikkenebas09@gmail.com";
+    github = "AristarhKenebas";
+    githubId = 142233116;
+    name = "Aristarh Kenebas";
+  };
  kirelagin = {
    email = "kirelagin@gmail.com";
    matrix = "@kirelagin:matrix.org";
@@ -26137,6 +26138,11 @@
    githubId = 20123683;
    name = "Shenleban Tongying";
  };
+  sledgehammervampire = {
+    name = "Kevin Tran";
+    github = "sledgehammervampire";
+    githubId = 47207223;
+  };
  sleexyz = {
    email = "freshdried@gmail.com";
    github = "sleexyz";
--- a/pkgs/by-name/bi/biome/package.nix
+++ b/pkgs/by-name/bi/biome/package.nix
@@ -11,16 +11,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "biome";
-  version = "2.4.16";
+  version = "2.5.0";

  src = fetchFromGitHub {
    owner = "biomejs";
    repo = "biome";
    rev = "@biomejs/biome@${finalAttrs.version}";
-    hash = "sha256-YfPaSSNESFdGjJjB3C3rubydZW/U7NQ/HtTlXtH7VB4=";
+    hash = "sha256-d8MhD749rkLWeCKDBxhw2aF3G09h8kug5w2Q40JSkt4=";
  };

-  cargoHash = "sha256-N5rKXNrLs/J4uDHYVDMl+jSRowB8ipjvJdIHNvJvAUU=";
+  cargoHash = "sha256-z1KgScoH9retj0qNd6eOTjejjQypfVkha0ae71Z6TSg=";

  nativeBuildInputs = [ pkg-config ];

--- a/pkgs/by-name/fi/firefoxpwa-unwrapped/package.nix
+++ b/pkgs/by-name/fi/firefoxpwa-unwrapped/package.nix
@@ -16,13 +16,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "firefoxpwa-unwrapped";
-  version = "2.18.2";
+  version = "2.18.4";

  src = fetchFromGitHub {
    owner = "filips123";
    repo = "PWAsForFirefox";
    rev = "v${version}";
-    hash = "sha256-eNJKR6dmG4dDKwvWjC0Nbzk5ixNJtnRXjWJgxc9W5i8=";
+    hash = "sha256-Rz0H6dpeTnKHRnmBUZicjgzRSrcpamuGDJRw/lqD/7k=";
  };

  sourceRoot = "${src.name}/native";
--- a/pkgs/by-name/fo/fosrl-newt/package.nix
+++ b/pkgs/by-name/fo/fosrl-newt/package.nix
@@ -9,16 +9,16 @@

 buildGoModule (finalAttrs: {
  pname = "newt";
-  version = "1.13.0";
+  version = "1.14.0";

  src = fetchFromGitHub {
    owner = "fosrl";
    repo = "newt";
    tag = finalAttrs.version;
-    hash = "sha256-Kt7YCxHQEv1DeASPJtjAwzmAiWBrkf+XNs7aJEZvb+M=";
+    hash = "sha256-WjjXtx2csUAzQ1h3Ey2axaYdsn8pTeyxYByiTfBURos=";
  };

-  vendorHash = "sha256-QJ70q53k4EvLpiMY+Nm70QqaZk14V0Q1CrwWVSowdUU=";
+  vendorHash = "sha256-JhNBJhj5YX3Wurv7r/JDu6YtHizOMLk+NCob7ISx+3c=";

  nativeInstallCheckInputs = [ versionCheckHook ];

--- a/pkgs/by-name/ge/gelly/package.nix
+++ b/pkgs/by-name/ge/gelly/package.nix
@@ -14,20 +14,21 @@
  openssl,
  bubblewrap,
  glycin-loaders,
+  nix-update-script,
 }:

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "gelly";
-  version = "1.7.0";
+  version = "1.9.0";

  src = fetchFromGitHub {
    owner = "Fingel";
    repo = "gelly";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-diezT6zEI7+ljDpzmJeIZDKbmdnsMfaabSuQ1/AvkFE=";
+    hash = "sha256-DIE+IjFpDG9kCEwN3XLlxYLWduGZ7G8LXjVDnl6pp1w=";
  };

-  cargoHash = "sha256-XYnBMBhv/8wKV+cZ06Ks8gzi/ib1FH1AM1FrWr81ghg=";
+  cargoHash = "sha256-iOJMUyjqYBl5muWZCnKRRgpAf5lTPgANjohTHa1cfGY=";

  nativeBuildInputs = [
    pkg-config
@@ -69,6 +70,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
    )
  '';

+  passthru.updateScript = nix-update-script { };
+
  meta = {
    description = "A Jellyfin GTK client for Linux focused on music";
    homepage = "https://github.com/Fingel/gelly";
--- a/pkgs/by-name/gt/gtree/package.nix
+++ b/pkgs/by-name/gt/gtree/package.nix
@@ -11,13 +11,13 @@
 # it's updated.
 buildGo126Module (finalAttrs: {
  pname = "gtree";
-  version = "1.14.5";
+  version = "1.14.9";

  src = fetchFromGitHub {
    owner = "ddddddO";
    repo = "gtree";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-tGmRVRy+xUq/WEYz7QktR7xuxKFbCWO7LSbAmSAodYw=";
+    hash = "sha256-MD9FYigqmYwprrj5dezB3vOrV1uGOrWHI7TuptP4tjo=";
  };

  vendorHash = "sha256-Vd5VKKl79Qu5R7jOYS1CTtQuAis9vWUbpBWnEI7sgpk=";
--- a/pkgs/by-name/jd/jdt-language-server/package.nix
+++ b/pkgs/by-name/jd/jdt-language-server/package.nix
@@ -63,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
    maintainers = with lib.maintainers; [
      matt-snider
      wenjinnn
+      yvnth
    ];
    platforms = lib.platforms.all;
    mainProgram = "jdtls";
--- a/pkgs/by-name/kd/kddockwidgets/package.nix
+++ b/pkgs/by-name/kd/kddockwidgets/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
      gpl3Only
    ];
    maintainers = with lib.maintainers; [
-      _1000teslas
+      sledgehammervampire
      tmarkus
    ];
  };
--- a/pkgs/by-name/ko/koffan/package.nix
+++ b/pkgs/by-name/ko/koffan/package.nix
@@ -7,13 +7,13 @@

 buildGoModule (finalAttrs: {
  pname = "koffan";
-  version = "2.11.0";
+  version = "2.12.0";

  src = fetchFromGitHub {
    owner = "PanSalut";
    repo = "Koffan";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-TaZ65WE6EfrENpB/c3oTDgMEsnBkiEt62B4jDEWCf98=";
+    hash = "sha256-E4R2FrL6pqwz1yuF+0TuSIE33/ksrvE0U9XO4z11AfE=";
  };

  vendorHash = "sha256-BYehi5LQQ0MIsKG/fN3DHaQwKVmxUFrvWGrKZeKj+ow=";
--- a/pkgs/by-name/li/libtorrent-rakshasa/package.nix
+++ b/pkgs/by-name/li/libtorrent-rakshasa/package.nix
@@ -14,7 +14,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "libtorrent-rakshasa";
-  version = "0.16.13";
+  version = "0.16.17";

  __structuredAttrs = true;

@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "rakshasa";
    repo = "libtorrent";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-PRVSH2kOzQhmUSdueDSB9stLwCtbITisuvpysrw4M+I=";
+    hash = "sha256-gwEbaAe1A5bPBrrQDBeKraAwdzgbcUYVZYt8Gjtugi8=";
  };

  strictDeps = true;
--- a/pkgs/by-name/mo/monkeys-audio/package.nix
+++ b/pkgs/by-name/mo/monkeys-audio/package.nix
@@ -6,12 +6,12 @@
 }:

 stdenv.mkDerivation (finalAttrs: {
-  version = "13.13";
+  version = "13.18";
  pname = "monkeys-audio";

  src = fetchzip {
    url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";
-    hash = "sha256-guXXLK0wWbuaMh57IwA9mGdAmghlh4Xk1Pt7VA9iXQY=";
+    hash = "sha256-zNEEJSHdr89lsLGBIL2lXixSCk0Wj1kgT0GKpph5jXY=";
    stripRoot = false;
  };

--- a/pkgs/by-name/nu/nushell-plugin-hcl/package.nix
+++ b/pkgs/by-name/nu/nushell-plugin-hcl/package.nix
@@ -9,16 +9,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "nu_plugin_hcl";
-  version = "0.113.1";
+  version = "0.114.0";

  src = fetchFromGitHub {
    owner = "Yethal";
    repo = "nu_plugin_hcl";
    tag = finalAttrs.version;
-    hash = "sha256-4rbYbyIYy3WEn2hSkreohVWJ8zhQHI/cdBN5xO4YKdY=";
+    hash = "sha256-3qUsEJIF91679W2mdU9eESTNmcp3TqmMxWoR7G5uUl8=";
  };

-  cargoHash = "sha256-lFlG86yGR61jgmKxTp2FYir2o0vEAVeoPk1owDGGWLM=";
+  cargoHash = "sha256-xAURId/OvgIGvbh5be4yS2dKmQObIpb4YYlRcjcHMeU=";

  nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];

--- a/pkgs/by-name/rt/rtorrent/package.nix
+++ b/pkgs/by-name/rt/rtorrent/package.nix
@@ -23,7 +23,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "rtorrent";
-  version = "0.16.13";
+  version = "0.16.17";

  __structuredAttrs = true;

@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "rakshasa";
    repo = "rtorrent";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-QvABQKKH/4KUbG6mSkvfcqMpX552nAKp1vZerin2sLA=";
+    hash = "sha256-pFEUbxrruP4Zq9WdlnBSmE6Fe95jpZ88x3md5jzytO4=";
  };

  outputs = [
--- a/pkgs/by-name/ru/rustc-demangle/package.nix
+++ b/pkgs/by-name/ru/rustc-demangle/package.nix
@@ -44,6 +44,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
      mit
    ];
    platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ _1000teslas ];
+    maintainers = with lib.maintainers; [ sledgehammervampire ];
  };
 })
--- a/pkgs/by-name/ru/rux/package.nix
+++ b/pkgs/by-name/ru/rux/package.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  llvmPackages_21,
+  fetchFromGitHub,
+  cmake,
+  ninja,
+}:
+
+llvmPackages_21.libcxxStdenv.mkDerivation (finalAttrs: {
+  pname = "rux";
+  version = "0.3.0";
+
+  src = fetchFromGitHub {
+    owner = "rux-lang";
+    repo = "Rux";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-GqShkT8uXi0C1W0G2+nuU8p1NcigdfEPOF/Yb5KCOhk=";
+  };
+
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 4.2)" "cmake_minimum_required(VERSION 4.1)"
+  '';
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+  ];
+
+  buildInputs = [
+    llvmPackages_21.libcxx
+  ];
+
+  cmakeFlags = [
+    "-DCMAKE_CXX_SCAN_FOR_MODULES=OFF"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/bin
+    cp ../Bin/Release/rux $out/bin/
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "A fast, compiled, strongly typed, multi-paradigm programming language";
+    homepage = "https://rux-lang.dev";
+    license = licenses.mit;
+    maintainers = with maintainers; [
+      KirCK
+      lukas-sgx
+    ];
+    mainProgram = "rux";
+    platforms = platforms.all;
+  };
+})
--- a/pkgs/by-name/sp/spi-tools/package.nix
+++ b/pkgs/by-name/sp/spi-tools/package.nix
@@ -7,13 +7,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "spi-tools";
-  version = "1.0.2";
+  version = "1.1.0";

  src = fetchFromGitHub {
    owner = "cpb-";
    repo = "spi-tools";
    tag = finalAttrs.version;
-    hash = "sha256-lrdoO4ZsZCf0pt1SSL5w4rXVuYzlkJZQpditYt61nUw=";
+    hash = "sha256-mlOpgzJ8YFX+2y8+V3A2WjsnOzzj+fF8lJHqzoEP30s=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/um/umu-launcher-unwrapped/package.nix
+++ b/pkgs/by-name/um/umu-launcher-unwrapped/package.nix
@@ -14,18 +14,18 @@
 }:
 python3Packages.buildPythonPackage rec {
  pname = "umu-launcher-unwrapped";
-  version = "1.4.0";
+  version = "1.4.1";

  src = fetchFromGitHub {
    owner = "Open-Wine-Components";
    repo = "umu-launcher";
    tag = version;
-    hash = "sha256-7BdA/iAAIn2NR/uLzxdvsIh5/1SZacSfkiXJVJBT3EQ=";
+    hash = "sha256-ZpYxoXux80QbmJUWyK5P9Om0iKNTWLrWH0RWDFXx5zE=";
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit src;
-    hash = "sha256-CVcbktCBRZGnEuDVvl2iJpRgKh+ShFe5mjT6oMHIjtQ=";
+    hash = "sha256-f9Me1dCS5GxXN4mADS6Z20M7YnX5ck3JXOXUFhM+h5o=";
  };

  nativeCheckInputs = [
--- a/pkgs/by-name/vu/vulkan-cts/package.nix
+++ b/pkgs/by-name/vu/vulkan-cts/package.nix
@@ -53,13 +53,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "vulkan-cts";
-  version = "1.4.6.0";
+  version = "1.4.6.1";

  src = fetchFromGitHub {
    owner = "KhronosGroup";
    repo = "VK-GL-CTS";
    rev = "vulkan-cts-${finalAttrs.version}";
-    hash = "sha256-WtKhem+ecf/fY63wGO/0HTW4uMYpV20M0lryu5DEkv8=";
+    hash = "sha256-Nv0aX4lzX4mvh71U7BbHXXaM0UN2itzKyIpdIQ22fM0=";
  };

  prePatch = ''
--- a/pkgs/by-name/wa/waffle/package.nix
+++ b/pkgs/by-name/wa/waffle/package.nix
@@ -25,14 +25,14 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "waffle";
-  version = "1.8.2";
+  version = "1.8.3";

  src = fetchFromGitLab {
    domain = "gitlab.freedesktop.org";
    owner = "Mesa";
    repo = "waffle";
    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-1yAg8ws4GIs/IHGVbfUKTXkD9JVRtjuH0REFIfDqXtc=";
+    sha256 = "sha256-VvkSZOddxTPukyPpngi4vxni/OqmMGJV7voiiM0uHXo=";
  };

  buildInputs = [
--- a/pkgs/by-name/wr/wrangler/package.nix
+++ b/pkgs/by-name/wr/wrangler/package.nix
@@ -94,26 +94,15 @@ stdenv.mkDerivation (finalAttrs: {
      done
    '';

-  # I'm sure this is suboptimal but it seems to work. Points:
-  # - when build is run in the original repo, no specific executable seems to be generated; you run the resulting build with pnpm run start
-  # - this means we need to add a dedicated script - perhaps it is possible to create this from the workers-sdk dir, but I don't know how to do this
-  # - the build process builds a version of miniflare which is used by wrangler; for this reason, the miniflare package is copied also
-  # - pnpm stores all content in the top-level node_modules directory, but it is linked to from a node_modules directory inside wrangler
-  # - as they are linked via symlinks, the relative location of them on the filesystem should be maintained
-  # - Update: Now we're copying everything over due to broken symlink errors
  installPhase = ''
    runHook preInstall
    mkdir -p $out/{bin,lib}
-    mv packages/~vitest-pool-workers packages/vitest-pool-workers
-    cp -r {fixtures,packages,node_modules} $out/lib
-    cp -r tools $out/lib/tools
-    rm -rf node_modules/typescript node_modules/eslint node_modules/prettier node_modules/bin node_modules/.bin node_modules/**/bin node_modules/**/.bin
-    rm -rf $out/lib/**/bin $out/lib/**/.bin
-    NODE_PATH_ARRAY=( "$out/lib/node_modules" "$out/lib/packages/wrangler/node_modules" )
+    pnpm config set --location=project injectWorkspacePackages true
+    pnpm --filter=wrangler --prod deploy $out/lib
    makeWrapper ${lib.getExe nodejs} $out/bin/wrangler \
      --inherit-argv0 \
-      --prefix-each NODE_PATH : "$${NODE_PATH_ARRAY[@]}" \
-      --add-flags $out/lib/packages/wrangler/bin/wrangler.js \
+      --set "NODE_PATH" $out/lib/node_modules \
+      --add-flags $out/lib/bin/wrangler.js \
      --set-default SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt" # https://github.com/cloudflare/workers-sdk/issues/3264
    runHook postInstall
  '';
@@ -141,6 +130,7 @@ stdenv.mkDerivation (finalAttrs: {
      dezren39
      ryand56
      ezrizhu
+      yuannan
    ];
    mainProgram = "wrangler";
    # Tunneling and other parts of wrangler, which require workerd won't run on
--- a/pkgs/by-name/xl/xleak/package.nix
+++ b/pkgs/by-name/xl/xleak/package.nix
@@ -9,16 +9,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "xleak";
-  version = "0.2.5";
+  version = "0.2.6";

  src = fetchFromGitHub {
    owner = "bgreenwell";
    repo = "xleak";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-5amFyNI1cfTu9b5PV7/n4XIXZbFoSnaTyZo7oPpDQL4=";
+    hash = "sha256-+w03XXQVsoMjsrdmw/+2umB3/aq/Nhisxcdi01v1xDY=";
  };

-  cargoHash = "sha256-FkSpMwkrnibOWAPbrE9Pycxc4To5jFHbma8YKGgXWSU=";
+  cargoHash = "sha256-ct03BgNozJUERq9pqOw/igVk8wWmqSV4JQ2ysNyH7mk=";

  doInstallCheck = true;
  nativeInstallCheckInputs = [ versionCheckHook ];
--- a/pkgs/by-name/ya/yaookctl/package.nix
+++ b/pkgs/by-name/ya/yaookctl/package.nix
@@ -6,13 +6,13 @@
 }:
 python3.pkgs.buildPythonApplication {
  pname = "yaookctl";
-  version = "0-unstable-2026-06-23";
+  version = "0-unstable-2026-07-02";

  src = fetchFromGitLab {
    owner = "yaook";
    repo = "yaookctl";
-    rev = "f525f4c11422e8d556f8ff5564c5ce7180570f20";
-    hash = "sha256-QPr1ryiT/OfBOEcIghGOgqKlu2iNLglWmZoWs6BLyvU=";
+    rev = "d444a887e0350a62b8b23d761a849ec7db46ad65";
+    hash = "sha256-EWKKwPnR15qkRuhuGRyj5otwUVX+sOmRei4WfN3aRpQ=";
  };

  pyproject = true;
--- a/pkgs/desktops/lomiri/development/geonames/default.nix
+++ b/pkgs/desktops/lomiri/development/geonames/default.nix
@@ -69,7 +69,8 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  # Tests need to be able to check locale
-  LC_ALL = lib.optionalString finalAttrs.finalPackage.doCheck "en_US.UTF-8";
+  env.LC_ALL = lib.optionalString finalAttrs.finalPackage.doCheck "en_US.UTF-8";
+
  nativeCheckInputs = [
    glibcLocales
  ];
--- a/pkgs/desktops/lomiri/development/libusermetrics/default.nix
+++ b/pkgs/desktops/lomiri/development/libusermetrics/default.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  # Tests need to be able to check locale
-  LC_ALL = lib.optionalString finalAttrs.finalPackage.doCheck "en_US.UTF-8";
+  env.LC_ALL = lib.optionalString finalAttrs.finalPackage.doCheck "en_US.UTF-8";

  nativeCheckInputs = [
    dbus
--- a/pkgs/development/compilers/dotnet/source/vmr.nix
+++ b/pkgs/development/compilers/dotnet/source/vmr.nix
@@ -403,15 +403,18 @@ stdenv.mkDerivation {
  dontConfigureNuget = true; # NUGET_PACKAGES breaks the build
  dontUseCmakeConfigure = true;

-  # https://github.com/NixOS/nixpkgs/issues/38991
-  # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
-  LOCALE_ARCHIVE = lib.optionalString (
-    isLinux && glibcLocales != null
-  ) "${glibcLocales}/lib/locale/locale-archive";
+  env = {
+    # https://github.com/NixOS/nixpkgs/issues/38991
+    # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
+    LOCALE_ARCHIVE = lib.optionalString (
+      isLinux && glibcLocales != null
+    ) "${glibcLocales}/lib/locale/locale-archive";

-  # clang: error: argument unused during compilation: '-Wa,--compress-debug-sections' [-Werror,-Wunused-command-line-argument]
-  # caused by separateDebugInfo
-  NIX_CFLAGS_COMPILE = "-Wno-unused-command-line-argument";
+    # clang: error: argument unused during compilation:
+    # '-Wa,--compress-debug-sections' [-Werror,-Wunused-command-line-argument]
+    # caused by separateDebugInfo
+    NIX_CFLAGS_COMPILE = "-Wno-unused-command-line-argument";
+  };

  buildFlags = [
    "--with-packages"
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -28,9 +28,9 @@ let
    "21.1.8".officialRelease.sha256 = "sha256-pgd8g9Yfvp7abjCCKSmIn1smAROjqtfZaJkaUkBSKW0=";
    "22.1.8".officialRelease.sha256 = "sha256-SF7wFuh4kXZTytpdgX7vUZItKtRobnVICm+ixze4iG0=";
    "23.0.0-git".gitRelease = {
-      rev = "4050d7a96903eec615c57e1d3d6f3c824096244c";
-      rev-version = "23.0.0-unstable-2026-06-28";
-      sha256 = "sha256-UAqDlH9F/GZ9O9VGiOyP5shuVTIC3SeSstyH5ZWDfAM=";
+      rev = "319c1f1c1132e54a2135ffe1d7c58ed7e47b5e51";
+      rev-version = "23.0.0-unstable-2026-07-05";
+      sha256 = "sha256-FM2a7MGnxE+gj4nz6sKOu+107jt9hVMUhCFVgqNyXCs=";
    };
  }
  // llvmVersions;
--- a/pkgs/development/ocaml-modules/ppx_deriving_variant_string/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving_variant_string/default.nix
@@ -8,11 +8,11 @@

 buildDunePackage (finalAttrs: {
  pname = "ppx_deriving_variant_string";
-  version = "1.0.1";
+  version = "1.1.0";

  src = fetchurl {
    url = "https://github.com/ahrefs/ppx_deriving_variant_string/releases/download/${finalAttrs.version}/ppx_deriving_variant_string-${finalAttrs.version}.tbz";
-    hash = "sha256-nSU9LEwPOOQuCpNAVQgBGucHuk5wjJ3dDIj708djLwc=";
+    hash = "sha256-24m53iwGHbRfTzxiAN055CJ3zLzZ4Syl2Wi28UDlTBQ=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/ocaml-modules/tuntap/default.nix
+++ b/pkgs/development/ocaml-modules/tuntap/default.nix
@@ -8,11 +8,11 @@

 buildDunePackage (finalAttrs: {
  pname = "tuntap";
-  version = "2.0.1";
+  version = "2.0.2";

  src = fetchurl {
    url = "https://github.com/mirage/ocaml-tuntap/releases/download/v${finalAttrs.version}/tuntap-${finalAttrs.version}.tbz";
-    hash = "sha256-J8YBl8w7xFloDqt/Xiz03KCIls5BR72VT8X/LYZMDN0=";
+    hash = "sha256-DfztWPkNhdSIX/TaldCoNhAA/AZwQDqCdRmDOyOORu0=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/tools/ocaml/camlp5/default.nix
+++ b/pkgs/development/tools/ocaml/camlp5/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (
  in
  {

-    version = if lib.versionAtLeast ocaml.version "4.12" && !legacy then "8.05.01" else "7.14";
+    version = if lib.versionAtLeast ocaml.version "4.12" && !legacy then "8.05.02" else "7.14";

    pname = "ocaml${ocaml.version}-camlp5";

@@ -36,7 +36,7 @@ stdenv.mkDerivation (
          "rel${builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version}";
      hash =
        {
-          "8.05.01" = "sha256-ym1cZIoAIwMnkGiygZf+TZxjhyO6WHYItWRXobdcKm0=";
+          "8.05.02" = "sha256-OnTc4Vpr2I3sFwm5JYxud9z1hbzDvQw3LNsO/EHa3k8=";
          "8.03.2" = "sha256-nz+VfGR/6FdBvMzPPpVpviAXXBWNqM3Ora96Yzx964o=";
          "7.14" = "sha256-/ORtS0uc/GN+g3y6N5ftjL4OBSqV6iswLRbfpeNCprU=";
        }
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -914,12 +914,12 @@ in

  sessionist = mkTmuxPlugin {
    pluginName = "sessionist";
-    version = "unstable-2017-12-03";
+    version = "unstable-2023-05-02";
    src = fetchFromGitHub {
      owner = "tmux-plugins";
      repo = "tmux-sessionist";
-      rev = "09ec86be38eae98ffc27bd0dde605ed10ae0dc89";
-      hash = "sha256-hFNrdbhmBUAyJ73RCG4RILzJ3LHIYiuNYGsqJGsVGAw=";
+      rev = "a315c423328d9bdf5cf796435ce7075fa5e1bffb";
+      hash = "sha256-iC8NvuLujTXw4yZBaenHJ+2uM+HA9aW5b2rQTA8e69s=";
    };
    meta = {
      homepage = "https://github.com/tmux-plugins/tmux-sessionist";