From 51ac0ed7fdb24f3c51d6b60e18191291a4d7a496 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <git@amaanq.com>
Date: Mon, 26 Jan 2026 23:05:56 -0500
Subject: [PATCH 01/19] html-xml-utils: fix build with GCC 15

GCC 15 treats empty parentheses as (void), conflicting with the actual
lookup_element signature generated by gperf. This was intentionally
done, as version 7.7 removed the arguments because gperf 3.0 generates
`unsigned int` while gperf 3.1 generates `size_t`. However, gperf 3.1 is
nearly 10 years old, so it's reasonable to assume that practically every
system that wants to use GCC 15 will have gperf 3.1 or later.

Nixpkgs uses gperf 3.3, so we use `size_t` in the prototype.

This commit also adds gperf to `nativeBuildInputs` since patching the
.hash file triggers regeneration of the C source.

Fixes #480448
---
 pkgs/by-name/ht/html-xml-utils/gcc15.patch | 32 ++++++++++++++++++++++
 pkgs/by-name/ht/html-xml-utils/package.nix |  5 ++++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/by-name/ht/html-xml-utils/gcc15.patch

diff --git a/pkgs/by-name/ht/html-xml-utils/gcc15.patch b/pkgs/by-name/ht/html-xml-utils/gcc15.patch
new file mode 100644
index 000000000000..389b90c15297
--- /dev/null
+++ b/pkgs/by-name/ht/html-xml-utils/gcc15.patch
@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Amaan Qureshi <git@amaanq.com>
+Date: Mon, 27 Jan 2026 00:00:00 -0500
+Subject: [PATCH] Fix GCC 15 build by adding proper function prototype
+
+GCC 15 treats empty parentheses as (void), conflicting with the actual
+lookup_element signature generated by gperf. This was intentionally done,
+as version 7.7 removed the arguments because gperf 3.0 generates `unsigned int`
+while gperf 3.1 generates `size_t`. However, gperf 3.1 is nearly 10 years old,
+so it's reasonable to assume that practically every system that wants
+to use GCC 15 will have gperf 3.1 or later.
+
+This patch uses `size_t` to match gperf 3.1.
+
+---
+ dtd.hash | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/dtd.hash b/dtd.hash
+--- a/dtd.hash
++++ b/dtd.hash
+@@ -43,8 +43,8 @@ EXPORT typedef struct _ElementType {
+ } ElementType;
+
+ /* lookup_element -- look up the string in the hash table */
+-EXPORT const ElementType * lookup_element(/* register const char *str,
+-					  register unsigned int len */);
++EXPORT const ElementType * lookup_element(register const char *str,
++					  register size_t len);
+
+ /* Different kinds of parent elements: */
+ #define PHRASE "abbr", "acronym", "b", "bdi", "bdo", "big", "cite", "code", "dfn", "em", "i", "kbd", "q", "s", "samp", "small", "span", "strong", "sub", "sup", "time", "tt", "u", "var"
diff --git a/pkgs/by-name/ht/html-xml-utils/package.nix b/pkgs/by-name/ht/html-xml-utils/package.nix
index f2486ec224a1..c0bc244bb03c 100644
--- a/pkgs/by-name/ht/html-xml-utils/package.nix
+++ b/pkgs/by-name/ht/html-xml-utils/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchurl,
   curl,
+  gperf,
   libiconv,
 }:
 
@@ -15,6 +16,10 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-iIoxYxp6cDCLsvMz4HfQQW9Lt4MX+Gl/+0qVGH9ncwE=";
   };
 
+  patches = [ ./gcc15.patch ];
+
+  nativeBuildInputs = [ gperf ];
+
   buildInputs = [
     curl
     libiconv

From db5da97f1b564e472782bf5ed3e7450dae1744f2 Mon Sep 17 00:00:00 2001
From: GiggleSquid <jack.connors@protonmail.com>
Date: Sun, 1 Feb 2026 11:50:50 +0000
Subject: [PATCH 02/19] gridcoin-research: fix GCC 15 build

---
 .../blockchains/gridcoin-research/default.nix             | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/applications/blockchains/gridcoin-research/default.nix b/pkgs/applications/blockchains/gridcoin-research/default.nix
index ba5a14a53845..405fec25f840 100644
--- a/pkgs/applications/blockchains/gridcoin-research/default.nix
+++ b/pkgs/applications/blockchains/gridcoin-research/default.nix
@@ -16,6 +16,7 @@
   libtool,
   miniupnpc,
   hexdump,
+  fetchpatch2,
 }:
 
 stdenv.mkDerivation rec {
@@ -29,6 +30,13 @@ stdenv.mkDerivation rec {
     hash = "sha256-nupZB4nNbitpf5EBCNy0e+ovjayAszup/r7qxbxA5jI=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      url = "https://github.com/gridcoin-community/Gridcoin-Research/commit/bab91e95ca8c83f06dcc505e6b3f8b44dc6d50d4.patch";
+      sha256 = "sha256-GzurVlR7Tk3pmQfgO9WtHXjX6xHqNzdYqOdbJND7MpA=";
+    })
+  ];
+
   nativeBuildInputs = [
     pkg-config
     wrapQtAppsHook

From e45fc96846b8500066bdf186d54aeada8a4a3e4b Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Fri, 6 Feb 2026 17:34:42 +0100
Subject: [PATCH 03/19] vp: add update script

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

diff --git a/pkgs/by-name/vp/vp/package.nix b/pkgs/by-name/vp/vp/package.nix
index 59c1a6cb3bc6..31d0a25c87d0 100644
--- a/pkgs/by-name/vp/vp/package.nix
+++ b/pkgs/by-name/vp/vp/package.nix
@@ -5,6 +5,7 @@
   autoreconfHook,
   fetchFromGitHub,
   stdenv,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -40,6 +41,10 @@ stdenv.mkDerivation (finalAttrs: {
     "-I${lib.getDev SDL_image}/include/SDL"
   ];
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version=branch" ];
+  };
+
   meta = {
     homepage = "https://github.com/erikg/vp";
     description = "SDL based picture viewer/slideshow";

From bae6dd105e1ef777310928edd8e8b5465fc75347 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Fri, 6 Feb 2026 17:34:47 +0100
Subject: [PATCH 04/19] chiaki: 2.2.0 -> 2.2.0-unstable-2026-01-04

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/ch/chiaki/package.nix | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ch/chiaki/package.nix b/pkgs/by-name/ch/chiaki/package.nix
index 39720c826f2e..c654d1707bcd 100644
--- a/pkgs/by-name/ch/chiaki/package.nix
+++ b/pkgs/by-name/ch/chiaki/package.nix
@@ -4,7 +4,7 @@
   fetchgit,
   cmake,
   pkg-config,
-  ffmpeg_7,
+  ffmpeg,
   libopus,
   SDL2,
   libevdev,
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "chiaki";
-  version = "2.2.0";
+  version = "2.2.0-unstable-2026-01-04";
 
   src = fetchgit {
     url = "https://git.sr.ht/~thestr4ng3r/chiaki";
-    tag = "v${finalAttrs.version}";
+    rev = "ab55cf4c95f7723faae08a546fbe14e0f6bddf45";
     fetchSubmodules = true;
-    hash = "sha256-mLx2ygMlIuDJt9iT4nIj/dcLGjMvvmneKd49L7C3BQk=";
+    hash = "sha256-GYhbq3QCyykMu5K1ITJ+XqNU593Gn3eBTM9coKmh/Vk=";
   };
 
   nativeBuildInputs = [
@@ -30,14 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
     libsForQt5.wrapQtAppsHook
   ];
 
-  postPatch = ''
-    substituteInPlace CMakeLists.txt --replace-fail \
-    'cmake_minimum_required(VERSION 3.2)' \
-    'cmake_minimum_required(VERSION 3.5)'
-  '';
-
   buildInputs = [
-    ffmpeg_7 # needs avcodec_close which was removed in ffmpeg 8
+    ffmpeg
     libopus
     libsForQt5.qtbase
     libsForQt5.qtmultimedia

From 23813cd12486eb0ed517cdd518596d136750bfa8 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Fri, 6 Feb 2026 17:59:02 +0100
Subject: [PATCH 05/19] vpWithSixel: drop

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/top-level/aliases.nix      | 1 +
 pkgs/top-level/all-packages.nix | 7 -------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 581697253578..143c1cbbeb95 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1896,6 +1896,7 @@ mapAliases {
   volk_2 = throw "'volk_2' has been removed after not being used by any package for a long time"; # Added 2025-10-25
   volnoti = throw "'volnoti' has been removed due to lack of maintenance upstream. Consider using 'rumno' instead."; # Added 2024-12-04
   voxelands = throw "'voxelands' has been removed due to lack of upstream maintenance"; # Added 2025-08-30
+  vpWithSixel = throw "'vpWithSixel' has been removed as vp switched to SDL2 which does not support sixel"; # Added 2026-02-06
   vtk_9 = warnAlias "'vtk_9' has been renamed to 'vtk_9_5'" vtk_9_5; # Added 2025-07-18
   vtk_9_egl = warnAlias "'vtk_9_5' now build with egl support by default, so `vtk_9_egl` is deprecated, consider using 'vtk_9_5' instead." vtk_9_5; # Added 2025-07-18
   vtk_9_withQt5 = throw "'vtk_9_withQt5' has been removed, Consider using 'vtkWithQt6' instead."; # Added 2025-07-18
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c516d2d0e4a2..4894fb99ddb1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3638,13 +3638,6 @@ with pkgs;
 
   vpn-slice = python3Packages.callPackage ../tools/networking/vpn-slice { };
 
-  vpWithSixel = vp.override {
-    # Enable next line for console graphics. Note that it requires `sixel`
-    # enabled terminals such as mlterm or xterm -ti 340
-    SDL = SDL_sixel;
-    SDL_image = SDL_image.override { SDL = SDL_sixel; };
-  };
-
   openconnectPackages = callPackage ../tools/networking/openconnect { };
 
   inherit (openconnectPackages) openconnect openconnect_openssl;

From 68d0458cf4bc70ebd577ed75d1f80a350ec47bb4 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Fri, 6 Feb 2026 17:34:47 +0100
Subject: [PATCH 06/19] vp: 1.8-unstable-2017-03-22 -> 1.8-unstable-2025-09-15

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

diff --git a/pkgs/by-name/vp/vp/package.nix b/pkgs/by-name/vp/vp/package.nix
index 31d0a25c87d0..32db057dc31b 100644
--- a/pkgs/by-name/vp/vp/package.nix
+++ b/pkgs/by-name/vp/vp/package.nix
@@ -1,7 +1,9 @@
 {
   lib,
-  SDL,
-  SDL_image,
+  pkg-config,
+  SDL2,
+  SDL2_image,
+  libx11,
   autoreconfHook,
   fetchFromGitHub,
   stdenv,
@@ -10,23 +12,24 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vp";
-  version = "1.8-unstable-2017-03-22";
+  version = "1.8-unstable-2025-09-15";
 
   src = fetchFromGitHub {
     owner = "erikg";
     repo = "vp";
-    rev = "52bae15955dbd7270cc906af59bb0fe821a01f27";
-    hash = "sha256-AWRJ//0z97EwvQ00qWDjVeZrPrKnRMOXn4RagdVrcFc=";
+    rev = "12ab0c49a7d837af8370b91d3f6e4fa11789e57a";
+    hash = "sha256-Ea1p9NLk7tW3elU0zmlPAkobyv+yLYeKv5hscJTFJhs=";
   };
 
   nativeBuildInputs = [
     autoreconfHook
-    SDL
+    pkg-config
   ];
 
   buildInputs = [
-    SDL
-    SDL_image
+    SDL2
+    SDL2_image
+    libx11
   ];
 
   outputs = [
@@ -36,10 +39,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  env.NIX_CFLAGS_COMPILE = toString [
-    "-I${lib.getDev SDL}/include/SDL"
-    "-I${lib.getDev SDL_image}/include/SDL"
-  ];
+  # gcc15 build failure
+  env.NIX_CFLAGS_COMPILE = toString [ "-std=gnu17" ];
 
   passthru.updateScript = nix-update-script {
     extraArgs = [ "--version=branch" ];
@@ -51,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl3Plus;
     mainProgram = "vp";
     maintainers = [ ];
-    inherit (SDL.meta) platforms;
+    inherit (SDL2.meta) platforms;
     hydraPlatforms = lib.platforms.linux; # build hangs on both Darwin platforms, needs investigation
   };
 })

From 2d2cd15a83f4e55a05ce820f7835f39582f6da70 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 7 Feb 2026 00:55:39 +0100
Subject: [PATCH 07/19] gnujump: fix build with gcc15

Tracking: https://github.com/NixOS/nixpkgs/issues/475479
Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/gn/gnujump/fix-c23-prototypes.patch | 16 ++++++++++++++++
 pkgs/by-name/gn/gnujump/package.nix              |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/by-name/gn/gnujump/fix-c23-prototypes.patch

diff --git a/pkgs/by-name/gn/gnujump/fix-c23-prototypes.patch b/pkgs/by-name/gn/gnujump/fix-c23-prototypes.patch
new file mode 100644
index 000000000000..ef5c36c0e0a3
--- /dev/null
+++ b/pkgs/by-name/gn/gnujump/fix-c23-prototypes.patch
@@ -0,0 +1,16 @@
+diff --git a/src/game.h b/src/game.h
+index fc75acc..fd511a8 100644
+--- a/src/game.h
++++ b/src/game.h
+@@ -207,9 +207,9 @@ void continueTimer (L_timer * time);
+ 
+ int yesNoQuestion (data_t * gfx, game_t * game, char *text);
+ 
+-int updateInput ();
++int updateInput (game_t * game);
+ 
+-void freeGame ();
++void freeGame (game_t * game);
+ 
+ void drawGame (data_t * gfx, game_t * game);
+ 
diff --git a/pkgs/by-name/gn/gnujump/package.nix b/pkgs/by-name/gn/gnujump/package.nix
index db5765e101a4..34b4522f06cf 100644
--- a/pkgs/by-name/gn/gnujump/package.nix
+++ b/pkgs/by-name/gn/gnujump/package.nix
@@ -28,6 +28,8 @@ stdenv.mkDerivation (finalAttrs: {
     SDL_mixer
   ];
 
+  patches = [ ./fix-c23-prototypes.patch ];
+
   env.NIX_LDFLAGS = "-lm";
 
   desktopItems = [

From 43a928c56a54bc0ed8641d2f83089284ab1f2274 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Tue, 10 Feb 2026 19:57:09 +0800
Subject: [PATCH 08/19] opencbm: fix build

---
 pkgs/by-name/op/opencbm/fix-dfu_bool.patch | 16 ++++++++++++++++
 pkgs/by-name/op/opencbm/package.nix        |  8 ++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/op/opencbm/fix-dfu_bool.patch

diff --git a/pkgs/by-name/op/opencbm/fix-dfu_bool.patch b/pkgs/by-name/op/opencbm/fix-dfu_bool.patch
new file mode 100644
index 000000000000..a69f8c77c1b3
--- /dev/null
+++ b/pkgs/by-name/op/opencbm/fix-dfu_bool.patch
@@ -0,0 +1,16 @@
+diff --git a/xum1541cfg/dfu-programmer-0.5.4/src/dfu-bool.h b/xum1541cfg/dfu-programmer-0.5.4/src/dfu-bool.h
+index 3dbe5a53..c77bc686 100644
+--- a/xum1541cfg/dfu-programmer-0.5.4/src/dfu-bool.h
++++ b/xum1541cfg/dfu-programmer-0.5.4/src/dfu-bool.h
+@@ -1,9 +1,6 @@
+ #ifndef __DFU_BOOL_H__
+ #define __DFU_BOOL_H__
+ 
+-typedef enum {
+-    false = 0,
+-    true  = 1
+-} dfu_bool;
+-
++#include <stdbool.h>
++#define dfu_bool bool
+ #endif
diff --git a/pkgs/by-name/op/opencbm/package.nix b/pkgs/by-name/op/opencbm/package.nix
index c7e8c45ba390..2631a75e42be 100644
--- a/pkgs/by-name/op/opencbm/package.nix
+++ b/pkgs/by-name/op/opencbm/package.nix
@@ -15,10 +15,14 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "OpenCBM";
     repo = "OpenCBM";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-5lj5F79Gbhrvi9dxKGobdyDyBLGcptAtxx9SANhLrKw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-5lj5F79Gbhrvi9dxKGobdyDyBLGcptAtxx9SANhLrKw=";
   };
 
+  patches = [
+    ./fix-dfu_bool.patch
+  ];
+
   makefile = "LINUX/Makefile";
   makeFlags = [
     "PREFIX=${placeholder "out"}"

From 47bd1405251ebc3d5b37d23d1aa600eb2a9a39db Mon Sep 17 00:00:00 2001
From: Artemis Tosini <artemis.tosini@obsidian.systems>
Date: Wed, 18 Feb 2026 16:07:49 -0500
Subject: [PATCH 09/19] libdecor: fix build on FreeBSD

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

diff --git a/pkgs/by-name/li/libdecor/package.nix b/pkgs/by-name/li/libdecor/package.nix
index b93d58b2992b..832cd08c5390 100644
--- a/pkgs/by-name/li/libdecor/package.nix
+++ b/pkgs/by-name/li/libdecor/package.nix
@@ -12,6 +12,7 @@
   dbus,
   pango,
   gtk3,
+  evdev-proto,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -51,13 +52,14 @@ stdenv.mkDerivation (finalAttrs: {
     dbus
     pango
     gtk3
-  ];
+  ]
+  ++ lib.optional stdenv.hostPlatform.isFreeBSD evdev-proto;
 
   meta = {
     homepage = "https://gitlab.freedesktop.org/libdecor/libdecor";
     description = "Client-side decorations library for Wayland clients";
     license = lib.licenses.mit;
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux ++ lib.platforms.freebsd;
     maintainers = with lib.maintainers; [ artturin ];
   };
 })

From c2ca0bed26e963faf1e21b1ecb5e58e5b1beb6b9 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 22 Feb 2026 11:38:12 -0800
Subject: [PATCH 10/19] python3Packages.cyclonedds-python: 0.10.5 -> 0.11.0;
 fix build

---
 .../python-modules/cyclonedds-python/default.nix  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/cyclonedds-python/default.nix b/pkgs/development/python-modules/cyclonedds-python/default.nix
index 22ad399498a4..1b002fdd20c8 100644
--- a/pkgs/development/python-modules/cyclonedds-python/default.nix
+++ b/pkgs/development/python-modules/cyclonedds-python/default.nix
@@ -10,11 +10,12 @@
   pytestCheckHook,
   pytest-mock,
   pytest-cov-stub,
+  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "cyclonedds-python";
-  version = "0.10.5";
+  version = "0.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -27,8 +28,17 @@ buildPythonPackage rec {
   postPatch = ''
     substituteInPlace pyproject.toml \
         --replace-fail "pytest-cov" ""
+  ''
+  + lib.optionalString (!pythonOlder "3.13") ''
+    substituteInPlace clayer/pysertype.c \
+        --replace-fail "_Py_IsFinalizing()" "Py_IsFinalizing()"
   '';
 
+  disabledTests = lib.optionals (!pythonOlder "3.13") [
+    "test_dynamic_subscribe_complex"
+    "test_dynamic_publish_complex"
+  ];
+
   build-system = [ setuptools ];
 
   buildInputs = [ cyclonedds ];
@@ -36,6 +46,7 @@ buildPythonPackage rec {
   dependencies = [ rich-click ];
 
   env.CYCLONEDDS_HOME = "${cyclonedds.out}";
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=discarded-qualifiers";
 
   nativeCheckInputs = [
     pytestCheckHook
@@ -43,6 +54,8 @@ buildPythonPackage rec {
     pytest-cov-stub
   ];
 
+  disabled = (!pythonOlder "3.14");
+
   meta = {
     description = "Python binding for Eclipse Cyclone DDS";
     homepage = "https://github.com/eclipse-cyclonedds/cyclonedds-python";

From 62efab0dada7d38f14f7147bdd6c350780e9af10 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 12 Feb 2026 10:24:54 +0100
Subject: [PATCH 11/19] wxwidgets_3_{1,2}: rename from wxGTK3{1,2}

fit attrname to pname
---
 nixos/modules/programs/ccache.nix                         | 2 +-
 pkgs/applications/audio/espeak/edit.nix                   | 4 ++--
 pkgs/applications/misc/opencpn/default.nix                | 4 ++--
 pkgs/applications/radio/limesuite/default.nix             | 4 ++--
 pkgs/by-name/ae/aegisub/package.nix                       | 6 +++---
 pkgs/by-name/am/amule/package.nix                         | 4 ++--
 pkgs/by-name/as/asc/package.nix                           | 4 ++--
 pkgs/by-name/au/audacity/package.nix                      | 4 ++--
 pkgs/by-name/ba/bambu-studio/package.nix                  | 4 ++--
 pkgs/by-name/bo/bochs/package.nix                         | 4 ++--
 pkgs/by-name/bo/boinc/package.nix                         | 4 ++--
 pkgs/by-name/bo/bossa/package.nix                         | 4 ++--
 pkgs/by-name/ce/cemu/package.nix                          | 6 +++---
 pkgs/by-name/co/codeblocks/package.nix                    | 4 ++--
 pkgs/by-name/co/comical/package.nix                       | 4 ++--
 pkgs/by-name/cu/cubicsdr/package.nix                      | 4 ++--
 pkgs/by-name/da/darkradiant/package.nix                   | 6 +++---
 pkgs/by-name/dv/dvdstyler/package.nix                     | 4 ++--
 pkgs/by-name/el/electricsheep/package.nix                 | 4 ++--
 pkgs/by-name/es/espanso/package.nix                       | 6 +++---
 pkgs/by-name/fa/far2l/package.nix                         | 4 ++--
 pkgs/by-name/fi/filezilla/package.nix                     | 4 ++--
 pkgs/by-name/fi/fityk/package.nix                         | 6 +++---
 pkgs/by-name/fl/flamerobin/package.nix                    | 4 ++--
 pkgs/by-name/fr/freedv/package.nix                        | 4 ++--
 pkgs/by-name/fr/freqtweak/package.nix                     | 4 ++--
 pkgs/by-name/fs/fsg/package.nix                           | 6 +++---
 pkgs/by-name/ga/gambit-project/package.nix                | 6 +++---
 pkgs/by-name/go/golly/package.nix                         | 6 +++---
 pkgs/by-name/gr/grandorgue/package.nix                    | 4 ++--
 pkgs/by-name/gr/grass/package.nix                         | 4 ++--
 pkgs/by-name/hu/hugin/package.nix                         | 4 ++--
 pkgs/by-name/ki/kicad/package.nix                         | 4 ++--
 pkgs/by-name/le/lenmus/package.nix                        | 4 ++--
 pkgs/by-name/me/mediainfo-gui/package.nix                 | 4 ++--
 pkgs/by-name/me/megaglest/package.nix                     | 6 +++---
 pkgs/by-name/mm/mmex/package.nix                          | 6 +++---
 pkgs/by-name/mu/multivnc/package.nix                      | 4 ++--
 pkgs/by-name/od/odamex/package.nix                        | 4 ++--
 pkgs/by-name/or/orca-slicer/package.nix                   | 4 ++--
 pkgs/by-name/pc/pcem/package.nix                          | 4 ++--
 pkgs/by-name/ph/phd2/package.nix                          | 4 ++--
 pkgs/by-name/pl/plplot/package.nix                        | 4 ++--
 pkgs/by-name/po/poedit/package.nix                        | 4 ++--
 pkgs/by-name/pr/prusa-slicer/package.nix                  | 4 ++--
 pkgs/by-name/pt/pterm/package.nix                         | 4 ++--
 pkgs/by-name/pw/pwsafe/package.nix                        | 6 +++---
 pkgs/by-name/ra/radiotray-ng/package.nix                  | 4 ++--
 pkgs/by-name/ra/rapidsvn/package.nix                      | 4 ++--
 pkgs/by-name/re/rehex/package.nix                         | 4 ++--
 pkgs/by-name/sa/saga/package.nix                          | 4 ++--
 pkgs/by-name/sc/scorched3d/package.nix                    | 4 ++--
 pkgs/by-name/sl/slade-unstable/package.nix                | 8 ++++----
 pkgs/by-name/sl/slade/package.nix                         | 8 ++++----
 pkgs/by-name/so/sooperlooper/package.nix                  | 4 ++--
 pkgs/by-name/so/sound-of-sorting/package.nix              | 4 ++--
 pkgs/by-name/sp/spatialite-gui/package.nix                | 4 ++--
 pkgs/by-name/sp/spek/package.nix                          | 4 ++--
 pkgs/by-name/su/super-slicer/package.nix                  | 8 ++++----
 pkgs/by-name/su/survex/package.nix                        | 6 +++---
 pkgs/by-name/te/tenacity/package.nix                      | 4 ++--
 pkgs/by-name/th/therion/package.nix                       | 4 ++--
 pkgs/by-name/tq/tqsl/package.nix                          | 4 ++--
 pkgs/by-name/tr/treesheets/package.nix                    | 4 ++--
 pkgs/by-name/uc/ucblogo/package.nix                       | 4 ++--
 pkgs/by-name/ur/urbackup-client/package.nix               | 4 ++--
 pkgs/by-name/ut/ut1999/package.nix                        | 4 ++--
 pkgs/by-name/vb/vbam/package.nix                          | 4 ++--
 pkgs/by-name/ve/veracrypt/package.nix                     | 4 ++--
 pkgs/by-name/wx/wxc/package.nix                           | 6 +++---
 pkgs/by-name/wx/wxformbuilder/package.nix                 | 4 ++--
 pkgs/by-name/wx/wxhexeditor/package.nix                   | 4 ++--
 pkgs/by-name/wx/wxmacmolplt/package.nix                   | 4 ++--
 pkgs/by-name/wx/wxsqlite3/package.nix                     | 4 ++--
 pkgs/by-name/wx/wxsqliteplus/package.nix                  | 4 ++--
 pkgs/by-name/wx/wxsvg/package.nix                         | 6 +++---
 .../0001-fix-assertion-using-hide-in-destroy.patch        | 0
 .../0002-support-webkitgtk-41.patch                       | 0
 pkgs/by-name/wx/{wxGTK31 => wxwidgets_3_1}/package.nix    | 0
 pkgs/by-name/wx/{wxGTK32 => wxwidgets_3_2}/package.nix    | 0
 pkgs/by-name/xc/xchm/package.nix                          | 8 ++++----
 pkgs/by-name/xm/xmlcopyeditor/package.nix                 | 4 ++--
 pkgs/by-name/xy/xylib/package.nix                         | 6 +++---
 pkgs/by-name/ze/zeroad-unwrapped/package.nix              | 4 ++--
 pkgs/by-name/zo/zod/package.nix                           | 4 ++--
 pkgs/development/haskell-modules/configuration-nix.nix    | 4 ++--
 pkgs/development/interpreters/erlang/generic-builder.nix  | 6 +++---
 pkgs/development/interpreters/gnudatalanguage/default.nix | 4 ++--
 pkgs/games/spring/springlobby.nix                         | 4 ++--
 pkgs/servers/klipper/klipper-firmware.nix                 | 4 ++--
 pkgs/tools/graphics/gnuplot/default.nix                   | 4 ++--
 pkgs/top-level/aliases.nix                                | 2 ++
 pkgs/top-level/all-packages.nix                           | 4 ++--
 pkgs/top-level/perl-packages.nix                          | 2 +-
 pkgs/top-level/python-packages.nix                        | 2 +-
 95 files changed, 203 insertions(+), 201 deletions(-)
 rename pkgs/by-name/wx/{wxGTK31 => wxwidgets_3_1}/0001-fix-assertion-using-hide-in-destroy.patch (100%)
 rename pkgs/by-name/wx/{wxGTK31 => wxwidgets_3_1}/0002-support-webkitgtk-41.patch (100%)
 rename pkgs/by-name/wx/{wxGTK31 => wxwidgets_3_1}/package.nix (100%)
 rename pkgs/by-name/wx/{wxGTK32 => wxwidgets_3_2}/package.nix (100%)

diff --git a/nixos/modules/programs/ccache.nix b/nixos/modules/programs/ccache.nix
index c758831c759e..4f6b5259afb9 100644
--- a/nixos/modules/programs/ccache.nix
+++ b/nixos/modules/programs/ccache.nix
@@ -23,7 +23,7 @@ in
       description = "Nix top-level packages to be compiled using CCache";
       default = [ ];
       example = [
-        "wxGTK32"
+        "wxwidgets_3_2"
         "ffmpeg"
         "libav_all"
       ];
diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix
index abb59307d08e..13d31d066065 100644
--- a/pkgs/applications/audio/espeak/edit.nix
+++ b/pkgs/applications/audio/espeak/edit.nix
@@ -5,7 +5,7 @@
   pkg-config,
   unzip,
   portaudio,
-  wxGTK32,
+  wxwidgets_3_2,
   sox,
 }:
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
     portaudio
-    wxGTK32
+    wxwidgets_3_2
   ];
 
   # TODO:
diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix
index 08f2bf8bc401..1ae9cdb2a8ec 100644
--- a/pkgs/applications/misc/opencpn/default.nix
+++ b/pkgs/applications/misc/opencpn/default.nix
@@ -42,7 +42,7 @@
   sqlite,
   tinyxml,
   util-linux,
-  wxGTK32,
+  wxwidgets_3_2,
   libxtst,
   libxdmcp,
   xz,
@@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
     rapidjson
     sqlite
     tinyxml
-    wxGTK32
+    wxwidgets_3_2
     xz
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix
index 4ff9ef72b682..c36c9c9e371a 100644
--- a/pkgs/applications/radio/limesuite/default.nix
+++ b/pkgs/applications/radio/limesuite/default.nix
@@ -5,7 +5,7 @@
   fetchpatch,
   cmake,
   sqlite,
-  wxGTK32,
+  wxwidgets_3_2,
   libusb1,
   soapysdr,
   mesa_glu,
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     fltk
     libx11
     mesa_glu
-    wxGTK32
+    wxwidgets_3_2
   ];
 
   doInstallCheck = true;
diff --git a/pkgs/by-name/ae/aegisub/package.nix b/pkgs/by-name/ae/aegisub/package.nix
index 2f6110a33b19..0e9452051f49 100644
--- a/pkgs/by-name/ae/aegisub/package.nix
+++ b/pkgs/by-name/ae/aegisub/package.nix
@@ -28,7 +28,7 @@
   python3,
   stdenv,
   wrapGAppsHook3,
-  wxGTK32,
+  wxwidgets_3_2,
   zlib,
   # Boolean guard flags
   alsaSupport ? stdenv.hostPlatform.isLinux,
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
     pkg-config
     python3
-    wxGTK32
+    wxwidgets_3_2
     wrapGAppsHook3
   ];
 
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
     libGL
     libass
     libuchardet
-    wxGTK32
+    wxwidgets_3_2
     zlib
   ]
   ++ lib.optionals alsaSupport [ alsa-lib ]
diff --git a/pkgs/by-name/am/amule/package.nix b/pkgs/by-name/am/amule/package.nix
index 92704f390d0b..680b56d16165 100644
--- a/pkgs/by-name/am/amule/package.nix
+++ b/pkgs/by-name/am/amule/package.nix
@@ -10,7 +10,7 @@
   lib,
   cmake,
   zlib,
-  wxGTK32,
+  wxwidgets_3_2,
   perl,
   cryptopp,
   libupnp,
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     zlib
-    wxGTK32
+    wxwidgets_3_2
     perl
     cryptopp.dev
     libupnp
diff --git a/pkgs/by-name/as/asc/package.nix b/pkgs/by-name/as/asc/package.nix
index cad2d9710a09..c28bd20cd0ef 100644
--- a/pkgs/by-name/as/asc/package.nix
+++ b/pkgs/by-name/as/asc/package.nix
@@ -12,7 +12,7 @@
   expat,
   freetype,
   libjpeg,
-  wxGTK32,
+  wxwidgets_3_2,
   lua,
   perl,
   pkg-config,
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
     expat
     freetype
     libjpeg
-    wxGTK32
+    wxwidgets_3_2
     lua
     perl
     zlib
diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix
index 9dd69e2093b0..272310aadca4 100644
--- a/pkgs/by-name/au/audacity/package.nix
+++ b/pkgs/by-name/au/audacity/package.nix
@@ -49,7 +49,7 @@
   libxkbcommon,
   util-linux,
   wavpack,
-  wxGTK32,
+  wxwidgets_3_2,
   gtk3,
   libpng,
   libjpeg,
@@ -129,7 +129,7 @@ stdenv.mkDerivation (finalAttrs: {
     twolame
     portaudio
     wavpack
-    wxGTK32
+    wxwidgets_3_2
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib # for portaudio
diff --git a/pkgs/by-name/ba/bambu-studio/package.nix b/pkgs/by-name/ba/bambu-studio/package.nix
index 90a9dd160407..a4ef61e672d8 100644
--- a/pkgs/by-name/ba/bambu-studio/package.nix
+++ b/pkgs/by-name/ba/bambu-studio/package.nix
@@ -36,13 +36,13 @@
   systemd,
   onetbb,
   webkitgtk_4_1,
-  wxGTK31,
+  wxwidgets_3_1,
   libx11,
   withSystemd ? stdenv.hostPlatform.isLinux,
 }:
 let
   wxGTK' =
-    (wxGTK31.override {
+    (wxwidgets_3_1.override {
       withCurl = true;
       withPrivateFonts = true;
       withWebKit = true;
diff --git a/pkgs/by-name/bo/bochs/package.nix b/pkgs/by-name/bo/bochs/package.nix
index 6b8ff52a4150..d4026a16cfa4 100644
--- a/pkgs/by-name/bo/bochs/package.nix
+++ b/pkgs/by-name/bo/bochs/package.nix
@@ -16,7 +16,7 @@
   readline,
   stdenv,
   wget,
-  wxGTK32,
+  wxwidgets_3_2,
   # Boolean flags
   enableSDL2 ? true,
   enableTerm ? true,
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals enableWx [
     gtk3
-    wxGTK32
+    wxwidgets_3_2
   ]
   ++ lib.optionals enableX11 [
     libGL
diff --git a/pkgs/by-name/bo/boinc/package.nix b/pkgs/by-name/bo/boinc/package.nix
index d9c277633124..1b170dfb5137 100644
--- a/pkgs/by-name/bo/boinc/package.nix
+++ b/pkgs/by-name/bo/boinc/package.nix
@@ -14,7 +14,7 @@
   libglut,
   libjpeg,
   libtool,
-  wxGTK32,
+  wxwidgets_3_2,
   libxcb-util,
   sqlite,
   gtk3,
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
     libxi
     libglut
     libjpeg
-    wxGTK32
+    wxwidgets_3_2
     gtk3
     libxscrnsaver
     libnotify
diff --git a/pkgs/by-name/bo/bossa/package.nix b/pkgs/by-name/bo/bossa/package.nix
index e1665d6d1ef6..72b7f2a9a18b 100644
--- a/pkgs/by-name/bo/bossa/package.nix
+++ b/pkgs/by-name/bo/bossa/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  wxGTK32,
+  wxwidgets_3_2,
   libx11,
   readline,
   fetchpatch,
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ bin2c ];
   buildInputs = [
-    wxGTK32
+    wxwidgets_3_2
     libx11
     readline
   ];
diff --git a/pkgs/by-name/ce/cemu/package.nix b/pkgs/by-name/ce/cemu/package.nix
index 912859780604..6d8efb1d6395 100644
--- a/pkgs/by-name/ce/cemu/package.nix
+++ b/pkgs/by-name/ce/cemu/package.nix
@@ -32,7 +32,7 @@
   wayland,
   wayland-scanner,
   wrapGAppsHook3,
-  wxGTK32,
+  wxwidgets_3_2,
   zarchive,
   bluez,
 }:
@@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
     nasm
     ninja
     pkg-config
-    wxGTK32
+    wxwidgets_3_2
     wayland-scanner
   ];
 
@@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
     rapidjson
     vulkan-headers
     wayland
-    wxGTK32
+    wxwidgets_3_2
     zarchive
     bluez
   ];
diff --git a/pkgs/by-name/co/codeblocks/package.nix b/pkgs/by-name/co/codeblocks/package.nix
index ef647155ab38..f9deb48f9f77 100644
--- a/pkgs/by-name/co/codeblocks/package.nix
+++ b/pkgs/by-name/co/codeblocks/package.nix
@@ -6,7 +6,7 @@
   pkg-config,
   file,
   zip,
-  wxGTK32,
+  wxwidgets_3_2,
   gtk3,
   contribPlugins ? false,
   hunspell,
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    wxGTK32
+    wxwidgets_3_2
     gtk3
   ]
   ++ lib.optionals contribPlugins [
diff --git a/pkgs/by-name/co/comical/package.nix b/pkgs/by-name/co/comical/package.nix
index 12b60ba5c3f9..789288f68988 100644
--- a/pkgs/by-name/co/comical/package.nix
+++ b/pkgs/by-name/co/comical/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   hexdump,
-  wxGTK32,
+  wxwidgets_3_2,
   zlib,
 }:
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    wxGTK32
+    wxwidgets_3_2
     zlib
   ];
 
diff --git a/pkgs/by-name/cu/cubicsdr/package.nix b/pkgs/by-name/cu/cubicsdr/package.nix
index 45865b47e42b..f7a4e54aab96 100644
--- a/pkgs/by-name/cu/cubicsdr/package.nix
+++ b/pkgs/by-name/cu/cubicsdr/package.nix
@@ -12,7 +12,7 @@
   liquid-dsp,
   pkg-config,
   soapysdr-with-plugins,
-  wxGTK32,
+  wxwidgets_3_2,
   enableDigitalLab ? false,
 }:
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     hamlib
     liquid-dsp
     soapysdr-with-plugins
-    wxGTK32
+    wxwidgets_3_2
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     libpulseaudio
diff --git a/pkgs/by-name/da/darkradiant/package.nix b/pkgs/by-name/da/darkradiant/package.nix
index 00ca5bd6ee82..25f7f9f17809 100644
--- a/pkgs/by-name/da/darkradiant/package.nix
+++ b/pkgs/by-name/da/darkradiant/package.nix
@@ -6,7 +6,7 @@
   pkg-config,
   zlib,
   libjpeg,
-  wxGTK32,
+  wxwidgets_3_2,
   libxml2,
   libsigcxx,
   libpng,
@@ -41,14 +41,14 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     asciidoctor
     wrapGAppsHook3
-    wxGTK32
+    wxwidgets_3_2
     installShellFiles
   ];
 
   buildInputs = [
     zlib
     libjpeg
-    wxGTK32
+    wxwidgets_3_2
     libxml2
     libsigcxx
     libpng
diff --git a/pkgs/by-name/dv/dvdstyler/package.nix b/pkgs/by-name/dv/dvdstyler/package.nix
index 23c861c75303..c0eb99d0dbb0 100644
--- a/pkgs/by-name/dv/dvdstyler/package.nix
+++ b/pkgs/by-name/dv/dvdstyler/package.nix
@@ -18,7 +18,7 @@
   libjpeg,
   pkg-config,
   wrapGAppsHook3,
-  wxGTK32,
+  wxwidgets_3_2,
   wxsvg,
   xine-ui,
   xmlto,
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
     libexif
     libjpeg
     wxsvg
-    wxGTK32
+    wxwidgets_3_2
     xine-ui
   ]
   ++ optionals dvdisasterSupport [ dvdisaster ]
