From 939fa2ab2b6e58a3952e716148316076ad10b771 Mon Sep 17 00:00:00 2001
From: Rasheeq Azad <rasheeqhere@gmail.com>
Date: Mon, 11 Aug 2025 17:34:53 -0400
Subject: [PATCH 01/25] nixos/users-groups: use submodule config in
 hashedPasswordFile.default

This fixes nixos-option of hashedPasswordFile.
---
 nixos/modules/config/users-groups.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 59f1b44483df..8074b9ce0492 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -377,7 +377,7 @@ let
 
         hashedPasswordFile = mkOption {
           type = with types; nullOr str;
-          default = cfg.users.${name}.passwordFile;
+          default = config.passwordFile;
           defaultText = literalExpression "null";
           description = ''
             The full path to a file that contains the hash of the user's

From f7bad94076e7446250515be82b24f6c8461717b9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sun, 5 Oct 2025 11:34:40 +0200
Subject: [PATCH 02/25] python313Packages.annotatedyaml: 1.0.0 -> 1.0.2

Diff: https://github.com/home-assistant-libs/annotatedyaml/compare/v1.0.0...v1.0.2

Changelog: https://github.com/home-assistant-libs/annotatedyaml/blob/v1.0.2/CHANGELOG.md
---
 pkgs/development/python-modules/annotatedyaml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/annotatedyaml/default.nix b/pkgs/development/python-modules/annotatedyaml/default.nix
index 16d589e587e0..1abd0e5399ee 100644
--- a/pkgs/development/python-modules/annotatedyaml/default.nix
+++ b/pkgs/development/python-modules/annotatedyaml/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "annotatedyaml";
-  version = "1.0.0";
+  version = "1.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "annotatedyaml";
     tag = "v${version}";
-    hash = "sha256-bVXhKm69A5FIXYY2yq7jXPIK7lSCQD20a3oX1GdqOLY=";
+    hash = "sha256-+4H3StCZ58TDV6LSXyeC6+Vn56W19+bIO4AdsJEfHI0=";
   };
 
   build-system = [

From fa8e369bb3e1393a28913020ba9694e8123c271e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Oct 2025 08:20:07 +0000
Subject: [PATCH 03/25] gh-gei: 1.18.1 -> 1.19

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

diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix
index bb4d9bbf585e..d6337a2f645b 100644
--- a/pkgs/by-name/gh/gh-gei/package.nix
+++ b/pkgs/by-name/gh/gh-gei/package.nix
@@ -7,13 +7,13 @@
 
 buildDotnetModule rec {
   pname = "gh-gei";
-  version = "1.18.1";
+  version = "1.19";
 
   src = fetchFromGitHub {
     owner = "github";
     repo = "gh-gei";
     rev = "v${version}";
-    hash = "sha256-ZMFom0irZa63Nzx7wViinmN6yRfiHxQFprJdIx1Ak2Y=";
+    hash = "sha256-3c9wrBm7sKrQaNhAe5uwGEEXQEfSLHBJJ/XFC2pc12Q=";
   };
 
   dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx;

From 676c3eaf2b4402cb4de2b82e10184c31d17aff24 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Oct 2025 21:30:19 +0000
Subject: [PATCH 04/25] python3Packages.robotframework-seleniumlibrary: 6.7.1
 -> 6.8.0

---
 .../python-modules/robotframework-seleniumlibrary/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix
index 9e588405e84d..38dc53c3229b 100644
--- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix
+++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "robotframework-seleniumlibrary";
-  version = "6.7.1";
+  version = "6.8.0";
   pyproject = true;
 
   # no tests included in PyPI tarball
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "robotframework";
     repo = "SeleniumLibrary";
     tag = "v${version}";
-    hash = "sha256-pKAOVycckUCe93wMk9kql1lY6WeUTiS4lk/skDAfKCY=";
+    hash = "sha256-TyYlcmoV5q3mfV4II/7P/SApfSNd3yC1EFYcuHllcyQ=";
   };
 
   build-system = [ setuptools ];

From bf00acfb6552cbc502cf80655a3ff1e2d2378f0a Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sat, 11 Oct 2025 20:09:44 +0200
Subject: [PATCH 05/25] maintainers: drop AdsonCicilioti

---
 maintainers/maintainer-list.nix                      | 6 ------
 pkgs/by-name/bi/bibata-cursors/package.nix           | 1 -
 pkgs/data/icons/bibata-cursors/translucent.nix       | 2 +-
 pkgs/development/python-modules/clickgen/default.nix | 2 +-
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fa4ed2b3b68b..0ac61f8b2712 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -685,12 +685,6 @@
     githubId = 260983;
     name = "Adrien Lemaire";
   };
-  AdsonCicilioti = {
-    name = "Adson Cicilioti";
-    email = "adson.cicilioti@live.com";
-    github = "AdsonCicilioti";
-    githubId = 6278398;
-  };
   adsr = {
     email = "as@php.net";
     github = "adsr";
diff --git a/pkgs/by-name/bi/bibata-cursors/package.nix b/pkgs/by-name/bi/bibata-cursors/package.nix
index 0c0253b4ae8e..7f390649f010 100644
--- a/pkgs/by-name/bi/bibata-cursors/package.nix
+++ b/pkgs/by-name/bi/bibata-cursors/package.nix
@@ -64,7 +64,6 @@ stdenvNoCC.mkDerivation rec {
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
       rawkode
-      AdsonCicilioti
     ];
   };
 }
