From 774a74d2e4edaaee31843b7bd4028987a1b3fc5b Mon Sep 17 00:00:00 2001
From: Yuchen He <yuchenhe126@gmail.com>
Date: Sun, 29 Jun 2025 20:42:02 +0200
Subject: [PATCH 01/36] endless-sky: 0.10.12 -> 0.10.14

Signed-off-by: Yuchen He <yuchenhe126@gmail.com>
---
 pkgs/by-name/en/endless-sky/fixes.patch | 30 ++++++++++++-------------
 pkgs/by-name/en/endless-sky/package.nix | 25 +++++++++++----------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/pkgs/by-name/en/endless-sky/fixes.patch b/pkgs/by-name/en/endless-sky/fixes.patch
index 2983ab5e66e9..47c20c0cdd72 100644
--- a/pkgs/by-name/en/endless-sky/fixes.patch
+++ b/pkgs/by-name/en/endless-sky/fixes.patch
@@ -1,21 +1,8 @@
-diff --git a/SConstruct b/SConstruct
-index 48fd080..419b40d 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -55,7 +55,7 @@ sky = env.Program("endless-sky", Glob("build/" + env["mode"] + "/*.cpp"))
- 
- 
- # Install the binary:
--env.Install("$DESTDIR$PREFIX/games", sky)
-+env.Install("$DESTDIR$PREFIX/bin", sky)
- 
- # Install the desktop file:
- env.Install("$DESTDIR$PREFIX/share/applications", "endless-sky.desktop")
 diff --git a/source/Files.cpp b/source/Files.cpp
-index f5dec21..ad57c55 100644
+index bb03ecf..6e37336 100644
 --- a/source/Files.cpp
 +++ b/source/Files.cpp
-@@ -115,6 +115,7 @@ void Files::Init(const char * const *argv)
+@@ -135,6 +135,7 @@ void Files::Init(const char * const *argv)
  		else if(IsParent(STANDARD_PATH, resources))
  			resources = STANDARD_PATH / RESOURCE_PATH;
  #endif
@@ -23,3 +10,16 @@ index f5dec21..ad57c55 100644
  	}
  	// If the resources are not here, search in the directories containing this
  	// one. This allows, for example, a Mac app that does not actually have the
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 17f290163..169fef120 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -312,7 +312,7 @@ elseif(WIN32)
+ 	include(CPack)
+ elseif(UNIX)
+	# Install the binary.
+-	install(TARGETS EndlessSky CONFIGURATIONS Release RUNTIME DESTINATION games)
++	install(TARGETS EndlessSky CONFIGURATIONS Release RUNTIME DESTINATION bin)
+
+ 	# Install the desktop file.
+ 	install(FILES io.github.endless_sky.endless_sky.desktop DESTINATION share/applications)
diff --git a/pkgs/by-name/en/endless-sky/package.nix b/pkgs/by-name/en/endless-sky/package.nix
index d19399b2eb62..dcca64a2730c 100644
--- a/pkgs/by-name/en/endless-sky/package.nix
+++ b/pkgs/by-name/en/endless-sky/package.nix
@@ -8,20 +8,22 @@
   libX11,
   glew,
   openal,
-  scons,
+  cmake,
+  pkg-config,
   libmad,
   libuuid,