diff --git a/pkgs/by-name/el/electricsheep/package.nix b/pkgs/by-name/el/electricsheep/package.nix
index 41ec4b9f9227..82419173a056 100644
--- a/pkgs/by-name/el/electricsheep/package.nix
+++ b/pkgs/by-name/el/electricsheep/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   autoreconfHook,
-  wxGTK32,
+  wxwidgets_3_2,
   ffmpeg,
   lua5_1,
   curl,
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    wxGTK32
+    wxwidgets_3_2
     ffmpeg
     lua5_1
     curl
diff --git a/pkgs/by-name/es/espanso/package.nix b/pkgs/by-name/es/espanso/package.nix
index 84130cbcb7aa..caadde2007af 100644
--- a/pkgs/by-name/es/espanso/package.nix
+++ b/pkgs/by-name/es/espanso/package.nix
@@ -18,7 +18,7 @@
   xdotool,
   setxkbmap,
   wl-clipboard,
-  wxGTK32,
+  wxwidgets_3_2,
   makeWrapper,
   securityWrapperPath ? null,
   nix-update-script,
@@ -50,7 +50,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     extra-cmake-modules
     pkg-config
     makeWrapper
-    wxGTK32
+    wxwidgets_3_2
   ];
 
   # Ref: https://github.com/espanso/espanso/blob/78df1b704fe2cc5ea26f88fdc443b6ae1df8a989/scripts/build_binary.rs#LL49C3-L62C4
@@ -70,7 +70,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   buildInputs = [
     libpng
-    wxGTK32
+    wxwidgets_3_2
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     openssl
diff --git a/pkgs/by-name/fa/far2l/package.nix b/pkgs/by-name/fa/far2l/package.nix
index 764eb5252960..ea771b7d03cd 100644
--- a/pkgs/by-name/fa/far2l/package.nix
+++ b/pkgs/by-name/fa/far2l/package.nix
@@ -21,7 +21,7 @@
   withTTYX ? true,
   libx11,
   withGUI ? true,
-  wxGTK32,
+  wxwidgets_3_2,
   withUCD ? true,
   libuchardet,
 
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     lib.optional withTTYX libx11
-    ++ lib.optional withGUI wxGTK32
+    ++ lib.optional withGUI wxwidgets_3_2
     ++ lib.optional withUCD libuchardet
     ++ lib.optionals withColorer [
       spdlog
diff --git a/pkgs/by-name/fi/filezilla/package.nix b/pkgs/by-name/fi/filezilla/package.nix
index 45c0920272a2..66ba7117e39e 100644
--- a/pkgs/by-name/fi/filezilla/package.nix
+++ b/pkgs/by-name/fi/filezilla/package.nix
@@ -15,7 +15,7 @@
   tinyxml,
   boost,
   wrapGAppsHook3,
-  wxGTK32,
+  wxwidgets_3_2,
   gtk3,
   xdg-utils,
 }:
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
     pugixml
     sqlite
     tinyxml
-    wxGTK32
+    wxwidgets_3_2
     gtk3
     xdg-utils
   ];
diff --git a/pkgs/by-name/fi/fityk/package.nix b/pkgs/by-name/fi/fityk/package.nix
index 670a46b802b2..49eaf2911318 100644
--- a/pkgs/by-name/fi/fityk/package.nix
+++ b/pkgs/by-name/fi/fityk/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   autoreconfHook,
-  wxGTK32,
+  wxwidgets_3_2,
   boost186,
   lua,
   zlib,
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
     swig
   ];
   buildInputs = [
-    wxGTK32
+    wxwidgets_3_2
     boost186
     lua
     zlib
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   configureFlags = [
-    "--with-wx-config=${lib.getExe' (lib.getDev wxGTK32) "wx-config"}"
+    "--with-wx-config=${lib.getExe' (lib.getDev wxwidgets_3_2) "wx-config"}"
   ];
 
   env.NIX_CFLAGS_COMPILE = toString [
diff --git a/pkgs/by-name/fl/flamerobin/package.nix b/pkgs/by-name/fl/flamerobin/package.nix
index 139dbd765ab3..924b04ae060f 100644
--- a/pkgs/by-name/fl/flamerobin/package.nix
+++ b/pkgs/by-name/fl/flamerobin/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  wxGTK32,
+  wxwidgets_3_2,
   boost,
   firebird,
 }:
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [
-    wxGTK32
+    wxwidgets_3_2
     boost
     firebird
   ];
diff --git a/pkgs/by-name/fr/freedv/package.nix b/pkgs/by-name/fr/freedv/package.nix
index a5d3af69c2d3..99d631b9ad1e 100644
--- a/pkgs/by-name/fr/freedv/package.nix
+++ b/pkgs/by-name/fr/freedv/package.nix
@@ -20,7 +20,7 @@
   portaudio,
   speexdsp,
   hamlib_4,
-  wxGTK32,
+  wxwidgets_3_2,
   dbus,
   apple-sdk_15,
   nix-update-script,
@@ -135,7 +135,7 @@ stdenv.mkDerivation (finalAttrs: {
     lpcnet
     speexdsp
     hamlib_4
-    wxGTK32
+    wxwidgets_3_2
     python3.pkgs.numpy
   ]
   ++ (
diff --git a/pkgs/by-name/fr/freqtweak/package.nix b/pkgs/by-name/fr/freqtweak/package.nix
index cc2012671fe3..7e28bd00420a 100644
--- a/pkgs/by-name/fr/freqtweak/package.nix
+++ b/pkgs/by-name/fr/freqtweak/package.nix
@@ -9,7 +9,7 @@
   libjack2,
   libsigcxx,
   libxml2,
-  wxGTK32,
+  wxwidgets_3_2,
 
 }:
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
     libjack2
     libsigcxx
     libxml2
-    wxGTK32
+    wxwidgets_3_2
   ];
 
   preConfigure = ''
diff --git a/pkgs/by-name/fs/fsg/package.nix b/pkgs/by-name/fs/fsg/package.nix
index d99f163a996b..cb53200d534c 100644
--- a/pkgs/by-name/fs/fsg/package.nix
+++ b/pkgs/by-name/fs/fsg/package.nix
@@ -7,7 +7,7 @@
   pkg-config,
   libGLU,
   libGL,
-  wxGTK32,
+  wxwidgets_3_2,
   libx11,
   xorgproto,
   runtimeShell,
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   # use correct wx-config for cross-compiling
   postPatch = ''
     substituteInPlace makefile \
-      --replace-fail 'wx-config' "${lib.getExe' wxGTK32 "wx-config"}"
+      --replace-fail 'wx-config' "${lib.getExe' wxwidgets_3_2 "wx-config"}"
   '';
 
   hardeningDisable = [ "format" ];
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     glib
     libGLU
     libGL
-    wxGTK32
+    wxwidgets_3_2
     libx11
     xorgproto
   ];
diff --git a/pkgs/by-name/ga/gambit-project/package.nix b/pkgs/by-name/ga/gambit-project/package.nix
index 80cfcce53714..deee39bcd247 100644
--- a/pkgs/by-name/ga/gambit-project/package.nix
+++ b/pkgs/by-name/ga/gambit-project/package.nix
@@ -3,7 +3,7 @@
   autoreconfHook,
   fetchFromGitHub,
   stdenv,
-  wxGTK31,
+  wxwidgets_3_1,
   withGui ? true,
 }:
 
@@ -18,9 +18,9 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-xoFtqPUC/qLrlEewIPeDmOH7rWMB+ak5CdVlH5t84MY=";
   };
 
-  nativeBuildInputs = [ autoreconfHook ] ++ lib.optional withGui wxGTK31;
+  nativeBuildInputs = [ autoreconfHook ] ++ lib.optional withGui wxwidgets_3_1;
 
-  buildInputs = lib.optional withGui wxGTK31;
+  buildInputs = lib.optional withGui wxwidgets_3_1;
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/go/golly/package.nix b/pkgs/by-name/go/golly/package.nix
index e6b1c27668c1..b694632a2853 100644
--- a/pkgs/by-name/go/golly/package.nix
+++ b/pkgs/by-name/go/golly/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   wrapGAppsHook3,
-  wxGTK32,
+  wxwidgets_3_2,
   python3,
   zlib,
   libGLU,
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    wxGTK32
+    wxwidgets_3_2
     python3
     zlib
     libGLU
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
     "CXX=${stdenv.cc.targetPrefix}c++"
     "CXXC=${stdenv.cc.targetPrefix}c++"
     "LD=${stdenv.cc.targetPrefix}c++"
-    "WX_CONFIG=${lib.getExe' (lib.getDev wxGTK32) "wx-config"}"
+    "WX_CONFIG=${lib.getExe' (lib.getDev wxwidgets_3_2) "wx-config"}"
   ];
 
   installPhase = ''
diff --git a/pkgs/by-name/gr/grandorgue/package.nix b/pkgs/by-name/gr/grandorgue/package.nix
index f599a2f592fa..16dc89c16c76 100644
--- a/pkgs/by-name/gr/grandorgue/package.nix
+++ b/pkgs/by-name/gr/grandorgue/package.nix
@@ -9,7 +9,7 @@
   alsa-lib,
   zlib,
   wavpack,
-  wxGTK32,
+  wxwidgets_3_2,
   udev,
   jackaudioSupport ? false,
   libjack2,
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
     fftwFloat
     zlib
     wavpack
-    wxGTK32
+    wxwidgets_3_2
     yaml-cpp
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
diff --git a/pkgs/by-name/gr/grass/package.nix b/pkgs/by-name/gr/grass/package.nix
index 97b23458ce7a..d0e064be74d4 100644
--- a/pkgs/by-name/gr/grass/package.nix
+++ b/pkgs/by-name/gr/grass/package.nix
@@ -33,7 +33,7 @@
   python3Packages,
   readline,
   sqlite,
-  wxGTK32,
+  wxwidgets_3_2,
   zlib,
   zstd,
 }:
@@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
     proj
     readline
     sqlite