diff --git a/pkgs/data/icons/bibata-cursors/translucent.nix b/pkgs/data/icons/bibata-cursors/translucent.nix
index ac7e8c2ce677..1de84b0ff499 100644
--- a/pkgs/data/icons/bibata-cursors/translucent.nix
+++ b/pkgs/data/icons/bibata-cursors/translucent.nix
@@ -25,6 +25,6 @@ stdenvNoCC.mkDerivation rec {
     homepage = "https://github.com/Silicasandwhich/Bibata_Cursor_Translucent";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ AdsonCicilioti ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/clickgen/default.nix b/pkgs/development/python-modules/clickgen/default.nix
index 73f42d2cc659..4fed05d02c5d 100644
--- a/pkgs/development/python-modules/clickgen/default.nix
+++ b/pkgs/development/python-modules/clickgen/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage rec {
       .png files. clickgen is using anicursorgen and xcursorgen under the hood.
     '';
     license = licenses.mit;
-    maintainers = with maintainers; [ AdsonCicilioti ];
+    maintainers = [ ];
     # fails with:
     # ld: unknown option: -zdefs
     broken = stdenv.hostPlatform.isDarwin;

From ecc27744a86f53beb2067ac3e1b3bbc7cf482180 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 12 Oct 2025 13:46:29 +0200
Subject: [PATCH 06/25] carla: remove gtk2

---
 doc/release-notes/rl-2511.section.md      | 2 ++
 pkgs/applications/audio/carla/default.nix | 9 ---------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index c1e01105f417..b12ca53b16fa 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -136,6 +136,8 @@
 
 - Greetd and its original greeters (`tuigreet`, `gtkgreet`, `qtgreet`, `regreet`, `wlgreet`) were moved from `greetd` namespace to top level (`greetd.tuigreet` -> `tuigreet`, `greetd.greetd` -> `greetd`, etc). The original attrs are available for compatibility as passthrus of `greetd`, but will emit a warning. They will be removed in future releases.
 
+- `carla` no longer support `gtk2` override.
+
 - The `archipelago-minecraft` package was removed, as upstream no longer provides support for the Minecraft APWorld.
 
 - `pcp` has been removed because the upstream repo was archived and it hasn't been updated since 2021.
diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix
index 779f3ba6815b..ece20404eac8 100644
--- a/pkgs/applications/audio/carla/default.nix
+++ b/pkgs/applications/audio/carla/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch2,
   alsa-lib,
   file,
   fluidsynth,
@@ -13,11 +12,9 @@
   pkg-config,
   python3Packages,
   which,
-  gtk2 ? null,
   gtk3 ? null,
   qtbase ? null,
   withFrontend ? true,
-  withGtk2 ? true,
   withGtk3 ? true,
   withQt ? true,
   wrapQtAppsHook ? null,
@@ -62,7 +59,6 @@ stdenv.mkDerivation (finalAttrs: {
     libsndfile
   ]
   ++ lib.optional withQt qtbase
-  ++ lib.optional withGtk2 gtk2
   ++ lib.optional withGtk3 gtk3;
 
   propagatedBuildInputs = finalAttrs.pythonPath;
@@ -77,11 +73,6 @@ stdenv.mkDerivation (finalAttrs: {
         filename="$(basename -- "$file")"
         substituteInPlace "$file" --replace-fail '--with-appname="$0"' "--with-appname=\"$filename\""
     done
-  ''
-  + lib.optionalString withGtk2 ''
-    # Will try to dlopen() libgtk-x11-2.0 at runtime when using the bridge.
-    substituteInPlace source/bridges-ui/Makefile \
-        --replace-fail '$(CXX) $(OBJS_GTK2)' '$(CXX) $(OBJS_GTK2) -lgtk-x11-2.0'
   '';
 
   dontWrapQtApps = true;

From 0365871171e76310355ee585211023927497afd3 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 13 Oct 2025 07:23:50 +0200
Subject: [PATCH 07/25] cadical: install header files into include/cadical/

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

diff --git a/pkgs/by-name/ca/cadical/package.nix b/pkgs/by-name/ca/cadical/package.nix
index c25118a876dc..dc1e4dd47166 100644
--- a/pkgs/by-name/ca/cadical/package.nix
+++ b/pkgs/by-name/ca/cadical/package.nix
@@ -84,6 +84,8 @@ stdenv.mkDerivation rec {
     install -Dm0755 build/mobical "$out/bin/mobical"
     install -Dm0644 src/ccadical.h "$dev/include/ccadical.h"
     install -Dm0644 src/cadical.hpp "$dev/include/cadical.hpp"
+    install -Dm0644 src/cadical.hpp "$dev/include/cadical/cadical.hpp"
+    install -Dm0644 src/tracer.hpp "$dev/include/cadical/tracer.hpp"
     install -Dm0644 build/libcadical.a "$lib/lib/libcadical.a"
     mkdir -p "$out/share/doc/${pname}/"
     install -Dm0755 {LICEN?E,README*,VERSION} "$out/share/doc/${pname}/"

From 7131c2c3b1adad91786ee78e2984a74a05db9008 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 13 Oct 2025 07:23:56 +0200
Subject: [PATCH 08/25] =?UTF-8?q?cvc5:=201.3.0=20=E2=86=92=201.3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/cv/cvc5/package.nix b/pkgs/by-name/cv/cvc5/package.nix
index 295c7891407d..d6450d7086c6 100644
--- a/pkgs/by-name/cv/cvc5/package.nix
+++ b/pkgs/by-name/cv/cvc5/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cvc5";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "cvc5";
     repo = "cvc5";
-    rev = "cvc5-${version}";
-    hash = "sha256-w8rIGPG9BTEPV9HG2U40A4DYYnC6HaWbzqDKCRhaT00=";
+    tag = "cvc5-${version}";
+    hash = "sha256-nxJjrpWZfYPuuKN4CWxOHEuou4r+MdK0AjdEPZHZbHI=";
   };
 
   nativeBuildInputs = [

From 5652062f6811338f517fe387a882075923d675a1 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Mon, 13 Oct 2025 22:54:24 +0200
Subject: [PATCH 09/25] nats-streaming-server: drop

'nats-streaming-server' has been removed as critical bug fixes and security fixes will no longer be performed as of June of 2023
---
 .../na/nats-streaming-server/package.nix      | 30 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 2 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 pkgs/by-name/na/nats-streaming-server/package.nix

diff --git a/pkgs/by-name/na/nats-streaming-server/package.nix b/pkgs/by-name/na/nats-streaming-server/package.nix
deleted file mode 100644
index 9f6da2be4195..000000000000
--- a/pkgs/by-name/na/nats-streaming-server/package.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  buildGoModule,
-  fetchFromGitHub,
-  lib,
-}:
-
-buildGoModule rec {
-  pname = "nats-streaming-server";
-  version = "0.25.6";
-
-  src = fetchFromGitHub {
-    rev = "v${version}";
-    owner = "nats-io";
-    repo = "nats-streaming-server";
-    sha256 = "sha256-i5fNxeJQXiyy+9NOGT1X68u9Pztxvnnba64rxIgjbZc=";
-  };
-
-  vendorHash = "sha256-r6RDHGAt83sKyMHvG3927rZroWdnTQFb8zTrmlc0W5U=";
-
-  # tests fail and ask to `go install`
-  doCheck = false;
-
-  meta = with lib; {
-    description = "NATS Streaming System Server";
-    license = licenses.asl20;
-    maintainers = [ maintainers.swdunlop ];
-    homepage = "https://nats.io/";
-    mainProgram = "nats-streaming-server";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 48b601634ca9..36f48a0fd9bd 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1812,6 +1812,7 @@ mapAliases {
   namazu = throw "namazu has been removed, as it was broken"; # Added 2025-08-25
   nanoblogger = throw "nanoblogger has been removed as upstream stopped developement in 2013"; # Added 2025-09-10
   nasc = throw "'nasc' has been removed as it was unmaintained and depends on deprecated webkitgtk_4_0"; # Added 2025-10-09
+  nats-streaming-server = throw "'nats-streaming-server' has been removed as critical bug fixes and security fixes will no longer be performed as of June of 2023"; # added 2025-10-13
   ncdu_2 = ncdu; # Added 2022-07-22
   neardal = throw "neardal has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-29
   neocities-cli = neocities; # Added 2024-07-31

From ae5edf1b040e2ffe384320d060cf55586c3f9191 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Oct 2025 08:43:37 +0000
Subject: [PATCH 10/25] grafanaPlugins.grafana-exploretraces-app: 1.1.3 ->
 1.2.0

---
 .../grafana/plugins/grafana-exploretraces-app/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix
index f4719d630acb..aba6765ee233 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "grafana-exploretraces-app";
-  version = "1.1.3";
-  zipHash = "sha256-0i9ndLOUXisJJk2sV0Xt0NC8KNn2k5/cIRS/G0jS8Ks=";
+  version = "1.2.0";
+  zipHash = "sha256-QXBOODMgFJvPLgr1Gr6mkpW2YJwYlDO/ZXL3BlEhEJ0=";
   meta = with lib; {
     description = "Opinionated traces app";
     license = licenses.agpl3Only;

From 99fa3bef3ffa665cb298acc8f6893b9aeb011211 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Tue, 14 Oct 2025 09:00:48 +0200
Subject: [PATCH 11/25] somatic-sniper: drop

---
 pkgs/by-name/so/somatic-sniper/package.nix    | 40 -------------------
 .../so/somatic-sniper/somatic-sniper.patch    | 26 ------------
 pkgs/top-level/aliases.nix                    |  1 +
 3 files changed, 1 insertion(+), 66 deletions(-)
 delete mode 100644 pkgs/by-name/so/somatic-sniper/package.nix
 delete mode 100644 pkgs/by-name/so/somatic-sniper/somatic-sniper.patch

diff --git a/pkgs/by-name/so/somatic-sniper/package.nix b/pkgs/by-name/so/somatic-sniper/package.nix
deleted file mode 100644
index e979fcee2cb7..000000000000
--- a/pkgs/by-name/so/somatic-sniper/package.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  zlib,
-  ncurses,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "somatic-sniper";
-  version = "1.0.5.0";
-
-  src = fetchFromGitHub {
-    owner = "genome";
-    repo = "somatic-sniper";
-    rev = "v${version}";
-    sha256 = "0lk7p9sp6mp50f6w1nppqhr40fcwy1asw06ivw8w8jvvnwaqf987";
-  };
-
-  patches = [ ./somatic-sniper.patch ];
-
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [
-    zlib
-    ncurses
-  ];
-
-  enableParallelBuilding = false;
-
-  meta = with lib; {
-    description = "Identify single nucleotide positions that are different between tumor and normal";
-    mainProgram = "bam-somaticsniper";
-    license = licenses.mit;
-    homepage = "https://github.com/genome/somatic-sniper";
-    maintainers = with maintainers; [ jbedo ];
-    platforms = platforms.linux;
-  };
-
-}
diff --git a/pkgs/by-name/so/somatic-sniper/somatic-sniper.patch b/pkgs/by-name/so/somatic-sniper/somatic-sniper.patch
deleted file mode 100644
index 9af04c0a0696..000000000000
--- a/pkgs/by-name/so/somatic-sniper/somatic-sniper.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6d5a180..7254292 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11,7 +11,7 @@ set(CMAKE_MODULE_PATH
-     )
- 
- include(TestHelper)
--include(VersionHelper)
-+#include(VersionHelper)
- include(ProjectHelper)
- 
- # NOTE: for sniper we want the exe suffix to be like 0.7.4, not just 0.7
-diff --git a/vendor/samtools.patch b/vendor/samtools.patch
-index f173017..654f878 100644
---- a/vendor/samtools.patch
-+++ b/vendor/samtools.patch
-@@ -6,7 +6,7 @@ diff -Nuar a/Makefile b/Makefile
-  
-  samtools:lib $(AOBJS)
- -		$(CC) $(CFLAGS) -o $@ $(AOBJS) -lm $(LIBPATH) $(LIBCURSES) -lz -L. -lbam
--+		$(CC) $(CFLAGS) -o $@ $(AOBJS) -lm $(LIBPATH) $(LIBCURSES) -L. -lbam -lz
-++		$(CC) $(CFLAGS) -o $@ $(AOBJS) -lm $(LIBPATH) -lncurses -L. -lbam -lz
-  
-  razip:razip.o razf.o
-  		$(CC) $(CFLAGS) -o $@ razf.o razip.o -lz
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 48b601634ca9..7233852ee0cc 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2416,6 +2416,7 @@ mapAliases {
   snort2 = throw "snort2 has been removed as it is deprecated and unmaintained by upstream. Consider using snort (snort3) package instead."; # 2025-05-21
   snowman = throw "snowman has been removed as it is unmaintained by upstream"; # 2025-10-12
   soldat-unstable = opensoldat; # Added 2022-07-02
+  somatic-sniper = throw "somatic-sniper has been removed as it was archived in 2020 and fails to build."; # Added 2025-10-14
   soulseekqt = throw "'soulseekqt' has been removed due to lack of maintenance in Nixpkgs in a long time. Consider using 'nicotine-plus' or 'slskd' instead."; # Added 2025-06-07
   soundkonverter = throw "'soundkonverter' has been dropped as it depends on KDE Gear 5, and is unmaintained"; # Added 2025-08-20
   soundOfSorting = sound-of-sorting; # Added 2023-07-07

From 769f5c977235a2e02376ab91b9d96b489fe2b79a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Oct 2025 23:14:48 +0000
Subject: [PATCH 12/25] sydbox: 3.39.1 -> 3.40.1

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

diff --git a/pkgs/by-name/sy/sydbox/package.nix b/pkgs/by-name/sy/sydbox/package.nix
index 9951760b51ec..146a41c816a1 100644
--- a/pkgs/by-name/sy/sydbox/package.nix
+++ b/pkgs/by-name/sy/sydbox/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sydbox";
-  version = "3.39.1";
+  version = "3.40.1";
 
   outputs = [
     "out"
@@ -24,10 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "Sydbox";
     repo = "sydbox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LJHZb4TGo+Lep7yiej2G1H6mXAoEk5ixn/lGDxAWqvg=";
+    hash = "sha256-hO17Rm4gOSCVlmVZTZdJ2qh9pzdrl8Ay9uU6w7V4RPo=";
   };
 
-  cargoHash = "sha256-mUeJ3A2HW2pXWXW3Abb+aqTaZjVrchYJNCJCDC2Em9s=";
+  cargoHash = "sha256-y6FvIH3+daDsYP18BpsoYKsshvpVcSU7s/tjPdnudtY=";
 
   nativeBuildInputs = [
     mandoc

From c788316a54859fae236a3e12a20f34b8ccfe0480 Mon Sep 17 00:00:00 2001
From: Michael Tibben <mtibben@groq.com>
Date: Thu, 16 Oct 2025 18:15:09 +1100
Subject: [PATCH 13/25] google-cloud-sdk: ensure determinism by not writing
 python bytecode

---
 pkgs/by-name/go/google-cloud-sdk/package.nix             | 2 ++
 pkgs/by-name/go/google-cloud-sdk/withExtraComponents.nix | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/by-name/go/google-cloud-sdk/package.nix b/pkgs/by-name/go/google-cloud-sdk/package.nix
index 1d37ebf1c416..e5c4399649a0 100644
--- a/pkgs/by-name/go/google-cloud-sdk/package.nix
+++ b/pkgs/by-name/go/google-cloud-sdk/package.nix
@@ -161,6 +161,8 @@ stdenv.mkDerivation rec {
   installCheckPhase = ''
     # Avoid trying to write logs to homeless-shelter
     export HOME=$(mktemp -d)
+    # Prevent Python from writing bytecode to ensure build determinism
+    export PYTHONDONTWRITEBYTECODE=1
     $out/bin/gcloud version --format json | jq '."Google Cloud SDK"' | grep "${version}"
     $out/bin/gsutil version | grep -w "$(cat platform/gsutil/VERSION)"
   '';
diff --git a/pkgs/by-name/go/google-cloud-sdk/withExtraComponents.nix b/pkgs/by-name/go/google-cloud-sdk/withExtraComponents.nix
index 986ee2ba4884..e13ea25caac9 100644
--- a/pkgs/by-name/go/google-cloud-sdk/withExtraComponents.nix
+++ b/pkgs/by-name/go/google-cloud-sdk/withExtraComponents.nix
@@ -81,6 +81,8 @@ symlinkJoin {
   postBuild = ''
     sed -i ';' $out/google-cloud-sdk/bin/.gcloud-wrapped
     sed -i -e "s#${google-cloud-sdk}#$out#" "$out/google-cloud-sdk/bin/gcloud"
+    # Prevent Python from writing bytecode to ensure build determinism
+    export PYTHONDONTWRITEBYTECODE=1
     ${installCheck}
   '';
 }

From f36da456a03cbec738dfbfb5f77c8bad894b6678 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <git@drawbu.dev>
Date: Thu, 16 Oct 2025 18:20:15 -0700
Subject: [PATCH 14/25] avidemux: fix build failure with cmake 4

- CMake 4 is no longer retro compatible with versions < 3.5
---
 pkgs/by-name/av/avidemux/package.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/by-name/av/avidemux/package.nix b/pkgs/by-name/av/avidemux/package.nix
index b570d6036af6..2343a70b463d 100644
--- a/pkgs/by-name/av/avidemux/package.nix
+++ b/pkgs/by-name/av/avidemux/package.nix
@@ -80,6 +80,21 @@ stdenv.mkDerivation rec {
         stripLen = 1;
       }
     } avidemux_core/ffmpeg_package/patches/
+
+    # Those CMake versions are deprecated and is no longer supported by CMake > 4
+    # https://github.com/NixOS/nixpkgs/issues/445447
+    substituteInPlace {avidemux_plugins,avidemux_core,avidemux/{cli,qt4}}/CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 3.0)" \
+      "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace avidemux/gtk/CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 2.6)" \
+      "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace avidemux/qt4/xdg_data/CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 2.8.11)" \
+      "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace addons/fontGen/CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 2.8)" \
+      "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [

From 4419dc0a76f4ba49dab7b770ffc69dbdb580a647 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Sat, 18 Oct 2025 11:09:27 +0200
Subject: [PATCH 15/25] claude-code: 2.0.17 -> 2.0.22

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md
---
 .../vscode/extensions/anthropic.claude-code/default.nix     | 4 ++--
 pkgs/by-name/cl/claude-code/package-lock.json               | 4 ++--
 pkgs/by-name/cl/claude-code/package.nix                     | 6 +++---
 pkgs/by-name/cl/claude-code/update.sh                       | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index 9ec2a7a18d94..4cb9c1bc531e 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "claude-code";
     publisher = "anthropic";
-    version = "2.0.17";
-    hash = "sha256-8R0BvDfQDJmWD038mywNVIYtmgzyzwSEbqnCHQBpjg8=";
+    version = "2.0.22";
+    hash = "sha256-ystT5nHh0ivpFLwhHr6Uw5PyubkdY/kWm841wzIfyJ4=";
   };
 
   meta = {
diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index 4d7863b7ee79..82dac85d93c1 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@anthropic-ai/claude-code",
-  "version": "2.0.15",
+  "version": "2.0.22",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@anthropic-ai/claude-code",
-      "version": "2.0.15",
+      "version": "2.0.22",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 49cba4d5eca1..3ca88da75005 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -7,14 +7,14 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "claude-code";
-  version = "2.0.17";
+  version = "2.0.22";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
-    hash = "sha256-uQ+iosjjs6dUT8MtnFwubJqp85pBtBYkmIXTlRGufQw=";
+    hash = "sha256-SDXYXEb7Vi150Hx04y9kd+Owzu11VSqVRgej36P2khU=";
   };
 
-  npmDepsHash = "sha256-g03tfNJjx/KIUu14/mqranKR4G8mo9ig74iRgCdiJuE=";
+  npmDepsHash = "sha256-kphPXek1YoEs4yvikOYg/CmkKuq1rMUJC6Rkrhydkxo=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json
diff --git a/pkgs/by-name/cl/claude-code/update.sh b/pkgs/by-name/cl/claude-code/update.sh
index b9aed11abae8..bb64ea3631c1 100755
--- a/pkgs/by-name/cl/claude-code/update.sh
+++ b/pkgs/by-name/cl/claude-code/update.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell --pure -i bash --packages nodejs nix-update git
+#!nix-shell --pure --keep NIX_PATH -i bash --packages nodejs nix-update git
 
 set -euo pipefail
 

From 1b7a46c24ed506533e29c20ac579bb57892e2bff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <git@drawbu.dev>
Date: Sat, 18 Oct 2025 16:01:05 -0700
Subject: [PATCH 16/25] cpp-netlib: fix build failure with cmake 4

- CMake 4 is no longer retro compatible with versions < 3.5
---
 pkgs/by-name/cp/cpp-netlib/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/cp/cpp-netlib/package.nix b/pkgs/by-name/cp/cpp-netlib/package.nix
index faab71f0e3f3..f7c126fcc1b9 100644
--- a/pkgs/by-name/cp/cpp-netlib/package.nix
+++ b/pkgs/by-name/cp/cpp-netlib/package.nix
@@ -28,6 +28,14 @@ stdenvForCppNetlib.mkDerivation rec {
     ./0001-Compatibility-with-boost-1.83.patch
   ];
 
+  # CMake 2.8 is deprecated and is no longer supported by CMake > 4
+  # https://github.com/NixOS/nixpkgs/issues/445447
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 2.8)" \
+      "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     # io_service.hpp has been removed in boost 1.87+

From cb7cf9d1923abbe9e0f11223b075fc1c44f18e36 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 19 Oct 2025 07:44:49 +0200
Subject: [PATCH 17/25] nsync: fix build with cmake4

---
 pkgs/by-name/ns/nsync/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/ns/nsync/package.nix b/pkgs/by-name/ns/nsync/package.nix
index 316775124b44..601376952bd6 100644
--- a/pkgs/by-name/ns/nsync/package.nix
+++ b/pkgs/by-name/ns/nsync/package.nix
@@ -16,6 +16,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-RAwrS8Vz5fZwZRvF4OQfn8Ls11S8OIV2TmJpNrBE4MI=";
   };
 
+  postPatch = ''
+    # CMake 3.0 is deprecated and is no longer supported by CMake > 4
+    # inline of https://github.com/google/nsync/pull/27
+    substituteInPlace CMakeLists.txt \
+     --replace-fail "cmake_minimum_required (VERSION 2.8.12)" \
+       "cmake_minimum_required (VERSION 3.10)"
+  '';
+
   nativeBuildInputs = [ cmake ];
 
   # Needed for case-insensitive filesystems like on macOS

From 6ba62bccb999b62d8805372e7f28858f6422c5fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <git@drawbu.dev>
Date: Sat, 18 Oct 2025 19:15:04 -0700
Subject: [PATCH 18/25] canokey-usbip: fix build failure with cmake 4

- CMake 4 is no longer retro compatible with versions < 3.5
---
 pkgs/by-name/ca/canokey-usbip/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/ca/canokey-usbip/package.nix b/pkgs/by-name/ca/canokey-usbip/package.nix
index ee1b53bc1222..4fde140277b4 100644
--- a/pkgs/by-name/ca/canokey-usbip/package.nix
+++ b/pkgs/by-name/ca/canokey-usbip/package.nix
@@ -21,6 +21,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     sed -i 's/COMMAND git describe.*\(>>.*\)/COMMAND echo ${finalAttrs.src.rev} \1/' canokey-core/CMakeLists.txt
+
+    # CMake 2.8.12 is deprecated and is no longer supported by CMake > 4
+    # https://github.com/NixOS/nixpkgs/issues/445447
+    substituteInPlace canokey-core/canokey-crypto/mbedtls/CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 2.8.12)" \
+      "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [
@@ -31,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   env = {
     NIX_CFLAGS_COMPILE = toString [
       "-Wno-error=incompatible-pointer-types"
+      (lib.optionalString stdenv.cc.isClang "-Wno-error=documentation")
     ];
   };
 

From a7395bf1db95a874659fba51b5e47bf3e0a63dbc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 18:49:06 +0000
Subject: [PATCH 19/25] svd2rust: 0.37.0 -> 0.37.1

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

diff --git a/pkgs/by-name/sv/svd2rust/package.nix b/pkgs/by-name/sv/svd2rust/package.nix
index 966d25495199..69c4d149f4be 100644
--- a/pkgs/by-name/sv/svd2rust/package.nix
+++ b/pkgs/by-name/sv/svd2rust/package.nix
@@ -6,14 +6,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "svd2rust";
-  version = "0.37.0";
+  version = "0.37.1";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-42Yz6BGmT5EcS3N5x6aHyvnfpnYqicje2rtPx3z+Bu0=";
+    hash = "sha256-50g5YVmVYTLYJdaWXk91OYdlghDchkyHXS9j2Z7IXSw=";
   };
 
-  cargoHash = "sha256-pSZrLhEZwbnbjiIHmU5bcpHOEcodgD1mVgO6oI7zTG4=";
+  cargoHash = "sha256-poP1az7Hv/qPrTUvqHbd7aylJrI9LGBMu88g+pFmXF4=";
 
   # error: linker `aarch64-linux-gnu-gcc` not found
   postPatch = ''

From d0532eced4e6e20a2366b9bfb851c40866ca140d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 20:46:38 +0000
Subject: [PATCH 20/25] altus: 5.7.1 -> 5.7.2

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

diff --git a/pkgs/by-name/al/altus/package.nix b/pkgs/by-name/al/altus/package.nix
index 51fc6edee604..c0ed153c0a47 100644
--- a/pkgs/by-name/al/altus/package.nix
+++ b/pkgs/by-name/al/altus/package.nix
@@ -7,12 +7,12 @@
 
 let
   pname = "altus";
-  version = "5.7.1";
+  version = "5.7.2";
 
   src = fetchurl {
     name = "altus-${version}.AppImage";
     url = "https://github.com/amanharwara/altus/releases/download/${version}/Altus-${version}.AppImage";
-    hash = "sha256-G0jKBnobMKJWZmLtyYLpdruNxEVGt5rZHPFJYJkY8Y4=";
+    hash = "sha256-sB4ONFLTNN2Dd3LIVtpXIGTyHDFcXako7nlKxzNEOtA=";
   };
 
   appimageContents = appimageTools.extractType2 {

From 29d9e829d7126af0a51f61c81a2b2c574ba1cb14 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 21:46:10 +0000
Subject: [PATCH 21/25] roddhjav-apparmor-rules: 0-unstable-2025-10-05 ->
 0-unstable-2025-10-14

---
 pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
index 2b7708c07d4a..9f19be05bf64 100644
--- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
+++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "roddhjav-apparmor-rules";
-  version = "0-unstable-2025-10-05";
+  version = "0-unstable-2025-10-14";
 
   src = fetchFromGitHub {
     owner = "roddhjav";
     repo = "apparmor.d";
-    rev = "cdc782ce0836f3d5566fafb93cb43cbae21b3f58";
-    hash = "sha256-uXa78bFhCYkMCOTdNnQJLu7Yz3do+hZBUG3TIZWv544=";
+    rev = "f85802feeaa5f414184398b38e9916cfd5a2e25c";
+    hash = "sha256-JlG7TpLICeRrTl+4MVe9UUF4nezeHiKcE+C8pwsca4M=";
   };
 
   dontConfigure = true;

From 931587160ec826ebe7818f1e5efc49a196b6aaf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 17 Oct 2025 22:33:12 -0700
Subject: [PATCH 22/25] python3Packages.asyncua: use default pytest-asyncio

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

diff --git a/pkgs/development/python-modules/asyncua/default.nix b/pkgs/development/python-modules/asyncua/default.nix
index d5d6ecd95907..a02509e9130b 100644
--- a/pkgs/development/python-modules/asyncua/default.nix
+++ b/pkgs/development/python-modules/asyncua/default.nix
@@ -8,7 +8,7 @@
   fetchFromGitHub,
   hatchling,
   pyopenssl,
-  pytest-asyncio_0_21,
+  pytest-asyncio,
   pytest-mock,
   pytestCheckHook,
   python-dateutil,
@@ -56,7 +56,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-    pytest-asyncio_0_21
+    pytest-asyncio
     pytest-mock
   ];
 

From 8f6ebd036e8e3a3532df723f5121320944e6feda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 17 Oct 2025 22:34:23 -0700
Subject: [PATCH 23/25] python3Packages.pytest-asyncio_0_21: drop

---
 pkgs/top-level/python-packages.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5309f911b8ca..fb31006dc940 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14450,16 +14450,6 @@ self: super: with self; {
 
   pytest-asyncio_0 = callPackage ../development/python-modules/pytest-asyncio/0.nix { };
 
-  pytest-asyncio_0_21 = pytest-asyncio.overridePythonAttrs (old: rec {
-    version = "0.21.2";
-    src = pkgs.fetchFromGitHub {
-      owner = "pytest-dev";
-      repo = "pytest-asyncio";
-      rev = "refs/tags/v${version}";
-      hash = "sha256-AVVvdo/CDF9IU6l779sLc7wKz5h3kzMttdDNTPLYxtQ=";
-    };
-  });
-
   pytest-base-url = callPackage ../development/python-modules/pytest-base-url { };
 
   pytest-bdd = callPackage ../development/python-modules/pytest-bdd { };

From 9fa3e74b4f2675ebdafdb0362f24b36178871dc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 19 Oct 2025 16:54:52 -0700
Subject: [PATCH 24/25] monotoneViz: drop

The old graphviz it relies on fails to compile with

    lefty.c: In function 'processinput':
    lefty.c:67:22: error: implicit declaration of function '__freadable' [-Wimplicit-function-declaration]
       67 | #define canread(fp) (__freadable(fp))
          |                      ^~~~~~~~~~~
    lefty.c:397:13: note: in expansion of macro 'canread'
      397 |             canread(iop[ioi].ifp))
          |             ^~~~~~~
---
 .../monotone-viz/default.nix                  | 105 ------------------
 .../monotone-viz/graphviz-2.0.nix             |  66 -----------
 pkgs/top-level/aliases.nix                    |   1 +
 pkgs/top-level/all-packages.nix               |   4 -
 4 files changed, 1 insertion(+), 175 deletions(-)
 delete mode 100644 pkgs/applications/version-management/monotone-viz/default.nix
 delete mode 100644 pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix

diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix
deleted file mode 100644
index 5f43c165dcba..000000000000
--- a/pkgs/applications/version-management/monotone-viz/default.nix
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  fetchpatch,
-  ocamlPackages,
-  gnome2,
-  pkg-config,
-  makeWrapper,
-  glib,
-  libtool,
-  libpng,
-  bison,
-  expat,
-  fontconfig,
-  gd,
-  pango,
-  libjpeg,
-  libwebp,
-  libX11,
-  libXaw,
-}:
-# We need an old version of Graphviz for format compatibility reasons.
-# This version is vulnerable, but monotone-viz will never feed it bad input.
-let
-  graphviz_2_0 = import ./graphviz-2.0.nix {
-    inherit
-      lib
-      stdenv
-      fetchurl
-      pkg-config
-      libX11
-      libpng
-      libjpeg
-      expat
-      libXaw
-      bison
-      libtool
-      fontconfig
-      pango
-      gd
-      libwebp
-      ;
-  };
-in
-let
-  inherit (gnome2) libgnomecanvas;
-in
-let
-  inherit (ocamlPackages) ocaml lablgtk camlp4;
-in
-stdenv.mkDerivation rec {
-  version = "1.0.2";
-  pname = "monotone-viz";
-
-  nativeBuildInputs = [
-    pkg-config
-    makeWrapper
-    ocaml
-    camlp4
-  ];
-  buildInputs = [
-    lablgtk
-    libgnomecanvas
-    glib
-    graphviz_2_0
-  ];
-  src = fetchurl {
-    url = "http://oandrieu.nerim.net/monotone-viz/${pname}-${version}-nolablgtk.tar.gz";
-    sha256 = "1l5x4xqz5g1aaqbc1x80mg0yzkiah9ma9k9mivmn08alkjlakkdk";
-  };
-
-  prePatch = "ln -s . a; ln -s . b";
-  patchFlags = [ "-p0" ];
-  patches = [
-    (fetchpatch {
-      url = "https://src.fedoraproject.org/rpms/monotone-viz/raw/c9f4c1bebe01bb471df05d8a37ca4b6d630574ec/f/monotone-viz-1.0.2-dot.patch";
-      hash = "sha256-e348703+IzM4m/3cpe6Z9VebZgTK8+3lRLdaTfXHwSI=";
-    })
-    (fetchpatch {
-      url = "https://src.fedoraproject.org/rpms/monotone-viz/raw/c9f4c1bebe01bb471df05d8a37ca4b6d630574ec/f/monotone-viz-1.0.2-new-stdio.patch";
-      hash = "sha256-9xQzJ+oYz06fDFOe1YOOisEZnwiwShqr2Rt7IXiu6Zo=";
-    })
-    (fetchpatch {
-      url = "https://src.fedoraproject.org/rpms/monotone-viz/raw/c9f4c1bebe01bb471df05d8a37ca4b6d630574ec/f/monotone-viz-1.0.2-typefix.patch";
-      hash = "sha256-52VGXDJKx4ZGvZRO8QCXdTGsWR0m1pqQnEOby7PMQdg=";
-    })
-  ];
-
-  preConfigure = ''
-    appendToVar configureFlags "--with-lablgtk-dir=$(echo ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2)"
-  '';
-
-  postInstall = ''
-    wrapProgram "$out/bin/monotone-viz" --prefix PATH : "${graphviz_2_0}/bin/"
-  '';
-
-  meta = {
-    description = "Monotone ancestry visualiser";
-    mainProgram = "monotone-viz";
-    license = lib.licenses.gpl2Plus;
-    maintainers = [ lib.maintainers.raskin ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
deleted file mode 100644
index 88fa657da437..000000000000
--- a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  pkg-config,
-  libX11,
-  libpng,
-  libjpeg,
-  expat,
-  libXaw,
-  bison,
-  libtool,
-  fontconfig,
-  pango,
-  gd,
-  libwebp,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "graphviz";
-  version = "2.0";
-
-  src = fetchurl {
-    url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-${version}.tar.gz";
-    sha256 = "39b8e1f2ba4cc1f5bdc8e39c7be35e5f831253008e4ee2c176984f080416676c";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [
-    libX11
-    libpng
-    libjpeg
-    expat
-    libXaw
-    bison
-    libtool
-    fontconfig
-    pango
-    gd
-    libwebp
-  ];
-
-  hardeningDisable = [
-    "format"
-    "fortify"
-  ];
-
-  configureFlags = [
-    "--with-pngincludedir=${libpng.dev}/include"
-    "--with-pnglibdir=${libpng.out}/lib"
-    "--with-jpegincludedir=${libjpeg.dev}/include"
-    "--with-jpeglibdir=${libjpeg.out}/lib"
-    "--with-expatincludedir=${expat.dev}/include"
-    "--with-expatlibdir=${expat.out}/lib"
-    "--with-ltdl-include=${libtool}/include"
-    "--with-ltdl-lib=${libtool.lib}/lib"
-  ]
-  ++ lib.optional (libX11 == null) "--without-x";
-
-  meta = {
-    description = "Program for visualising graphs";
-    homepage = "http://www.graphviz.org/";
-    branch = "2.0";
-    platforms = lib.platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 909f5afde9a1..704196799882 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1781,6 +1781,7 @@ mapAliases {
   mongodb-4_4 = throw "mongodb-4_4 has been removed, it's end of life since April 2024"; # Added 2024-04-11
   mongodb-5_0 = throw "mongodb-5_0 has been removed, it's end of life since October 2024"; # Added 2024-10-01
   mongodb-6_0 = throw "mongodb-6_0 has been removed, it's end of life since July 2025"; # Added 2025-07-23
+  monotoneViz = throw "monotoneViz was removed because it relies on a broken version of graphviz"; # added 2025-10-19
   moralerspace-nf = throw "moralerspace-nf has been removed, use moralerspace instead."; # Added 2025-08-30
   moralerspace-hwnf = throw "moralerspace-hwnf has been removed, use moralerspace-hw instead."; # Added 2025-08-30
   morty = throw "morty has been removed, as searxng removed support for it and it was unmaintained."; # Added 2025-09-26
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3fc8c9d034fc..e6a26fe6f280 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11877,10 +11877,6 @@ with pkgs;
     lua = lua5;
   };
 
-  monotoneViz = callPackage ../applications/version-management/monotone-viz {
-    ocamlPackages = ocaml-ng.ocamlPackages_4_14_unsafe_string;
-  };
-
   moolticute = libsForQt5.callPackage ../applications/misc/moolticute { };
 
   mopidyPackages =

From c0456b15d58187c731d63c0c0262c4b242247aef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 01:23:13 +0000
Subject: [PATCH 25/25] kodiPackages.jellyfin: 1.1.0 -> 1.1.1

---
 pkgs/applications/video/kodi/addons/jellyfin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi/addons/jellyfin/default.nix b/pkgs/applications/video/kodi/addons/jellyfin/default.nix
index 0c57f5e20ed1..7e2bb9a17a5f 100644
--- a/pkgs/applications/video/kodi/addons/jellyfin/default.nix
+++ b/pkgs/applications/video/kodi/addons/jellyfin/default.nix
@@ -17,13 +17,13 @@ in
 buildKodiAddon rec {
   pname = "jellyfin";
   namespace = "plugin.video.jellyfin";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellyfin-kodi";
     rev = "v${version}";
-    sha256 = "sha256-5CJenvNmyNwrlNfF4jPap99oj21T96TeExbod8+KKTA=";
+    sha256 = "sha256-Pi8q64VykEfyIm9VlNOkWFeEhEhl7D6KLnNLpVsY+iU=";
   };
 
   nativeBuildInputs = [ python ];