+  minizip,
 }:
 
 stdenv.mkDerivation rec {
   pname = "endless-sky";
-  version = "0.10.12";
+  version = "0.10.14";
 
   src = fetchFromGitHub {
     owner = "endless-sky";
     repo = "endless-sky";
     tag = "v${version}";
-    hash = "sha256-cT/bklRGQnS9Nm8J0oH1mG20JQOe58FAAHToNDpvPpQ=";
+    hash = "sha256-/jW9TXmK2xgHUQe6H+WSCHPQthxvoNepdkdnOD3sXXo=";
   };
 
   patches = [
@@ -33,17 +35,14 @@ stdenv.mkDerivation rec {
     # endless sky naively joins the paths with string concatenation
     # so it's essential that there be a trailing slash on the resources path
     substituteInPlace source/Files.cpp \
-      --replace '%NIXPKGS_RESOURCES_PATH%' "$out/share/games/endless-sky/"
-  '';
-
-  preBuild = ''
-    export AR="${stdenv.cc.targetPrefix}gcc-ar"
+      --replace-fail '%NIXPKGS_RESOURCES_PATH%' "$out/share/games/endless-sky/"
   '';
 
   enableParallelBuilding = true;
 
   nativeBuildInputs = [
-    scons
+    cmake
+    pkg-config
   ];
 
   buildInputs = [
@@ -55,10 +54,9 @@ stdenv.mkDerivation rec {
     openal
     libmad
     libuuid
+    minizip
   ];
 
-  prefixKey = "PREFIX=";
-
   meta = with lib; {
     description = "Sandbox-style space exploration game similar to Elite, Escape Velocity, or Star Control";
     mainProgram = "endless-sky";
@@ -69,7 +67,10 @@ stdenv.mkDerivation rec {
       cc-by-sa-40
       publicDomain
     ];
-    maintainers = with maintainers; [ _360ied ];
+    maintainers = with maintainers; [
+      _360ied
+      lilacious
+    ];
     platforms = platforms.linux; # Maybe other non-darwin Unix
   };
 }

From 870f8bf3c60ae544f2ceb05be5b4d825df172a38 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@determinate.systems>
Date: Sat, 20 Sep 2025 10:38:42 -0700
Subject: [PATCH 02/36] pythonPackages.pyluwen: fix pyproject version
 misalignment

---
 pkgs/development/python-modules/pyluwen/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/pyluwen/default.nix b/pkgs/development/python-modules/pyluwen/default.nix
index 329e5ecb898a..dad420df0e76 100644
--- a/pkgs/development/python-modules/pyluwen/default.nix
+++ b/pkgs/development/python-modules/pyluwen/default.nix
@@ -34,6 +34,7 @@ buildPythonPackage rec {
   postPatch = ''
     cd ../$sourceRoot
     cp --no-preserve=ownership,mode ../../Cargo.lock .
+    sed -i '0,/version = /{s/version = "*.*.*"/version = "${version}"/g}' Cargo.toml
   '';
 
   nativeBuildInputs = with rustPlatform; [

From 75d6a7961c0d01b64fbe454fb815ace661308e68 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@determinate.systems>
Date: Sat, 20 Sep 2025 10:39:10 -0700
Subject: [PATCH 03/36] pythonPackages.tt-tools-common: 1.4.25 -> 1.4.28

---
 pkgs/development/python-modules/tt-tools-common/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tt-tools-common/default.nix b/pkgs/development/python-modules/tt-tools-common/default.nix
index a6e69f9bc319..bdff5a7aa6ee 100644
--- a/pkgs/development/python-modules/tt-tools-common/default.nix
+++ b/pkgs/development/python-modules/tt-tools-common/default.nix
@@ -13,21 +13,23 @@
   requests,
   tqdm,
   pydantic,
+  setuptools-scm,
 }:
 buildPythonPackage rec {
   pname = "tt-tools-common";
-  version = "1.4.25";
+  version = "1.4.28";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tenstorrent";
     repo = "tt-tools-common";
     tag = "v${version}";
-    hash = "sha256-phal8KxfQqsGAIcKQTlSPZB04J158jZYlyamZr45vdU=";
+    hash = "sha256-L7MYrzQXb0LakQCx5CMlgTo0EjBoLLKC8u38eXksvoo=";
   };
 
   build-system = [
     setuptools
+    setuptools-scm
   ];
 
   dependencies = [

From df60683060dab4530620eb51225b6850a02d7ed6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 27 Sep 2025 03:01:27 +0000
Subject: [PATCH 04/36] linuxPackages.tt-kmd: 2.3.0 -> 2.4.1

---
 pkgs/os-specific/linux/tt-kmd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/tt-kmd/default.nix b/pkgs/os-specific/linux/tt-kmd/default.nix
index 2ac25fef650f..b04d64ed63f7 100644
--- a/pkgs/os-specific/linux/tt-kmd/default.nix
+++ b/pkgs/os-specific/linux/tt-kmd/default.nix
@@ -7,13 +7,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "tt-kmd";
-  version = "2.3.0";
+  version = "2.4.1";
 
   src = fetchFromGitHub {
     owner = "tenstorrent";
     repo = "tt-kmd";
     tag = "ttkmd-${finalAttrs.version}";
-    hash = "sha256-o9F6WsiNQGD/0VraBVO2oEwPTc2Yjh3aitvITp/M2+4=";
+    hash = "sha256-m4XZdgOHQOWNoZlV2VqN6yhLcQuZxam22JKpOGXbjwI=";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;

From 8daac0819835bd5e277c27abf8de561f17b5a2d4 Mon Sep 17 00:00:00 2001
From: Nova Hahn <mail@novahahn.eu>
Date: Wed, 1 Oct 2025 14:57:17 +0200
Subject: [PATCH 05/36] rimsort: 1.0.30 -> 1.0.47

https://github.com/RimSort/RimSort/releases/tag/v1.0.47 etc.
---
 pkgs/by-name/ri/rimsort/package.nix     |  5 +++--
 pkgs/by-name/ri/rimsort/steam-run.patch | 24 ++++++++++++++----------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ri/rimsort/package.nix b/pkgs/by-name/ri/rimsort/package.nix
index 43e844b9560b..a010306b94eb 100644
--- a/pkgs/by-name/ri/rimsort/package.nix
+++ b/pkgs/by-name/ri/rimsort/package.nix
@@ -15,13 +15,13 @@
 }:
 let
   pname = "rimsort";
-  version = "1.0.30";
+  version = "1.0.47";
 
   src = fetchFromGitHub {
     owner = "RimSort";
     repo = "RimSort";
     rev = "v${version}";
-    hash = "sha256-f1wYoBC0EbkvYNJHkVuoMukJZMY7eNjCIzJra7/hpLs=";
+    hash = "sha256-1wn3WIflrhH3IMBeGFwcHi0zOREakuk/5gqwPY720eA=";
     fetchSubmodules = true;
   };
   steamworksSrc = fetchzip {
@@ -100,6 +100,7 @@ stdenv.mkDerivation {
       toposort
       watchdog
       xmltodict
+      zstandard
       steamworkspy
       ;
   };
diff --git a/pkgs/by-name/ri/rimsort/steam-run.patch b/pkgs/by-name/ri/rimsort/steam-run.patch
index 4969dacb75b6..6d22eaf62064 100644
--- a/pkgs/by-name/ri/rimsort/steam-run.patch
+++ b/pkgs/by-name/ri/rimsort/steam-run.patch
@@ -1,19 +1,23 @@
 diff --git a/app/utils/generic.py b/app/utils/generic.py
+index f23aa5c..9ff4a04 100644
 --- a/app/utils/generic.py
 +++ b/app/utils/generic.py
-@@ -255,7 +255,7 @@
-                 popen_args.extend(args)
-                 p = subprocess.Popen(popen_args)
-             else:
--                popen_args = [executable_path]
-+                popen_args = ["@steam-run@/bin/steam-run", executable_path]
-                 popen_args.extend(args)
- 
-                 if sys.platform == "win32":
+@@ -260,6 +260,10 @@ def launch_game_process(game_install_path: Path, args: list[str]) -> None:
+                 + str(args)
+                 + "`"
+             )
++
++            args = [executable_path, *args]
++            executable_path = "@steam-run@/bin/steam-run"
++
+             pid, popen_args = launch_process(
+                 executable_path, args, str(game_install_path)
+             )
 diff --git a/app/utils/steam/steamcmd/wrapper.py b/app/utils/steam/steamcmd/wrapper.py
+index 398e0fd..79bb162 100644
 --- a/app/utils/steam/steamcmd/wrapper.py
 +++ b/app/utils/steam/steamcmd/wrapper.py
-@@ -316,8 +316,8 @@
+@@ -317,8 +317,8 @@ class SteamcmdInterface:
                  script_output.write("\n".join(script))
              runner.message(f"Compiled & using script: {script_path}")
              runner.execute(

From ff44f241246f6b448c50cf85e118bc4a15cd1e49 Mon Sep 17 00:00:00 2001
From: quartz <weirdrock@riseup.net>
Date: Thu, 21 Aug 2025 11:32:37 -0400
Subject: [PATCH 06/36] rimsort: fix desktop items

---
 pkgs/by-name/ri/rimsort/package.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ri/rimsort/package.nix b/pkgs/by-name/ri/rimsort/package.nix
index a010306b94eb..b630ef54e8ff 100644
--- a/pkgs/by-name/ri/rimsort/package.nix
+++ b/pkgs/by-name/ri/rimsort/package.nix
@@ -7,6 +7,7 @@
   makeBinaryWrapper,
 
   makeDesktopItem,
+  copyDesktopItems,
   replaceVars,
 
   todds,
@@ -24,6 +25,7 @@ let
     hash = "sha256-1wn3WIflrhH3IMBeGFwcHi0zOREakuk/5gqwPY720eA=";
     fetchSubmodules = true;
   };
+
   steamworksSrc = fetchzip {
     url = "https://web.archive.org/web/20250527013243/https://partner.steamgames.com/downloads/steamworks_sdk_162.zip"; # Steam sometimes requires auth to download.
     hash = "sha256-yDA92nGj3AKTNI4vnoLaa+7mDqupQv0E4YKRRUWqyZw=";
@@ -70,6 +72,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     makeBinaryWrapper
+    copyDesktopItems
   ];
 
   buildInputs = [
@@ -134,7 +137,7 @@ stdenv.mkDerivation {
       name = "RimSort";
       desktopName = "RimSort";
       exec = "rimsort";
-      icon = "io.github.rimsort.rimsort";
+      icon = "rimsort.png";
       comment = "RimWorld Mod Manager";
       categories = [ "Game" ];
     })
@@ -156,7 +159,7 @@ stdenv.mkDerivation {
       --prefix PYTHONPATH : "$PYTHONPATH" \
       --set RIMSORT_DISABLE_UPDATER 1
 
-    install -D ./themes/default-icons/AppIcon_a.png $out/share/icons/hicolor/512x512/apps/io.github.rimsort.rimsort
+    install -D ./themes/default-icons/AppIcon_a.png $out/share/icons/hicolor/512x512/apps/rimsort.png
 
     runHook postInstall
   '';

From da238bcf7f535cc4eeb72dd0ea165715b5817756 Mon Sep 17 00:00:00 2001
From: Nova Hahn <mail@novahahn.eu>
Date: Wed, 1 Oct 2025 20:04:22 +0200
Subject: [PATCH 07/36] rimsort: Remove icon extension in desktop item

---
 pkgs/by-name/ri/rimsort/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ri/rimsort/package.nix b/pkgs/by-name/ri/rimsort/package.nix
index b630ef54e8ff..562cd797a68b 100644
--- a/pkgs/by-name/ri/rimsort/package.nix
+++ b/pkgs/by-name/ri/rimsort/package.nix
@@ -137,7 +137,7 @@ stdenv.mkDerivation {
       name = "RimSort";
       desktopName = "RimSort";
       exec = "rimsort";
-      icon = "rimsort.png";
+      icon = "rimsort";
       comment = "RimWorld Mod Manager";
       categories = [ "Game" ];
     })

From fa4dca66ab7d5ca6c5c27c7e6f818e2a0daca3b5 Mon Sep 17 00:00:00 2001
From: Benjamin Lemouzy <blemouzy.ml@gmail.com>
Date: Tue, 19 Aug 2025 11:51:43 +0200
Subject: [PATCH 08/36] segger-jlink: 824 -> 874

---
 pkgs/by-name/se/segger-jlink/source.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/se/segger-jlink/source.nix b/pkgs/by-name/se/segger-jlink/source.nix
index 1eb982ce80e5..07887df66dab 100644
--- a/pkgs/by-name/se/segger-jlink/source.nix
+++ b/pkgs/by-name/se/segger-jlink/source.nix
@@ -1,39 +1,39 @@
 {
-  version = "824";
+  version = "874";
   x86_64-linux = {
     os = "Linux";
     name = "x86_64";
     ext = "tgz";
-    hash = "sha256-TsNlwApXdbkHEI+pG9NVK7pJkKdvFYGIGgn+9xJ9q8A=";
+    hash = "sha256-7Ny7G0DXhYTf6MYLmEUT7meYPNMrGLPDdvrVuYyETWA=";
   };
   i686-linux = {
     os = "Linux";
     name = "i386";
     ext = "tgz";
-    hash = "sha256-Gs4iifvchFY0d39bhQ61lX/TPGjCKPRidkJQbva91gA=";
+    hash = "sha256-pJ/2KSfoxvXMqAtlXbSXbxGh3zQec0zfZsEbdRw+CMU=";
   };
   aarch64-linux = {
     os = "Linux";
     name = "arm64";
     ext = "tgz";
-    hash = "sha256-YowEzJ//idmZ4eznPNgEW142ApsnvkboGAWfDCHfIS0=";
+    hash = "sha256-IgX30NgPAkQ4nsJRbVqTcW7y8XN8prmpG+/S0dpJriE=";
   };
   armv7l-linux = {
     os = "Linux";
     name = "arm";
     ext = "tgz";
-    hash = "sha256-mLl/qNtxMfFOe/M0fCZnnebei7E2ON4gvE9Q7XIufag=";
+    hash = "sha256-ZU4ibaO0Kg6/fVCthsV+scWdJuENcUHi187XN8OOdcw=";
   };
   aarch64-darwin = {
     os = "MacOSX";
     name = "arm64";
     ext = "pkg";
-    hash = "sha256-GKlWof4XdxEwW7G8YmhdfjjJpXEXICqWapI7fly8Uvg=";
+    hash = "sha256-wfK9cV2Ul3LGmqTwerS1+BR0BuhmCFZdXtWykwJqWCM=";
   };
   x86_64-darwin = {
     os = "MacOSX";
     name = "x86_64";
     ext = "pkg";
-    hash = "sha256-LWLUdzNVkN60qET7vhvLCoepg7kuHPqs2bZspRzZkGo=";
+    hash = "sha256-4xgulHc4AtGr2CV1NIX02N0y75k5s9AXgX6jK6hXW9s=";
   };
 }

From 1422ed88014e9a43d262fa5c3ff5a925d135c030 Mon Sep 17 00:00:00 2001
From: Ratchanan Srirattanamet <peathot@hotmail.com>
Date: Mon, 15 Sep 2025 02:24:35 +0700
Subject: [PATCH 09/36] kimai: fix bundled assets missing

We were relying on `composerNoScripts = false` to make sure post-install
command `assets:install` is run. `assets:install` copies assets from
`vendor/` directory into `public/` directory, placing it in appropriate
places.

However, with commit 80bb9aec24 ("kimai: switch to buildComposerProject2
and tag"), we switched to `buildComposerProject2` which has moved
`composer install` step to `composerVendor` derivation. By design,
`composerVendor` ignores anything that happens outside `vendor/`, so
the assets was not copied into final derivation.

So stop relying on `composerNoScripts = false` and run `assets:install`
ourselves in `postInstall` step. A side effect of this is that there is
another post-install step being skipped (`cache:clear`). However we
simply handle caches outside of the derivation (it's handled in the
module), so that's not a problem.

Fixes: https://github.com/NixOS/nixpkgs/issues/442208
---
 nixos/tests/kimai.nix             | 3 +++
 pkgs/by-name/ki/kimai/package.nix | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/kimai.nix b/nixos/tests/kimai.nix
index 967d531f3c54..526aa7faeeb6 100644
--- a/nixos/tests/kimai.nix
+++ b/nixos/tests/kimai.nix
@@ -17,5 +17,8 @@
     machine.wait_for_unit("nginx.service")
     machine.wait_for_open_port(80)
     machine.succeed("curl -v --location --fail http://localhost/")
+    # Make sure bundled assets are served.
+    # https://github.com/NixOS/nixpkgs/issues/442208
+    machine.succeed("curl -v --location --fail http://localhost/bundles/tabler/tabler.css")
   '';
 }
diff --git a/pkgs/by-name/ki/kimai/package.nix b/pkgs/by-name/ki/kimai/package.nix
index 8ac6d55981a9..1137d8419b74 100644
--- a/pkgs/by-name/ki/kimai/package.nix
+++ b/pkgs/by-name/ki/kimai/package.nix
@@ -41,13 +41,16 @@ php.buildComposerProject2 (finalAttrs: {
   vendorHash = "sha256-I4v4WkPGLc8vBPjCiYzPxcLn4rH3HWtQXSqwGVKXeGg=";
 
   composerNoPlugins = false;
-  composerNoScripts = false;
 
   postInstall = ''
     # Make available the console utility, as Kimai doesn't list this in
     # composer.json.
     mkdir -p "$out"/share/php/kimai "$out"/bin
     ln -s "$out"/share/php/kimai/bin/console "$out"/bin/console
+
+    # Install bundled assets. This is normally done in the `composer install`
+    # post-install script, but it's being skipped.
+    (cd "$out"/share/php/kimai && php ./bin/console assets:install)
   '';
 
   passthru.tests = {

From 7957a734e9199b6a6608819caeeb514797b04b14 Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Sun, 5 Oct 2025 14:29:10 -0400
Subject: [PATCH 10/36] ruffle: use new version names; fix `meta.changelog`
 attribute

---
 pkgs/by-name/ru/ruffle/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix
index d1728d030498..2e678bb7e129 100644
--- a/pkgs/by-name/ru/ruffle/package.nix
+++ b/pkgs/by-name/ru/ruffle/package.nix
@@ -21,12 +21,12 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ruffle";
-  version = "0.2-nightly-2025-10-05";
+  version = "0.2.0-nightly-2025-10-05";
 
   src = fetchFromGitHub {
     owner = "ruffle-rs";
     repo = "ruffle";
-    tag = lib.strings.removePrefix "0.2-" finalAttrs.version;
+    tag = lib.strings.removePrefix "0.2.0-" finalAttrs.version;
     hash = "sha256-u12Qfc0fmcs7TU35/gqfRxjSpw9SDbc4+ebR7lGpvJI=";
   };
 
@@ -35,8 +35,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   env =
     let
-      tag = lib.strings.removePrefix "0.2-" finalAttrs.version;
-      versionDate = lib.strings.removePrefix "0.2-nightly-" finalAttrs.version;
+      tag = lib.strings.removePrefix "0.2.0-" finalAttrs.version;
+      versionDate = lib.strings.removePrefix "0.2.0-nightly-" finalAttrs.version;
     in
     {
       VERGEN_IDEMPOTENT = "1";
@@ -116,7 +116,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
           curl https://api.github.com/repos/ruffle-rs/ruffle/releases?per_page=1 | \
           jq -r ".[0].tag_name" \
         )"
-        exec nix-update --version "0.2-$version" ruffle
+        exec nix-update --version "0.2.0-$version" ruffle
       '';
     });
   };
@@ -135,11 +135,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
     homepage = "https://ruffle.rs/";
     downloadPage = "https://ruffle.rs/downloads";
-    changelog = "https://github.com/ruffle-rs/ruffle/releases/tag/${lib.strings.removePrefix "0.2" finalAttrs.version}";
     license = [
       lib.licenses.mit
       lib.licenses.asl20
     ];
+    changelog = "https://github.com/ruffle-rs/ruffle/releases/tag/${lib.strings.removePrefix "0.2.0-" finalAttrs.version}";
     maintainers = [
       lib.maintainers.jchw
       lib.maintainers.normalcea

From 3c023c2bbb7ae076e7963d70322b626d8024c02d Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Sun, 5 Oct 2025 13:11:10 -0400
Subject: [PATCH 11/36] ruffle: add `withX11` custom argument; clean-up
 arguments

To allow for building ruffle without any X11 dependencie, create a
custom pacakge attribute `withX`. This also substitutes the `xorg`
attribute for flattened versions of each library listed separately for
exactness.

All custom package attributes are placed at the end of the
argument list for readability.
---
 pkgs/by-name/ru/ruffle/package.nix | 36 +++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix
index 2e678bb7e129..83b8d0837682 100644
--- a/pkgs/by-name/ru/ruffle/package.nix
+++ b/pkgs/by-name/ru/ruffle/package.nix
@@ -2,14 +2,17 @@
   lib,
   stdenv,
   rustPlatform,
-  withRuffleTools ? false,
   fetchFromGitHub,
   jre_minimal,
   pkg-config,
   autoPatchelfHook,
   alsa-lib,
   wayland,
-  xorg,
+  libXcursor,
+  libXrandr,
+  libXi,
+  libX11,
+  libxcb,
   vulkan-loader,
   udev,
   libxkbcommon,
@@ -18,7 +21,10 @@
   curl,
   jq,
   nix-update,
+  withX11 ? true,
+  withRuffleTools ? false,
 }:
+
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ruffle";
   version = "0.2.0-nightly-2025-10-05";
@@ -75,17 +81,21 @@ rustPlatform.buildRustPackage (finalAttrs: {
     else
       null;
 
-  runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [
-    wayland
-    xorg.libXcursor
-    xorg.libXrandr
-    xorg.libXi
-    xorg.libX11
-    xorg.libxcb
-    libxkbcommon
-    vulkan-loader
-    finalAttrs.openh264-241
-  ];
+  runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux (
+    [
+      wayland
+      libxkbcommon
+      vulkan-loader
+      finalAttrs.openh264-241
+    ]
+    ++ lib.optionals withX11 [
+      libXcursor
+      libXrandr
+      libXi
+      libX11
+      libxcb
+    ]
+  );
 
   postInstall = ''
     mv $out/bin/ruffle_desktop $out/bin/ruffle

From 5faf70b127ff53565041b21854802b3905a32c53 Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Sun, 5 Oct 2025 23:10:54 -0400
Subject: [PATCH 12/36] ruffle: remove open264 override

Cisco openh264 won't cut a 2.5.2 release for ruffle and so ruffle
upstream has decided to hold back their openh264 dependency due to
flatpak dropping it due to ABI breakage. Instead, patch ruffle to
accept any openh264 version in nixpkgs.

- https://github.com/cisco/openh264/issues/3837 (original issue)
- https://github.com/cisco/openh264/pull/3868 (patch)
- https://github.com/cisco/openh264/issues/3873 (reason for using 2.4.1)

This removes the security vulnerability CVEs for 2.4.1.
---
 pkgs/by-name/ru/ruffle/package.nix | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix
index 83b8d0837682..6f4a11b8decf 100644
--- a/pkgs/by-name/ru/ruffle/package.nix
+++ b/pkgs/by-name/ru/ruffle/package.nix
@@ -36,6 +36,19 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-u12Qfc0fmcs7TU35/gqfRxjSpw9SDbc4+ebR7lGpvJI=";
   };
 
+  postPatch =
+    let
+      versionList = lib.versions.splitVersion openh264.version;
+      major = lib.elemAt versionList 0;
+      minor = lib.elemAt versionList 1;
+      patch = lib.elemAt versionList 2;
+    in
+    ''
+      substituteInPlace video/external/src/decoder/openh264.rs \
+        --replace-fail "OpenH264Version(2, 4, 1)" \
+                       "OpenH264Version(${major}, ${minor}, ${patch})"
+    '';
+
   cargoHash = "sha256-v/3vf7YYJiz+PMBsznvOJsNLtv6bEQ9pffAI33rLVuw=";
   cargoBuildFlags = lib.optional withRuffleTools "--workspace";
 
@@ -66,27 +79,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
     (lib.getLib stdenv.cc.cc)
   ];
 
-  # Prevents ruffle from downloading openh264 at runtime for Linux
-  openh264-241 =
-    if stdenv.hostPlatform.isLinux then
-      openh264.overrideAttrs (_: rec {
-        version = "2.4.1";
-        src = fetchFromGitHub {
-          owner = "cisco";
-          repo = "openh264";
-          tag = "v${version}";
-          hash = "sha256-ai7lcGcQQqpsLGSwHkSs7YAoEfGCIbxdClO6JpGA+MI=";
-        };
-      })
-    else
-      null;
-
   runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux (
     [
       wayland
       libxkbcommon
       vulkan-loader
-      finalAttrs.openh264-241
+      openh264
     ]
     ++ lib.optionals withX11 [
       libXcursor

From b0df84143c66d36e9d6dc917b195db7ff10c107d Mon Sep 17 00:00:00 2001
From: Christoph Hollizeck <christoph.hollizeck@hey.com>
Date: Wed, 8 Oct 2025 10:42:16 +0200
Subject: [PATCH 13/36] pyfa: 2.64.1 -> 2.64.2

---
 pkgs/by-name/py/pyfa/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/py/pyfa/package.nix b/pkgs/by-name/py/pyfa/package.nix
index 262cc926e074..c505bdb229b2 100644
--- a/pkgs/by-name/py/pyfa/package.nix
+++ b/pkgs/by-name/py/pyfa/package.nix
@@ -10,7 +10,7 @@
   copyDesktopItems,
 }:
 let
-  version = "2.64.1";
+  version = "2.64.2";
 in
 python3Packages.buildPythonApplication rec {
   inherit version;
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
     owner = "pyfa-org";
     repo = "Pyfa";
     tag = "v${version}";
-    hash = "sha256-qqfJ8nYI1y74sGJDbwrq0mT03em62BmU+y6GPmUUIIo=";
+    hash = "sha256-82zXMcIQPXTjMnKwhfpkm2apwDXLwKpbyglah6yHz/E=";
   };
 
   desktopItems = [

From f263078e24f2e66264a1913ff4d71393a82d76b8 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Wed, 8 Oct 2025 08:16:12 -0700
Subject: [PATCH 14/36] rocmPackages.hipblaslt: stop inlining war and peace in
 asm comments

Reduces peak build dir usage to 150G

hipblaslt was filling the build tmpfs, peaking at 240G in the
build/Tensile/build_tmp/TENSILEdir

with this bodge we stop it from writing very verbose comments in
the generated assembly kernels

example excessive whitespace/comment content:
s_nop 0                                            // 1 wait state required when next inst writes vgprs held by previous dwordx4 store inst
---
 .../rocm-modules/6/hipblaslt/default.nix      |  3 ++
 .../6/hipblaslt/reduce-comment-spam.patch     | 47 +++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/development/rocm-modules/6/hipblaslt/reduce-comment-spam.patch

diff --git a/pkgs/development/rocm-modules/6/hipblaslt/default.nix b/pkgs/development/rocm-modules/6/hipblaslt/default.nix
index 47bfd00909fc..effc0c2f97c3 100644
--- a/pkgs/development/rocm-modules/6/hipblaslt/default.nix
+++ b/pkgs/development/rocm-modules/6/hipblaslt/default.nix
@@ -111,6 +111,9 @@ stdenv.mkDerivation (finalAttrs: {
     # Support loading zstd compressed .dat files, required to keep output under
     # hydra size limit
     ./messagepack-compression-support.patch
+    # excessive comments are written to temporary asm files in build dir
+    # TODO: report upstream, find a better solution
+    ./reduce-comment-spam.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/development/rocm-modules/6/hipblaslt/reduce-comment-spam.patch b/pkgs/development/rocm-modules/6/hipblaslt/reduce-comment-spam.patch
new file mode 100644
index 000000000000..32969c517781
--- /dev/null
+++ b/pkgs/development/rocm-modules/6/hipblaslt/reduce-comment-spam.patch
@@ -0,0 +1,47 @@
+diff --git a/projects/hipblaslt/tensilelite/rocisa/rocisa/include/format.hpp b/projects/hipblaslt/tensilelite/rocisa/rocisa/include/format.hpp
+index b7dcb6f59a..b0625ba769 100644
+--- a/tensilelite/rocisa/rocisa/include/format.hpp
++++ b/tensilelite/rocisa/rocisa/include/format.hpp
+@@ -8,11 +8,13 @@ namespace rocisa
+     // Text format functions
+     inline std::string slash(const std::string& comment)
+     {
++        return "";
+         return "// " + comment + "\n";
+     }
+ 
+     inline std::string slash50(const std::string& comment)
+     {
++        return "";
+         std::ostringstream oss;
+         oss << std::setw(50) << ""
+             << " // " << comment << "\n";
+@@ -21,16 +23,19 @@ namespace rocisa
+ 
+     inline std::string block(const std::string& comment)
+     {
++        return "";
+         return "/* " + comment + " */\n";
+     }
+ 
+     inline std::string blockNewLine(const std::string& comment)
+     {
++        return "";
+         return "\n/* " + comment + " */\n";
+     }
+ 
+     inline std::string block3Line(const std::string& comment)
+     {
++        return "";
+         std::ostringstream oss;
+         oss << "\n/******************************************/\n";
+         std::istringstream iss(comment);
+@@ -52,7 +57,7 @@ namespace rocisa
+         {
+             formattedStr = "\"" + formattedStr + "\\n\\t\"";
+         }
+-        if(!comment.empty())
++        if(false)
+         {
+             std::string buffer = formattedStr
+                                  + std::string(std::max(0, 50 - int(formattedStr.length())), ' ')

From 611fa68a1c23a6c6b81fb95aa433506bf4ba4b01 Mon Sep 17 00:00:00 2001
From: Caleb Norton <n0603919@outlook.com>
Date: Wed, 8 Oct 2025 12:55:49 -0500
Subject: [PATCH 15/36] cemu: update discord-rpc dependency

discord-rpc has been unmaintained for years. cemu has replaced it with a
new discord rpc implementation but has not cut a new release since 2.6
causing the package to not build when nixpkgs cmake bumped to version 4
---
 pkgs/by-name/ce/cemu/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ce/cemu/package.nix b/pkgs/by-name/ce/cemu/package.nix
index 2d462dfa4594..52b100884300 100644
--- a/pkgs/by-name/ce/cemu/package.nix
+++ b/pkgs/by-name/ce/cemu/package.nix
@@ -7,6 +7,7 @@
   cubeb,
   curl,
   fetchFromGitHub,
+  fetchpatch2,
   fmt_9,
   gamemode,
   glm,
@@ -66,6 +67,10 @@ stdenv.mkDerivation (finalAttrs: {
     # > SPIRV-Tools-opt
     ./0000-spirv-tools-opt-cmakelists.patch
     ./0002-cemu-imgui.patch
+    (fetchpatch2 {
+      url = "https://github.com/cemu-project/Cemu/commit/c1c2962b6633017cd956c6925288e2529c532ee4.diff?full_index=1";
+      sha256 = "sha256-Dz7WnCf5+Vbr/ETX71wIo/x/zPWdrsOtPH7bsL5Bd+A=";
+    })
   ];
 
   nativeBuildInputs = [

From 071b4799ab8b86d10e9aedc8294a81698179cfb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 7 Oct 2025 08:20:10 -0700
Subject: [PATCH 16/36] zug: run tests

---
 pkgs/by-name/zu/zug/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/zu/zug/package.nix b/pkgs/by-name/zu/zug/package.nix
index 13e2f709283f..95c9d82f06aa 100644
--- a/pkgs/by-name/zu/zug/package.nix
+++ b/pkgs/by-name/zu/zug/package.nix
@@ -39,6 +39,8 @@ stdenv.mkDerivation (finalAttrs: {
     rm BUILD
   '';
 
+  doCheck = true;
+
   meta = {
     homepage = "https://github.com/arximboldi/zug";
     description = "Library for functional interactive c++ programs";

From d7cf90125a50c3583c9afe64bdc48e68b3a9d320 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 2 Aug 2025 12:25:17 +0200
Subject: [PATCH 17/36] rpcs3: 0.0.37 -> 0.0.38

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/rp/rpcs3/package.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix
index e0c9abfbc793..a30bbd580a6d 100644
--- a/pkgs/by-name/rp/rpcs3/package.nix
+++ b/pkgs/by-name/rp/rpcs3/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch2,
   nix-update-script,
   cmake,
   pkg-config,
@@ -46,24 +45,16 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "rpcs3";
-  version = "0.0.37";
+  version = "0.0.38";
 
   src = fetchFromGitHub {
     owner = "RPCS3";
     repo = "rpcs3";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/ve1qe76Rc+mXHemq8DI2U9IP6+tPV5m5SNh/wmppEw=";
+    hash = "sha256-HaguOzCN0/FvAb0b4RZWnw9yvVum14wEj26WnqOnSag=";
     fetchSubmodules = true;
   };
 
-  patches = [
-    (fetchpatch2 {
-      # https://github.com/RPCS3/rpcs3/pull/17316
-      url = "https://github.com/RPCS3/rpcs3/commit/bad6e992586264344ee1a3943423863d2bd39b45.patch?full_index=1";
-      hash = "sha256-rSyA1jcmRiV6m8rPKqTnDFuBh9WYFTGmyTSU2qrd+Go=";
-    })
-  ];
-
   passthru.updateScript = nix-update-script { };
 
   preConfigure = ''

From ba76e2f7af216d35cdfa1fe1e7d8456ad3dfbefb Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 2 Aug 2025 12:25:17 +0200
Subject: [PATCH 18/36] rpcs3: unvendor some dependencies

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/rp/rpcs3/package.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix
index a30bbd580a6d..ed68bcb2ec19 100644
--- a/pkgs/by-name/rp/rpcs3/package.nix
+++ b/pkgs/by-name/rp/rpcs3/package.nix
@@ -33,6 +33,13 @@
   waylandSupport ? true,
   wayland,
   wrapGAppsHook3,
+  miniupnpc,
+  rtmidi,
+  asmjit,
+  glslang,
+  zstd,
+  hidapi,
+  vulkan-memory-allocator,
 }:
 
 let
@@ -80,6 +87,12 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "USE_SYSTEM_SDL" true)
     (lib.cmakeBool "USE_SYSTEM_OPENCV" true)
     (lib.cmakeBool "USE_SYSTEM_CUBEB" true)
+    (lib.cmakeBool "USE_SYSTEM_MINIUPNPC" true)
+    (lib.cmakeBool "USE_SYSTEM_RTMIDI" true)
+    (lib.cmakeBool "USE_SYSTEM_GLSLANG" true)
+    (lib.cmakeBool "USE_SYSTEM_ZSTD" true)
+    (lib.cmakeBool "USE_SYSTEM_HIDAPI" true)
+    (lib.cmakeBool "USE_SYSTEM_VULKAN_MEMORY_ALLOCATOR" true)
     (lib.cmakeBool "USE_SDL" true)
     (lib.cmakeBool "WITH_LLVM" true)
     (lib.cmakeBool "BUILD_LLVM" false)
@@ -121,6 +134,13 @@ stdenv.mkDerivation (finalAttrs: {
     libSM
     opencv.cxxdev
     cubeb
+    miniupnpc
+    rtmidi
+    asmjit
+    glslang
+    zstd
+    hidapi
+    vulkan-memory-allocator
   ]
   ++ lib.optional faudioSupport faudio
   ++ lib.optionals waylandSupport [

From 11dcb32fb23ef29e8d039e5edc7356f3c7e9ac03 Mon Sep 17 00:00:00 2001
From: Daniel Fahey <daniel.fahey@pm.me>
Date: Fri, 10 Oct 2025 10:42:46 +0100
Subject: [PATCH 19/36] python3Packages.vllm: fix CPU build with upstream
 oneDNN patches

- Add upstream patches from vLLM that properly handle oneDNN integration for CPU builds, see https://github.com/vllm-project/vllm/pull/26401
- Set `FETCHCONTENT_SOURCE_DIR_ONEDNN` via environment variable to `oneDNN.src` instead of using cmake flag with `lib.getDev oneDNN`
- Remove unused `pythonOlder` import
- Remove broken flag for CPU support
---
 .../python-modules/vllm/default.nix           | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix
index a65300932ef4..61a84b14a4de 100644
--- a/pkgs/development/python-modules/vllm/default.nix
+++ b/pkgs/development/python-modules/vllm/default.nix
@@ -3,7 +3,6 @@
   stdenv,
   python,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
   fetchpatch,
   symlinkJoin,
@@ -290,6 +289,17 @@ buildPythonPackage rec {
     ./0002-setup.py-nix-support-respect-cmakeFlags.patch
     ./0003-propagate-pythonpath.patch
     ./0005-drop-intel-reqs.patch
+    # TODO: Remove the below patches when included in vLLM release
+    (fetchpatch {
+      url = "https://github.com/vllm-project/vllm/commit/9705fba7b727a3b9c275b012258608531e2223d1.patch";
+      hash = "sha256-DxRGLiwkegMlMjqFmFc0igpaVv06/Y2WjL+ISoIOET4=";
+    })
+    # patch above is previous commit needed to apply patch below
+    # oneDNN / CPU fix from https://github.com/vllm-project/vllm/pull/26401
+    (fetchpatch {
+      url = "https://github.com/vllm-project/vllm/commit/d7be1f2a480bdc62a6a1ec0126a401e3d42985fe.patch";
+      hash = "sha256-Zi1k5wiOPjsbWHFKpcLq9Ns43wIP37Mbvesi5K80zaQ=";
+    })
   ];
 
   postPatch = ''
@@ -441,9 +451,6 @@ buildPythonPackage rec {
     (lib.cmakeFeature "CAFFE2_USE_CUDNN" "ON")
     (lib.cmakeFeature "CAFFE2_USE_CUFILE" "ON")
     (lib.cmakeFeature "CUTLASS_ENABLE_CUBLAS" "ON")
-  ]
-  ++ lib.optionals cpuSupport [
-    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ONEDNN" "${lib.getDev oneDNN}")
   ];
 
   env =
@@ -459,6 +466,7 @@ buildPythonPackage rec {
     }
     // lib.optionalAttrs cpuSupport {
       VLLM_TARGET_DEVICE = "cpu";
+      FETCHCONTENT_SOURCE_DIR_ONEDNN = "${oneDNN.src}";
     };
 
   preConfigure = ''
@@ -488,10 +496,6 @@ buildPythonPackage rec {
       lach
       daniel-fahey
     ];
-    # Python 3.12 vLLM v0.10.2+CPU blake3 1.0.7 incompatibility
-    # discovered during https://github.com/NixOS/nixpkgs/pull/447722
-    # reported upstream in https://github.com/vllm-project/vllm/issues/26229
-    broken = (cpuSupport && pythonOlder "3.13");
     badPlatforms = [
       # CMake Error at cmake/cpu_extension.cmake:78 (find_isa):
       # find_isa Function invoked with incorrect arguments for function named:

From 95da8afe04a57eb4a2388aa16c9d2f257db393ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Oct 2025 12:09:52 +0000
Subject: [PATCH 20/36] tailwindcss-language-server: 0.14.26 -> 0.14.28

---
 pkgs/by-name/ta/tailwindcss-language-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ta/tailwindcss-language-server/package.nix b/pkgs/by-name/ta/tailwindcss-language-server/package.nix
index 31c9c164d998..e1bfc8baaf33 100644
--- a/pkgs/by-name/ta/tailwindcss-language-server/package.nix
+++ b/pkgs/by-name/ta/tailwindcss-language-server/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tailwindcss-language-server";
-  version = "0.14.26";
+  version = "0.14.28";
 
   src = fetchFromGitHub {
     owner = "tailwindlabs";
     repo = "tailwindcss-intellisense";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XXRWxN+1fOuVULh+ZE+XRRBaoRzhCpw7n8SkBIorG9A=";
+    hash = "sha256-jds6Wq4rcR4wXonZ1v9JITiEc4gflT0sTc3KUSBCMFc=";
   };
 
   pnpmDeps = pnpm_9.fetchDeps {
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
       pnpmWorkspaces
       ;
     fetcherVersion = 1;
-    hash = "sha256-SUEq20gZCiTDkFuNgMc5McHBPgW++8P9Q1MJb7a7pY8=";
+    hash = "sha256-1F4DeqJWJs3L1hDzNn7PJr9sSBv2TcN8QfV8/pwAKuU=";
   };
 
   nativeBuildInputs = [

From 3ff4483aa309ce85fd1809abfc7f38e611bc2b92 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@determinate.systems>
Date: Sat, 20 Sep 2025 10:39:28 -0700
Subject: [PATCH 21/36] pythonPackages.tt-smi: init at 3.0.30

---
 .../python-modules/tt-smi/default.nix         | 59 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 61 insertions(+)
 create mode 100644 pkgs/development/python-modules/tt-smi/default.nix

diff --git a/pkgs/development/python-modules/tt-smi/default.nix b/pkgs/development/python-modules/tt-smi/default.nix
new file mode 100644
index 000000000000..c58ae346e466
--- /dev/null
+++ b/pkgs/development/python-modules/tt-smi/default.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonOlder,
+  setuptools,
+  distro,
+  elasticsearch,
+  pydantic,
+  pyluwen,
+  rich,
+  textual,
+  pre-commit,
+  importlib-resources,
+  tt-tools-common,
+  tomli,
+}:
+buildPythonPackage rec {
+  pname = "tt-smi";
+  version = "3.0.30";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "tenstorrent";
+    repo = "tt-smi";
+    tag = "v${version}";
+    hash = "sha256-C6CfcS0H3rFew/Y1uhmzICdFp1UYU7H9h3YPeAKlcbE=";
+  };
+
+  disabled = pythonOlder "3.13";
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    distro
+    elasticsearch
+    pydantic
+    pyluwen
+    rich
+    textual
+    pre-commit
+    importlib-resources
+    tt-tools-common
+    setuptools
+    tomli
+  ];
+
+  # Fails due to having no tests
+  dontUsePytestCheck = true;
+
+  meta = {
+    description = "Tenstorrent console based hardware information program";
+    homepage = "https://github.com/tenstorrent/tt-smi";
+    maintainers = with lib.maintainers; [ RossComputerGuy ];
+    license = with lib.licenses; [ asl20 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f2747156e712..2534be2f00cd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18768,6 +18768,8 @@ self: super: with self; {
 
   tt-flash = callPackage ../development/python-modules/tt-flash { };
 
+  tt-smi = callPackage ../development/python-modules/tt-smi { };
+
   tt-tools-common = callPackage ../development/python-modules/tt-tools-common { };
 
   ttach = callPackage ../development/python-modules/ttach { };

From d6a82215d13080ac280b88df47a6e6195c48d777 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Oct 2025 22:17:14 +0000
Subject: [PATCH 22/36] gitu: 0.37.0 -> 0.38.0

---
 pkgs/by-name/gi/gitu/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/gitu/package.nix b/pkgs/by-name/gi/gitu/package.nix
index 23d0a1e0c561..08dab6595f6b 100644
--- a/pkgs/by-name/gi/gitu/package.nix
+++ b/pkgs/by-name/gi/gitu/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gitu";
-  version = "0.37.0";
+  version = "0.38.0";
 
   src = fetchFromGitHub {
     owner = "altsem";
     repo = "gitu";
     rev = "v${version}";
-    hash = "sha256-BAfOenO/LrMfOPI+DStKdPp14t4+1AP8Z8/uoqU6Wfw=";
+    hash = "sha256-eOt16jeWLQ7nxKMBwwDs/4NIf/rzr+q6s0QHcY+zzSk=";
   };
 
-  cargoHash = "sha256-yqmXXkviRbY9YS+JjAx5iXLu6cvMWotcf/PsrpfER5k=";
+  cargoHash = "sha256-pJs8uTim+/TrqzjxCzKHlaZRQudd0dMIZXqlAZU7G1M=";
 
   nativeBuildInputs = [
     pkg-config

From da80618b7e23d80357ca6b14de6c77fc989f26cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Oct 2025 22:36:37 +0000
Subject: [PATCH 23/36] slackdump: 3.1.7 -> 3.1.8

---
 pkgs/by-name/sl/slackdump/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sl/slackdump/package.nix b/pkgs/by-name/sl/slackdump/package.nix
index ba199f91f65b..827225012408 100644
--- a/pkgs/by-name/sl/slackdump/package.nix
+++ b/pkgs/by-name/sl/slackdump/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "slackdump";
-  version = "3.1.7";
+  version = "3.1.8";
 
   src = fetchFromGitHub {
     owner = "rusq";
     repo = "slackdump";
     tag = "v${version}";
-    hash = "sha256-rVNXVkM4DpfNdqDGzaw23zOL/VSbzKsCyOc/Cq/mtZM=";
+    hash = "sha256-cIlhdhSyBO3xo++Z0v2DniUZwKjnUxaMlLBKWFPwQzk=";
   };
 
   nativeCheckInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.IOKitTools;

From 3c2d4dec333d74854865722db4c869eb0e3efa4f Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Fri, 10 Oct 2025 19:07:08 -0400
Subject: [PATCH 24/36] Reapply "llama-cpp: 6670 -> 6729"

This reverts commit 611fb3216d9460a0bcba77002522d463a578b442.

Also, drop the vulkan build patch that fails to apply and regardless is
no longer needed for a successful build.
---
 pkgs/by-name/ll/llama-cpp/disable_bfloat16.patch | 15 ---------------
 pkgs/by-name/ll/llama-cpp/package.nix            |  6 ++----
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/by-name/ll/llama-cpp/disable_bfloat16.patch

diff --git a/pkgs/by-name/ll/llama-cpp/disable_bfloat16.patch b/pkgs/by-name/ll/llama-cpp/disable_bfloat16.patch
deleted file mode 100644
index 38388e2b82dc..000000000000
--- a/pkgs/by-name/ll/llama-cpp/disable_bfloat16.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-index b97e7bf9..9cdc62a4 100644
---- a/ggml/src/ggml-vulkan/CMakeLists.txt
-+++ b/ggml/src/ggml-vulkan/CMakeLists.txt
-@@ -70,11 +70,5 @@ if (Vulkan_FOUND)
-         "GGML_VULKAN_INTEGER_DOT_GLSLC_SUPPORT"
-     )
-
--    test_shader_extension_support(
--        "GL_EXT_bfloat16"
--        "${CMAKE_CURRENT_SOURCE_DIR}/vulkan-shaders/test_bfloat16_support.comp"
--        "GGML_VULKAN_BFLOAT16_GLSLC_SUPPORT"
--    )
--
-     target_link_libraries(ggml-vulkan PRIVATE Vulkan::Vulkan)
-     target_include_directories(ggml-vulkan PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index 4fd8d35ddd6f..9df32043c859 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -75,13 +75,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "llama-cpp";
-  version = "6670";
+  version = "6729";
 
   src = fetchFromGitHub {
     owner = "ggml-org";
     repo = "llama.cpp";
     tag = "b${finalAttrs.version}";
-    hash = "sha256-B4Qog7RLcre8KB9N+aVUZSJwlkHIIcCxR8jySoxbXoQ=";
+    hash = "sha256-CkPLgzSsiCkSIAp4XetUJszt0+WjPRt+9V9SvRogbVU=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > $out/COMMIT
@@ -89,8 +89,6 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     '';
   };
 
-  patches = lib.optionals vulkanSupport [ ./disable_bfloat16.patch ];
-
   nativeBuildInputs = [
     cmake
     ninja

From 7a94228edfd7e15a1a3a6e7abb2f4590a3758e43 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Oct 2025 00:22:19 +0000
Subject: [PATCH 25/36] home-assistant-custom-components.dreo: 1.3.3 -> 1.4.2

---
 .../servers/home-assistant/custom-components/dreo/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/dreo/package.nix b/pkgs/servers/home-assistant/custom-components/dreo/package.nix
index db0587b33b7f..672dfc714013 100644
--- a/pkgs/servers/home-assistant/custom-components/dreo/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/dreo/package.nix
@@ -12,13 +12,13 @@
 buildHomeAssistantComponent rec {
   owner = "JeffSteinbok";
   domain = "dreo";
-  version = "1.3.3";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "hass-dreo";
     tag = "v${version}";
-    hash = "sha256-eAgqjAXNAY8kr7+49q+tikW3bDBJ0N0Rh5WJwzLYr8I=";
+    hash = "sha256-j5dsT+1/qd+z9TBHXui3kx2kBQBnJ8VaSxdFt6R8sFQ=";
   };
 
   dependencies = [ websockets ];

From 931592d97ea44f3bad078549bab85e7b35a84354 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Oct 2025 00:47:54 +0000
Subject: [PATCH 26/36] python3Packages.internetarchive: 5.5.1 -> 5.6.0

---
 pkgs/development/python-modules/internetarchive/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix
index e1a5cd92132b..56bb064cda58 100644
--- a/pkgs/development/python-modules/internetarchive/default.nix
+++ b/pkgs/development/python-modules/internetarchive/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "internetarchive";
-  version = "5.5.1";
+  version = "5.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "jjjake";
     repo = "internetarchive";
     tag = "v${version}";
-    hash = "sha256-Og0EPdaxu4etWj+9WPSyAHlz/BNUanu2gf+6k4FzN90=";
+    hash = "sha256-m3BB3rER3YHC3/Xj9L/zhVkjV0o46d/TCP3Jvw+eDgo=";
   };
 
   build-system = [ setuptools ];

From 8619190cc709019cfcd9d56e341d626e17768bbe Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 10 Oct 2025 22:08:43 +0200
Subject: [PATCH 27/36] python3Packages.python-ldap: 3.4.4 -> 3.4.5

https://github.com/python-ldap/python-ldap/releases/tag/python-ldap-3.4.5

Fixes: CVE-2025-61911, CVE-2025-61912
---
 .../python-modules/python-ldap/default.nix          | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/python-ldap/default.nix b/pkgs/development/python-modules/python-ldap/default.nix
index 3ef438678abb..4ac1ade56c3e 100644
--- a/pkgs/development/python-modules/python-ldap/default.nix
+++ b/pkgs/development/python-modules/python-ldap/default.nix
@@ -1,9 +1,7 @@
 {
   lib,
-  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
 
   # build-system
   distutils,
@@ -23,18 +21,21 @@
 
 buildPythonPackage rec {
   pname = "python-ldap";
-  version = "3.4.4";
+  version = "3.4.5";
   pyproject = true;
 
-  disabled = pythonOlder "3.6";
-
   src = fetchFromGitHub {
     owner = "python-ldap";
     repo = "python-ldap";
     tag = "python-ldap-${version}";
-    hash = "sha256-v1cWoRGxbvvFnHqnwoIfmiQQcxfaA8Bf3+M5bE5PtuU=";
+    hash = "sha256-olRu5HacRKaAcNbQczA+UCbDxhySUOO7qH0KdWlSbT0=";
   };
 
+  postPatch = ''
+    # unused in 3.4.5; https://github.com/python-ldap/python-ldap/pull/597
+    sed -i "/setuptools-scm/d" pyproject.toml
+  '';
+
   build-system = [
     distutils
     setuptools

From 3e5522dcf3713cda1e1deaa972d5d4c9bebf3bd1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Oct 2025 02:10:23 +0000
Subject: [PATCH 28/36] rsrpc: 0.24.3 -> 0.25.0

---
 pkgs/by-name/rs/rsrpc/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/rs/rsrpc/package.nix b/pkgs/by-name/rs/rsrpc/package.nix
index 966dd772a848..12f6e4980eb7 100644
--- a/pkgs/by-name/rs/rsrpc/package.nix
+++ b/pkgs/by-name/rs/rsrpc/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rsrpc";
-  version = "0.24.3";
+  version = "0.25.0";
 
   src = fetchFromGitHub {
     owner = "SpikeHD";
     repo = "rsRPC";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qQduMRITva425T+w2sWX/mRmJLq2SsfPkFzgjyq9x9E=";
+    hash = "sha256-zQtCd8d2n41ak+hQbEsjGlsHgbW3n5B5DQZ85icIogs=";
   };
 
-  cargoHash = "sha256-aUTy+8XCUgsBEBBWr0PmvZ6agkq0sojXPWi9rDWp2Iw=";
+  cargoHash = "sha256-mF2pgg1NmOHM0DE7XUuik0IPp4w4EUs3VRYvBh3ZFK8=";
 
   nativeBuildInputs = [
     pkg-config

From 47348f554eb71fa9b466cbc542c2981821d20664 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Fri, 10 Oct 2025 19:21:44 -0700
Subject: [PATCH 29/36] nixos/tenstorrent: init

---
 nixos/modules/hardware/tenstorrent.nix | 29 ++++++++++++++++++++++++++
 nixos/modules/module-list.nix          |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 nixos/modules/hardware/tenstorrent.nix

diff --git a/nixos/modules/hardware/tenstorrent.nix b/nixos/modules/hardware/tenstorrent.nix
new file mode 100644
index 000000000000..7c3fa2b92cb0
--- /dev/null
+++ b/nixos/modules/hardware/tenstorrent.nix
@@ -0,0 +1,29 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+let
+  inherit (lib) mkEnableOption mkIf;
+  inherit (config.boot.kernelPackages) tt-kmd;
+
+  cfg = config.hardware.tenstorrent;
+in
+{
+  options.hardware.tenstorrent.enable = mkEnableOption "Tenstorrent driver & utilities";
+
+  config = mkIf cfg.enable {
+    boot = {
+      extraModulePackages = [ tt-kmd ];
+      kernelModules = [ "tenstorrent" ];
+    };
+
+    services.udev.packages = [
+      tt-kmd
+    ];
+
+    # TODO: add tt-smi to environment.systemPackages once https://github.com/NixOS/nixpkgs/pull/444714 is merged
+    # TODO: add tt-system-tools to environment.systemPackages once https://github.com/NixOS/nixpkgs/pull/444748 is merged
+  };
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index cda428430449..a8ebddbd019d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -109,6 +109,7 @@
   ./hardware/sheep-net.nix
   ./hardware/steam-hardware.nix
   ./hardware/system-76.nix
+  ./hardware/tenstorrent.nix
   ./hardware/tuxedo-drivers.nix
   ./hardware/ubertooth.nix
   ./hardware/uinput.nix

From 2c514701992bf20e351a71c584845b16b22bb934 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Oct 2025 02:53:11 +0000
Subject: [PATCH 30/36] double-entry-generator: 2.11.0 -> 2.12.0

---
 pkgs/by-name/do/double-entry-generator/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/do/double-entry-generator/package.nix b/pkgs/by-name/do/double-entry-generator/package.nix
index 2262a60251f1..6f469f1be697 100644
--- a/pkgs/by-name/do/double-entry-generator/package.nix
+++ b/pkgs/by-name/do/double-entry-generator/package.nix
@@ -6,11 +6,11 @@
 }:
 buildGoModule rec {
   pname = "double-entry-generator";
-  version = "2.11.0";
+  version = "2.12.0";
   src = fetchFromGitHub {
     owner = "deb-sig";
     repo = "double-entry-generator";
-    hash = "sha256-tHJwn1G/2wySnKpF+P0tyOu3mYk8zD9D301kxrWaWws=";
+    hash = "sha256-j/iShGFfuk4iIGFv+S5sxXCyJ2f0xbJVYOSFtsijjq0=";
     rev = "v${version}";
   };
 

From f679da704aa507fcfc8d66cdce22f615bab22273 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Oct 2025 02:58:05 +0000
Subject: [PATCH 31/36] androidStudioPackages.canary: 2025.2.1.3 -> 2025.2.1.5

---
 pkgs/applications/editors/android-studio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index dcf89cbac870..bf552b073508 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -24,8 +24,8 @@ let
     sha256Hash = "sha256-KrKUsA7wFeI7IBa9VOp+MERqWIiMnNzLFO8oF0rCiIw=";
   };
   latestVersion = {
-    version = "2025.2.1.3"; # "Android Studio Otter | 2025.2.1 Canary 3"
-    sha256Hash = "sha256-McgPREXfErJ6vcHPKlAC4EVf61QedMV6J643LM5N7Wg=";
+    version = "2025.2.1.5"; # "Android Studio Otter | 2025.2.1 Canary 5"
+    sha256Hash = "sha256-Slpp29OMpG4i/9ykYBF/KMwnBgOTSuqObZrfdcMfDbQ=";
   };
 in
 {

From 751be5e78052a47fc4bcf2e9201916bca7b0c9f1 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@determinate.systems>
Date: Sat, 20 Sep 2025 12:28:54 -0700
Subject: [PATCH 32/36] tt-system-tools: init at 1.4.0

---
 pkgs/by-name/tt/tt-system-tools/package.nix | 51 +++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 pkgs/by-name/tt/tt-system-tools/package.nix

diff --git a/pkgs/by-name/tt/tt-system-tools/package.nix b/pkgs/by-name/tt/tt-system-tools/package.nix
new file mode 100644
index 000000000000..f242fba017ff
--- /dev/null
+++ b/pkgs/by-name/tt/tt-system-tools/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  makeWrapper,
+  # Remove "? null" once https://github.com/NixOS/nixpkgs/pull/444714 is merged
+  tt-smi ? null,
+  pstree,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "tt-system-tools";
+  version = "1.4.0";
+
+  src = fetchFromGitHub {
+    owner = "tenstorrent";
+    repo = "tt-system-tools";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ZtEs1XRho/EJShAV6+8Db2wxCK2QQBuNp+TRqb+ZiM4=";
+  };
+
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 tt-oops/tt-oops.sh $out/bin/tt-oops
+    wrapProgram "$out/bin/tt-oops" \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          tt-smi
+          pstree
+        ]
+      }
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "System tools for Tenstorrent cards";
+    homepage = "https://github.com/tenstorrent/tt-system-tools";
+    changelog = "https://github.com/tenstorrent/tt-system-tools/blob/${finalAttrs.src.tag}/debian/changelog";
+    maintainers = with lib.maintainers; [ RossComputerGuy ];
+    license = with lib.licenses; [ asl20 ];
+    platforms = lib.platforms.linux;
+  };
+})

From 36a5b09fdf4a1ccb6c82ed78b75cb17bfbdd6676 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Fri, 10 Oct 2025 20:12:59 -0700
Subject: [PATCH 33/36] nixos/docs/rl2511: add tenstorrent module entry

---
 nixos/doc/manual/release-notes/rl-2511.section.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 2c78a6d7c5a7..ae98d9123d5e 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -150,6 +150,8 @@
 
 - [ringboard](https://github.com/SUPERCILEX/clipboard-history), a fast, efficient, and composable clipboard manager for Linux. Available for x11 as [services.ringboard](#opt-services.ringboard.x11.enable) and for wayland as [services.ringboard](#opt-services.ringboard.wayland.enable).
 
+- [Tenstorrent](https://tenstorrent.com) hardware module has been added.
+
 ## Backward Incompatibilities {#sec-release-25.11-incompatibilities}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

From 2c574b9c4c6f97074c24d4019cf1279a5613134b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 10 Oct 2025 20:21:34 -0700
Subject: [PATCH 34/36] python311Packages.tkinter: mark broken

It fails to build with

    fatal error: tommath.h: No such file or directory
---
 pkgs/development/python-modules/tkinter/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/tkinter/default.nix b/pkgs/development/python-modules/tkinter/default.nix
index afc6d765a498..7933c994356a 100644
--- a/pkgs/development/python-modules/tkinter/default.nix
+++ b/pkgs/development/python-modules/tkinter/default.nix
@@ -86,6 +86,7 @@ buildPythonPackage {
   pythonImportsCheck = [ "tkinter" ];
 
   meta = {
+    broken = pythonOlder "3.12"; # tommath.h: No such file or directory
     # Based on first sentence from https://docs.python.org/3/library/tkinter.html
     description = "Standard Python interface to the Tcl/Tk GUI toolkit";
     longDescription = ''

From 22412a6ab0448c78663d60277cc0a47a3f1987f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 10 Oct 2025 20:31:00 -0700
Subject: [PATCH 35/36] python311Packages.matplotlib: disable Tk on Python 3.11

The tkinter package fails to build on Python 3.11.
---
 pkgs/development/python-modules/matplotlib/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index 4c23466b9880..926dd2467971 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -4,6 +4,7 @@
   fetchPypi,
   buildPythonPackage,
   isPyPy,
+  pythonAtLeast,
   pythonOlder,
 
   # build-system
@@ -52,7 +53,8 @@
 
   # Tk
   # Darwin has its own "MacOSX" backend, PyPy has tkagg backend and does not support tkinter
-  enableTk ? (!stdenv.hostPlatform.isDarwin && !isPyPy),
+  # tkinter fails to build on Python 3.11
+  enableTk ? (!stdenv.hostPlatform.isDarwin && !isPyPy && pythonAtLeast "3.12"),
   tkinter,
 
   # Qt

From cf59517d92366b9e5778eee75cbcdce6adc5af26 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Fri, 10 Oct 2025 22:23:01 +0530
Subject: [PATCH 36/36] libvdpau-va-gl: 0.4.2 -> 0.4.2-unstable-2025-05-18

---
 pkgs/by-name/li/libvdpau-va-gl/package.nix | 31 +++++-----------------
 1 file changed, 6 insertions(+), 25 deletions(-)

diff --git a/pkgs/by-name/li/libvdpau-va-gl/package.nix b/pkgs/by-name/li/libvdpau-va-gl/package.nix
index b55f73762ac2..fbd1a28cb3d7 100644
--- a/pkgs/by-name/li/libvdpau-va-gl/package.nix
+++ b/pkgs/by-name/li/libvdpau-va-gl/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   pkg-config,
   libX11,
@@ -16,40 +15,22 @@
   libGLU,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "libvdpau-va-gl";
-  version = "0.4.2";
+  version = "0.4.2-unstable-2025-05-18";
 
   src = fetchFromGitHub {
     owner = "i-rinat";
     repo = "libvdpau-va-gl";
-    rev = "v${version}";
-    sha256 = "0asndybfv8xb0fx73sjjw5kydqrahqkm6n04lh589pbf18s5qlld";
+    rev = "a845e8720d900e4bcc89e7ee16106ce63b44af0d";
+    hash = "sha256-CtpyWod+blqC3u12MaQyqFOXurCP5Rb2PYq7PoaoASA=";
   };
 
-  patches = [
-    # cmake-4 compatibility
-    (fetchpatch {
-      name = "cmake-4-1.patch";
-      url = "https://github.com/i-rinat/libvdpau-va-gl/commit/30c8ac91f3aa2843f7dc1c1d167e09fad447fd91.patch?full_index=1";
-      hash = "sha256-PFEqBg3NE0fVFBAW4zdDbh8eBfKyPX3BZ8P2M15Qq5A=";
-    })
-    (fetchpatch {
-      name = "cmake-4-2.patch";
-      url = "https://github.com/i-rinat/libvdpau-va-gl/commit/38c7d8fddb092824cbcdf2b11af519775930cc8b.patch?full_index=1";
-      hash = "sha256-XsX/GLIS2Ce7obQJ4uVhLDtTI1TrDAGi3ECxEH6oOFI=";
-    })
-    (fetchpatch {
-      name = "cmake-4-3.patch";
-      url = "https://github.com/i-rinat/libvdpau-va-gl/commit/a845e8720d900e4bcc89e7ee16106ce63b44af0.patch?full_index=1";
-      hash = "sha256-lhiZFDR2ytDmo9hQUT35IJS4KL4+nYWAOnxZlj7u3tM=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config
   ];
+
   buildInputs = [
     libX11
     libpthreadstubs
@@ -69,6 +50,6 @@ stdenv.mkDerivation rec {
     description = "VDPAU driver with OpenGL/VAAPI backend";
     license = licenses.lgpl3;
     platforms = platforms.linux;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.johnrtitor ];
   };
 }