-    wxGTK32
+    wxwidgets_3_2
     zlib
     zstd
   ]
diff --git a/pkgs/by-name/hu/hugin/package.nix b/pkgs/by-name/hu/hugin/package.nix
index 053b9c7f8f83..9d3bf5f3f330 100644
--- a/pkgs/by-name/hu/hugin/package.nix
+++ b/pkgs/by-name/hu/hugin/package.nix
@@ -30,8 +30,8 @@
   sqlite,
   vigra,
   wrapGAppsHook3,
-  wxGTK32,
-  wxGTK' ? wxGTK32,
+  wxwidgets_3_2,
+  wxGTK' ? wxwidgets_3_2,
   zlib,
 }:
 
diff --git a/pkgs/by-name/ki/kicad/package.nix b/pkgs/by-name/ki/kicad/package.nix
index 11e14c5d7ed7..60218a56b109 100644
--- a/pkgs/by-name/ki/kicad/package.nix
+++ b/pkgs/by-name/ki/kicad/package.nix
@@ -12,7 +12,7 @@
   adwaita-icon-theme,
   dconf,
   gtk3,
-  wxGTK32,
+  wxwidgets_3_2,
   librsvg,
   cups,
   gsettings-desktop-schemas,
@@ -134,7 +134,7 @@ let
     else
       versionsImport.${baseName}.libVersion.version;
 
-  wxGTK = wxGTK32;
+  wxGTK = wxwidgets_3_2;
   python = python3;
   wxPython = python.pkgs.wxpython;
   addonPath = "addon.zip";
diff --git a/pkgs/by-name/le/lenmus/package.nix b/pkgs/by-name/le/lenmus/package.nix
index 076eb9501d88..745f08915694 100644
--- a/pkgs/by-name/le/lenmus/package.nix
+++ b/pkgs/by-name/le/lenmus/package.nix
@@ -13,7 +13,7 @@
   libpng,
   pngpp,
   zlib,
-  wxGTK32,
+  wxwidgets_3_2,
   wxsqlite3,
   fluidsynth,
   fontconfig,
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpng
     pngpp
     zlib
-    wxGTK32
+    wxwidgets_3_2
     wxsqlite3
     fluidsynth
     fontconfig
diff --git a/pkgs/by-name/me/mediainfo-gui/package.nix b/pkgs/by-name/me/mediainfo-gui/package.nix
index 878c491e45ee..a5d7caaecea4 100644
--- a/pkgs/by-name/me/mediainfo-gui/package.nix
+++ b/pkgs/by-name/me/mediainfo-gui/package.nix
@@ -5,7 +5,7 @@
   autoreconfHook,
   pkg-config,
   libmediainfo,
-  wxGTK32,
+  wxwidgets_3_2,
   desktop-file-utils,
   libsm,
   imagemagick,
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libmediainfo
-    wxGTK32
+    wxwidgets_3_2
     desktop-file-utils
     libsm
     imagemagick
diff --git a/pkgs/by-name/me/megaglest/package.nix b/pkgs/by-name/me/megaglest/package.nix
index d4ff02faf708..27ed4c25f9f4 100644
--- a/pkgs/by-name/me/megaglest/package.nix
+++ b/pkgs/by-name/me/megaglest/package.nix
@@ -11,7 +11,7 @@
   lua,
   libvlc,
   libjpeg,
-  wxGTK32,
+  wxwidgets_3_2,
   cppunit,
   ftgl,
   glew,
@@ -57,7 +57,7 @@ let
       stdenv.cc.cc
       glew
       libGLU
-      wxGTK32
+      wxwidgets_3_2
     ];
   };
   path-env = buildEnv {
@@ -127,7 +127,7 @@ stdenv.mkDerivation {
     libpng
     libjpeg
     libvlc
-    wxGTK32
+    wxwidgets_3_2
     glib
     cppunit
     fontconfig
diff --git a/pkgs/by-name/mm/mmex/package.nix b/pkgs/by-name/mm/mmex/package.nix
index 4c7d3ec3fe2c..5dde256cfdb9 100644
--- a/pkgs/by-name/mm/mmex/package.nix
+++ b/pkgs/by-name/mm/mmex/package.nix
@@ -12,7 +12,7 @@
   wrapGAppsHook3,
   curl,
   sqlite,
-  wxGTK32,
+  wxwidgets_3_2,
   gtk3,
   lua,
   wxsqlite3,
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
     makeWrapper
     pkg-config
     wrapGAppsHook3
-    wxGTK32
+    wxwidgets_3_2
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     lsb-release
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     curl
     sqlite
-    wxGTK32
+    wxwidgets_3_2
     gtk3
     lua
     wxsqlite3
diff --git a/pkgs/by-name/mu/multivnc/package.nix b/pkgs/by-name/mu/multivnc/package.nix
index 8428293895d8..fd2da3a2cafb 100644
--- a/pkgs/by-name/mu/multivnc/package.nix
+++ b/pkgs/by-name/mu/multivnc/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   fetchpatch,
-  wxGTK32,
+  wxwidgets_3_2,
   gtk3,
   zlib,
   libjpeg,
@@ -69,7 +69,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     gtk3
-    wxGTK32
+    wxwidgets_3_2
     zlib
     libjpeg
     libvncserver-patched
diff --git a/pkgs/by-name/od/odamex/package.nix b/pkgs/by-name/od/odamex/package.nix
index 8811c7ce19ac..cb9669d79184 100644
--- a/pkgs/by-name/od/odamex/package.nix
+++ b/pkgs/by-name/od/odamex/package.nix
@@ -30,7 +30,7 @@
   portmidi,
   wayland-scanner,
   waylandpp,
-  wxGTK32,
+  wxwidgets_3_2,
   libx11,
   xorgproto,
   zstd,
@@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
     libsysprof-capture
     pcre2
     portmidi
-    wxGTK32
+    wxwidgets_3_2
     zstd
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix
index 25240b2c63a2..37268f2bb356 100644
--- a/pkgs/by-name/or/orca-slicer/package.nix
+++ b/pkgs/by-name/or/orca-slicer/package.nix
@@ -37,14 +37,14 @@
   systemd,
   onetbb,
   webkitgtk_4_1,
-  wxGTK31,
+  wxwidgets_3_1,
   libx11,
   libnoise,
   withSystemd ? stdenv.hostPlatform.isLinux,
 }:
 let
   wxGTK' =
-    (wxGTK31.override {
+    (wxwidgets_3_1.override {
       withCurl = true;
       withPrivateFonts = true;
       withWebKit = true;
diff --git a/pkgs/by-name/pc/pcem/package.nix b/pkgs/by-name/pc/pcem/package.nix
index 65e7aec32009..5d4980d1eaf5 100644
--- a/pkgs/by-name/pc/pcem/package.nix
+++ b/pkgs/by-name/pc/pcem/package.nix
@@ -2,7 +2,7 @@
   stdenv,
   lib,
   fetchzip,
-  wxGTK32,
+  wxwidgets_3_2,
   coreutils,
   SDL2,
   openal,
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsHook3
   ];
   buildInputs = [
-    wxGTK32
+    wxwidgets_3_2
     coreutils
     SDL2
     openal
diff --git a/pkgs/by-name/ph/phd2/package.nix b/pkgs/by-name/ph/phd2/package.nix
index 75d1fabb98de..0d0c3aa74fa4 100644
--- a/pkgs/by-name/ph/phd2/package.nix
+++ b/pkgs/by-name/ph/phd2/package.nix
@@ -16,7 +16,7 @@
   gtk3,
   libnova,
   libusb1,
-  wxGTK32,
+  wxwidgets_3_2,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
     gtk3
     libnova
     libusb1
-    wxGTK32
+    wxwidgets_3_2
   ];
 
   cmakeFlags = [
diff --git a/pkgs/by-name/pl/plplot/package.nix b/pkgs/by-name/pl/plplot/package.nix
index 5534fb0bc6d2..f4584b101e31 100644
--- a/pkgs/by-name/pl/plplot/package.nix
+++ b/pkgs/by-name/pl/plplot/package.nix
@@ -5,7 +5,7 @@
   cmake,
   pkg-config,
   enableWX ? false,
-  wxGTK32,
+  wxwidgets_3_2,
   enableXWin ? false,
   libx11,
   enablePNG ? false,
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs =
-    lib.optional enableWX wxGTK32
+    lib.optional enableWX wxwidgets_3_2
     ++ lib.optional enableXWin libx11
     ++ lib.optionals enablePNG [
       cairo
diff --git a/pkgs/by-name/po/poedit/package.nix b/pkgs/by-name/po/poedit/package.nix
index 29a207cc5ba3..f7522b1e1495 100644
--- a/pkgs/by-name/po/poedit/package.nix
+++ b/pkgs/by-name/po/poedit/package.nix
@@ -7,7 +7,7 @@
   libtool,
   gettext,
   pkg-config,
-  wxGTK32,
+  wxwidgets_3_2,
   boost,
   icu,
   lucenepp,
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     lucenepp
     nlohmann_json
-    wxGTK32
+    wxwidgets_3_2
     icu
     pugixml
     gtk3
diff --git a/pkgs/by-name/pr/prusa-slicer/package.nix b/pkgs/by-name/pr/prusa-slicer/package.nix
index 7b3436da5be5..ef23c31a461b 100644
--- a/pkgs/by-name/pr/prusa-slicer/package.nix
+++ b/pkgs/by-name/pr/prusa-slicer/package.nix
@@ -29,7 +29,7 @@
   openvdb,
   qhull,
   onetbb,
-  wxGTK32,
+  wxwidgets_3_2,
   libx11,
   libbgcode,
   heatshrink,
@@ -56,7 +56,7 @@ let
       hash = "sha256-WNdAYu66ggpSYJ8Kt57yEA4mSTv+Rvzj9Rm1q765HpY=";
     };
   });
-  wxGTK-override' = if wxGTK-override == null then wxGTK32 else wxGTK-override;
+  wxGTK-override' = if wxGTK-override == null then wxwidgets_3_2 else wxGTK-override;
   opencascade-override' =
     if opencascade-override == null then opencascade-occt_7_6_1 else opencascade-override;
 in
diff --git a/pkgs/by-name/pt/pterm/package.nix b/pkgs/by-name/pt/pterm/package.nix
index 675ae8a5934a..c7f3639f6075 100644
--- a/pkgs/by-name/pt/pterm/package.nix
+++ b/pkgs/by-name/pt/pterm/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   libsndfile,
-  wxGTK32,
+  wxwidgets_3_2,
   SDL,
 }:
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libsndfile
     SDL
-    wxGTK32
+    wxwidgets_3_2
   ];
 
   src = fetchurl {
diff --git a/pkgs/by-name/pw/pwsafe/package.nix b/pkgs/by-name/pw/pwsafe/package.nix
index dedc0249bba7..1550d70dc40f 100644
--- a/pkgs/by-name/pw/pwsafe/package.nix
+++ b/pkgs/by-name/pw/pwsafe/package.nix
@@ -7,7 +7,7 @@
   zip,
   gettext,
   perl,
-  wxGTK32,
+  wxwidgets_3_2,
   libxext,
   libxi,
   libxt,
@@ -41,12 +41,12 @@ stdenv.mkDerivation (finalAttrs: {
     gettext
     perl
     pkg-config
-    wxGTK32
+    wxwidgets_3_2
     zip
   ];
 
   buildInputs = [
-    wxGTK32
+    wxwidgets_3_2
     curl
     qrencode
     openssl
diff --git a/pkgs/by-name/ra/radiotray-ng/package.nix b/pkgs/by-name/ra/radiotray-ng/package.nix
index f844a04d46c3..10195ae3446e 100644
--- a/pkgs/by-name/ra/radiotray-ng/package.nix
+++ b/pkgs/by-name/ra/radiotray-ng/package.nix
@@ -18,7 +18,7 @@
   libappindicator-gtk3,
   libnotify,
   libxdg_basedir,
-  wxGTK32,
+  wxwidgets_3_2,
   # GStreamer
   glib-networking,
   gst_all_1,
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
     libnotify
     libxdg_basedir
     lsb-release
-    wxGTK32
+    wxwidgets_3_2
     # for https gstreamer / libsoup
     glib-networking
   ]
diff --git a/pkgs/by-name/ra/rapidsvn/package.nix b/pkgs/by-name/ra/rapidsvn/package.nix
index abbaeca4ef56..99bf1dafc63e 100644
--- a/pkgs/by-name/ra/rapidsvn/package.nix
+++ b/pkgs/by-name/ra/rapidsvn/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   autoreconfHook,
-  wxGTK32,
+  wxwidgets_3_2,
   subversion,
   apr,
   aprutil,
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    wxGTK32
+    wxwidgets_3_2
     subversion
     apr
     aprutil
diff --git a/pkgs/by-name/re/rehex/package.nix b/pkgs/by-name/re/rehex/package.nix
index dbbbc6971899..1aa827713c19 100644
--- a/pkgs/by-name/re/rehex/package.nix
+++ b/pkgs/by-name/re/rehex/package.nix
@@ -10,7 +10,7 @@
   capstone,
   jansson,
   libunistring,
-  wxGTK32,
+  wxwidgets_3_2,
   lua53Packages,
   perlPackages,
   gtk3,
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
     capstone
     jansson
     libunistring
-    wxGTK32
+    wxwidgets_3_2
   ]
   ++ (with lua53Packages; [
     lua
diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix
index 7d105488af7f..a95fc1b5935b 100644
--- a/pkgs/by-name/sa/saga/package.nix
+++ b/pkgs/by-name/sa/saga/package.nix
@@ -30,7 +30,7 @@
   proj,
   qhull,
   vigra,
-  wxGTK32,
+  wxwidgets_3_2,
   xz,
   # darwin-specific
   netcdf,
@@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
     proj
     qhull
     vigra
-    wxGTK32
+    wxwidgets_3_2
     xz
   ]
   ++ lib.optionals cudaSupport [
diff --git a/pkgs/by-name/sc/scorched3d/package.nix b/pkgs/by-name/sc/scorched3d/package.nix
index d2669a36eb24..7608ac82e937 100644
--- a/pkgs/by-name/sc/scorched3d/package.nix
+++ b/pkgs/by-name/sc/scorched3d/package.nix
@@ -8,7 +8,7 @@
   pkg-config,
   openal-soft,
   freealut,
-  wxGTK32,
+  wxwidgets_3_2,
   libogg,
   freetype,
   libvorbis,
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     glew
     openal-soft
     freealut
-    wxGTK32
+    wxwidgets_3_2
     libogg
     freetype
     libvorbis
diff --git a/pkgs/by-name/sl/slade-unstable/package.nix b/pkgs/by-name/sl/slade-unstable/package.nix
index 14eebfe9310e..4381f91192ce 100644
--- a/pkgs/by-name/sl/slade-unstable/package.nix
+++ b/pkgs/by-name/sl/slade-unstable/package.nix
@@ -6,7 +6,7 @@
   pkg-config,
   which,
   zip,
-  wxGTK32,
+  wxwidgets_3_2,
   gtk3,
   sfml_2,
   fluidsynth,
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    wxGTK32
+    wxwidgets_3_2
     gtk3
     sfml_2
     fluidsynth
@@ -53,8 +53,8 @@ stdenv.mkDerivation {
   ];
 
   cmakeFlags = [
-    "-DwxWidgets_LIBRARIES=${wxGTK32}/lib"
-    (lib.cmakeFeature "CL_WX_CONFIG" (lib.getExe' (lib.getDev wxGTK32) "wx-config"))
+    "-DwxWidgets_LIBRARIES=${wxwidgets_3_2}/lib"
+    (lib.cmakeFeature "CL_WX_CONFIG" (lib.getExe' (lib.getDev wxwidgets_3_2) "wx-config"))
   ];
 
   env.NIX_CFLAGS_COMPILE = "-Wno-narrowing";
diff --git a/pkgs/by-name/sl/slade/package.nix b/pkgs/by-name/sl/slade/package.nix
index c8ae877a1c0a..1e3d861d0f93 100644
--- a/pkgs/by-name/sl/slade/package.nix
+++ b/pkgs/by-name/sl/slade/package.nix
@@ -6,7 +6,7 @@
   pkg-config,
   which,
   zip,
-  wxGTK32,
+  wxwidgets_3_2,
   gtk3,
   sfml_2,
   fluidsynth,
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    wxGTK32
+    wxwidgets_3_2
     gtk3
     sfml_2
     fluidsynth
@@ -52,8 +52,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
-    "-DwxWidgets_LIBRARIES=${wxGTK32}/lib"
-    (lib.cmakeFeature "CL_WX_CONFIG" (lib.getExe' (lib.getDev wxGTK32) "wx-config"))
+    "-DwxWidgets_LIBRARIES=${wxwidgets_3_2}/lib"
+    (lib.cmakeFeature "CL_WX_CONFIG" (lib.getExe' (lib.getDev wxwidgets_3_2) "wx-config"))
   ];
 
   env.NIX_CFLAGS_COMPILE = "-Wno-narrowing";
diff --git a/pkgs/by-name/so/sooperlooper/package.nix b/pkgs/by-name/so/sooperlooper/package.nix
index 0644d475067a..78b2aa4baa32 100644
--- a/pkgs/by-name/so/sooperlooper/package.nix
+++ b/pkgs/by-name/so/sooperlooper/package.nix
@@ -10,7 +10,7 @@
   libxml2,
   libjack2,
   libsndfile,
-  wxGTK32,
+  wxwidgets_3_2,
   libsigcxx,
   libsamplerate,
   rubberband,
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxml2
     libjack2
     libsndfile
-    wxGTK32
+    wxwidgets_3_2
     libsigcxx
     libsamplerate
     rubberband
diff --git a/pkgs/by-name/so/sound-of-sorting/package.nix b/pkgs/by-name/so/sound-of-sorting/package.nix
index 4f01b6a418cb..fcee0754c92e 100644
--- a/pkgs/by-name/so/sound-of-sorting/package.nix
+++ b/pkgs/by-name/so/sound-of-sorting/package.nix
@@ -5,7 +5,7 @@
   fetchpatch,
   pkg-config,
   SDL2,
-  wxGTK32,
+  wxwidgets_3_2,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    wxGTK32
+    wxwidgets_3_2
     SDL2
   ];
 
diff --git a/pkgs/by-name/sp/spatialite-gui/package.nix b/pkgs/by-name/sp/spatialite-gui/package.nix
index 42ec69fcee55..9a74ecc00beb 100644
--- a/pkgs/by-name/sp/spatialite-gui/package.nix
+++ b/pkgs/by-name/sp/spatialite-gui/package.nix
@@ -20,7 +20,7 @@
   proj,
   sqlite,
   virtualpg,
-  wxGTK32,
+  wxwidgets_3_2,
   xz,
   zstd,
 }:
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     proj
     sqlite
     virtualpg
-    wxGTK32
+    wxwidgets_3_2
     xz
     zstd
   ];
diff --git a/pkgs/by-name/sp/spek/package.nix b/pkgs/by-name/sp/spek/package.nix
index 1abbb0b2a2d8..735242cd96f4 100644
--- a/pkgs/by-name/sp/spek/package.nix
+++ b/pkgs/by-name/sp/spek/package.nix
@@ -6,7 +6,7 @@
   intltool,
   pkg-config,
   ffmpeg,
-  wxGTK32,
+  wxwidgets_3_2,
   gtk3,
   wrapGAppsHook3,
 }:
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     ffmpeg
-    wxGTK32
+    wxwidgets_3_2
     gtk3
   ];
 
diff --git a/pkgs/by-name/su/super-slicer/package.nix b/pkgs/by-name/su/super-slicer/package.nix
index d5207b2cfe36..5f14f172aa4b 100644
--- a/pkgs/by-name/su/super-slicer/package.nix
+++ b/pkgs/by-name/su/super-slicer/package.nix
@@ -3,7 +3,7 @@
   fetchFromGitHub,
   fetchpatch,
   makeDesktopItem,
-  wxGTK31,
+  wxwidgets_3_1,
   prusa-slicer,
   libspnav,
   opencascade-occt_7_6,
@@ -23,7 +23,7 @@ let
     ./super-slicer-fix-cereal-1.3.1.patch
   ];
 
-  wxGTK31-prusa = wxGTK31.overrideAttrs (old: {
+  wxwidgets_3_1-prusa = wxwidgets_3_1.overrideAttrs (old: {
     pname = "wxwidgets-prusa3d-patched";
     version = "3.1.4";
     src = fetchFromGitHub {
@@ -44,7 +44,7 @@ let
       hash = "sha256-FkoGcgVoBeHSZC3W5y30TBPmPrWnZSlO66TgwskgqAU=";
       inherit patches;
       overrides = {
-        wxGTK-override = wxGTK31-prusa;
+        wxGTK-override = wxwidgets_3_1-prusa;
       };
     };
     latest = {
@@ -52,7 +52,7 @@ let
       hash = "sha256-FkoGcgVoBeHSZC3W5y30TBPmPrWnZSlO66TgwskgqAU=";
       inherit patches;
       overrides = {
-        wxGTK-override = wxGTK31-prusa;
+        wxGTK-override = wxwidgets_3_1-prusa;
       };
     };
     beta = {
diff --git a/pkgs/by-name/su/survex/package.nix b/pkgs/by-name/su/survex/package.nix
index d0bc1af7736b..88641fe1357e 100644
--- a/pkgs/by-name/su/survex/package.nix
+++ b/pkgs/by-name/su/survex/package.nix
@@ -14,7 +14,7 @@
   gdal,
   python3,
   wrapGAppsHook3,
-  wxGTK32,
+  wxwidgets_3_2,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     proj
     gdal
-    wxGTK32
+    wxwidgets_3_2
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     # TODO: libGLU doesn't build for macOS because of Mesa issues
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   configureFlags = [
-    "WX_CONFIG=${lib.getExe' (lib.getDev wxGTK32) "wx-config"}"
+    "WX_CONFIG=${lib.getExe' (lib.getDev wxwidgets_3_2) "wx-config"}"
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/te/tenacity/package.nix b/pkgs/by-name/te/tenacity/package.nix
index eefa424ddbdf..085c68528982 100644
--- a/pkgs/by-name/te/tenacity/package.nix
+++ b/pkgs/by-name/te/tenacity/package.nix
@@ -4,7 +4,7 @@
   fetchFromCodeberg,
   cmake,
   ninja,
-  wxGTK32,
+  wxwidgets_3_2,
   gtk3,
   pkg-config,
   python3,
@@ -160,7 +160,7 @@ stdenv.mkDerivation (finalAttrs: {
     sratom
     suil
     twolame
-    wxGTK32
+    wxwidgets_3_2
     gtk3
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
diff --git a/pkgs/by-name/th/therion/package.nix b/pkgs/by-name/th/therion/package.nix
index 09e6cef875c6..b143aef21a8f 100644
--- a/pkgs/by-name/th/therion/package.nix
+++ b/pkgs/by-name/th/therion/package.nix
@@ -15,7 +15,7 @@
   makeWrapper,
   fmt,
   proj,
-  wxGTK32,
+  wxwidgets_3_2,
   vtk,
   freetype,
   libjpeg,
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
     expat
     tclPackages.tkimg
     proj
-    wxGTK32
+    wxwidgets_3_2
     vtk
     tk
     freetype
diff --git a/pkgs/by-name/tq/tqsl/package.nix b/pkgs/by-name/tq/tqsl/package.nix
index 16879752daa8..35122d3d64ba 100644
--- a/pkgs/by-name/tq/tqsl/package.nix
+++ b/pkgs/by-name/tq/tqsl/package.nix
@@ -9,7 +9,7 @@
   lmdb,
   curl,
   sqlite,
-  wxGTK32,
+  wxwidgets_3_2,
   wrapGAppsHook3,
 }:
 
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
     lmdb
     curl
     sqlite
-    wxGTK32
+    wxwidgets_3_2
   ];
 
   meta = {
diff --git a/pkgs/by-name/tr/treesheets/package.nix b/pkgs/by-name/tr/treesheets/package.nix
index 5aee8c97e650..06dd3e81be74 100644
--- a/pkgs/by-name/tr/treesheets/package.nix
+++ b/pkgs/by-name/tr/treesheets/package.nix
@@ -6,7 +6,7 @@
   ninja,
   wrapGAppsHook3,
   makeWrapper,
-  wxGTK32,
+  wxwidgets_3_2,
   unstableGitUpdater,
 }:
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    wxGTK32
+    wxwidgets_3_2
   ];
 
   env.NIX_CFLAGS_COMPILE = "-DPACKAGE_VERSION=\"${
diff --git a/pkgs/by-name/uc/ucblogo/package.nix b/pkgs/by-name/uc/ucblogo/package.nix
index d4cb1520e63c..53c2893ccfc9 100644
--- a/pkgs/by-name/uc/ucblogo/package.nix
+++ b/pkgs/by-name/uc/ucblogo/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  wxGTK32,
+  wxwidgets_3_2,
   texinfo,
   tetex,
   wrapGAppsHook3,
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    wxGTK32
+    wxwidgets_3_2
   ];
 
   meta = {
diff --git a/pkgs/by-name/ur/urbackup-client/package.nix b/pkgs/by-name/ur/urbackup-client/package.nix
index 50d92d94ad87..221048d48ffa 100644
--- a/pkgs/by-name/ur/urbackup-client/package.nix
+++ b/pkgs/by-name/ur/urbackup-client/package.nix
@@ -2,7 +2,7 @@
   stdenv,
   lib,
   fetchzip,
-  wxGTK32,
+  wxwidgets_3_2,
   zlib,
   zstd,
 }:
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   buildInputs = [
-    wxGTK32
+    wxwidgets_3_2
     zlib
     zstd
   ];
diff --git a/pkgs/by-name/ut/ut1999/package.nix b/pkgs/by-name/ut/ut1999/package.nix
index b069bca8eac8..5f15f39bac8d 100644
--- a/pkgs/by-name/ut/ut1999/package.nix
+++ b/pkgs/by-name/ut/ut1999/package.nix
@@ -11,7 +11,7 @@
   imagemagick,
   runCommand,
   libgcc,
-  wxGTK32,
+  wxwidgets_3_2,
   libGL,
   SDL2,
   openal,
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libgcc
-    wxGTK32
+    wxwidgets_3_2
     SDL2
     libGL
     openal
diff --git a/pkgs/by-name/vb/vbam/package.nix b/pkgs/by-name/vb/vbam/package.nix
index d884d63dc604..03bbc75945a7 100644
--- a/pkgs/by-name/vb/vbam/package.nix
+++ b/pkgs/by-name/vb/vbam/package.nix
@@ -6,7 +6,7 @@
   fetchFromGitHub,
   ffmpeg_7,
   gettext,
-  wxGTK32,
+  wxwidgets_3_2,
   gtk3,
   libGLU,
   libGL,
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
     sfml_2
     zip
     zlib
-    wxGTK32
+    wxwidgets_3_2
     gtk3
     gsettings-desktop-schemas
   ];
diff --git a/pkgs/by-name/ve/veracrypt/package.nix b/pkgs/by-name/ve/veracrypt/package.nix
index d4d749b6645e..d55219ecf251 100644
--- a/pkgs/by-name/ve/veracrypt/package.nix
+++ b/pkgs/by-name/ve/veracrypt/package.nix
@@ -6,7 +6,7 @@
   makeself,
   yasm,
   fuse,
-  wxGTK32,
+  wxwidgets_3_2,
   lvm2,
   replaceVars,
   e2fsprogs,
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     fuse
     lvm2
-    wxGTK32
+    wxwidgets_3_2
     pcsclite
   ];
 
diff --git a/pkgs/by-name/wx/wxc/package.nix b/pkgs/by-name/wx/wxc/package.nix
index 9628cc8ed501..a92535a62926 100644
--- a/pkgs/by-name/wx/wxc/package.nix
+++ b/pkgs/by-name/wx/wxc/package.nix
@@ -4,7 +4,7 @@
   fetchFromCodeberg,
   cmake,
   libGL,
-  wxGTK32,
+  wxwidgets_3_2,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
-    wxGTK32 # in nativeBuildInputs because of wx-config
+    wxwidgets_3_2 # in nativeBuildInputs because of wx-config
   ];
 
   buildInputs = [
@@ -41,6 +41,6 @@ stdenv.mkDerivation (finalAttrs: {
       wxWindowsException31
     ];
     maintainers = with lib.maintainers; [ fgaz ];
-    platforms = wxGTK32.meta.platforms;
+    platforms = wxwidgets_3_2.meta.platforms;
   };
 })
diff --git a/pkgs/by-name/wx/wxformbuilder/package.nix b/pkgs/by-name/wx/wxformbuilder/package.nix
index 3bda111dc931..bb23475919f7 100644
--- a/pkgs/by-name/wx/wxformbuilder/package.nix
+++ b/pkgs/by-name/wx/wxformbuilder/package.nix
@@ -7,7 +7,7 @@
   makeWrapper,
   shared-mime-info,
   boost,
-  wxGTK32,
+  wxwidgets_3_2,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     boost
-    wxGTK32
+    wxwidgets_3_2
   ];
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
diff --git a/pkgs/by-name/wx/wxhexeditor/package.nix b/pkgs/by-name/wx/wxhexeditor/package.nix
index 66d705ab90f1..a8ae91e8debc 100644
--- a/pkgs/by-name/wx/wxhexeditor/package.nix
+++ b/pkgs/by-name/wx/wxhexeditor/package.nix
@@ -8,7 +8,7 @@
   gettext,
   libtool,
   python3,
-  wxGTK32,
+  wxwidgets_3_2,
   wrapGAppsHook3,
   llvmPackages,
 }:
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     gettext
     libtool
     python3
-    wxGTK32
+    wxwidgets_3_2
     wrapGAppsHook3
   ];
 
diff --git a/pkgs/by-name/wx/wxmacmolplt/package.nix b/pkgs/by-name/wx/wxmacmolplt/package.nix
index 4629193946c9..bbd76bd3b89f 100644
--- a/pkgs/by-name/wx/wxmacmolplt/package.nix
+++ b/pkgs/by-name/wx/wxmacmolplt/package.nix
@@ -2,7 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  wxGTK32,
+  wxwidgets_3_2,
   libGL,
   libGLU,
   pkg-config,
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsHook4
   ];
   buildInputs = [
-    wxGTK32
+    wxwidgets_3_2
     libGL
     libGLU
     libx11
diff --git a/pkgs/by-name/wx/wxsqlite3/package.nix b/pkgs/by-name/wx/wxsqlite3/package.nix
index 18da48b8af14..da7760010b34 100644
--- a/pkgs/by-name/wx/wxsqlite3/package.nix
+++ b/pkgs/by-name/wx/wxsqlite3/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   autoreconfHook,
-  wxGTK32,
+  wxwidgets_3_2,
   sqlite,
 }:
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     sqlite
-    wxGTK32
+    wxwidgets_3_2
   ];
 
   doCheck = true;
diff --git a/pkgs/by-name/wx/wxsqliteplus/package.nix b/pkgs/by-name/wx/wxsqliteplus/package.nix
index 9fcd3ab13e72..4f7dad29104d 100644
--- a/pkgs/by-name/wx/wxsqliteplus/package.nix
+++ b/pkgs/by-name/wx/wxsqliteplus/package.nix
@@ -5,7 +5,7 @@
   cmake,
   pkg-config,
   makeWrapper,
-  wxGTK32,
+  wxwidgets_3_2,
   wxsqlite3,
   sqlite,
 }:
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    wxGTK32
+    wxwidgets_3_2
     wxsqlite3
     sqlite
   ];
diff --git a/pkgs/by-name/wx/wxsvg/package.nix b/pkgs/by-name/wx/wxsvg/package.nix
index 7897c22e7935..848622de65ba 100644
--- a/pkgs/by-name/wx/wxsvg/package.nix
+++ b/pkgs/by-name/wx/wxsvg/package.nix
@@ -8,7 +8,7 @@
   libexif,
   pango,
   pkg-config,
-  wxGTK32,
+  wxwidgets_3_2,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     ffmpeg
     libexif
     pango
-    wxGTK32
+    wxwidgets_3_2
   ];
 
   enableParallelBuilding = true;
@@ -51,6 +51,6 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.gpl2Plus;
     maintainers = [ ];
-    inherit (wxGTK32.meta) platforms;
+    inherit (wxwidgets_3_2.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/wx/wxGTK31/0001-fix-assertion-using-hide-in-destroy.patch b/pkgs/by-name/wx/wxwidgets_3_1/0001-fix-assertion-using-hide-in-destroy.patch
similarity index 100%
rename from pkgs/by-name/wx/wxGTK31/0001-fix-assertion-using-hide-in-destroy.patch
rename to pkgs/by-name/wx/wxwidgets_3_1/0001-fix-assertion-using-hide-in-destroy.patch
diff --git a/pkgs/by-name/wx/wxGTK31/0002-support-webkitgtk-41.patch b/pkgs/by-name/wx/wxwidgets_3_1/0002-support-webkitgtk-41.patch
similarity index 100%
rename from pkgs/by-name/wx/wxGTK31/0002-support-webkitgtk-41.patch
rename to pkgs/by-name/wx/wxwidgets_3_1/0002-support-webkitgtk-41.patch
diff --git a/pkgs/by-name/wx/wxGTK31/package.nix b/pkgs/by-name/wx/wxwidgets_3_1/package.nix
similarity index 100%
rename from pkgs/by-name/wx/wxGTK31/package.nix
rename to pkgs/by-name/wx/wxwidgets_3_1/package.nix
diff --git a/pkgs/by-name/wx/wxGTK32/package.nix b/pkgs/by-name/wx/wxwidgets_3_2/package.nix
similarity index 100%
rename from pkgs/by-name/wx/wxGTK32/package.nix
rename to pkgs/by-name/wx/wxwidgets_3_2/package.nix
diff --git a/pkgs/by-name/xc/xchm/package.nix b/pkgs/by-name/xc/xchm/package.nix
index 679c8785d59b..449e266a34ff 100644
--- a/pkgs/by-name/xc/xchm/package.nix
+++ b/pkgs/by-name/xc/xchm/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   autoreconfHook,
-  wxGTK32,
+  wxwidgets_3_2,
   chmlib,
   desktopToDarwinBundle,
 }:
@@ -27,14 +27,14 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    wxGTK32
+    wxwidgets_3_2
     chmlib
   ];
 
-  configureFlags = [ "--with-wx-prefix=${wxGTK32}" ];
+  configureFlags = [ "--with-wx-prefix=${wxwidgets_3_2}" ];
 
   preConfigure = ''
-    export LDFLAGS="$LDFLAGS $(${wxGTK32}/bin/wx-config --libs std,aui | sed -e s@-pthread@@)"
+    export LDFLAGS="$LDFLAGS $(${wxwidgets_3_2}/bin/wx-config --libs std,aui | sed -e s@-pthread@@)"
   '';
 
   meta = {
diff --git a/pkgs/by-name/xm/xmlcopyeditor/package.nix b/pkgs/by-name/xm/xmlcopyeditor/package.nix
index 156b444867e7..5542d144efa2 100644
--- a/pkgs/by-name/xm/xmlcopyeditor/package.nix
+++ b/pkgs/by-name/xm/xmlcopyeditor/package.nix
@@ -10,7 +10,7 @@
   libxml2,
   libxslt,
   pcre2,
-  wxGTK32,
+  wxwidgets_3_2,
   xercesc,
 }:
 
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxml2
     libxslt
     pcre2
-    wxGTK32
+    wxwidgets_3_2
     xercesc
   ];
 
diff --git a/pkgs/by-name/xy/xylib/package.nix b/pkgs/by-name/xy/xylib/package.nix
index 563dfff3b320..b62ae98ea8e9 100644
--- a/pkgs/by-name/xy/xylib/package.nix
+++ b/pkgs/by-name/xy/xylib/package.nix
@@ -5,7 +5,7 @@
   boost,
   zlib,
   bzip2,
-  wxGTK32,
+  wxwidgets_3_2,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -21,11 +21,11 @@ stdenv.mkDerivation (finalAttrs: {
     boost
     zlib
     bzip2
-    wxGTK32
+    wxwidgets_3_2
   ];
 
   configureFlags = [
-    "--with-wx-config=${lib.getExe' (lib.getDev wxGTK32) "wx-config"}"
+    "--with-wx-config=${lib.getExe' (lib.getDev wxwidgets_3_2) "wx-config"}"
   ];
 
   meta = {
diff --git a/pkgs/by-name/ze/zeroad-unwrapped/package.nix b/pkgs/by-name/ze/zeroad-unwrapped/package.nix
index 6e4a62bbbb37..f0b49dd9b49d 100644
--- a/pkgs/by-name/ze/zeroad-unwrapped/package.nix
+++ b/pkgs/by-name/ze/zeroad-unwrapped/package.nix
@@ -34,7 +34,7 @@
   cxxtest,
   freetype,
   withEditor ? true,
-  wxGTK32,
+  wxwidgets_3_2,
 }:
 
 # You can find more instructions on how to build 0ad here:
@@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
     premake5
     cxxtest
   ]
-  ++ lib.optional withEditor wxGTK32;
+  ++ lib.optional withEditor wxwidgets_3_2;
 
   env.NIX_CFLAGS_COMPILE = toString [
     "-I${xorgproto}/include"
diff --git a/pkgs/by-name/zo/zod/package.nix b/pkgs/by-name/zo/zod/package.nix
index 2626a6d18a34..161bf682b19e 100644
--- a/pkgs/by-name/zo/zod/package.nix
+++ b/pkgs/by-name/zo/zod/package.nix
@@ -8,7 +8,7 @@
   SDL_ttf,
   SDL_mixer,
   libmysqlclient,
-  wxGTK32,
+  wxwidgets_3_2,
   symlinkJoin,
   runCommandLocal,
   makeWrapper,
@@ -35,7 +35,7 @@ let
     SDL_ttf
     SDL_mixer
     libmysqlclient
-    wxGTK32
+    wxwidgets_3_2
     coreutils
   ];
   hardeningDisable = [ "format" ];
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 2e0aee58aa7b..ad945875cfb8 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -628,8 +628,8 @@ builtins.intersectAttrs super {
 
   # wxc supports wxGTX >= 3.0, but our current default version points to 2.8.
   # http://hydra.cryp.to/build/1331287/log/raw
-  wxc = (addBuildDepend self.split super.wxc).override { wxGTK = pkgs.wxGTK32; };
-  wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK32; };
+  wxc = (addBuildDepend self.split super.wxc).override { wxGTK = pkgs.wxwidgets_3_2; };
+  wxcore = super.wxcore.override { wxGTK = pkgs.wxwidgets_3_2; };
 
   shellify = enableSeparateBinOutput super.shellify;
   specup = enableSeparateBinOutput super.specup;
diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix
index 5d6b0f3eb699..de761f5be030 100644
--- a/pkgs/development/interpreters/erlang/generic-builder.nix
+++ b/pkgs/development/interpreters/erlang/generic-builder.nix
@@ -40,7 +40,7 @@
   systemd,
   unixODBC,
   wrapGAppsHook3,
-  wxGTK32,
+  wxwidgets_3_2,
   libx11,
   zlib,
 }:
@@ -53,12 +53,12 @@ let
 
   wxPackages2 =
     if stdenv.hostPlatform.isDarwin then
-      [ wxGTK32 ]
+      [ wxwidgets_3_2 ]
     else
       [
         libGL
         libGLU
-        wxGTK32
+        wxwidgets_3_2
         libx11
         wrapGAppsHook3
       ];
diff --git a/pkgs/development/interpreters/gnudatalanguage/default.nix b/pkgs/development/interpreters/gnudatalanguage/default.nix
index ce3d127517ae..2b0d720c7df7 100644
--- a/pkgs/development/interpreters/gnudatalanguage/default.nix
+++ b/pkgs/development/interpreters/gnudatalanguage/default.nix
@@ -60,7 +60,7 @@
   # wxWidgets is preferred over X11 for this project but we only have it on Linux
   # and Darwin.
   enableWX ? (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin),
-  wxGTK32,
+  wxwidgets_3_2,
   # X11: OFF by default for platform consistency. Use X where WX is not available
   enableXWin ? (!stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isDarwin),
 }:
@@ -170,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optional enableXWin plplot-with-drivers.libx11
   ++ lib.optional enableGRIB eccodes
   ++ lib.optional enableGLPK glpk
-  ++ lib.optional enableWX wxGTK32
+  ++ lib.optional enableWX wxwidgets_3_2
   ++ lib.optional enableMPI mpi
   ++ lib.optional enableLibtirpc hdf4-custom.libtirpc
   ++ lib.optional enableSzip szip;
diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index 3b5fe45441b0..8c4d7ac369f7 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   cmake,
-  wxGTK32,
+  wxwidgets_3_2,
   openal,
   pkg-config,
   curl,
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     makeWrapper
   ];
   buildInputs = [
-    wxGTK32
+    wxwidgets_3_2
     openal
     curl
     libtorrent-rasterbar
diff --git a/pkgs/servers/klipper/klipper-firmware.nix b/pkgs/servers/klipper/klipper-firmware.nix
index 6b812db3a336..90b29f33d987 100644
--- a/pkgs/servers/klipper/klipper-firmware.nix
+++ b/pkgs/servers/klipper/klipper-firmware.nix
@@ -7,7 +7,7 @@ args@{
   bintools-unwrapped,
   libffi,
   libusb1,
-  wxGTK32,
+  wxwidgets_3_2,
   python3,
   gcc-arm-embedded,
   klipper,
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
     avrdude
     stm32flash
     pkg-config
-    wxGTK32 # Required for bossac
+    wxwidgets_3_2 # Required for bossac
   ];
 
   configurePhase = ''
diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix
index c1c75403d5fa..8a1fb92d513c 100644
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@@ -23,7 +23,7 @@
   libxaw,
   aquaterm ? false,
   withWxGTK ? false,
-  wxGTK32,
+  wxwidgets_3_2,
   fontconfig,
   gnused,
   coreutils,
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
     qtbase
     qtsvg
   ]
-  ++ lib.optional withWxGTK wxGTK32;
+  ++ lib.optional withWxGTK wxwidgets_3_2;
 
   postPatch = ''
     # lrelease is in qttools, not in qtbase.
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4b735b0af592..81402dbf0a26 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2043,6 +2043,8 @@ mapAliases {
   wrapGradle = throw "'wrapGradle' has been removed; use `gradle-packages.wrapGradle` or `(gradle-packages.mkGradle { ... }).wrapped` instead"; # Added 2025-11-02
   wring = throw "'wring' has been removed since it has been abandoned upstream"; # Added 2025-11-07
   write_stylus = throw "'write_stylus' has been renamed to/replaced by 'styluslabs-write-bin'"; # Converted to throw 2025-10-27
+  wxGTK31 = warnAlias "'wxGTK31' has been renamed to 'wxwidgets_3_1'" wxwidgets_3_1; # Added 2026-02-12
+  wxGTK32 = warnAlias "'wxGTK32' has been renamed to 'wxwidgets_3_2'" wxwidgets_3_2; # Added 2026-02-12
   wxGTK33 = wxwidgets_3_3; # Added 2025-07-20
   wxSVG = warnAlias "'wxSVG' has been renamed to 'wxsvg'" wxsvg;
   xbrightness = throw "'xbrightness' has been removed as it is unmaintained"; # Added 2025-08-28
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d5e2785c51cd..129b11192e8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10342,7 +10342,7 @@ with pkgs;
   diffpdf = libsForQt5.callPackage ../applications/misc/diffpdf { };
 
   diff-pdf = callPackage ../applications/misc/diff-pdf {
-    wxGTK = wxGTK32;
+    wxGTK = wxwidgets_3_2;
   };
 
   mypaint-brushes1 = callPackage ../development/libraries/mypaint-brushes/1.0.nix { };
@@ -12067,7 +12067,7 @@ with pkgs;
   };
 
   wxmaxima = callPackage ../applications/science/math/wxmaxima {
-    wxGTK = wxGTK32.override {
+    wxGTK = wxwidgets_3_2.override {
       withWebKit = true;
     };
   };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 942dc19f5172..b3da3950b9dc 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -604,7 +604,7 @@ with self;
     propagatedBuildInputs = [
       pkgs.pkg-config
       pkgs.gtk3
-      pkgs.wxGTK32
+      pkgs.wxwidgets_3_2
       ModulePluggable
     ];
     buildInputs = [ LWPProtocolHttps ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1bcb6529dc79..b61cd0202d38 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20972,7 +20972,7 @@ self: super: with self; {
   wurlitzer = callPackage ../development/python-modules/wurlitzer { };
 
   wxpython = callPackage ../development/python-modules/wxpython/4.2.nix {
-    wxGTK = pkgs.wxGTK32.override { withWebKit = true; };
+    wxGTK = pkgs.wxwidgets_3_2.override { withWebKit = true; };
   };
 
   wyoming = callPackage ../development/python-modules/wyoming { };

From 1c0cc9d7c79d117ece7da23517bc5b4e2b45d7ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Mar 2026 11:46:49 +0000
Subject: [PATCH 12/19] github-runner: 2.331.0 -> 2.332.0

---
 pkgs/by-name/gi/github-runner/deps.json   | 13 +++++++++----
 pkgs/by-name/gi/github-runner/package.nix |  4 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/gi/github-runner/deps.json b/pkgs/by-name/gi/github-runner/deps.json
index 4c0dc03597f2..2a267236fb96 100644
--- a/pkgs/by-name/gi/github-runner/deps.json
+++ b/pkgs/by-name/gi/github-runner/deps.json
@@ -29,6 +29,11 @@
     "version": "8.0.0",
     "hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="
   },
+  {
+    "pname": "Microsoft.Bcl.Cryptography",
+    "version": "10.0.2",
+    "hash": "sha256-+OYtcWsd1qZcEXadYeA4t6+pyADg1APQCxpKUtP002M="
+  },
   {
     "pname": "Microsoft.CodeCoverage",
     "version": "17.14.1",
@@ -506,8 +511,8 @@
   },
   {
     "pname": "System.Formats.Asn1",
-    "version": "8.0.1",
-    "hash": "sha256-may/Wg+esmm1N14kQTG4ESMBi+GQKPp0ZrrBo/o6OXM="
+    "version": "10.0.2",
+    "hash": "sha256-PY875Po9vWaGTNbyZaxo9AbKFc8pg1eKf9akGQnJ5cc="
   },
   {
     "pname": "System.Globalization",
@@ -796,8 +801,8 @@
   },
   {
     "pname": "System.Security.Cryptography.Pkcs",
-    "version": "8.0.0",
-    "hash": "sha256-yqfIIeZchsII2KdcxJyApZNzxM/VKknjs25gDWlweBI="
+    "version": "10.0.2",
+    "hash": "sha256-B33jrdvy1mvc8CnZJvnGp438K8wBI/d9x2IGxijefuU="
   },
   {
     "pname": "System.Security.Cryptography.Primitives",
diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix
index 710f952a5223..9942dc5eedd4 100644
--- a/pkgs/by-name/gi/github-runner/package.nix
+++ b/pkgs/by-name/gi/github-runner/package.nix
@@ -35,13 +35,13 @@ assert builtins.all (
 
 buildDotnetModule (finalAttrs: {
   pname = "github-runner";
-  version = "2.331.0";
+  version = "2.332.0";
 
   src = fetchFromGitHub {
     owner = "actions";
     repo = "runner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Qn3sOzZVBf/UfmMEkTPDfAWBtJzZv/xp9kCmiSowgUc=";
+    hash = "sha256-jxeuyomWBzynwYHvmNi5CcP9+z2odl7W3uXOGVgv2PY=";
     leaveDotGit = true;
     postFetch = ''
       git -C $out rev-parse --short HEAD > $out/.git-revision

From b095d3e0cc18fcb53c0676bf2f2cfeccf5a55921 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Wed, 4 Mar 2026 21:00:39 +0100
Subject: [PATCH 13/19] jasp-desktop: 0.95.4 -> 0.96.0

---
 pkgs/by-name/ja/jasp-desktop/boost.patch |  40 +-----
 pkgs/by-name/ja/jasp-desktop/modules.nix | 169 +++++++++++------------
 pkgs/by-name/ja/jasp-desktop/package.nix |  18 ++-
 3 files changed, 104 insertions(+), 123 deletions(-)

diff --git a/pkgs/by-name/ja/jasp-desktop/boost.patch b/pkgs/by-name/ja/jasp-desktop/boost.patch
index d69bc3f0a402..321c96660f82 100644
--- a/pkgs/by-name/ja/jasp-desktop/boost.patch
+++ b/pkgs/by-name/ja/jasp-desktop/boost.patch
@@ -1,41 +1,15 @@
-diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
-index 4251554..1600f77 100644
---- a/Common/CMakeLists.txt
-+++ b/Common/CMakeLists.txt
-@@ -31,7 +31,6 @@ target_include_directories(
- target_link_libraries(
- 	Common
- 	PUBLIC
--	Boost::system
- 	Boost::date_time
- 	Boost::timer
- 	Boost::chrono
-diff --git a/Engine/CMakeLists.txt b/Engine/CMakeLists.txt
-index f3a87e1..1949b2a 100644
---- a/Engine/CMakeLists.txt
-+++ b/Engine/CMakeLists.txt
-@@ -34,7 +34,6 @@ target_link_libraries(
- 	QMLComponents
- 	CommonData
- 	Common
--	Boost::system
- 	Boost::date_time
- 	Boost::timer
- 	Boost::chrono
 diff --git a/Tools/CMake/Libraries.cmake b/Tools/CMake/Libraries.cmake
-index 3b950e1..149747b 100644
+index 3f0fa28..6cdcfad 100644
 --- a/Tools/CMake/Libraries.cmake
 +++ b/Tools/CMake/Libraries.cmake
-@@ -67,11 +67,10 @@ if((NOT LibArchive_FOUND) AND (NOT WIN32))
+@@ -67,8 +67,8 @@ if((NOT LibArchive_FOUND) AND (NOT WIN32))
    endif()
  endif()
  
 -set(Boost_USE_STATIC_LIBS ON)
+-find_package(Boost 1.78 REQUIRED COMPONENTS system)
 +add_definitions(-DBOOST_LOG_DYN_LINK)
- find_package(
-   Boost 1.78 REQUIRED
-   COMPONENTS filesystem
--             system
-              date_time
-              timer
-              chrono)
++find_package(Boost 1.78 REQUIRED)
+ find_package(Qt6 REQUIRED COMPONENTS Core)
+ 
+ get_target_property(QT_TARGET_TYPE Qt6::Core TYPE)
diff --git a/pkgs/by-name/ja/jasp-desktop/modules.nix b/pkgs/by-name/ja/jasp-desktop/modules.nix
index c0d9684f40ab..8c5f350abe84 100644
--- a/pkgs/by-name/ja/jasp-desktop/modules.nix
+++ b/pkgs/by-name/ja/jasp-desktop/modules.nix
@@ -32,13 +32,6 @@ let
     ];
   };
 
-  jaspColumnEncoder-src = fetchFromGitHub {
-    owner = "jasp-stats";
-    repo = "jaspColumnEncoder";
-    rev = "32c53153da95087feb109c0f5f69534ffa3f32b7";
-    hash = "sha256-VOMcoXpLH24auQfZCWW6hQ10u6n2GxuEQHMaXrvGTnI=";
-  };
-
   jaspBase = buildRPackage {
     pname = "jaspBase";
     version = jasp-version;
@@ -46,11 +39,10 @@ let
     src = jasp-src;
     sourceRoot = "${jasp-src.name}/Engine/jaspBase";
 
-    env.INCLUDE_DIR = "../inst/include/jaspColumnEncoder";
-
-    postPatch = ''
-      mkdir -p inst/include
-      cp -r --no-preserve=all ${jaspColumnEncoder-src} inst/include/jaspColumnEncoder
+    preConfigure = ''
+      mkdir -p ./inst/include/
+      cp -r --no-preserve=all ../../Common ./inst/include/Common
+      export INCLUDE_DIR=$(pwd)/inst/include/Common/
     '';
 
     propagatedBuildInputs = [
@@ -120,13 +112,13 @@ let
 
   flexplot = buildRPackage {
     pname = "flexplot";
-    version = "0.25.5";
+    version = "0.26.3";
 
     src = fetchFromGitHub {
       owner = "dustinfife";
       repo = "flexplot";
-      rev = "9a39de871d48364dd5f096b2380a4c9907adf4c3";
-      hash = "sha256-yf5wbhfffztT5iF6h/JSg4NSbuaexk+9JEOfT5Is1vE=";
+      rev = "cae36ba45502ce1794ad35cfeaf0155275db3056";
+      hash = "sha256-aOCYy21EQ/lGDWQvkGAspTSZiJif8mlS2lCwS180dUA=";
     };
 
     propagatedBuildInputs = [
@@ -200,8 +192,8 @@ in
   modules = rec {
     jaspAcceptanceSampling = buildJaspModule {
       pname = "jaspAcceptanceSampling";
-      version = "0.95.3";
-      hash = "sha256-Z0NyUPAmgCYC3+w2JX2vSmkyFWdJERd5NckXfF46n5o=";
+      version = "0.96.0";
+      hash = "sha256-sbLzTuGr7r/OsIMliOfvwVsmgUgZxL+6rqiq4W+BIBc=";
       deps = [
         abtest
         BayesFactor
@@ -218,8 +210,8 @@ in
     };
     jaspAnova = buildJaspModule {
       pname = "jaspAnova";
-      version = "0.95.3";
-      hash = "sha256-d0m/mGyRkcBlk3961lafQ+X10yTvsWvQnExVDraW28M=";
+      version = "0.96.0";
+      hash = "sha256-K695RXTxzbYVF+gh8gzFTsceTTNdx976yF6WiPHm3No=";
       deps = [
         afex
         BayesFactor
@@ -247,8 +239,8 @@ in
     };
     jaspAudit = buildJaspModule {
       pname = "jaspAudit";
-      version = "0.95.3";
-      hash = "sha256-XnQFmf5xdUqClpaJ6Qz0zJAHs1ieeYd4nffxDKX7ReE=";
+      version = "0.96.0";
+      hash = "sha256-1j6Na7Ikk8XJQjbTRRuK28K3jMVdUVe0FwTzo5ywppY=";
       deps = [
         bstats
         extraDistr
@@ -261,8 +253,8 @@ in
     };
     jaspBain = buildJaspModule {
       pname = "jaspBain";
-      version = "0.95.3";
-      hash = "sha256-kt0s2VJQGhVeD+ALY4FTtU1+7hYw81cXM1WvJ99lnZQ=";
+      version = "0.96.0";
+      hash = "sha256-CcelkJJD/rr5BOx8MaCkHfbUKp7/tvWOSSC+Ilsopc8=";
       deps = [
         bain
         lavaan
@@ -276,8 +268,8 @@ in
     };
     jaspBFF = buildJaspModule {
       pname = "jaspBFF";
-      version = "0.95.3";
-      hash = "sha256-E+CYTFfiAM7Fng4vY39cceU2IUFcXKn+uejLufnwcOc=";
+      version = "0.96.0";
+      hash = "sha256-bh3uLZcjfYpwaNmEzqVW5eNdPFq/Ig3bh7+1DgXYoF8=";
       deps = [
         BFF
         jaspBase
@@ -286,8 +278,8 @@ in
     };
     jaspBfpack = buildJaspModule {
       pname = "jaspBfpack";
-      version = "0.95.3";
-      hash = "sha256-9biiB/m8QsSjlAheoo3hllxYyAIgoeEb1W0KXUEa5C8=";
+      version = "0.96.0";
+      hash = "sha256-S1lKrMC6BG6cjJWuxVYVtUciZIeePX0Nx/IvwCjixHY=";
       deps = [
         BFpack
         bain
@@ -300,8 +292,8 @@ in
     };
     jaspBsts = buildJaspModule {
       pname = "jaspBsts";
-      version = "0.95.3";
-      hash = "sha256-TJi0fqZ3abV9mM9XyRiuQfK1tkOJ7VluyKilUdHHj0Y=";
+      version = "0.96.0";
+      hash = "sha256-sFbn0yOr7ZaaO2APYNOshBcs1zvgIZUT89BvdRrN/+4=";
       deps = [
         Boom
         bsts
@@ -314,8 +306,8 @@ in
     };
     jaspCircular = buildJaspModule {
       pname = "jaspCircular";
-      version = "0.95.3";
-      hash = "sha256-L3WVErysIMtRLDRzaRd+MCYL9smzWERMTiyzrPHGPjQ=";
+      version = "0.96.0";
+      hash = "sha256-fqBSR/um02+BXuu7gucd7WWG/RSOeLmhXHQl2wXiVGw=";
       deps = [
         jaspBase
         jaspGraphs
@@ -325,8 +317,8 @@ in
     };
     jaspCochrane = buildJaspModule {
       pname = "jaspCochrane";
-      version = "0.95.3";
-      hash = "sha256-MAIj0ThgUdo07gHBs0a5tzEsJTrtPS3XnyW2Wj+xp3g=";
+      version = "0.96.0";
+      hash = "sha256-z6rglW4wItG9akHWplpDBzB5yzRko/ze+DcQotJmHTg=";
       deps = [
         jaspBase
         jaspGraphs
@@ -336,8 +328,8 @@ in
     };
     jaspDescriptives = buildJaspModule {
       pname = "jaspDescriptives";
-      version = "0.95.3";
-      hash = "sha256-W4LWha+GTVSrOAJLIv9Uy3wOnyHxoT0O/yxj9Zw8/Tg=";
+      version = "0.96.0";
+      hash = "sha256-cJCTglQhU5fCH7henOKA0h39VuA07zVVfATtuct8tqY=";
       deps = [
         ggplot2
         ggrepel
@@ -347,6 +339,7 @@ in
         forecast
         flexplot
         ggrain
+        ggh4x
         ggpp
         ggtext
         dplyr
@@ -359,8 +352,8 @@ in
 
     jaspDistributions = buildJaspModule {
       pname = "jaspDistributions";
-      version = "0.95.3";
-      hash = "sha256-EutMd5cD3jEW/3e3Ch9IClo1LaNsuvmnvh9cy8hG5Bc=";
+      version = "0.96.0";
+      hash = "sha256-uZWCVCOFfNkLNjJJ82x4H5rKH1m7KE3UDX1p/7dn4uY=";
       deps = [
         car
         fitdistrplus
@@ -377,8 +370,8 @@ in
     };
     jaspEquivalenceTTests = buildJaspModule {
       pname = "jaspEquivalenceTTests";
-      version = "0.95.3";
-      hash = "sha256-cTVPephc/9IIJ8eUP3Ma1d215E6bI1MOWtlQDGqPN70=";
+      version = "0.96.0";
+      hash = "sha256-4XFN6ikBfOZWHMTLbNPBwgMoYiLVULQE0XyNaoPQ40k=";
       deps = [
         BayesFactor
         ggplot2
@@ -391,8 +384,8 @@ in
     };
     jaspEsci = buildJaspModule {
       pname = "jaspEsci";
-      version = "0.95.3";
-      hash = "sha256-wgbp1iZRWfm6dRVkVhK6iC0hHu73pFm3Hk9pN7Z6ej8=";
+      version = "0.96.0";
+      hash = "sha256-pH1neP1GmL3usXP5ycQKGeLNzvfMV/UBrrKF718QaGI=";
       deps = [
         jaspBase
         jaspGraphs
@@ -404,8 +397,8 @@ in
     };
     jaspFactor = buildJaspModule {
       pname = "jaspFactor";
-      version = "0.95.3";
-      hash = "sha256-1e4HYst/G5JqN7fksFR907LqysdyTCcUXLgRfiSBCd0=";
+      version = "0.96.0";
+      hash = "sha256-AU9nTrxZNseN0Wsp3932V3N+ax5CzfJMoEB128AR5LM=";
       deps = [
         ggplot2
         jaspBase
@@ -423,8 +416,8 @@ in
     };
     jaspFrequencies = buildJaspModule {
       pname = "jaspFrequencies";
-      version = "0.95.3";
-      hash = "sha256-3JznrmKqAJJop57gNQw7eOLjbS7B41AriUdZTttoSkM=";
+      version = "0.96.0";
+      hash = "sha256-qolgiJjiODzheW04fXdtxNqAreEny7ln+GlwV4ztRik=";
       deps = [
         abtest
         BayesFactor
@@ -443,8 +436,8 @@ in
     };
     jaspJags = buildJaspModule {
       pname = "jaspJags";
-      version = "0.95.3";
-      hash = "sha256-wZsc3NSiNKa35R7c/mrnp+crA8OkNk/2JRiiEW8DZq4=";
+      version = "0.96.0";
+      hash = "sha256-f26njMClIUWNc4fGsPgwitzKbqdU6Ld+Ys6ukWAHE/M=";
       deps = [
         coda
         ggplot2
@@ -460,8 +453,8 @@ in
     };
     jaspLearnBayes = buildJaspModule {
       pname = "jaspLearnBayes";
-      version = "0.95.3";
-      hash = "sha256-YRzoF4FrPrSeDcKq7V9N8FcNtCKZ4n5e2O9u9aseAik=";
+      version = "0.96.0";
+      hash = "sha256-zqMcWFML/iexmegMtGWCe/OCGqwmWW98/XZfKVs6N8w=";
       deps = [
         extraDistr
         ggplot2
@@ -483,8 +476,8 @@ in
     };
     jaspLearnStats = buildJaspModule {
       pname = "jaspLearnStats";
-      version = "0.95.3";
-      hash = "sha256-PSrLmRlvd0U7hkFXRvzi5hFz7/Czj3iOSdWyGGoOHVI=";
+      version = "0.96.0";
+      hash = "sha256-Yvqhv269Uvr087IjiGMBzTHZj+4Wu5A8dN/F9+8odqY=";
       deps = [
         extraDistr
         ggplot2
@@ -502,8 +495,8 @@ in
     };
     jaspMachineLearning = buildJaspModule {
       pname = "jaspMachineLearning";
-      version = "0.95.3";
-      hash = "sha256-ZZKEO+FMx5uycD1JBln6HG5qLqbzRCnr/B2/yDUqhYs=";
+      version = "0.96.0";
+      hash = "sha256-Wg1C/ZJL98U8JkMfeZcc4/83DmCHRYOIn2OglsMqImw=";
       deps = [
         kknn
         AUC
@@ -541,8 +534,8 @@ in
     };
     jaspMetaAnalysis = buildJaspModule {
       pname = "jaspMetaAnalysis";
-      version = "0.95.3";
-      hash = "sha256-JxO3jvEVcYIkOPncCYLHJFbu0i2HYx7ltqEBzSNKRjM=";
+      version = "0.96.0";
+      hash = "sha256-bXHlYiGEtNMqr833ve3Qrdv+TCm7G4let07McMETUv8=";
       deps = [
         dplyr
         ggplot2
@@ -575,13 +568,12 @@ in
     };
     jaspMixedModels = buildJaspModule {
       pname = "jaspMixedModels";
-      version = "0.95.3";
-      hash = "sha256-rc0l9aYKVjpSruxutYxYHLRmDN045fBYXD3itKbzDYA=";
+      version = "0.96.0";
+      hash = "sha256-F7NEyqA+vW+66l/ZmWaVvTSbG+0fxI+SsgfV6GmwJLs=";
       deps = [
         afex
         emmeans
         ggplot2
-        ggpol
         jaspBase
         jaspGraphs
         lme4
@@ -595,8 +587,8 @@ in
     };
     jaspNetwork = buildJaspModule {
       pname = "jaspNetwork";
-      version = "0.95.3";
-      hash = "sha256-16qRhOgzFRgbImeIfTKZJyn8ZlGnohPp4/whabdDHeM=";
+      version = "0.96.0";
+      hash = "sha256-alF9pDjBqrJvqDaJIOf9F/SWu/wrmspSFY/chE8/U9k=";
       deps = [
         bootnet
         easybgm
@@ -619,8 +611,8 @@ in
     };
     jaspPower = buildJaspModule {
       pname = "jaspPower";
-      version = "0.95.3";
-      hash = "sha256-2PrPaksHMAFVYCPN+xigLDSyALarzrO4FTylMmi4+vk=";
+      version = "0.96.0";
+      hash = "sha256-Q5CBXoHr6jPs/UNMpyQXzhMm5a48G8LTYr37VKfzrrc=";
       deps = [
         pwr
         jaspBase
@@ -630,8 +622,8 @@ in
     };
     jaspPredictiveAnalytics = buildJaspModule {
       pname = "jaspPredictiveAnalytics";
-      version = "0.95.3";
-      hash = "sha256-mQx/LsFDaD9zS2DqqiXfFNT019/J3HPdNsPzxWn2Pwc=";
+      version = "0.96.0";
+      hash = "sha256-CrpozVhA+vTv15dWUH9CqK37BdO7okE8XML6BYRsoYw=";
       deps = [
         jaspBase
         jaspGraphs
@@ -651,8 +643,8 @@ in
     };
     jaspProcess = buildJaspModule {
       pname = "jaspProcess";
-      version = "0.95.3";
-      hash = "sha256-wWMpqOXOKEx3z0juBXfnfJvbKCeI+H/Wnhh24dNWJWw=";
+      version = "0.96.0";
+      hash = "sha256-ZO3Y+3qA84s0wUdL9iRqnc4vljzg69crH34eCbGWmOo=";
       deps = [
         blavaan
         dagitty
@@ -666,8 +658,8 @@ in
     };
     jaspProphet = buildJaspModule {
       pname = "jaspProphet";
-      version = "0.95.3";
-      hash = "sha256-AOm0oNqCHmkUdhC8Cqb4O9HkUoC9L8TFaSNcZ/DzoYQ=";
+      version = "0.96.0";
+      hash = "sha256-rEBXWEVpavXiMljtvNfKLVvI8VIaTk+yymaGx4w/li8=";
       deps = [
         rstan
         ggplot2
@@ -679,8 +671,8 @@ in
     };
     jaspQualityControl = buildJaspModule {
       pname = "jaspQualityControl";
-      version = "0.95.3";
-      hash = "sha256-zFxC3icKd84jjilwZBCe7JRV8S1eb4AO8UyBENXsF/U=";
+      version = "0.96.0";
+      hash = "sha256-5DNz827MZHfmLnFXNUTFweMmOdDftxm6S8ZJwzCCDa8=";
       deps = [
         car
         cowplot
@@ -708,11 +700,12 @@ in
         tibble
         vipor
         weibullness
+        flexsurv
       ];
     };
     jaspRegression = buildJaspModule {
       pname = "jaspRegression";
-      version = "0.95.3";
+      version = "0.96.0";
       rev = "b0ecad26bb248964e778ee6d4486d671b83930b2";
       hash = "sha256-wm/Fz/wA7B96bzj8UylZjFgrrZgwOTdGnCsmfaCPGp0=";
       deps = [
@@ -742,8 +735,8 @@ in
     };
     jaspReliability = buildJaspModule {
       pname = "jaspReliability";
-      version = "0.95.3";
-      hash = "sha256-80G8Z8JWxwyAer1GsQgzytEcSquCBW8Zmu92KKiHu1I=";
+      version = "0.96.0";
+      hash = "sha256-WZW9CAAKdEYUTwGC1zmtChvntgRTkLL6xwrpukDoqSo=";
       deps = [
         Bayesrel
         coda
@@ -761,8 +754,8 @@ in
     };
     jaspRobustTTests = buildJaspModule {
       pname = "jaspRobustTTests";
-      version = "0.95.3";
-      hash = "sha256-txcItwNHq41ifdjvyY9Jhp2sfHJYA/YStTxpyk/lUPQ=";
+      version = "0.96.0";
+      hash = "sha256-U6qH0tKC7lLFvnTGK9mNli7Azh/SA6pUEJdsUoOCsYo=";
       deps = [
         RoBTT
         ggplot2
@@ -772,8 +765,8 @@ in
     };
     jaspSem = buildJaspModule {
       pname = "jaspSem";
-      version = "0.95.3";
-      hash = "sha256-QI1OGAfyBJ9p3Nb/sI3A5sISXc4ZpsN1sPaJL/3chP8=";
+      version = "0.96.0";
+      hash = "sha256-acSH/0IbqDxSOZi30zBjDgU3I6jxUYCgVG9B7dbkAh8=";
       deps = [
         forcats
         ggplot2
@@ -788,12 +781,14 @@ in
         tibble
         tidyr
         SEMsens
+        mxsem
+        OpenMx
       ];
     };
     jaspSummaryStatistics = buildJaspModule {
       pname = "jaspSummaryStatistics";
-      version = "0.95.3";
-      hash = "sha256-6OEnYhp4NBd8mr518Mz63F7eZ297unDRYLiOoWzlAbc=";
+      version = "0.96.0";
+      hash = "sha256-UuC26atGRnRHwp1xhAJtj5vkdPvYjcs2WIPgAq/0Uvg=";
       deps = [
         BayesFactor
         bstats
@@ -810,8 +805,8 @@ in
     };
     jaspSurvival = buildJaspModule {
       pname = "jaspSurvival";
-      version = "0.95.3";
-      hash = "sha256-rrbzd8Iws7lhKPJGRtFLuFgRkqHa8B0R6ZH/HdHDk44=";
+      version = "0.96.0";
+      hash = "sha256-P652YSopruDje69vXfeBMSBMU/GPmYCuRp7jd2ZneEI=";
       deps = [
         survival
         ggsurvfit
@@ -822,8 +817,8 @@ in
     };
     jaspTTests = buildJaspModule {
       pname = "jaspTTests";
-      version = "0.95.3";
-      hash = "sha256-yuNLBi56qKCTCh/UNoYjA7YlyL/1B0QXsgN4C8SzQbs=";
+      version = "0.96.0";
+      hash = "sha256-K1thMejBibf8nzP07QbKyS/j3FbbrGQNPdiBpkhKf1w=";
       deps = [
         BayesFactor
         car
@@ -848,8 +843,8 @@ in
     };
     jaspTimeSeries = buildJaspModule {
       pname = "jaspTimeSeries";
-      version = "0.95.3";
-      hash = "sha256-qOrLihjSH7cEazTiFJZIfMe9uGZ6ltZ3uMm+1fwPN7E=";
+      version = "0.96.0";
+      hash = "sha256-FZEEa1n7B9Kt74L7dw+oYWmHBGobI78wUBzQ1wsKos8=";
       deps = [
         jaspBase
         jaspGraphs
@@ -859,8 +854,8 @@ in
     };
     jaspVisualModeling = buildJaspModule {
       pname = "jaspVisualModeling";
-      version = "0.95.3";
-      hash = "sha256-KwFfgwBlukRmSltHt1LVzIMB/x2iCvRMc/Rrhmmxw98=";
+      version = "0.96.0";
+      hash = "sha256-lhvH69LUIzXsFQ730hqcWnkTK0aeMhal3VhSTrr4eHc=";
       deps = [
         flexplot
         jaspBase
diff --git a/pkgs/by-name/ja/jasp-desktop/package.nix b/pkgs/by-name/ja/jasp-desktop/package.nix
index 76eb48ebde5f..86cb7b932e15 100644
--- a/pkgs/by-name/ja/jasp-desktop/package.nix
+++ b/pkgs/by-name/ja/jasp-desktop/package.nix
@@ -6,6 +6,7 @@
 
   buildEnv,
   linkFarm,
+  writers,
 
   cmake,
   ninja,
@@ -23,17 +24,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jasp-desktop";
-  version = "0.95.4";
+  version = "0.96.0";
   src = fetchFromGitHub {
     owner = "jasp-stats";
     repo = "jasp-desktop";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-n7lXedICK+sAuSW6hODy+TngAZpDIObWDhTtOjiTXgc=";
+    hash = "sha256-5yvnlhPHssWfO9xxgBRULAMe6e5EyAWr8JVY0BQxKog=";
   };
 
   patches = [
-    ./boost.patch # link boost dynamically, don't try to link removed system stub library
+    ./boost.patch # link boost dynamically, don't try to find removed system stub library
     ./disable-module-install-logic.patch # don't try to install modules via cmake
     ./disable-renv-logic.patch
     ./dont-check-for-module-deps.patch # dont't check for dependencies required for building modules
@@ -80,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     # symlink modules from the store
     ln -s ${finalAttrs.passthru.moduleLibs} $out/Modules/module_libs
+    ln -s ${finalAttrs.passthru.moduleManifests} $out/Modules/manifests
   '';
 
   passthru = {
@@ -110,6 +112,16 @@ stdenv.mkDerivation (finalAttrs: {
         path = "${drv}/library";
       }) finalAttrs.passthru.modules
     );
+
+    moduleManifests = linkFarm "jasp-desktop-${finalAttrs.version}-module-manifests" (
+      lib.mapAttrsToList (name: drv: {
+        name = "${name}_manifest.json";
+        path = writers.writeJSON "${name}_manifest.json" {
+          name = name;
+          version = drv.version;
+        };
+      }) finalAttrs.passthru.modules
+    );
   };
 
   meta = {

From 2af097fa5d9cf5410522e16db200eeaf7b672b15 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Wed, 4 Mar 2026 21:59:06 +0100
Subject: [PATCH 14/19] rPackages.ggpol: remark as broken

---
 pkgs/development/r-modules/cran-packages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/r-modules/cran-packages.json b/pkgs/development/r-modules/cran-packages.json
index c1f411130d5f..335b57f7018d 100644
--- a/pkgs/development/r-modules/cran-packages.json
+++ b/pkgs/development/r-modules/cran-packages.json
@@ -157220,7 +157220,7 @@
       "version": "0.0.7",
       "sha256": "11xr26kwmkjjb51wm44ydv0vcinc6k6faqwx4s2faj4iwidlys1m",
       "depends": ["dplyr", "ggplot2", "glue", "gtable", "plyr", "rlang", "tibble"],
-      "broken": false
+      "broken": true
     },
     "ggseas": {
       "name": "ggseas",

From faad8694de332ba0e747287b9868bae9a1a0a600 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Mar 2026 02:02:56 +0000
Subject: [PATCH 15/19] protoc-gen-go-ttrpc: 1.2.7 -> 1.2.8

---
 pkgs/by-name/pr/protoc-gen-go-ttrpc/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/protoc-gen-go-ttrpc/package.nix b/pkgs/by-name/pr/protoc-gen-go-ttrpc/package.nix
index 265a85b4ee82..94e73cc450ba 100644
--- a/pkgs/by-name/pr/protoc-gen-go-ttrpc/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-go-ttrpc/package.nix
@@ -6,17 +6,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "protoc-gen-go-ttrpc";
-  version = "1.2.7";
+  version = "1.2.8";
 
   src = fetchFromGitHub {
     owner = "containerd";
     repo = "ttrpc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oQamR59cQrcuw9tervKrf+2vYnweRRNgST8GObFNjTk=";
+    hash = "sha256-B7tEuRHBMzZZ7NZ3zliFpXqtZcApDEYz6T4ZHzd4bD0=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-ecEO3ZM4RWl6fXvCkncetjgUZB4+LBzSFVTgiYO3tOU=";
+  vendorHash = "sha256-fDq1lYp1JB5CQUOQcM1KCO0W1d37u3x22MSJCzUCYdE=";
 
   subPackages = [
     "cmd/protoc-gen-go-ttrpc"

From 51b8c79529852d3a0a96a3c74677292f41e8741e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Mar 2026 04:01:20 +0000
Subject: [PATCH 16/19] asusctl: 6.3.3 -> 6.3.4

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

diff --git a/pkgs/by-name/as/asusctl/package.nix b/pkgs/by-name/as/asusctl/package.nix
index e74c15e6d837..f45ead3382ea 100644
--- a/pkgs/by-name/as/asusctl/package.nix
+++ b/pkgs/by-name/as/asusctl/package.nix
@@ -18,16 +18,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "asusctl";
-  version = "6.3.3";
+  version = "6.3.4";
 
   src = fetchFromGitLab {
     owner = "asus-linux";
     repo = "asusctl";
     tag = finalAttrs.version;
-    hash = "sha256-nc6pGxLutxKyd4LiI23e7UfWK45aQiLQRKL6zX7rVO0=";
+    hash = "sha256-1B4uKX8Aqorxh+QMsUEmSnO56zqYhUb6wLMXPAR5HQo=";
   };
 
-  cargoHash = "sha256-LZsSnIGTemu+SvJxszPWkA5EIdu8XzruZXaYIibV31Q=";
+  cargoHash = "sha256-aRsrA1j4nYp2rbQM2FbTfWVDkVfKFFa6L+DtW8mKcmk=";
 
   postPatch = ''
     files="

From e1111f8b8635eace51c21af257b3a6ea01384b61 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Mar 2026 04:30:12 +0000
Subject: [PATCH 17/19] pyrefly: 0.53.0 -> 0.55.0

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

diff --git a/pkgs/by-name/py/pyrefly/package.nix b/pkgs/by-name/py/pyrefly/package.nix
index 4a922722c45a..184f7088b82e 100644
--- a/pkgs/by-name/py/pyrefly/package.nix
+++ b/pkgs/by-name/py/pyrefly/package.nix
@@ -10,17 +10,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pyrefly";
-  version = "0.53.0";
+  version = "0.55.0";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "pyrefly";
     tag = finalAttrs.version;
-    hash = "sha256-tw4VQw0liyPjZBZxP7U79JLdJcSuitMr53lVdtje5KE=";
+    hash = "sha256-Pdfi+ZCAnBCCFNI/5NLNexacn1kFDHjnjgkhfw/m1j0=";
   };
 
   buildAndTestSubdir = "pyrefly";
-  cargoHash = "sha256-+LwF0PHBU+do+eg84PGMEt3ri9LjMD+e2p82i2icwh4=";
+  cargoHash = "sha256-HXJsTE0a8X4c+CvC9e0xp4PVUBrFOpB5R/K/UG5MeDs=";
 
   buildInputs = [ rust-jemalloc-sys ];
 

From 1fa820dfddbdacc00d9c574f95088fd210c9f693 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Mar 2026 05:32:25 +0000
Subject: [PATCH 18/19] terraform-providers.ubiquiti-community_unifi: 0.41.13
 -> 0.41.17

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index fead5d0e4b99..294a22399a41 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1400,13 +1400,13 @@
     "vendorHash": null
   },
   "ubiquiti-community_unifi": {
-    "hash": "sha256-8mbQpDqs+2vvzmapJmusipo3IbUwyFlLPY3GkwORXpI=",
+    "hash": "sha256-2IYiy/DLCj+bcEkU+nwLg7Wt2j7bh29cScPcSTGsU5A=",
     "homepage": "https://registry.terraform.io/providers/ubiquiti-community/unifi",
     "owner": "ubiquiti-community",
     "repo": "terraform-provider-unifi",
-    "rev": "v0.41.13",
+    "rev": "v0.41.17",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-kEUmuXSNFFBUlFp7tqa00H+M/NTDSd6j6liFTH6PUVw="
+    "vendorHash": "sha256-rixXMK+M6/8g4cw/f+zNzY9x3GkA3nqmkQTPrONoueY="
   },
   "ucloud_ucloud": {
     "hash": "sha256-UOVnfWYhntmRHMApQgemjUBsyUIz0bexsc1gwDGGee4=",

From 2cc2e0225f9882364846163abb0665243a8222ba Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <github@infinisil.com>
Date: Fri, 6 Mar 2026 08:41:24 +0100
Subject: [PATCH 19/19] Revert "ci: module maintainer review requests;
 nixos/modules: init `meta.teams`"

---
 ci/eval/compare/default.nix                   |  11 +-
 ci/eval/compare/maintainers.nix               | 156 ++++++------
 ci/eval/compare/test.nix                      | 228 ------------------
 modules/generic/meta-maintainers.nix          |  58 ++---
 modules/generic/meta-maintainers/test.nix     |  10 +-
 nixos/modules/config/vte.nix                  |   2 +-
 nixos/modules/config/xdg/autostart.nix        |   2 +-
 nixos/modules/config/xdg/icons.nix            |   2 +-
 nixos/modules/config/xdg/menus.nix            |   2 +-
 nixos/modules/config/xdg/mime.nix             |   2 +-
 nixos/modules/config/xdg/portal.nix           |   2 +-
 nixos/modules/config/xdg/portals/lxqt.nix     |   2 +-
 nixos/modules/config/xdg/sounds.nix           |   2 +-
 nixos/modules/programs/dsearch.nix            |   2 +-
 nixos/modules/programs/geary.nix              |   2 +-
 nixos/modules/programs/gnome-disks.nix        |   2 +-
 nixos/modules/programs/gnome-terminal.nix     |   2 +-
 nixos/modules/programs/nm-applet.nix          |   2 +-
 nixos/modules/programs/steam.nix              |   2 +-
 nixos/modules/programs/thunar.nix             |   2 +-
 nixos/modules/programs/wayland/dms-shell.nix  |   2 +-
 nixos/modules/programs/wayland/hyprland.nix   |   2 +-
 nixos/modules/programs/wayland/hyprlock.nix   |   2 +-
 nixos/modules/programs/xfconf.nix             |   2 +-
 nixos/modules/security/acme/default.nix       |   2 +-
 nixos/modules/security/apparmor.nix           |   2 +-
 .../services/cluster/rancher/default.nix      |   3 +-
 .../buildbot/master.nix                       |   2 +-
 .../buildbot/worker.nix                       |   2 +-
 .../gitlab-runner/runner.nix                  |   2 +-
 .../modules/services/databases/clickhouse.nix |   2 +-
 .../services/desktop-managers/budgie.nix      |   2 +-
 .../services/desktop-managers/cosmic.nix      |   2 +-
 .../services/desktop-managers/gnome.nix       |   2 +-
 .../services/desktop-managers/lomiri.nix      |   2 +-
 .../services/desktop-managers/pantheon.nix    |   2 +-
 .../services/desktops/accountsservice.nix     |   2 +-
 nixos/modules/services/desktops/geoclue2.nix  |   2 +-
 .../services/desktops/gnome/at-spi2-core.nix  |   2 +-
 .../desktops/gnome/evolution-data-server.nix  |   2 +-
 .../services/desktops/gnome/gcr-ssh-agent.nix |   2 +-
 .../desktops/gnome/glib-networking.nix        |   2 +-
 .../gnome/gnome-browser-connector.nix         |   2 +-
 .../desktops/gnome/gnome-initial-setup.nix    |   2 +-
 .../services/desktops/gnome/gnome-keyring.nix |   2 +-
 .../desktops/gnome/gnome-online-accounts.nix  |   2 +-
 .../desktops/gnome/gnome-remote-desktop.nix   |   2 +-
 .../desktops/gnome/gnome-settings-daemon.nix  |   2 +-
 .../desktops/gnome/gnome-software.nix         |   2 +-
 .../desktops/gnome/gnome-user-share.nix       |   2 +-
 .../services/desktops/gnome/localsearch.nix   |   2 +-
 .../modules/services/desktops/gnome/rygel.nix |   2 +-
 .../modules/services/desktops/gnome/sushi.nix |   2 +-
 .../services/desktops/gnome/tinysparql.nix    |   2 +-
 nixos/modules/services/desktops/gvfs.nix      |   2 +-
 .../services/desktops/pipewire/pipewire.nix   |   3 +-
 nixos/modules/services/desktops/tumbler.nix   |   2 +-
 nixos/modules/services/desktops/zeitgeist.nix |   2 +-
 .../display-managers/cosmic-greeter.nix       |   2 +-
 .../services/display-managers/dms-greeter.nix |   2 +-
 .../modules/services/display-managers/gdm.nix |   2 +-
 .../home-automation/home-assistant.nix        |   2 +-
 nixos/modules/services/matrix/dendrite.nix    |   2 +-
 nixos/modules/services/misc/forgejo.nix       |   2 +-
 nixos/modules/services/misc/gitlab.nix        |   2 +-
 nixos/modules/services/networking/epmd.nix    |   2 +-
 .../services/networking/jibri/default.nix     |   2 +-
 nixos/modules/services/networking/jicofo.nix  |   2 +-
 nixos/modules/services/networking/jigasi.nix  |   2 +-
 .../services/networking/jitsi-videobridge.nix |   2 +-
 .../services/networking/modemmanager.nix      |   2 +-
 .../services/networking/networkmanager.nix    |   5 +-
 nixos/modules/services/security/reaction.nix  |  10 +-
 nixos/modules/services/wayland/hypridle.nix   |   2 +-
 .../modules/services/web-apps/jitsi-meet.nix  |   2 +-
 nixos/modules/services/web-apps/nextcloud.nix |   2 +-
 .../services/web-apps/peertube-runner.nix     |   2 +-
 .../x11/desktop-managers/enlightenment.nix    |   2 +-
 .../services/x11/desktop-managers/lumina.nix  |   2 +-
 .../services/x11/desktop-managers/lxqt.nix    |   2 +-
 .../services/x11/desktop-managers/xfce.nix    |   2 +-
 .../display-managers/account-service-util.nix |   2 +-
 .../lightdm-greeters/lomiri.nix               |   2 +-
 .../lightdm-greeters/pantheon.nix             |   2 +-
 .../services/x11/display-managers/lightdm.nix |   2 +-
 nixos/modules/services/x11/touchegg.nix       |   2 +-
 nixos/modules/virtualisation/containers.nix   |   2 +-
 nixos/modules/virtualisation/cri-o.nix        |   2 +-
 nixos/modules/virtualisation/incus-agent.nix  |   2 +-
 .../virtualisation/incus-virtual-machine.nix  |   2 +-
 nixos/modules/virtualisation/incus.nix        |   2 +-
 .../modules/virtualisation/lxc-container.nix  |   2 +-
 .../virtualisation/lxc-image-metadata.nix     |   2 +-
 .../virtualisation/lxc-instance-common.nix    |   2 +-
 nixos/modules/virtualisation/lxc.nix          |   2 +-
 nixos/modules/virtualisation/lxcfs.nix        |   2 +-
 .../modules/virtualisation/podman/default.nix |   2 +-
 .../podman/network-socket-ghostunnel.nix      |   3 +-
 .../virtualisation/podman/network-socket.nix  |   3 +-
 nixos/modules/virtualisation/xen-dom0.nix     |   2 +-
 100 files changed, 210 insertions(+), 458 deletions(-)
 delete mode 100644 ci/eval/compare/test.nix

diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix
index ed1129d75f2e..f1473367a7d9 100644
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -123,7 +123,9 @@ let
   # - values: lists of `packagePlatformPath`s
   diffAttrs = builtins.fromJSON (builtins.readFile "${combined}/combined-diff.json");
 
+  changedPackagePlatformAttrs = convertToPackagePlatformAttrs diffAttrs.changed;
   rebuildsPackagePlatformAttrs = convertToPackagePlatformAttrs diffAttrs.rebuilds;
+  removedPackagePlatformAttrs = convertToPackagePlatformAttrs diffAttrs.removed;
 
   changed-paths =
     let
@@ -160,10 +162,9 @@ let
 
   inherit
     (callPackage ./maintainers.nix {
-      affectedAttrPaths = map (a: a.packagePath) (
-        convertToPackagePlatformAttrs (diffAttrs.changed ++ diffAttrs.removed)
-      );
-      changedFiles = lib.importJSON touchedFilesJson;
+      changedattrs = lib.attrNames (lib.groupBy (a: a.name) changedPackagePlatformAttrs);
+      changedpathsjson = touchedFilesJson;
+      removedattrs = lib.attrNames (lib.groupBy (a: a.name) removedPackagePlatformAttrs);
     })
     users
     teams
@@ -180,7 +181,7 @@ runCommand "compare"
     ];
     users = builtins.toJSON users;
     teams = builtins.toJSON teams;
-    packages = builtins.toJSON (lib.map (lib.concatStringsSep ".") packages);
+    packages = builtins.toJSON packages;
     passAsFile = [
       "users"
       "teams"
diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix
index 903e42f733f6..daecc1c154da 100644
--- a/ci/eval/compare/maintainers.nix
+++ b/ci/eval/compare/maintainers.nix
@@ -1,54 +1,70 @@
-# Figure out which maintainers (users/teams) are relevant for a PR:
-# - All maintainers that can be linked directly to changedFiles
-# - Maintainers of affectedAttrPaths if a file directly related to the attribute is in changedFiles
-#
-# Files and attributes are linked in various ways:
-# - pkgs/by-name/<attr>/* is linked to pkgs.<attr>
-# - The file position of various attributes of pkgs.<attr>
-# - Explicitly specified file positions in derivations
-#
-# Test with
-#   nix-instantiate --eval --strict --json test.nix -A result | jq
-#
-# Empty list as an output means success
 {
-  # Files that were changed
-  # Type: ListOf (Nixpkgs-root-relative path)
-  changedFiles,
-  # Attributes whose value was affected by the change
-  # Type: ListOf (ListOf String)
-  affectedAttrPaths,
-
-  pkgs ? import ../../.. {
+  lib,
+  changedattrs,
+  changedpathsjson,
+  removedattrs,
+}:
+let
+  pkgs = import ../../.. {
     system = "x86_64-linux";
     # We should never try to ping maintainers through package aliases, this can only lead to errors.
     # One example case is, where an attribute is a throw alias, but then re-introduced in a PR.
     # This would trigger the throw. By disabling aliases, we can fallback gracefully below.
     config.allowAliases = false;
-    overlays = [ ];
-  },
-  lib,
-}:
-let
-  nixpkgsRoot = toString ../../.. + "/";
-  stripNixpkgsRootFromKeys = lib.mapAttrs' (
-    file: value: lib.nameValuePair (lib.removePrefix nixpkgsRoot file) value
-  );
+  };
 
-  moduleMeta = (pkgs.nixos { }).config.meta;
+  changedpaths = lib.importJSON changedpathsjson;
 
-  # Currently just nixos module maintainers, but in the future we can use this for code owners too
-  fileUsers = stripNixpkgsRootFromKeys moduleMeta.maintainers;
-  fileTeams = stripNixpkgsRootFromKeys moduleMeta.teams;
+  # Extract attributes that changed from by-name paths.
+  # This allows pinging reviewers for pure refactors.
+  touchedattrs = lib.pipe changedpaths [
+    (lib.filter (changed: lib.hasPrefix "pkgs/by-name/" changed && changed != "pkgs/by-name/README.md"))
+    (map (lib.splitString "/"))
+    (map (path: lib.elemAt path 3))
+    lib.unique
+  ];
 
-  anyMatchingFile = filename: lib.any (lib.hasPrefix filename) changedFiles;
+  anyMatchingFile = filename: lib.any (lib.hasPrefix filename) changedpaths;
 
   anyMatchingFiles = files: lib.any anyMatchingFile files;
 
+  sharded = name: "${lib.substring 0 2 name}/${name}";
+
+  attrsWithMaintainers = lib.pipe (changedattrs ++ removedattrs ++ touchedattrs) [
+    # An attribute can appear in changed/removed *and* touched
+    lib.unique
+    (map (
+      name:
+      let
+        path = lib.splitString "." name;
+        # Some packages might be reported as changed on a different platform, but
+        # not even have an attribute on the platform the maintainers are requested on.
+        # Fallback to `null` for these to filter them out below.
+        package = lib.attrByPath path null pkgs;
+      in
+      {
+        inherit name package;
+        # Adds all files in by-name to each package, no matter whether they are discoverable
+        # via meta attributes below. For example, this allows pinging maintainers for
+        # updates to .json files.
+        # TODO: Support by-name package sets.
+        filenames = lib.optional (lib.length path == 1) "pkgs/by-name/${sharded (lib.head path)}/";
+        # meta.maintainers also contains all individual team members.
+        # We only want to ping individuals if they're added individually as maintainers, not via teams.
+        users = package.meta.nonTeamMaintainers or [ ];
+        teams = package.meta.teams or [ ];
+      }
+    ))
+    # No need to match up packages without maintainers with their files.
+    # This also filters out attributes where `package = null`, which is the
+    # case for libintl, for example.
+    (lib.filter (pkg: pkg.users != [ ] || pkg.teams != [ ]))
+  ];
+
   relevantFilenames =
     drv:
     (lib.unique (
-      map (pos: lib.removePrefix nixpkgsRoot pos.file) (
+      map (pos: lib.removePrefix "${toString ../../..}/" pos.file) (
         lib.filter (x: x != null) [
           (drv.meta.maintainersPosition or null)
           (drv.meta.teamsPosition or null)
@@ -71,82 +87,50 @@ let
       )
     ));
 
-  relevantAffectedAttrPaths = lib.filter (
-    attrPath:
-    # Some packages might be reported as changed on a different platform, but
-    # not even have an attribute on the platform the maintainers are requested on.
-    # Fallback to `null` for these to filter them out
-    let
-      package = lib.attrByPath attrPath null pkgs;
-    in
-    package != null && anyMatchingFiles (relevantFilenames package)
-  ) affectedAttrPaths;
+  attrsWithFilenames = map (
+    pkg: pkg // { filenames = pkg.filenames ++ relevantFilenames pkg.package; }
+  ) attrsWithMaintainers;
 
-  # Extract attributes that changed from by-name paths.
-  # This allows pinging reviewers for pure refactors.
-  changedByNameAttrPaths = lib.pipe changedFiles [
-    (lib.filter (changed: lib.hasPrefix "pkgs/by-name/" changed))
-    (map (lib.splitString "/"))
-    # Filters out e.g. pkgs/by-name/README.md
-    (lib.filter (path: lib.length path > 3))
-    (map (path: lib.elemAt path 3))
-    (map lib.singleton)
-  ];
-
-  # An attribute can appear in affected *and* touched
-  attrPathsToGetMaintainersFor = lib.unique (relevantAffectedAttrPaths ++ changedByNameAttrPaths);
-
-  attrPathEntities = lib.concatMap (
-    attrPath:
-    let
-      package = lib.getAttrFromPath attrPath pkgs;
-    in
-    # meta.maintainers also contains all individual team members.
-    # We only want to ping individuals if they're added individually as maintainers, not via teams.
-    userPings { inherit attrPath; } (package.meta.nonTeamMaintainers or [ ])
-    ++ lib.concatMap (teamPings { inherit attrPath; }) (package.meta.teams or [ ])
-  ) attrPathsToGetMaintainersFor;
-
-  changedFileEntities = lib.concatMap (
-    file:
-    userPings { inherit file; } (fileUsers.${file} or [ ])
-    ++ lib.concatMap (teamPings { inherit file; }) (fileTeams.${file} or [ ])
-  ) changedFiles;
+  attrsWithModifiedFiles = lib.filter (pkg: anyMatchingFiles pkg.filenames) attrsWithFilenames;
 
   userPings =
-    context:
+    pkg:
     map (maintainer: {
       type = "user";
       userId = maintainer.githubId;
-      inherit context;
+      packageName = pkg.name;
     });
 
   teamPings =
-    context: team:
-    if team ? githubId then
+    pkg: team:
+    if team ? github then
       [
         {
           type = "team";
           teamId = team.githubId;
-          inherit context;
+          packageName = pkg.name;
         }
       ]
     else
-      userPings context team.members;
+      userPings pkg team.members;
 
-  byType = lib.groupBy (ping: ping.type) (attrPathEntities ++ changedFileEntities);
+  maintainersToPing = lib.concatMap (
+    pkg: userPings pkg pkg.users ++ lib.concatMap (teamPings pkg) pkg.teams
+  ) attrsWithModifiedFiles;
+
+  byType = lib.groupBy (ping: ping.type) maintainersToPing;
 
   byUser = lib.pipe (byType.user or [ ]) [
     (lib.groupBy (ping: toString ping.userId))
-    (lib.mapAttrs (_user: lib.map (pkg: pkg.context)))
+    (lib.mapAttrs (_user: lib.map (pkg: pkg.packageName)))
   ];
   byTeam = lib.pipe (byType.team or [ ]) [
     (lib.groupBy (ping: toString ping.teamId))
-    (lib.mapAttrs (_team: lib.map (pkg: pkg.context)))
+    (lib.mapAttrs (_team: lib.map (pkg: pkg.packageName)))
   ];
 in
 {
   users = byUser;
   teams = byTeam;
-  packages = attrPathsToGetMaintainersFor;
+  packages = lib.catAttrs "name" attrsWithModifiedFiles;
 }
diff --git a/ci/eval/compare/test.nix b/ci/eval/compare/test.nix
deleted file mode 100644
index 323d71d87680..000000000000
--- a/ci/eval/compare/test.nix
+++ /dev/null
@@ -1,228 +0,0 @@
-{
-  pkgs ? import ../../.. {
-    config = { };
-    overlays = [ ];
-  },
-  lib ? pkgs.lib,
-}:
-let
-  fun = import ./maintainers.nix;
-
-  mockPkgs =
-    {
-      packages ? [ ],
-      modules ? [ ],
-      githubTeams ? true,
-    }:
-    lib.updateManyAttrsByPath
-      (lib.imap0 (i: p: {
-        path = p;
-        update = _: {
-          meta.maintainersPosition.file = lib.concatStringsSep "/" p;
-          meta.nonTeamMaintainers = [ { githubId = i; } ];
-          meta.teams =
-            if githubTeams then [ { githubId = i + 100; } ] else [ { members = [ { githubId = i + 100; } ]; } ];
-        };
-      }) packages)
-      {
-        nixos =
-          { }:
-          {
-            config.meta.maintainers = lib.listToAttrs (
-              lib.imap0 (i: m: lib.nameValuePair m [ { githubId = i; } ]) modules
-            );
-            config.meta.teams = lib.listToAttrs (
-              lib.imap0 (
-                i: m:
-                lib.nameValuePair m (
-                  if githubTeams then [ { githubId = i + 100; } ] else [ { members = [ { githubId = i + 100; } ]; } ]
-                )
-              ) modules
-            );
-          };
-      };
-
-  tests = {
-    testEmpty = {
-      expr = fun {
-        pkgs = mockPkgs { };
-        inherit lib;
-        changedFiles = [ ];
-        affectedAttrPaths = [ ];
-      };
-      expected = {
-        packages = [ ];
-        teams = { };
-        users = { };
-      };
-    };
-    testNonExistentAffected = {
-      expr = fun {
-        pkgs = mockPkgs { };
-        inherit lib;
-        changedFiles = [ "a" ];
-        affectedAttrPaths = [ [ "b" ] ];
-      };
-      expected = {
-        packages = [ ];
-        teams = { };
-        users = { };
-      };
-    };
-    testIrrelevantAffected = {
-      expr = fun {
-        pkgs = mockPkgs {
-          packages = [ [ "b" ] ];
-        };
-        inherit lib;
-        changedFiles = [ "a" ];
-        affectedAttrPaths = [ [ "b" ] ];
-      };
-      expected = {
-        packages = [ ];
-        teams = { };
-        users = { };
-      };
-    };
-    testRelevantAffected = {
-      expr = fun {
-        pkgs = mockPkgs {
-          packages = [ [ "b" ] ];
-        };
-        inherit lib;
-        # Also tests that subpaths work
-        changedFiles = [ "b/c" ];
-        affectedAttrPaths = [ [ "b" ] ];
-      };
-      expected = {
-        packages = [ [ "b" ] ];
-        teams."100" = [
-          { attrPath = [ "b" ]; }
-        ];
-        users."0" = [
-          { attrPath = [ "b" ]; }
-        ];
-      };
-    };
-    testRelevantAffectedNonGitHub = {
-      expr = fun {
-        pkgs = mockPkgs {
-          packages = [ [ "b" ] ];
-          githubTeams = false;
-        };
-        inherit lib;
-        changedFiles = [ "b/c" ];
-        affectedAttrPaths = [ [ "b" ] ];
-      };
-      expected = {
-        packages = [ [ "b" ] ];
-        teams = { };
-        users."0" = [
-          { attrPath = [ "b" ]; }
-        ];
-        users."100" = [
-          { attrPath = [ "b" ]; }
-        ];
-      };
-    };
-    testByNameChanged = {
-      expr = fun {
-        pkgs = mockPkgs {
-          packages = [ [ "hello" ] ];
-        };
-        inherit lib;
-        changedFiles = [ "pkgs/by-name/he/hello/sources.json" ];
-        affectedAttrPaths = [ ];
-      };
-      expected = {
-        packages = [ [ "hello" ] ];
-        teams."100" = [
-          { attrPath = [ "hello" ]; }
-        ];
-        users."0" = [
-          { attrPath = [ "hello" ]; }
-        ];
-      };
-    };
-    testByNameReadmeChanged = {
-      expr = fun {
-        pkgs = mockPkgs {
-          packages = [ [ "hello" ] ];
-        };
-        inherit lib;
-        changedFiles = [ "pkgs/by-name/README.md" ];
-        affectedAttrPaths = [ ];
-      };
-      expected = {
-        packages = [ ];
-        teams = { };
-        users = { };
-      };
-    };
-    testNoDuplicates = {
-      expr = fun {
-        pkgs = mockPkgs {
-          packages = [ [ "hello" ] ];
-        };
-        inherit lib;
-        changedFiles = [
-          "hello"
-          "pkgs/by-name/he/hello/sources.json"
-        ];
-        affectedAttrPaths = [ [ "hello" ] ];
-      };
-      expected = {
-        packages = [ [ "hello" ] ];
-        teams."100" = [
-          { attrPath = [ "hello" ]; }
-        ];
-        users."0" = [
-          { attrPath = [ "hello" ]; }
-        ];
-      };
-    };
-    testModuleMaintainers = {
-      expr = fun {
-        pkgs = mockPkgs {
-          modules = [ "a" ];
-        };
-        inherit lib;
-        changedFiles = [ "a" ];
-        affectedAttrPaths = [ ];
-      };
-      expected = {
-        packages = [ ];
-        teams."100" = [
-          { file = "a"; }
-        ];
-        users."0" = [
-          { file = "a"; }
-        ];
-      };
-    };
-    testModuleMaintainersNonGithub = {
-      expr = fun {
-        pkgs = mockPkgs {
-          modules = [ "a" ];
-          githubTeams = false;
-        };
-        inherit lib;
-        changedFiles = [ "a" ];
-        affectedAttrPaths = [ ];
-      };
-      expected = {
-        packages = [ ];
-        teams = { };
-        users."100" = [
-          { file = "a"; }
-        ];
-        users."0" = [
-          { file = "a"; }
-        ];
-      };
-    };
-  };
-in
-{
-  result = lib.runTests tests;
-}
diff --git a/modules/generic/meta-maintainers.nix b/modules/generic/meta-maintainers.nix
index ce37dae03db6..f9e8a19aea82 100644
--- a/modules/generic/meta-maintainers.nix
+++ b/modules/generic/meta-maintainers.nix
@@ -4,12 +4,39 @@
 let
   inherit (lib)
     mkOption
+    mkOptionType
     types
     ;
 
-  # The resulting value of this type shows where all values were defined
-  sourceList = types.listOf types.raw // {
-    merge = loc: defs: lib.listToAttrs (lib.map ({ file, value }: lib.nameValuePair file value) defs);
+  maintainer = mkOptionType {
+    name = "maintainer";
+    check = email: lib.elem email (lib.attrValues lib.maintainers);
+    merge = loc: defs: {
+      # lib.last: Perhaps this could be merged instead, if "at most once per module"
+      # is a problem (see option description).
+      ${(lib.last defs).file} = (lib.last defs).value;
+    };
+  };
+
+  listOfMaintainers = types.listOf maintainer // {
+    merge =
+      loc: defs:
+      lib.zipAttrs (
+        lib.flatten (
+          lib.imap1 (
+            n: def:
+            lib.imap1 (
+              m: def':
+              maintainer.merge (loc ++ [ "[${toString n}-${toString m}]" ]) [
+                {
+                  inherit (def) file;
+                  value = def';
+                }
+              ]
+            ) def.value
+          ) defs
+        )
+      );
   };
 in
 {
@@ -17,14 +44,7 @@ in
   options = {
     meta = {
       maintainers = mkOption {
-        type =
-          let
-            allMaintainers = lib.attrValues lib.maintainers;
-          in
-          lib.types.addCheck sourceList (lib.all (v: lib.elem v allMaintainers))
-          // {
-            description = "list of lib.maintainers";
-          };
+        type = listOfMaintainers;
         default = [ ];
         example = lib.literalExpression "[ lib.maintainers.alice lib.maintainers.bob ]";
         description = ''
@@ -34,22 +54,6 @@ in
           The option value is not a list of maintainers, but an attribute set that maps module file names to lists of maintainers.
         '';
       };
-      teams = mkOption {
-        type =
-          let
-            allTeams = lib.attrValues lib.teams;
-          in
-          lib.types.addCheck sourceList (lib.all (v: lib.elem v allTeams))
-          // {
-            description = "list of lib.teams";
-          };
-        default = [ ];
-        example = lib.literalExpression "[ lib.teams.acme lib.teams.haskell ]";
-        description = ''
-          List of team maintainers of each module.
-          This option should be defined at most once per module.
-        '';
-      };
     };
   };
   meta.maintainers = with lib.maintainers; [
diff --git a/modules/generic/meta-maintainers/test.nix b/modules/generic/meta-maintainers/test.nix
index a9859a6ee2dc..e4b37780ca83 100644
--- a/modules/generic/meta-maintainers/test.nix
+++ b/modules/generic/meta-maintainers/test.nix
@@ -14,17 +14,9 @@ let
   };
 in
 rec {
-  # Inject ghost into lib.maintainers so it passes the addCheck validation
-  lib = (import ../../../lib).extend (
-    final: prev: {
-      maintainers = prev.maintainers // {
-        inherit ghost;
-      };
-    }
-  );
+  lib = import ../../../lib;
 
   example = lib.evalModules {
-    specialArgs.lib = lib;
     modules = [
       ../meta-maintainers.nix
       {
diff --git a/nixos/modules/config/vte.nix b/nixos/modules/config/vte.nix
index f3ec58012b0d..8ed746d4966d 100644
--- a/nixos/modules/config/vte.nix
+++ b/nixos/modules/config/vte.nix
@@ -22,7 +22,7 @@ in
 {
 
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   options = {
diff --git a/nixos/modules/config/xdg/autostart.nix b/nixos/modules/config/xdg/autostart.nix
index 8310c377d43b..8fc3cb9920fa 100644
--- a/nixos/modules/config/xdg/autostart.nix
+++ b/nixos/modules/config/xdg/autostart.nix
@@ -1,7 +1,7 @@
 { config, lib, ... }:
 {
   meta = {
-    teams = [ lib.teams.freedesktop ];
+    maintainers = lib.teams.freedesktop.members;
   };
 
   options = {
diff --git a/nixos/modules/config/xdg/icons.nix b/nixos/modules/config/xdg/icons.nix
index 41eee42767f4..7810c57ef386 100644
--- a/nixos/modules/config/xdg/icons.nix
+++ b/nixos/modules/config/xdg/icons.nix
@@ -6,7 +6,7 @@
 }:
 {
   meta = {
-    teams = [ lib.teams.freedesktop ];
+    maintainers = lib.teams.freedesktop.members;
   };
 
   options = {
diff --git a/nixos/modules/config/xdg/menus.nix b/nixos/modules/config/xdg/menus.nix
index efbfdc5f2383..6c05d49189ad 100644
--- a/nixos/modules/config/xdg/menus.nix
+++ b/nixos/modules/config/xdg/menus.nix
@@ -1,7 +1,7 @@
 { config, lib, ... }:
 {
   meta = {
-    teams = [ lib.teams.freedesktop ];
+    maintainers = lib.teams.freedesktop.members;
   };
 
   options = {
diff --git a/nixos/modules/config/xdg/mime.nix b/nixos/modules/config/xdg/mime.nix
index 59d62a32010b..79955a03ef2f 100644
--- a/nixos/modules/config/xdg/mime.nix
+++ b/nixos/modules/config/xdg/mime.nix
@@ -13,7 +13,7 @@ in
 
 {
   meta = {
-    teams = [ lib.teams.freedesktop ];
+    maintainers = lib.teams.freedesktop.members ++ [ ];
   };
 
   options = {
diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix
index 6bc6ce5e33e7..5fd9d7fdd1bb 100644
--- a/nixos/modules/config/xdg/portal.nix
+++ b/nixos/modules/config/xdg/portal.nix
@@ -32,7 +32,7 @@ in
   ];
 
   meta = {
-    teams = [ teams.freedesktop ];
+    maintainers = teams.freedesktop.members;
   };
 
   options.xdg.portal = {
diff --git a/nixos/modules/config/xdg/portals/lxqt.nix b/nixos/modules/config/xdg/portals/lxqt.nix
index 423fcae1b2b1..77a5f144730d 100644
--- a/nixos/modules/config/xdg/portals/lxqt.nix
+++ b/nixos/modules/config/xdg/portals/lxqt.nix
@@ -10,7 +10,7 @@ let
 in
 {
   meta = {
-    teams = [ lib.teams.lxqt ];
+    maintainers = lib.teams.lxqt.members;
   };
 
   options.xdg.portal.lxqt = {
diff --git a/nixos/modules/config/xdg/sounds.nix b/nixos/modules/config/xdg/sounds.nix
index e23ced7f76dd..8b5bb67e4109 100644
--- a/nixos/modules/config/xdg/sounds.nix
+++ b/nixos/modules/config/xdg/sounds.nix
@@ -6,7 +6,7 @@
 }:
 {
   meta = {
-    teams = [ lib.teams.freedesktop ];
+    maintainers = lib.teams.freedesktop.members;
   };
 
   options = {
diff --git a/nixos/modules/programs/dsearch.nix b/nixos/modules/programs/dsearch.nix
index 5e99478054d3..f1597189fa38 100644
--- a/nixos/modules/programs/dsearch.nix
+++ b/nixos/modules/programs/dsearch.nix
@@ -49,5 +49,5 @@ in
     systemd.user.services.dsearch.wantedBy = mkIf cfg.systemd.enable [ cfg.systemd.target ];
   };
 
-  meta.teams = [ lib.teams.danklinux ];
+  meta.maintainers = lib.teams.danklinux.members;
 }
diff --git a/nixos/modules/programs/geary.nix b/nixos/modules/programs/geary.nix
index 6c881dc8ccaf..0cbfe5b0605c 100644
--- a/nixos/modules/programs/geary.nix
+++ b/nixos/modules/programs/geary.nix
@@ -11,7 +11,7 @@ let
 in
 {
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   options = {
diff --git a/nixos/modules/programs/gnome-disks.nix b/nixos/modules/programs/gnome-disks.nix
index c6de53d844f3..e6f93c6fdfe6 100644
--- a/nixos/modules/programs/gnome-disks.nix
+++ b/nixos/modules/programs/gnome-disks.nix
@@ -10,7 +10,7 @@
 {
 
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   ###### interface
diff --git a/nixos/modules/programs/gnome-terminal.nix b/nixos/modules/programs/gnome-terminal.nix
index f7ade6a184c4..aea0e97c3634 100644
--- a/nixos/modules/programs/gnome-terminal.nix
+++ b/nixos/modules/programs/gnome-terminal.nix
@@ -16,7 +16,7 @@ in
 {
 
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   options = {
diff --git a/nixos/modules/programs/nm-applet.nix b/nixos/modules/programs/nm-applet.nix
index a1c69f52f624..7aecbadd2ebf 100644
--- a/nixos/modules/programs/nm-applet.nix
+++ b/nixos/modules/programs/nm-applet.nix
@@ -10,7 +10,7 @@ let
 in
 {
   meta = {
-    teams = [ lib.teams.freedesktop ];
+    maintainers = lib.teams.freedesktop.members;
   };
 
   options.programs.nm-applet = {
diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix
index 2ae30243c432..6fa66f681457 100644
--- a/nixos/modules/programs/steam.nix
+++ b/nixos/modules/programs/steam.nix
@@ -285,5 +285,5 @@ in
     ];
   };
 
-  meta.teams = [ lib.teams.steam ];
+  meta.maintainers = lib.teams.steam.members;
 }
diff --git a/nixos/modules/programs/thunar.nix b/nixos/modules/programs/thunar.nix
index c565f3ef1cec..76da7d94c67c 100644
--- a/nixos/modules/programs/thunar.nix
+++ b/nixos/modules/programs/thunar.nix
@@ -11,7 +11,7 @@ let
 in
 {
   meta = {
-    teams = [ lib.teams.xfce ];
+    maintainers = lib.teams.xfce.members;
   };
 
   options = {
diff --git a/nixos/modules/programs/wayland/dms-shell.nix b/nixos/modules/programs/wayland/dms-shell.nix
index b24253b57c23..53f84c1a41b1 100644
--- a/nixos/modules/programs/wayland/dms-shell.nix
+++ b/nixos/modules/programs/wayland/dms-shell.nix
@@ -226,5 +226,5 @@ in
     hardware.graphics.enable = lib.mkDefault true;
   };
 
-  meta.teams = [ lib.teams.danklinux ];
+  meta.maintainers = lib.teams.danklinux.members;
 }
diff --git a/nixos/modules/programs/wayland/hyprland.nix b/nixos/modules/programs/wayland/hyprland.nix
index 744f7af70fe5..44aedc3d248e 100644
--- a/nixos/modules/programs/wayland/hyprland.nix
+++ b/nixos/modules/programs/wayland/hyprland.nix
@@ -130,5 +130,5 @@ in
     ] "Nvidia patches are no longer needed")
   ];
 
-  meta.teams = [ lib.teams.hyprland ];
+  meta.maintainers = lib.teams.hyprland.members;
 }
diff --git a/nixos/modules/programs/wayland/hyprlock.nix b/nixos/modules/programs/wayland/hyprlock.nix
index c1ba14ddf771..e05d8f826a4c 100644
--- a/nixos/modules/programs/wayland/hyprlock.nix
+++ b/nixos/modules/programs/wayland/hyprlock.nix
@@ -26,5 +26,5 @@ in
     security.pam.services.hyprlock = { };
   };
 
-  meta.teams = [ lib.teams.hyprland ];
+  meta.maintainers = lib.teams.hyprland.members;
 }
diff --git a/nixos/modules/programs/xfconf.nix b/nixos/modules/programs/xfconf.nix
index 74a05cc1a798..cc9b6ddf7ac7 100644
--- a/nixos/modules/programs/xfconf.nix
+++ b/nixos/modules/programs/xfconf.nix
@@ -11,7 +11,7 @@ let
 in
 {
   meta = {
-    teams = [ lib.teams.xfce ];
+    maintainers = lib.teams.xfce.members;
   };
 
   options = {
diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix
index cb3a0010a758..1b262e285e19 100644
--- a/nixos/modules/security/acme/default.nix
+++ b/nixos/modules/security/acme/default.nix
@@ -1218,7 +1218,7 @@ in
   ];
 
   meta = {
-    teams = [ lib.teams.acme ];
+    maintainers = lib.teams.acme.members;
     doc = ./default.md;
   };
 }
diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix
index d446bb37a722..6b059c2bd522 100644
--- a/nixos/modules/security/apparmor.nix
+++ b/nixos/modules/security/apparmor.nix
@@ -272,5 +272,5 @@ in
     };
   };
 
-  meta.teams = [ lib.teams.apparmor ];
+  meta.maintainers = lib.teams.apparmor.members;
 }
diff --git a/nixos/modules/services/cluster/rancher/default.nix b/nixos/modules/services/cluster/rancher/default.nix
index c511da5a62f5..3ed0f75d081e 100644
--- a/nixos/modules/services/cluster/rancher/default.nix
+++ b/nixos/modules/services/cluster/rancher/default.nix
@@ -962,6 +962,5 @@ in
       (import ./rke2.nix args)
     ];
 
-  meta.teams = [ lib.teams.k3s ];
-  meta.maintainers = pkgs.rke2.meta.maintainers;
+  meta.maintainers = pkgs.rke2.meta.maintainers ++ lib.teams.k3s.members;
 }
diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix
index 1cf585604b5e..42e88e9ddbe3 100644
--- a/nixos/modules/services/continuous-integration/buildbot/master.nix
+++ b/nixos/modules/services/continuous-integration/buildbot/master.nix
@@ -313,5 +313,5 @@ in
     '')
   ];
 
-  meta.teams = [ lib.teams.buildbot ];
+  meta.maintainers = lib.teams.buildbot.members;
 }
diff --git a/nixos/modules/services/continuous-integration/buildbot/worker.nix b/nixos/modules/services/continuous-integration/buildbot/worker.nix
index c16720b0bf67..b1e1e7e254b5 100644
--- a/nixos/modules/services/continuous-integration/buildbot/worker.nix
+++ b/nixos/modules/services/continuous-integration/buildbot/worker.nix
@@ -196,6 +196,6 @@ in
     };
   };
 
-  meta.teams = [ lib.teams.buildbot ];
+  meta.maintainers = lib.teams.buildbot.members;
 
 }
diff --git a/nixos/modules/services/continuous-integration/gitlab-runner/runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner/runner.nix
index 693229b87d97..b95d30ceea4a 100644
--- a/nixos/modules/services/continuous-integration/gitlab-runner/runner.nix
+++ b/nixos/modules/services/continuous-integration/gitlab-runner/runner.nix
@@ -893,5 +893,5 @@ in
     )
   ];
 
-  meta.teams = [ teams.gitlab ];
+  meta.maintainers = teams.gitlab.members;
 }
diff --git a/nixos/modules/services/databases/clickhouse.nix b/nixos/modules/services/databases/clickhouse.nix
index 50c291a10be6..de9371de513a 100644
--- a/nixos/modules/services/databases/clickhouse.nix
+++ b/nixos/modules/services/databases/clickhouse.nix
@@ -13,7 +13,7 @@ let
 in
 {
 
-  meta.maintainers = with lib.maintainers; [ thevar1able ];
+  meta.maintainers = [ "thevar1able" ];
 
   ###### interface
 
diff --git a/nixos/modules/services/desktop-managers/budgie.nix b/nixos/modules/services/desktop-managers/budgie.nix
index 36f2946970bd..160ac04ecd6d 100644
--- a/nixos/modules/services/desktop-managers/budgie.nix
+++ b/nixos/modules/services/desktop-managers/budgie.nix
@@ -61,7 +61,7 @@ let
   notExcluded = pkg: utils.disablePackageByName pkg config.environment.budgie.excludePackages;
 in
 {
-  meta.teams = [ lib.teams.budgie ];
+  meta.maintainers = lib.teams.budgie.members;
 
   imports = [
     (lib.mkRenamedOptionModule
diff --git a/nixos/modules/services/desktop-managers/cosmic.nix b/nixos/modules/services/desktop-managers/cosmic.nix
index c780a5164922..26b185cc7742 100644
--- a/nixos/modules/services/desktop-managers/cosmic.nix
+++ b/nixos/modules/services/desktop-managers/cosmic.nix
@@ -44,7 +44,7 @@ let
     ];
 in
 {
-  meta.teams = [ lib.teams.cosmic ];
+  meta.maintainers = lib.teams.cosmic.members;
 
   options = {
     services.desktopManager.cosmic = {
diff --git a/nixos/modules/services/desktop-managers/gnome.nix b/nixos/modules/services/desktop-managers/gnome.nix
index ddd13354612e..5c11388eb97b 100644
--- a/nixos/modules/services/desktop-managers/gnome.nix
+++ b/nixos/modules/services/desktop-managers/gnome.nix
@@ -82,7 +82,7 @@ in
 {
   meta = {
     doc = ./gnome.md;
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   imports = [
diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix
index 1f40afb3732a..b82c194be92c 100644
--- a/nixos/modules/services/desktop-managers/lomiri.nix
+++ b/nixos/modules/services/desktop-managers/lomiri.nix
@@ -292,5 +292,5 @@ in
     })
   ];
 
-  meta.teams = [ lib.teams.lomiri ];
+  meta.maintainers = lib.teams.lomiri.members;
 }
diff --git a/nixos/modules/services/desktop-managers/pantheon.nix b/nixos/modules/services/desktop-managers/pantheon.nix
index b9498a0adb83..1fe99c0f66ac 100644
--- a/nixos/modules/services/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/desktop-managers/pantheon.nix
@@ -25,7 +25,7 @@ in
 
   meta = {
     doc = ./pantheon.md;
-    teams = [ teams.pantheon ];
+    maintainers = teams.pantheon.members;
   };
 
   imports = [
diff --git a/nixos/modules/services/desktops/accountsservice.nix b/nixos/modules/services/desktops/accountsservice.nix
index fd328e357ce2..758f7383ca63 100644
--- a/nixos/modules/services/desktops/accountsservice.nix
+++ b/nixos/modules/services/desktops/accountsservice.nix
@@ -7,7 +7,7 @@
 }:
 {
   meta = {
-    teams = [ lib.teams.freedesktop ];
+    maintainers = lib.teams.freedesktop.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix
index e44816cf2542..ffc48d6b9435 100644
--- a/nixos/modules/services/desktops/geoclue2.nix
+++ b/nixos/modules/services/desktops/geoclue2.nix
@@ -373,6 +373,6 @@ in
   };
 
   meta = {
-    teams = [ lib.teams.pantheon ];
+    maintainers = [ ] ++ lib.teams.pantheon.members;
   };
 }
diff --git a/nixos/modules/services/desktops/gnome/at-spi2-core.nix b/nixos/modules/services/desktops/gnome/at-spi2-core.nix
index 77070843e04e..293a3166b187 100644
--- a/nixos/modules/services/desktops/gnome/at-spi2-core.nix
+++ b/nixos/modules/services/desktops/gnome/at-spi2-core.nix
@@ -10,7 +10,7 @@
 {
 
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/desktops/gnome/evolution-data-server.nix b/nixos/modules/services/desktops/gnome/evolution-data-server.nix
index 4437be835604..539fcf25342e 100644
--- a/nixos/modules/services/desktops/gnome/evolution-data-server.nix
+++ b/nixos/modules/services/desktops/gnome/evolution-data-server.nix
@@ -10,7 +10,7 @@
 {
 
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/desktops/gnome/gcr-ssh-agent.nix b/nixos/modules/services/desktops/gnome/gcr-ssh-agent.nix
index eb1bad3b15c4..d88f1a618049 100644
--- a/nixos/modules/services/desktops/gnome/gcr-ssh-agent.nix
+++ b/nixos/modules/services/desktops/gnome/gcr-ssh-agent.nix
@@ -13,7 +13,7 @@ let
 in
 {
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   options = {
diff --git a/nixos/modules/services/desktops/gnome/glib-networking.nix b/nixos/modules/services/desktops/gnome/glib-networking.nix
index 048db8cf54a3..558abca0aa31 100644
--- a/nixos/modules/services/desktops/gnome/glib-networking.nix
+++ b/nixos/modules/services/desktops/gnome/glib-networking.nix
@@ -10,7 +10,7 @@
 {
 
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix b/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix
index 17c1dd9045e8..335ebc9a144d 100644
--- a/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix
+++ b/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix
@@ -16,7 +16,7 @@ in
 
 {
   meta = {
-    teams = [ teams.gnome ];
+    maintainers = teams.gnome.members;
   };
 
   options = {
diff --git a/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix b/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix
index e72574795e65..3df01b59738d 100644
--- a/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix
+++ b/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix
@@ -48,7 +48,7 @@ in
 {
 
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/desktops/gnome/gnome-keyring.nix b/nixos/modules/services/desktops/gnome/gnome-keyring.nix
index 9140d261a770..550c6ba8eff5 100644
--- a/nixos/modules/services/desktops/gnome/gnome-keyring.nix
+++ b/nixos/modules/services/desktops/gnome/gnome-keyring.nix
@@ -12,7 +12,7 @@ in
 {
 
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   options = {
diff --git a/nixos/modules/services/desktops/gnome/gnome-online-accounts.nix b/nixos/modules/services/desktops/gnome/gnome-online-accounts.nix
index 7ec9c7e06296..920c4cf8133e 100644
--- a/nixos/modules/services/desktops/gnome/gnome-online-accounts.nix
+++ b/nixos/modules/services/desktops/gnome/gnome-online-accounts.nix
@@ -10,7 +10,7 @@
 {
 
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix b/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix
index 958fbb546dc3..6e685557ecf0 100644
--- a/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix
+++ b/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix
@@ -8,7 +8,7 @@
 
 {
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix b/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix
index 7d6f7f7f3478..06d001ab8134 100644
--- a/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix
+++ b/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix
@@ -16,7 +16,7 @@ in
 {
 
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/desktops/gnome/gnome-software.nix b/nixos/modules/services/desktops/gnome/gnome-software.nix
index 6bbe4d5487ab..ced2549a9e21 100644
--- a/nixos/modules/services/desktops/gnome/gnome-software.nix
+++ b/nixos/modules/services/desktops/gnome/gnome-software.nix
@@ -7,7 +7,7 @@
 
 {
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   options = {
diff --git a/nixos/modules/services/desktops/gnome/gnome-user-share.nix b/nixos/modules/services/desktops/gnome/gnome-user-share.nix
index eb869106c818..c6d0f723c047 100644
--- a/nixos/modules/services/desktops/gnome/gnome-user-share.nix
+++ b/nixos/modules/services/desktops/gnome/gnome-user-share.nix
@@ -10,7 +10,7 @@
 {
 
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/desktops/gnome/localsearch.nix b/nixos/modules/services/desktops/gnome/localsearch.nix
index 90018c557ec1..9160d1f06431 100644
--- a/nixos/modules/services/desktops/gnome/localsearch.nix
+++ b/nixos/modules/services/desktops/gnome/localsearch.nix
@@ -7,7 +7,7 @@
 
 {
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   imports = [
diff --git a/nixos/modules/services/desktops/gnome/rygel.nix b/nixos/modules/services/desktops/gnome/rygel.nix
index 410550b8990c..e8a147ed6e76 100644
--- a/nixos/modules/services/desktops/gnome/rygel.nix
+++ b/nixos/modules/services/desktops/gnome/rygel.nix
@@ -14,7 +14,7 @@ in
 
 {
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/desktops/gnome/sushi.nix b/nixos/modules/services/desktops/gnome/sushi.nix
index d8aff2a7a0bd..ea99c7ce30f0 100644
--- a/nixos/modules/services/desktops/gnome/sushi.nix
+++ b/nixos/modules/services/desktops/gnome/sushi.nix
@@ -10,7 +10,7 @@
 {
 
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/desktops/gnome/tinysparql.nix b/nixos/modules/services/desktops/gnome/tinysparql.nix
index 3811780ddbc4..551b5800e84c 100644
--- a/nixos/modules/services/desktops/gnome/tinysparql.nix
+++ b/nixos/modules/services/desktops/gnome/tinysparql.nix
@@ -10,7 +10,7 @@ let
 in
 {
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   imports = [
diff --git a/nixos/modules/services/desktops/gvfs.nix b/nixos/modules/services/desktops/gvfs.nix
index 004810327798..315141705546 100644
--- a/nixos/modules/services/desktops/gvfs.nix
+++ b/nixos/modules/services/desktops/gvfs.nix
@@ -16,7 +16,7 @@ in
 {
 
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix
index 77cdfa9a573e..3f4cf2af05b2 100644
--- a/nixos/modules/services/desktops/pipewire/pipewire.nix
+++ b/nixos/modules/services/desktops/pipewire/pipewire.nix
@@ -85,8 +85,7 @@ let
   };
 in
 {
-  meta.teams = [ teams.freedesktop ];
-  meta.maintainers = [ maintainers.k900 ];
+  meta.maintainers = teams.freedesktop.members ++ [ maintainers.k900 ];
 
   ###### interface
   options = {
diff --git a/nixos/modules/services/desktops/tumbler.nix b/nixos/modules/services/desktops/tumbler.nix
index 9143466fafef..12b0184d42c9 100644
--- a/nixos/modules/services/desktops/tumbler.nix
+++ b/nixos/modules/services/desktops/tumbler.nix
@@ -18,7 +18,7 @@ in
   ];
 
   meta = {
-    teams = [ lib.teams.pantheon ];
+    maintainers = [ ] ++ lib.teams.pantheon.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/desktops/zeitgeist.nix b/nixos/modules/services/desktops/zeitgeist.nix
index fe065c4a4d7a..227287dd2377 100644
--- a/nixos/modules/services/desktops/zeitgeist.nix
+++ b/nixos/modules/services/desktops/zeitgeist.nix
@@ -8,7 +8,7 @@
 {
 
   meta = {
-    teams = [ lib.teams.pantheon ];
+    maintainers = [ ] ++ lib.teams.pantheon.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/display-managers/cosmic-greeter.nix b/nixos/modules/services/display-managers/cosmic-greeter.nix
index 93320b9be90a..8886a4766e4e 100644
--- a/nixos/modules/services/display-managers/cosmic-greeter.nix
+++ b/nixos/modules/services/display-managers/cosmic-greeter.nix
@@ -16,7 +16,7 @@ let
 in
 
 {
-  meta.teams = [ lib.teams.cosmic ];
+  meta.maintainers = lib.teams.cosmic.members;
 
   options.services.displayManager.cosmic-greeter = {
     enable = lib.mkEnableOption "COSMIC greeter";
diff --git a/nixos/modules/services/display-managers/dms-greeter.nix b/nixos/modules/services/display-managers/dms-greeter.nix
index abdd6e2ddf3b..d049daa9b24f 100644
--- a/nixos/modules/services/display-managers/dms-greeter.nix
+++ b/nixos/modules/services/display-managers/dms-greeter.nix
@@ -321,5 +321,5 @@ in
     services.libinput.enable = mkDefault true;
   };
 
-  meta.teams = [ lib.teams.danklinux ];
+  meta.maintainers = lib.teams.danklinux.members;
 }
diff --git a/nixos/modules/services/display-managers/gdm.nix b/nixos/modules/services/display-managers/gdm.nix
index 9fc92e91018c..e46c8cf72fe7 100644
--- a/nixos/modules/services/display-managers/gdm.nix
+++ b/nixos/modules/services/display-managers/gdm.nix
@@ -105,7 +105,7 @@ in
   ];
 
   meta = {
-    teams = [ lib.teams.gnome ];
+    maintainers = lib.teams.gnome.members;
   };
 
   ###### interface
diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix
index eb4b475d4187..dc1900f52c1e 100644
--- a/nixos/modules/services/home-automation/home-assistant.nix
+++ b/nixos/modules/services/home-automation/home-assistant.nix
@@ -171,7 +171,7 @@ in
 
   meta = {
     buildDocsInSandbox = false;
-    teams = [ lib.teams.home-assistant ];
+    maintainers = lib.teams.home-assistant.members;
   };
 
   options.services.home-assistant = {
diff --git a/nixos/modules/services/matrix/dendrite.nix b/nixos/modules/services/matrix/dendrite.nix
index 302bd42b5e37..2c31266457df 100644
--- a/nixos/modules/services/matrix/dendrite.nix
+++ b/nixos/modules/services/matrix/dendrite.nix
@@ -341,5 +341,5 @@ in
       };
     };
   };
-  meta.teams = [ lib.teams.matrix ];
+  meta.maintainers = lib.teams.matrix.members;
 }
diff --git a/nixos/modules/services/misc/forgejo.nix b/nixos/modules/services/misc/forgejo.nix
index 6834ca2008ea..9b85fc8dc133 100644
--- a/nixos/modules/services/misc/forgejo.nix
+++ b/nixos/modules/services/misc/forgejo.nix
@@ -849,5 +849,5 @@ in
   };
 
   meta.doc = ./forgejo.md;
-  meta.teams = [ lib.teams.forgejo ];
+  meta.maintainers = lib.teams.forgejo.members;
 }
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 0601454e9b2e..c353caed9e03 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -1911,5 +1911,5 @@ in
   };
 
   meta.doc = ./gitlab.md;
-  meta.teams = [ teams.gitlab ];
+  meta.maintainers = teams.gitlab.members;
 }
diff --git a/nixos/modules/services/networking/epmd.nix b/nixos/modules/services/networking/epmd.nix
index d2aceb5a9bb1..c17a7c974fa7 100644
--- a/nixos/modules/services/networking/epmd.nix
+++ b/nixos/modules/services/networking/epmd.nix
@@ -63,5 +63,5 @@ in
     };
   };
 
-  meta.teams = [ lib.teams.beam ];
+  meta.maintainers = lib.teams.beam.members;
 }
diff --git a/nixos/modules/services/networking/jibri/default.nix b/nixos/modules/services/networking/jibri/default.nix
index 861a6713b017..e07bf5131a92 100644
--- a/nixos/modules/services/networking/jibri/default.nix
+++ b/nixos/modules/services/networking/jibri/default.nix
@@ -444,5 +444,5 @@ in
     };
   };
 
-  meta.teams = [ lib.teams.jitsi ];
+  meta.maintainers = lib.teams.jitsi.members;
 }
diff --git a/nixos/modules/services/networking/jicofo.nix b/nixos/modules/services/networking/jicofo.nix
index 9c2139eff1ab..9d0fbfd74081 100644
--- a/nixos/modules/services/networking/jicofo.nix
+++ b/nixos/modules/services/networking/jicofo.nix
@@ -166,5 +166,5 @@ in
       lib.mkDefault "${pkgs.jicofo}/etc/jitsi/jicofo/logging.properties-journal";
   };
 
-  meta.teams = [ lib.teams.jitsi ];
+  meta.maintainers = lib.teams.jitsi.members;
 }
diff --git a/nixos/modules/services/networking/jigasi.nix b/nixos/modules/services/networking/jigasi.nix
index c6bcbd28dead..54b2f36685f6 100644
--- a/nixos/modules/services/networking/jigasi.nix
+++ b/nixos/modules/services/networking/jigasi.nix
@@ -243,5 +243,5 @@ in
       lib.mkDefault "${stateDir}/logging.properties-journal";
   };
 
-  meta.teams = [ lib.teams.jitsi ];
+  meta.maintainers = lib.teams.jitsi.members;
 }
diff --git a/nixos/modules/services/networking/jitsi-videobridge.nix b/nixos/modules/services/networking/jitsi-videobridge.nix
index bd9692e6338a..a55760d5cae2 100644
--- a/nixos/modules/services/networking/jitsi-videobridge.nix
+++ b/nixos/modules/services/networking/jitsi-videobridge.nix
@@ -331,5 +331,5 @@ in
     ];
   };
 
-  meta.teams = [ lib.teams.jitsi ];
+  meta.maintainers = lib.teams.jitsi.members;
 }
diff --git a/nixos/modules/services/networking/modemmanager.nix b/nixos/modules/services/networking/modemmanager.nix
index 604340fd0748..fefee7a448eb 100644
--- a/nixos/modules/services/networking/modemmanager.nix
+++ b/nixos/modules/services/networking/modemmanager.nix
@@ -9,7 +9,7 @@ let
 in
 {
   meta = {
-    teams = [ lib.teams.freedesktop ];
+    maintainers = lib.teams.freedesktop.members;
   };
 
   options = with lib; {
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 2cb3532471c8..1f3773c70b00 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -142,8 +142,9 @@ in
 {
 
   meta = {
-    teams = [ lib.teams.freedesktop ];
-    maintainers = [ lib.maintainers.frontear ];
+    maintainers = teams.freedesktop.members ++ [
+      lib.maintainers.frontear
+    ];
   };
 
   ###### interface
diff --git a/nixos/modules/services/security/reaction.nix b/nixos/modules/services/security/reaction.nix
index ba0cc6581dbc..039e507ae57f 100644
--- a/nixos/modules/services/security/reaction.nix
+++ b/nixos/modules/services/security/reaction.nix
@@ -299,8 +299,10 @@ in
       environment.systemPackages = [ cfg.package ];
     };
 
-  meta.teams = [ lib.teams.ngi ];
-  meta.maintainers = with lib.maintainers; [
-    ppom
-  ];
+  meta.maintainers =
+    with lib.maintainers;
+    [
+      ppom
+    ]
+    ++ lib.teams.ngi.members;
 }
diff --git a/nixos/modules/services/wayland/hypridle.nix b/nixos/modules/services/wayland/hypridle.nix
index 29e77c6be34f..4ccb126b56f2 100644
--- a/nixos/modules/services/wayland/hypridle.nix
+++ b/nixos/modules/services/wayland/hypridle.nix
@@ -28,5 +28,5 @@ in
     };
   };
 
-  meta.teams = [ lib.teams.hyprland ];
+  meta.maintainers = lib.teams.hyprland.members;
 }
diff --git a/nixos/modules/services/web-apps/jitsi-meet.nix b/nixos/modules/services/web-apps/jitsi-meet.nix
index 18da068fa5c6..b7993cfc46dc 100644
--- a/nixos/modules/services/web-apps/jitsi-meet.nix
+++ b/nixos/modules/services/web-apps/jitsi-meet.nix
@@ -756,5 +756,5 @@ in
   };
 
   meta.doc = ./jitsi-meet.md;
-  meta.teams = [ lib.teams.jitsi ];
+  meta.maintainers = lib.teams.jitsi.members;
 }
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index d069480f3d70..cff0f6ff1872 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -1774,5 +1774,5 @@ in
   );
 
   meta.doc = ./nextcloud.md;
-  meta.teams = [ lib.teams.nextcloud ];
+  meta.maintainers = lib.teams.nextcloud.members;
 }
diff --git a/nixos/modules/services/web-apps/peertube-runner.nix b/nixos/modules/services/web-apps/peertube-runner.nix
index 4756569d9d9c..9b126b7fa97c 100644
--- a/nixos/modules/services/web-apps/peertube-runner.nix
+++ b/nixos/modules/services/web-apps/peertube-runner.nix
@@ -252,5 +252,5 @@ in
     };
   };
 
-  meta.teams = [ lib.teams.ngi ];
+  meta.maintainers = lib.teams.ngi.members;
 }
diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index df132f95e95c..bc5c2b0273e7 100644
--- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -25,7 +25,7 @@ in
 
 {
   meta = {
-    teams = [ teams.enlightenment ];
+    maintainers = teams.enlightenment.members;
   };
 
   imports = [
diff --git a/nixos/modules/services/x11/desktop-managers/lumina.nix b/nixos/modules/services/x11/desktop-managers/lumina.nix
index a0cd79f7aae7..74fabced3af3 100644
--- a/nixos/modules/services/x11/desktop-managers/lumina.nix
+++ b/nixos/modules/services/x11/desktop-managers/lumina.nix
@@ -16,7 +16,7 @@ in
 
 {
   meta = {
-    teams = [ teams.lumina ];
+    maintainers = teams.lumina.members;
   };
 
   options = {
diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix
index 8948eff23d46..1ccaa28f8642 100644
--- a/nixos/modules/services/x11/desktop-managers/lxqt.nix
+++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix
@@ -15,7 +15,7 @@ in
 
 {
   meta = {
-    teams = [ teams.lxqt ];
+    maintainers = teams.lxqt.members;
   };
 
   options = {
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 2d53eb58f287..55da49799e31 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -15,7 +15,7 @@ let
 in
 {
   meta = {
-    teams = [ teams.xfce ];
+    maintainers = teams.xfce.members;
   };
 
   imports = [
diff --git a/nixos/modules/services/x11/display-managers/account-service-util.nix b/nixos/modules/services/x11/display-managers/account-service-util.nix
index 697d5b9e940d..0f4d1c0729ad 100644
--- a/nixos/modules/services/x11/display-managers/account-service-util.nix
+++ b/nixos/modules/services/x11/display-managers/account-service-util.nix
@@ -40,6 +40,6 @@ python3.pkgs.buildPythonApplication {
   '';
 
   meta = {
-    teams = [ lib.teams.pantheon ];
+    maintainers = [ ] ++ lib.teams.pantheon.members;
   };
 }
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/lomiri.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/lomiri.nix
index d8db7706d89f..387f485e2fea 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/lomiri.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/lomiri.nix
@@ -13,7 +13,7 @@ let
 
 in
 {
-  meta.teams = [ lib.teams.lomiri ];
+  meta.maintainers = lib.teams.lomiri.members;
 
   options = {
     services.xserver.displayManager.lightdm.greeters.lomiri = {
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
index 3c61ba1556c8..05e03befdad6 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
@@ -16,7 +16,7 @@ let
 in
 {
   meta = {
-    teams = [ lib.teams.pantheon ];
+    maintainers = [ ] ++ lib.teams.pantheon.members;
   };
 
   options = {
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 467207ecd92b..1ace9c1b8c1f 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -73,7 +73,7 @@ let
 in
 {
   meta = {
-    teams = [ lib.teams.pantheon ];
+    maintainers = [ ] ++ lib.teams.pantheon.members;
   };
 
   # Note: the order in which lightdm greeter modules are imported
diff --git a/nixos/modules/services/x11/touchegg.nix b/nixos/modules/services/x11/touchegg.nix
index cb1b9eb4adc8..def3dac738e0 100644
--- a/nixos/modules/services/x11/touchegg.nix
+++ b/nixos/modules/services/x11/touchegg.nix
@@ -13,7 +13,7 @@ let
 in
 {
   meta = {
-    teams = [ teams.pantheon ];
+    maintainers = teams.pantheon.members;
   };
 
   ###### interface
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 6386a57079f2..a0c7e826223d 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -13,7 +13,7 @@ let
 in
 {
   meta = {
-    teams = [ lib.teams.podman ];
+    maintainers = [ ] ++ lib.teams.podman.members;
   };
 
   options.virtualisation.containers = {
diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix
index 68cfc2ccaad9..ddaccf8199a1 100644
--- a/nixos/modules/virtualisation/cri-o.nix
+++ b/nixos/modules/virtualisation/cri-o.nix
@@ -21,7 +21,7 @@ let
 in
 {
   meta = {
-    teams = [ teams.podman ];
+    maintainers = teams.podman.members;
   };
 
   options.virtualisation.cri-o = {
diff --git a/nixos/modules/virtualisation/incus-agent.nix b/nixos/modules/virtualisation/incus-agent.nix
index 34c08e8ee014..bfb9eeb75d33 100644
--- a/nixos/modules/virtualisation/incus-agent.nix
+++ b/nixos/modules/virtualisation/incus-agent.nix
@@ -10,7 +10,7 @@ let
 in
 {
   meta = {
-    teams = [ lib.teams.lxc ];
+    maintainers = lib.teams.lxc.members;
   };
 
   options = {
diff --git a/nixos/modules/virtualisation/incus-virtual-machine.nix b/nixos/modules/virtualisation/incus-virtual-machine.nix
index d714b7fdc36c..8899fc34bb85 100644
--- a/nixos/modules/virtualisation/incus-virtual-machine.nix
+++ b/nixos/modules/virtualisation/incus-virtual-machine.nix
@@ -10,7 +10,7 @@ let
 in
 {
   meta = {
-    teams = [ lib.teams.lxc ];
+    maintainers = lib.teams.lxc.members;
   };
 
   imports = [
diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix
index 1b8908d0d3d6..7101407fb5bc 100644
--- a/nixos/modules/virtualisation/incus.nix
+++ b/nixos/modules/virtualisation/incus.nix
@@ -176,7 +176,7 @@ let
 in
 {
   meta = {
-    teams = [ lib.teams.lxc ];
+    maintainers = lib.teams.lxc.members;
   };
 
   options = {
diff --git a/nixos/modules/virtualisation/lxc-container.nix b/nixos/modules/virtualisation/lxc-container.nix
index ec206d6a5ece..a6964b8b2c9a 100644
--- a/nixos/modules/virtualisation/lxc-container.nix
+++ b/nixos/modules/virtualisation/lxc-container.nix
@@ -7,7 +7,7 @@
 
 {
   meta = {
-    teams = [ lib.teams.lxc ];
+    maintainers = lib.teams.lxc.members;
   };
 
   imports = [
diff --git a/nixos/modules/virtualisation/lxc-image-metadata.nix b/nixos/modules/virtualisation/lxc-image-metadata.nix
index 1ac1bd2e4e5e..d27f476a59b8 100644
--- a/nixos/modules/virtualisation/lxc-image-metadata.nix
+++ b/nixos/modules/virtualisation/lxc-image-metadata.nix
@@ -71,7 +71,7 @@ in
   ];
 
   meta = {
-    teams = [ lib.teams.lxc ];
+    maintainers = lib.teams.lxc.members;
   };
 
   options = {
diff --git a/nixos/modules/virtualisation/lxc-instance-common.nix b/nixos/modules/virtualisation/lxc-instance-common.nix
index d3056be46fe3..ff27b1931f8b 100644
--- a/nixos/modules/virtualisation/lxc-instance-common.nix
+++ b/nixos/modules/virtualisation/lxc-instance-common.nix
@@ -2,7 +2,7 @@
 
 {
   meta = {
-    teams = [ lib.teams.lxc ];
+    maintainers = lib.teams.lxc.members;
   };
 
   imports = [
diff --git a/nixos/modules/virtualisation/lxc.nix b/nixos/modules/virtualisation/lxc.nix
index eca2eb8115ab..903006a6dabf 100644
--- a/nixos/modules/virtualisation/lxc.nix
+++ b/nixos/modules/virtualisation/lxc.nix
@@ -13,7 +13,7 @@ in
 
 {
   meta = {
-    teams = [ lib.teams.lxc ];
+    maintainers = lib.teams.lxc.members;
   };
 
   options.virtualisation.lxc = {
diff --git a/nixos/modules/virtualisation/lxcfs.nix b/nixos/modules/virtualisation/lxcfs.nix
index 711bcf655d22..f7347af19148 100644
--- a/nixos/modules/virtualisation/lxcfs.nix
+++ b/nixos/modules/virtualisation/lxcfs.nix
@@ -12,7 +12,7 @@ let
 in
 {
   meta = {
-    teams = [ lib.teams.lxc ];
+    maintainers = lib.teams.lxc.members;
   };
 
   ###### interface
diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix
index c0acbe4cac3d..63cc4c5e3f63 100644
--- a/nixos/modules/virtualisation/podman/default.nix
+++ b/nixos/modules/virtualisation/podman/default.nix
@@ -63,7 +63,7 @@ in
   ];
 
   meta = {
-    teams = [ lib.teams.podman ];
+    maintainers = lib.teams.podman.members;
   };
 
   options.virtualisation.podman = {
diff --git a/nixos/modules/virtualisation/podman/network-socket-ghostunnel.nix b/nixos/modules/virtualisation/podman/network-socket-ghostunnel.nix
index 962ca39b1598..d5b4bef5f0d9 100644
--- a/nixos/modules/virtualisation/podman/network-socket-ghostunnel.nix
+++ b/nixos/modules/virtualisation/podman/network-socket-ghostunnel.nix
@@ -35,6 +35,5 @@ in
 
   };
 
-  meta.teams = [ lib.teams.podman ];
-  meta.maintainers = [ lib.maintainers.roberth ];
+  meta.maintainers = lib.teams.podman.members ++ [ lib.maintainers.roberth ];
 }
diff --git a/nixos/modules/virtualisation/podman/network-socket.nix b/nixos/modules/virtualisation/podman/network-socket.nix
index d3a49d204f8a..39434216d780 100644
--- a/nixos/modules/virtualisation/podman/network-socket.nix
+++ b/nixos/modules/virtualisation/podman/network-socket.nix
@@ -95,6 +95,5 @@ in
     networking.firewall.allowedTCPPorts = lib.optional (cfg.enable && cfg.openFirewall) cfg.port;
   };
 
-  meta.teams = [ lib.teams.podman ];
-  meta.maintainers = [ lib.maintainers.roberth ];
+  meta.maintainers = lib.teams.podman.members ++ [ lib.maintainers.roberth ];
 }
diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index 2cc939631f84..bbd6bfb57751 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -937,6 +937,6 @@ in
   };
   meta = {
     doc = ./xen.md;
-    teams = [ teams.xen ];
+    maintainers = teams.xen.members;
   };
 }