diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b76709a0654c..452b4efc3859 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -15543,12 +15543,6 @@
     githubId = 1140462;
     name = "magenbluten";
   };
-  maggesi = {
-    email = "marco.maggesi@gmail.com";
-    github = "maggesi";
-    githubId = 1809783;
-    name = "Marco Maggesi";
-  };
   magicquark = {
     name = "magicquark";
     github = "magicquark";
@@ -18989,6 +18983,12 @@
     githubId = 1348;
     name = "Nate Smith";
   };
+  nxm = {
+    email = "szturomski@jakub.app";
+    name = "Jakub Szturomski";
+    github = "nxm";
+    githubId = 22380073;
+  };
   nyabinary = {
     name = "Niko Cantero";
     email = "nyanbinary@keemail.me";
diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 16ce699c53f2..848fa1eb9b52 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -344,7 +344,7 @@
 
 - Due to [deprecation of gnome-session X11 support](https://blogs.gnome.org/alatiera/2025/06/08/the-x11-session-removal/), `services.desktopManager.pantheon` now defaults to pantheon-wayland session. The X11 session has been removed, see [this issue](https://github.com/elementary/session-settings/issues/91) for details.
 
-- `bcachefs` file systems will now use the out-of-tree module for supported kernels. The in-tree module is unmaintained and users are strongly recommended to switch to kernels that support the out-of-tree module.
+- `bcachefs` file systems will now use the out-of-tree module for supported kernels. The in-tree module has been removed, and users will need to switch to kernels that support the out-of-tree module.
 
 - `services.filesender` and the package `filesender` have been removed because they depend on `simplesamlphp`.
 
diff --git a/nixos/modules/installer/cd-dvd/latest-kernel.nix b/nixos/modules/installer/cd-dvd/latest-kernel.nix
index 53b9af38ba0b..20190ebd2531 100644
--- a/nixos/modules/installer/cd-dvd/latest-kernel.nix
+++ b/nixos/modules/installer/cd-dvd/latest-kernel.nix
@@ -2,6 +2,7 @@
 {
   boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.supportedFilesystems.zfs = false;
+  boot.supportedFilesystems.bcachefs = true;
   environment.etc."nixos-generate-config.conf".text = ''
     [Defaults]
     Kernel=latest
diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixos/modules/tasks/filesystems/bcachefs.nix
index bbd9b40ad8e5..362f6ff32b10 100644
--- a/nixos/modules/tasks/filesystems/bcachefs.nix
+++ b/nixos/modules/tasks/filesystems/bcachefs.nix
@@ -242,14 +242,6 @@ in
           }
         ];
 
-        warnings = lib.mkIf cfg.modulePackage.meta.broken [
-          ''
-            Using unmaintained in-tree bcachefs kernel module. This
-            will be removed in 26.05. Please use a kernel supported
-            by the out-of-tree module package.
-          ''
-        ];
-
         # Bcachefs upstream recommends using the latest kernel
         boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
 
@@ -257,9 +249,7 @@ in
         system.fsPackages = [ cfg.package ];
         services.udev.packages = [ cfg.package ];
 
-        boot.extraModulePackages = lib.optionals (!cfg.modulePackage.meta.broken) [
-          cfg.modulePackage
-        ];
+        boot.extraModulePackages = [ cfg.modulePackage ];
 
         systemd = {
           packages = [ cfg.package ];
diff --git a/nixos/tests/kernel-generic/default.nix b/nixos/tests/kernel-generic/default.nix
index a98015b58ac6..0fd9672d4006 100644
--- a/nixos/tests/kernel-generic/default.nix
+++ b/nixos/tests/kernel-generic/default.nix
@@ -55,6 +55,14 @@ let
         nodes.machine =
           { config, ... }:
           {
+            # we could/would do something like below, but linuxPackages comes from outside
+            # the machine closure, so an overlay doesn't apply to the kernelPackages.
+            # nixpkgs.overlays = [
+            #   (final: prev: {
+            #     kernelPackagesExtensions = prev.kernelPackagesExtensions ++ [ helloWorldExtension ];
+            #   })
+            # ]
+
             boot.kernelPackages = linuxPackages;
 
             boot.extraModulePackages = [ config.boot.kernelPackages.hello-world ];
@@ -93,6 +101,6 @@ mapAttrs (_: lP: testsForLinuxPackages lP) kernels
     # Useful for development testing of all Kernel configs without building full Kernel
     configfiles = mapAttrs (_: lP: lP.kernel.configfile) kernels;
 
-    testsForKernel = kernel: testsForLinuxPackages (pkgs.linuxPackagesFor kernel);
+    testsForKernel = kernel: testsForLinuxPackages (patchedPkgs.linuxPackagesFor kernel);
   };
 }
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 2130a31f6e59..5ffc54eedcc4 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -6,7 +6,7 @@
   fetchpatch2,
   lib,
   pam,
-  python311,
+  python3,
   libxslt,
   perl,
   perlPackages,
@@ -360,7 +360,7 @@ stdenv.mkDerivation (finalAttrs: {
     perlPackages.ArchiveZip
     perlPackages.IOCompress
     pkg-config
-    python311
+    python3
     unzip
     zip
   ]
@@ -457,7 +457,7 @@ stdenv.mkDerivation (finalAttrs: {
       pam
       poppler
       libpq
-      python311
+      python3
       sane-backends
       unixODBC
       util-linux
@@ -663,7 +663,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     inherit srcs;
     jdk = if withJava then jre' else null;
-    python = python311; # for unoconv
+    python = python3; # for unoconv
     updateScript = [
       ./update.sh
       # Pass it this file name as argument
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index 92c6456b3918..c8e9d1ee32f2 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -78,7 +78,6 @@ stdenv.mkDerivation {
     platforms = platforms.unix;
     maintainers = with maintainers; [
       thoughtpolice
-      maggesi
       vbgl
     ];
   };
diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index cc7369fd0fbf..f6421fc64f78 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -79,7 +79,6 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://www.fossil-scm.org/";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ maggesi ];
     platforms = platforms.all;
     mainProgram = "fossil";
   };
diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix
index c71124bd9ce4..cd47ee912a7a 100644
--- a/pkgs/by-name/bi/bitwarden-desktop/package.nix
+++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix
@@ -34,13 +34,13 @@ let
 in
 buildNpmPackage' rec {
   pname = "bitwarden-desktop";
-  version = "2025.9.0";
+  version = "2025.10.0";
 
   src = fetchFromGitHub {
     owner = "bitwarden";
     repo = "clients";
     rev = "desktop-v${version}";
-    hash = "sha256-vxGyDYtv0O5U4pnVrQm/BOIpDtpcDUOyFFdBDehQ2to=";
+    hash = "sha256-A7bxAdFDChr7yiexV70N3tqhaUVAwJdGhhRKJyX0ra8=";
   };
 
   patches = [
@@ -87,7 +87,7 @@ buildNpmPackage' rec {
     "--ignore-scripts"
   ];
   npmWorkspace = "apps/desktop";
-  npmDepsHash = "sha256-R3IyNrSHcqz+Sz/OHbg16To0WXRu8S4mpWcJchEPwdY=";
+  npmDepsHash = "sha256-EPYUGxXhJSwLF1fW5rWMlF6+RNjiVYxZvnT3zg7KW3A=";
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit
@@ -97,7 +97,7 @@ buildNpmPackage' rec {
       cargoRoot
       patches
       ;
-    hash = "sha256-sKK/8YNLNYVg7L3IFGaWEVK91eC17gS54jib6G0RUGI=";
+    hash = "sha256-fgnf+yT3UV8dHTE2tDHdBWTBW+LHAYI/JGgfS0J/Bgk=";
   };
   cargoRoot = "apps/desktop/desktop_native";
 
diff --git a/pkgs/by-name/fd/fdupes/package.nix b/pkgs/by-name/fd/fdupes/package.nix
index 83e336b07d8f..cb11612c4dab 100644
--- a/pkgs/by-name/fd/fdupes/package.nix
+++ b/pkgs/by-name/fd/fdupes/package.nix
@@ -40,7 +40,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/adrianlopezroche/fdupes";
     license = licenses.mit;
     platforms = platforms.all;
-    maintainers = [ maintainers.maggesi ];
     mainProgram = "fdupes";
   };
 }
diff --git a/pkgs/by-name/fl/flatpak/package.nix b/pkgs/by-name/fl/flatpak/package.nix
index 6412d8166338..73ab3651c4c3 100644
--- a/pkgs/by-name/fl/flatpak/package.nix
+++ b/pkgs/by-name/fl/flatpak/package.nix
@@ -228,6 +228,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonOption "system_dbus_proxy" (lib.getExe xdg-dbus-proxy))
     (lib.mesonOption "system_fusermount" "/run/wrappers/bin/fusermount3")
     (lib.mesonOption "system_install_dir" "/var/lib/flatpak")
+    (lib.mesonOption "sysconfdir" "/etc")
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/by-name/id/idevicerestore/package.nix b/pkgs/by-name/id/idevicerestore/package.nix
index 4dba23da49d1..0326144ebabc 100644
--- a/pkgs/by-name/id/idevicerestore/package.nix
+++ b/pkgs/by-name/id/idevicerestore/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "idevicerestore";
-  version = "1.0.0+date=2023-05-23";
+  version = "1.0.0-unstable-2025-10-02";
 
   src = fetchFromGitHub {
     owner = "libimobiledevice";
     repo = "idevicerestore";
-    rev = "609f7f058487596597e8e742088119fdd46729df";
-    hash = "sha256-VXtXAitPC1+pxZlkGBg+u6yYhyM/jVpSgDO/6dXh5V4=";
+    rev = "f4d0f7e83105cc362527566315abee07b0840848";
+    hash = "sha256-fqTVAHTxamk2lIllr7ZNHOJ1YTJHM4JpVQylMV33CJI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/io/io/package.nix b/pkgs/by-name/io/io/package.nix
index ee8a6c453c49..b7954a8ddaa4 100644
--- a/pkgs/by-name/io/io/package.nix
+++ b/pkgs/by-name/io/io/package.nix
@@ -115,7 +115,6 @@ stdenv.mkDerivation {
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
       raskin
-      maggesi
     ];
     platforms = [ "x86_64-linux" ];
   };
diff --git a/pkgs/by-name/li/libimobiledevice/package.nix b/pkgs/by-name/li/libimobiledevice/package.nix
index 9a630dedf1fb..5c1909b5eb95 100644
--- a/pkgs/by-name/li/libimobiledevice/package.nix
+++ b/pkgs/by-name/li/libimobiledevice/package.nix
@@ -9,6 +9,7 @@
   libgcrypt,
   libplist,
   libtasn1,
+  libtatsu,
   libusbmuxd,
   libimobiledevice-glue,
   unstableGitUpdater,
@@ -16,25 +17,15 @@
 
 stdenv.mkDerivation rec {
   pname = "libimobiledevice";
-  version = "1.3.0-unstable-2024-05-20";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "libimobiledevice";
     repo = "libimobiledevice";
-    rev = "9ccc52222c287b35e41625cc282fb882544676c6";
-    hash = "sha256-pNvtDGUlifp10V59Kah4q87TvLrcptrCJURHo+Y+hs4=";
+    tag = version;
+    hash = "sha256-SWWsa7asCXpcz80VNhxoePWr74QY8SP0byGSCp+nGG0=";
   };
 
-  patches = [
-    # Fix gcc-14 and clang-16 build:
-    #   https://github.com/libimobiledevice/libimobiledevice/pull/1569
-    (fetchpatch {
-      name = "fime.h.patch";
-      url = "https://github.com/libimobiledevice/libimobiledevice/commit/92256c2ae2422dac45d8648a63517598bdd89883.patch";
-      hash = "sha256-sB+wEFuXFoQnuf7ntWfvYuCgWfYbmlPL7EjW0L0F74o=";
-    })
-  ];
-
   preAutoreconf = ''
     export RELEASE_VERSION=${version}
   '';
@@ -51,6 +42,7 @@ stdenv.mkDerivation rec {
     libgcrypt
     libplist
     libtasn1
+    libtatsu
     libusbmuxd
     libimobiledevice-glue
   ];
diff --git a/pkgs/by-name/li/libirecovery/package.nix b/pkgs/by-name/li/libirecovery/package.nix
index 72bb2d167b7b..ebece12070f9 100644
--- a/pkgs/by-name/li/libirecovery/package.nix
+++ b/pkgs/by-name/li/libirecovery/package.nix
@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libirecovery";
-  version = "1.2.1";
+  version = "1.3.1";
 
   outputs = [
     "out"
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     owner = "libimobiledevice";
     repo = "libirecovery";
     rev = version;
-    hash = "sha256-R+oBC7F4op0qoIk3d/WqS4MwzZY3WMAMIqlJfJb188Q=";
+    hash = "sha256-CSDG8mOLvKAIpxmZnNLMKY1HvQIqk66/rkjmzq7F8vY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libre/package.nix b/pkgs/by-name/li/libre/package.nix
index 5ace0617d47d..4958285b8bb5 100644
--- a/pkgs/by-name/li/libre/package.nix
+++ b/pkgs/by-name/li/libre/package.nix
@@ -8,13 +8,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.24.0";
+  version = "4.2.0";
   pname = "libre";
   src = fetchFromGitHub {
     owner = "baresip";
     repo = "re";
     rev = "v${version}";
-    sha256 = "sha256-wcntgFKpVxDlRMF8a7s9UxeXihguiGxTL/PGv9ImB80=";
+    sha256 = "sha256-BMaDkEpOnL1w8+SsPtX3SJPOmdLTURZPX/f1KMz1jhI=";
   };
 
   buildInputs = [
diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/by-name/li/libressl/default.nix
similarity index 86%
rename from pkgs/development/libraries/libressl/default.nix
rename to pkgs/by-name/li/libressl/default.nix
index af6fcb0d0672..279cbdf60f2e 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/by-name/li/libressl/default.nix
@@ -37,9 +37,6 @@ let
         # .note.GNU-stack section, and if that section is missing from any object,
         # the linker will make the stack executable.
         "-DCMAKE_C_FLAGS=-DHAVE_GNU_STACK"
-        # libressl will append this to the regular prefix for libdir
-        "-DCMAKE_INSTALL_LIBDIR=lib"
-
         "-DTLS_DEFAULT_CA_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt"
       ]
       ++ lib.optional buildShared "-DBUILD_SHARED_LIBS=ON";
@@ -50,9 +47,6 @@ let
       # removing ./configure pre-config.
       preConfigure = ''
         rm configure
-        substituteInPlace CMakeLists.txt \
-          --replace-fail 'exec_prefix \''${prefix}' "exec_prefix ${placeholder "bin"}" \
-          --replace-fail 'libdir      \''${exec_prefix}' 'libdir \''${prefix}'
       '';
 
       inherit patches;
@@ -86,10 +80,10 @@ let
         moveToOutput "share/man/man1/nc.1.gz" "$nc"
       '';
 
-      meta = with lib; {
+      meta = {
         description = "Free TLS/SSL implementation";
         homepage = "https://www.libressl.org";
-        license = with licenses; [
+        license = with lib.licenses; [
           publicDomain
           bsdOriginal
           bsd0
@@ -98,8 +92,8 @@ let
           isc
           openssl
         ];
-        platforms = platforms.all;
-        maintainers = with maintainers; [
+        platforms = lib.platforms.all;
+        maintainers = with lib.maintainers; [
           thoughtpolice
           fpletz
         ];
@@ -116,6 +110,11 @@ let
         ];
       };
     };
+  # https://github.com/libressl/portable/pull/1206
+  common-cmake-install-full-dirs-patch = fetchpatch {
+    url = "https://github.com/libressl/portable/commit/a15ea0710398eaeed3be53cf643e80a1e80c981d.patch";
+    hash = "sha256-Mlf4SrGCCqALQicbGtmVGdkdfcE8DEGYkOuVyG2CozM=";
+  };
 in
 {
   libressl_4_0 = generic {
@@ -135,6 +134,7 @@ in
         '';
         hash = "sha256-dEdtmHHiR7twAqgebXv1Owle/KYCak71NhDCp0PdseU=";
       })
+      common-cmake-install-full-dirs-patch
     ];
   };
 
@@ -152,5 +152,16 @@ in
         }
       } include/arch/loongarch64/opensslconf.h
     '';
+    patches = [
+      common-cmake-install-full-dirs-patch
+    ];
+  };
+
+  libressl_4_2 = generic {
+    version = "4.2.0";
+    hash = "sha256-D326RNfLjfjVPyz78ZVSVLwSjgCJWV8aui+s+u6ECLI=";
+    patches = [
+      common-cmake-install-full-dirs-patch
+    ];
   };
 }
diff --git a/pkgs/by-name/li/libressl/package.nix b/pkgs/by-name/li/libressl/package.nix
new file mode 100644
index 000000000000..f9b05eb9555b
--- /dev/null
+++ b/pkgs/by-name/li/libressl/package.nix
@@ -0,0 +1,5 @@
+{
+  libressl_4_2,
+}:
+
+libressl_4_2
diff --git a/pkgs/by-name/li/libtatsu/package.nix b/pkgs/by-name/li/libtatsu/package.nix
new file mode 100644
index 000000000000..afaf472b87cf
--- /dev/null
+++ b/pkgs/by-name/li/libtatsu/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  pkg-config,
+  libplist,
+  libimobiledevice-glue,
+  curl,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libtatsu";
+  version = "1.0.5";
+
+  src = fetchFromGitHub {
+    owner = "libimobiledevice";
+    repo = "libtatsu";
+    tag = finalAttrs.version;
+    hash = "sha256-vf4xBTTGDJCTj4TMLOhojjAfzSbkx+ogGBnf+UeumG0=";
+  };
+
+  preAutoreconf = ''
+    echo ${finalAttrs.version} > .tarball-version
+    export PACKAGE_VERSION=${finalAttrs.version}
+  '';
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    libplist
+    libimobiledevice-glue
+    curl
+  ];
+
+  meta = {
+    description = "Library handling the communication with Apple's Tatsu Signing Server (TSS)";
+    homepage = "https://github.com/libimobiledevice/libtatsu";
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ nxm ];
+  };
+})
diff --git a/pkgs/by-name/my/mympd/package.nix b/pkgs/by-name/my/mympd/package.nix
index e6157a23c26f..819ad8a5e463 100644
--- a/pkgs/by-name/my/mympd/package.nix
+++ b/pkgs/by-name/my/mympd/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mympd";
-  version = "22.1.1";
+  version = "22.1.2";
 
   src = fetchFromGitHub {
     owner = "jcorporation";
     repo = "myMPD";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-EMKr4haye49P4M8/tAAA/IfWP4LqDB6Bp9QQHzYQ3pc=";
+    sha256 = "sha256-jgRzfVwVf6QOBGAsKNm9f8YqWBWd0KMJj0FTFcnu4NM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ni/nihstro/package.nix b/pkgs/by-name/ni/nihstro/package.nix
index d6e962f799e8..c398f0179089 100644
--- a/pkgs/by-name/ni/nihstro/package.nix
+++ b/pkgs/by-name/ni/nihstro/package.nix
@@ -19,6 +19,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-ZHgWyZFW7t2VTibH7WeuU8+I12bb95I9NcHI5s4U3VU=";
   };
 
+  postPatch = ''
+    # CMake 2.6 is deprecated and is no longer supported by CMake > 4
+    # inline of https://github.com/neobrain/nihstro/pull/71
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" \
+        "cmake_minimum_required(VERSION 3.5)"
+  '';
+
   strictDeps = true;
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix
index 91f01c964b9b..7411af78662d 100644
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -16,18 +16,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ruff";
-  version = "0.14.0";
+  version = "0.14.1";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ruff";
     tag = finalAttrs.version;
-    hash = "sha256-Vueccz5lkUTdgqqZl/+PB0kVYezvPKIVxee8EJYcz4g=";
+    hash = "sha256-jBhlaLWoWp+sNsLBrHoT3J5dtdU1sZzuuhugw9UVw+c=";
   };
 
   cargoBuildFlags = [ "--package=ruff" ];
 
-  cargoHash = "sha256-bnSTiQzlZrS2tqQiRHr6gNDq40Naqxrxcyc8zcVlt7A=";
+  cargoHash = "sha256-shDP5j3mGpnFV0cuFmsWfPoOzJB/wSTUEjNUO+CIadg=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/ti/time/package.nix b/pkgs/by-name/ti/time/package.nix
index af26954c2c57..cd49f0f89850 100644
--- a/pkgs/by-name/ti/time/package.nix
+++ b/pkgs/by-name/ti/time/package.nix
@@ -17,11 +17,9 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     # fixes cross-compilation to riscv64-linux
     ./time-1.9-implicit-func-decl-clang.patch
+    # https://lists.gnu.org/archive/html/bug-time/2025-10/msg00000.html
     # fix compilation with gcc15
-    (fetchpatch {
-      url = "https://src.fedoraproject.org/rpms/time/raw/191440912c2e9a63af87802e507ca3ccb923e805/f/time-1.9-Fix-compiling-with-GCC15.patch";
-      hash = "sha256-4Qp3mV8XuCmz518GPtrW52gyaPOb+97RE6FDPKNCyJw=";
-    })
+    ./time-1.9-fix-sighandler-prototype-for-c23.patch
   ];
 
   meta = {
diff --git a/pkgs/by-name/ti/time/time-1.9-fix-sighandler-prototype-for-c23.patch b/pkgs/by-name/ti/time/time-1.9-fix-sighandler-prototype-for-c23.patch
new file mode 100644
index 000000000000..d092fa39ef2f
--- /dev/null
+++ b/pkgs/by-name/ti/time/time-1.9-fix-sighandler-prototype-for-c23.patch
@@ -0,0 +1,30 @@
+In C23 functions with empty argument list in the prototype are treated
+as taking no arguments. This means that the `int` argument of the
+sighandler must be specified explicitly or the code will fail to
+compile due to mismatched function type.
+
+Signed-off-by: Marcin Serwin <marcin@serwin.dev>
+---
+This fixes the same issue as
+<https://lists.gnu.org/archive/html/bug-time/2025-01/msg00000.html> and
+<https://lists.gnu.org/archive/html/bug-time/2025-03/msg00000.html> but does not
+rely on `sighandler_t` which is a GNU extension.
+
+ src/time.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/time.c b/src/time.c
+index 7b401bc..88287dd 100644
+--- a/src/time.c
++++ b/src/time.c
+@@ -77,7 +77,7 @@ enum
+
+
+ /* A Pointer to a signal handler.  */
+-typedef RETSIGTYPE (*sighandler) ();
++typedef RETSIGTYPE (*sighandler) (int);
+
+ /* msec = milliseconds = 1/1,000 (1*10e-3) second.
+    usec = microseconds = 1/1,000,000 (1*10e-6) second.  */
+--
+2.51.0
diff --git a/pkgs/by-name/to/toml11/package.nix b/pkgs/by-name/to/toml11/package.nix
index 8bf21b712a05..dd5924edd489 100644
--- a/pkgs/by-name/to/toml11/package.nix
+++ b/pkgs/by-name/to/toml11/package.nix
@@ -3,7 +3,9 @@
   stdenv,
   fetchFromGitHub,
   cmake,
+  doctest,
   fetchpatch,
+  nlohmann_json,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -14,8 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ToruNiina";
     repo = "toml11";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NnM+I43UVcd72Y9h+ysAAc7s5gZ78mjVwIMReTJ7G5M=";
-    fetchSubmodules = true;
+    hash = "sha256-sgWKYxNT22nw376ttGsTdg0AMzOwp8QH3E8mx0BZJTQ=";
   };
 
   patches = [
@@ -26,11 +27,21 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
+  # Required to use the system `doctest` over upstream's submodule
+  postPatch = lib.optionalString finalAttrs.finalPackage.doCheck ''
+    substituteInPlace tests/*.{c,h}pp \
+      --replace-warn '"doctest.h"' '"doctest/doctest.h"'
+  '';
+
   nativeBuildInputs = [
     cmake
   ];
   cmakeFlags = [
-    (lib.cmakeBool "TOML11_BUILD_TOML_TESTS" true)
+    (lib.cmakeBool "TOML11_BUILD_TOML_TESTS" finalAttrs.finalPackage.doCheck)
+  ];
+  checkInputs = [
+    doctest
+    nlohmann_json
   ];
   doCheck = true;
 
diff --git a/pkgs/by-name/wh/whois/package.nix b/pkgs/by-name/wh/whois/package.nix
index 44d87d25a7b6..f5b434fc5b8a 100644
--- a/pkgs/by-name/wh/whois/package.nix
+++ b/pkgs/by-name/wh/whois/package.nix
@@ -11,14 +11,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "5.6.4";
+  version = "5.6.5";
   pname = "whois";
 
   src = fetchFromGitHub {
     owner = "rfc1036";
     repo = "whois";
     rev = "v${version}";
-    hash = "sha256-9c67LrpJu3cW/j1hfNhatB4nkCxMTCfHpszawGtU7ko=";
+    hash = "sha256-zCaM3fMittoEzuMRELqc1ES8QPgZRXVjyHUfMsS5tJA=";
   };
 
   patches = [
diff --git a/pkgs/by-name/xw/xwinmosaic/package.nix b/pkgs/by-name/xw/xwinmosaic/package.nix
index a6ce3afe44bb..75ffc31d4bd5 100644
--- a/pkgs/by-name/xw/xwinmosaic/package.nix
+++ b/pkgs/by-name/xw/xwinmosaic/package.nix
@@ -39,6 +39,11 @@ stdenv.mkDerivation rec {
     libXdamage
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     description = "X window switcher drawing a colourful grid";
     license = lib.licenses.bsd2;
diff --git a/pkgs/by-name/ya/yajl/package.nix b/pkgs/by-name/ya/yajl/package.nix
index 936e1d9a6225..2d10ad86590c 100644
--- a/pkgs/by-name/ya/yajl/package.nix
+++ b/pkgs/by-name/ya/yajl/package.nix
@@ -41,6 +41,5 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.isc;
     pkgConfigModules = [ "yajl" ];
     platforms = with lib.platforms; linux ++ darwin;
-    maintainers = with lib.maintainers; [ maggesi ];
   };
 })
diff --git a/pkgs/development/compilers/polyml/5.6.nix b/pkgs/development/compilers/polyml/5.6.nix
index 02c8d79a2468..5b1d9f799738 100644
--- a/pkgs/development/compilers/polyml/5.6.nix
+++ b/pkgs/development/compilers/polyml/5.6.nix
@@ -50,7 +50,6 @@ stdenv.mkDerivation {
     platforms = with lib.platforms; linux;
     maintainers = [
       # Add your name here!
-      lib.maintainers.maggesi
     ];
   };
 }
diff --git a/pkgs/development/compilers/polyml/5.7.nix b/pkgs/development/compilers/polyml/5.7.nix
index 40ef97ebd871..b9f280fbeac0 100644
--- a/pkgs/development/compilers/polyml/5.7.nix
+++ b/pkgs/development/compilers/polyml/5.7.nix
@@ -61,7 +61,6 @@ stdenv.mkDerivation rec {
     homepage = "https://www.polyml.org/";
     license = licenses.lgpl21;
     platforms = with platforms; (linux ++ darwin);
-    maintainers = with maintainers; [ maggesi ];
     # never built on aarch64-darwin since first introduction in nixpkgs
     broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
   };
diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix
index c3c78d99990a..5443e865454d 100644
--- a/pkgs/development/compilers/polyml/default.nix
+++ b/pkgs/development/compilers/polyml/default.nix
@@ -59,7 +59,6 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl21;
     platforms = with platforms; (linux ++ darwin);
     maintainers = with maintainers; [
-      maggesi
       kovirobi
     ];
   };
diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix
index c86ac0591a1b..707c855b4944 100644
--- a/pkgs/development/ocaml-modules/batteries/default.nix
+++ b/pkgs/development/ocaml-modules/batteries/default.nix
@@ -46,8 +46,5 @@ buildDunePackage (finalAttrs: {
       language.
     '';
     license = lib.licenses.lgpl21Plus;
-    maintainers = [
-      lib.maintainers.maggesi
-    ];
   };
 })
diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix
index 89913be9f02e..615be6448431 100644
--- a/pkgs/development/ocaml-modules/camlzip/default.nix
+++ b/pkgs/development/ocaml-modules/camlzip/default.nix
@@ -95,6 +95,5 @@ stdenv.mkDerivation {
       ocamlLgplLinkingException
     ];
     inherit (ocaml.meta) platforms;
-    maintainers = with maintainers; [ maggesi ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/camomile/0.8.5.nix b/pkgs/development/ocaml-modules/camomile/0.8.5.nix
index 430991dcad07..ebf33cec061d 100644
--- a/pkgs/development/ocaml-modules/camomile/0.8.5.nix
+++ b/pkgs/development/ocaml-modules/camomile/0.8.5.nix
@@ -39,8 +39,5 @@ stdenv.mkDerivation {
     description = "Comprehensive Unicode library for OCaml";
     license = lib.licenses.lgpl21;
     inherit (ocaml.meta) platforms;
-    maintainers = [
-      lib.maintainers.maggesi
-    ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix
index b69342f19add..0876f4d98707 100644
--- a/pkgs/development/ocaml-modules/cryptgps/default.nix
+++ b/pkgs/development/ocaml-modules/cryptgps/default.nix
@@ -41,8 +41,5 @@ else
       '';
       license = lib.licenses.mit;
       inherit (ocaml.meta) platforms;
-      maintainers = [
-        lib.maintainers.maggesi
-      ];
     };
   }
diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix
index 1de4fd6c0fd9..33ec440fb5a2 100644
--- a/pkgs/development/ocaml-modules/cryptokit/default.nix
+++ b/pkgs/development/ocaml-modules/cryptokit/default.nix
@@ -38,8 +38,5 @@ buildDunePackage rec {
     homepage = "http://pauillac.inria.fr/~xleroy/software.html";
     description = "Library of cryptographic primitives for OCaml";
     license = lib.licenses.lgpl2Only;
-    maintainers = [
-      lib.maintainers.maggesi
-    ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix
index c9a77e89ea9f..8116c368049a 100644
--- a/pkgs/development/ocaml-modules/lablgtk/default.nix
+++ b/pkgs/development/ocaml-modules/lablgtk/default.nix
@@ -86,7 +86,6 @@ stdenv.mkDerivation {
     homepage = "http://lablgtk.forge.ocamlcore.org/";
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [
-      maggesi
       roconnor
       vbgl
     ];
diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix
index 72ecf9ada9cb..dbf4f3c5379a 100644
--- a/pkgs/development/ocaml-modules/ocamlnet/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix
@@ -70,8 +70,5 @@ lib.throwIf (lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.v
       description = "Library implementing Internet protocols (http, cgi, email, etc.) for OCaml";
       license = "Most Ocamlnet modules are released under the zlib/png license. The HTTP server module Nethttpd is, however, under the GPL.";
       inherit (ocaml.meta) platforms;
-      maintainers = [
-        lib.maintainers.maggesi
-      ];
     };
   }
diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix
index ec1527ceb20d..cf0a68ef576a 100644
--- a/pkgs/development/ocaml-modules/pcre/default.nix
+++ b/pkgs/development/ocaml-modules/pcre/default.nix
@@ -28,7 +28,6 @@ buildDunePackage rec {
     description = "Efficient C-library for pattern matching with Perl-style regular expressions in OCaml";
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [
-      maggesi
       vbmithr
     ];
   };
diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix
index a5cd1cb10f04..9ca397aafdd6 100644
--- a/pkgs/development/ocaml-modules/react/default.nix
+++ b/pkgs/development/ocaml-modules/react/default.nix
@@ -34,7 +34,6 @@ stdenv.mkDerivation rec {
     license = licenses.bsd3;
     inherit (ocaml.meta) platforms;
     maintainers = with maintainers; [
-      maggesi
       vbmithr
       gal_bolle
     ];
diff --git a/pkgs/development/ocaml-modules/sail/default.nix b/pkgs/development/ocaml-modules/sail/default.nix
index cded62a1e5cd..b93d8bdd1954 100644
--- a/pkgs/development/ocaml-modules/sail/default.nix
+++ b/pkgs/development/ocaml-modules/sail/default.nix
@@ -16,7 +16,7 @@
   lem,
   linksem,
   yojson,
-  version ? "0.19.1",
+  version ? "0.20",
 }:
 
 buildDunePackage {
@@ -25,7 +25,7 @@ buildDunePackage {
 
   src = fetchurl {
     url = "https://github.com/rems-project/sail/releases/download/${version}/sail-${version}.tbz";
-    hash = "sha256-Xplpi2NnwBgTPJCq7Szv8XPeINtuYcM+KxlZSh1IKjI=";
+    hash = "sha256-WTmYltCrNkt/OeST79Z1xMC2YDgN2HxLJ3PrE7k+R9M=";
   };
 
   minimalOCamlVersion = "4.08";
diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix
index 4830a9e91607..8ab95ae39f76 100644
--- a/pkgs/development/ocaml-modules/sqlite3/default.nix
+++ b/pkgs/development/ocaml-modules/sqlite3/default.nix
@@ -29,7 +29,6 @@ buildDunePackage rec {
     description = "OCaml bindings to the SQLite 3 database access library";
     license = licenses.mit;
     maintainers = with maintainers; [
-      maggesi
       vbgl
     ];
   };
diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix
index fc0a75ca140f..06fb4e2245c9 100644
--- a/pkgs/development/ocaml-modules/ssl/default.nix
+++ b/pkgs/development/ocaml-modules/ssl/default.nix
@@ -44,7 +44,6 @@ buildDunePackage rec {
     maintainers = with lib.maintainers; [
       anmonteiro
       dandellion
-      maggesi
     ];
   };
 }
diff --git a/pkgs/development/python-modules/httpx-aiohttp/default.nix b/pkgs/development/python-modules/httpx-aiohttp/default.nix
index aee6166157f6..1223fc607040 100644
--- a/pkgs/development/python-modules/httpx-aiohttp/default.nix
+++ b/pkgs/development/python-modules/httpx-aiohttp/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "httpx-aiohttp";
-  version = "0.1.8";
+  version = "0.1.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "karpetrosyan";
     repo = "httpx-aiohttp";
     tag = version;
-    hash = "sha256-Fdu8aKsXWggRkc/512OBEiEwWNAajrhjfG/+v4+cows=";
+    hash = "sha256-XngJwwolGsiT5AAsDvyQWOi4VEp7ItMdqeoQG6cyDlk=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/development/python-modules/kserve/default.nix b/pkgs/development/python-modules/kserve/default.nix
index 10d86bf89974..f73275866a44 100644
--- a/pkgs/development/python-modules/kserve/default.nix
+++ b/pkgs/development/python-modules/kserve/default.nix
@@ -140,6 +140,9 @@ buildPythonPackage rec {
 
     # AssertionError
     "test/test_server.py::TestTFHttpServerLoadAndUnLoad::test_unload"
+
+    # Race condition when called concurrently between two instances of the same model (i.e. in nixpkgs-review)
+    "test/test_dataplane.py::TestDataPlane::test_model_metadata[TEST_RAY_SERVE_MODEL]"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # RuntimeError: Failed to start GCS
diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix
index 4f6f0463e23f..49f70b69960a 100644
--- a/pkgs/development/tools/ocaml/camlp5/default.nix
+++ b/pkgs/development/tools/ocaml/camlp5/default.nix
@@ -98,7 +98,6 @@ else
         license = licenses.bsd3;
         platforms = ocaml.meta.platforms or [ ];
         maintainers = with maintainers; [
-          maggesi
           vbgl
         ];
       };
diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix
index 4efd7cba37ee..160ac54df903 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@@ -91,7 +91,6 @@ stdenv.mkDerivation rec {
     homepage = "http://projects.camlcity.org/projects/findlib.html";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      maggesi
       vbmithr
     ];
     mainProgram = "ocamlfind";
diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix
index 38a11db77626..7443f35a023c 100644
--- a/pkgs/development/tools/ocaml/oasis/default.nix
+++ b/pkgs/development/tools/ocaml/oasis/default.nix
@@ -57,7 +57,6 @@ lib.throwIf (lib.versionAtLeast ocaml.version "5.0") "oasis is not available for
       license = licenses.lgpl21;
       maintainers = with maintainers; [
         vbgl
-        maggesi
       ];
       mainProgram = "oasis";
       inherit (ocaml.meta) platforms;
diff --git a/pkgs/development/tools/ocaml/ocamlify/default.nix b/pkgs/development/tools/ocaml/ocamlify/default.nix
index 08a301080554..b5a8987f5663 100644
--- a/pkgs/development/tools/ocaml/ocamlify/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlify/default.nix
@@ -25,9 +25,6 @@ buildDunePackage (finalAttrs: {
     homepage = "https://github.com/gildor478/ocamlify";
     description = "Include files in OCaml code";
     license = lib.licenses.lgpl21;
-    maintainers = with lib.maintainers; [
-      maggesi
-    ];
     mainProgram = "ocamlify";
   };
 })
diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix
index 3f3f6bbe7f8b..f4b614db8db5 100644
--- a/pkgs/development/tools/ocaml/ocamlmod/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix
@@ -25,9 +25,6 @@ buildDunePackage (finalAttrs: {
   meta = {
     homepage = "https://github.com/gildor478/ocamlmod";
     description = "Generate OCaml modules from source files";
-    maintainers = with lib.maintainers; [
-      maggesi
-    ];
     mainProgram = "ocamlmod";
   };
 })
diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index aab9065f8ed7..57d68b125fbc 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -35,12 +35,12 @@ let
   yarn-berry = yarn-berry_4;
 
   pname = "anki";
-  version = "25.07.5";
-  rev = "7172b2d26684c7ef9d10e249bd43dc5bf73ae00c";
+  version = "25.09.2";
+  rev = "3890e12c9e48c028c3f12aa58cb64bd9f8895e30";
 
-  srcHash = "sha256-nWxRr55Hm40V3Ijw+WetBKNoreLpcvRscgbOZa0REcY=";
-  cargoHash = "sha256-H/xwPPL6VupSZGLPEThhoeMcg12FvAX3fmNM6zYfqRQ=";
-  yarnHash = "sha256-adHnV345oDm20R8zGdEiEW+8/mTQAz4oxraybRfmwew=";
+  srcHash = "sha256-0hLTQR7f7s58DUgAZbDeREMee6VrqAKHyhS1Hs/Em1A=";
+  cargoHash = "sha256-qcB+r9VzBz6ACZaXPL26MOxxtb/h2OIuxyc54vUgfPM=";
+  yarnHash = "sha256-EmKeHORr/+qsDzAwtearMi7qodcCgjeAQcy+79HL7Vg=";
   pythonDeps = map (meta: {
     url = meta.url;
     path = toString (fetchurl meta);
@@ -116,7 +116,6 @@ python3Packages.buildPythonApplication rec {
     ./patches/disable-auto-update.patch
     ./patches/remove-the-gl-library-workaround.patch
     ./patches/skip-formatting-python-code.patch
-    ./patches/fix-compilation-under-rust-1.89.patch
     # Used in with-addons.nix
     ./patches/allow-setting-addons-folder.patch
   ];
diff --git a/pkgs/games/anki/patches/fix-compilation-under-rust-1.89.patch b/pkgs/games/anki/patches/fix-compilation-under-rust-1.89.patch
deleted file mode 100644
index 1f71dc5898e4..000000000000
--- a/pkgs/games/anki/patches/fix-compilation-under-rust-1.89.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From d8843c5fcaef79d209803849070e1a79ab380903 Mon Sep 17 00:00:00 2001
-From: Euan Kemp <euank@euank.com>
-Date: Sun, 24 Aug 2025 20:24:34 +0900
-Subject: [PATCH] Fix compilation under rust 1.89
-
-Rust 1.89 produces the following output:
-
-```
-error: unicode codepoint changing visible direction of text present in literal
-...
-warning: allow(text_direction_codepoint_in_literal) is ignored unless specified at crate level
- --> rslib/i18n/src/generated.rs:7:10
-  |
-7 | #![allow(text_direction_codepoint_in_literal)]
-  |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-```
-
-This change fixes it.
-
-This ensures that some third-party crate that pulls in this code as
-library code (and thus isn't subject to the rust-toolchain file in this
-repo) doesn't hit this compilation error.
----
- rslib/i18n/src/generated.rs | 1 -
- rslib/i18n/src/lib.rs       | 1 +
- 2 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/rslib/i18n/src/generated.rs b/rslib/i18n/src/generated.rs
-index f3526f79f..f3fa71ce8 100644
---- a/rslib/i18n/src/generated.rs
-+++ b/rslib/i18n/src/generated.rs
-@@ -4,6 +4,5 @@
- // Include auto-generated content
- 
- #![allow(clippy::all)]
--#![allow(text_direction_codepoint_in_literal)]
- 
- include!(concat!(env!("OUT_DIR"), "/strings.rs"));
-diff --git a/rslib/i18n/src/lib.rs b/rslib/i18n/src/lib.rs
-index bfd6f5ba2..f9dbb1948 100644
---- a/rslib/i18n/src/lib.rs
-+++ b/rslib/i18n/src/lib.rs
-@@ -1,6 +1,7 @@
- // Copyright: Ankitects Pty Ltd and contributors
- // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
- 
-+#![allow(text_direction_codepoint_in_literal)]
- mod generated;
- 
- use std::borrow::Cow;
--- 
-2.50.1
-
diff --git a/pkgs/games/anki/uv-deps.json b/pkgs/games/anki/uv-deps.json
index f1180b3f999e..f5ee5be647c6 100644
--- a/pkgs/games/anki/uv-deps.json
+++ b/pkgs/games/anki/uv-deps.json
@@ -28,8 +28,8 @@
     "hash": "sha256-tIslN4eXaeA+n0uH18N++dn6LlRw4hFkcdcJZmthV3M="
   },
   {
-    "url": "https://files.pythonhosted.org/packages/b3/9f/c4d3e635ddbd2c6c24ff5454e96900fd2061b9abbb0198b9283446780d08/anki_mac_helper-0.1.0-py3-none-any.whl",
-    "hash": "sha256-7USauifqO8eZkFSvoQ2s8I74Vu169GUm2chZnYF5phg="
+    "url": "https://files.pythonhosted.org/packages/40/82/edb6194704defec181dddce8bc6a53c4afc72fa1f2bb4d68ffe244567767/anki_mac_helper-0.1.1-py3-none-any.whl",
+    "hash": "sha256-d0ppz58P5tS1SUni1liKVKdv9R54y/wmtSfR7TxbNOM="
   },
   {
     "url": "https://files.pythonhosted.org/packages/15/58/5260205b9968c20b6457ed82f48f9e3d6edf2f1f95103161798b73aeccf0/astroid-3.3.10-py3-none-any.whl",
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index c9a2f4b255c7..03a8b930bc92 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -723,8 +723,8 @@ let
 
       BTRFS_FS_POSIX_ACL = yes;
 
-      BCACHEFS_QUOTA = whenBetween "6.7" "6.18" (option yes);
-      BCACHEFS_POSIX_ACL = whenBetween "6.7" "6.18" (option yes);
+      # Provided by external module
+      BCACHEFS_FS = whenBetween "6.7" "6.18" no;
 
       UBIFS_FS_ADVANCED_COMPR = option yes;
 
@@ -1000,6 +1000,11 @@ let
 
       # Enable device detection on virtio-mmio hypervisors
       VIRTIO_MMIO_CMDLINE_DEVICES = yes;
+
+      # Enable CDEV and NOIOMMU support for VFIO, which is useful for
+      # passthrough.
+      VFIO_DEVICE_CDEV = yes;
+      VFIO_NOIOMMU = yes;
     };
 
     media = {
diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index e40d19fac90b..144d74916ee7 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -1,17 +1,17 @@
 {
     "testing": {
-        "version": "6.18-rc1",
-        "hash": "sha256:1warfcvr86as1rcls3g5f9i4az6xqabjwmf6jxlx9dk2l523sl1l",
+        "version": "6.18-rc2",
+        "hash": "sha256:1qnn47hz4q8z1613p4d641qmj71g631zwv7x7nglp9ixg2r4lxzv",
         "lts": false
     },
     "6.1": {
-        "version": "6.1.156",
-        "hash": "sha256:13i2l04pmba7dksz2p5kwxgr5bydc5lp7284d4wfsnjf425i9fyl",
+        "version": "6.1.157",
+        "hash": "sha256:0vpnjrk5kjc03sk5m66i9bv677xfy9mfrjvzx3jcrbr10bhq98d0",
         "lts": true
     },
     "5.15": {
-        "version": "5.15.194",
-        "hash": "sha256:0zi6ihvjmaf940arnc7jjvdqrjf3cvkc9mqc8n24dz85vam6z39l",
+        "version": "5.15.195",
+        "hash": "sha256:0hd4p76qv29zlr0iik4j9y9qynyqisk6bgfiqcwkk7gr6bf81l13",
         "lts": true
     },
     "5.10": {
@@ -25,13 +25,13 @@
         "lts": true
     },
     "6.6": {
-        "version": "6.6.112",
-        "hash": "sha256:08la2f8w5w2x0l9nmvzsmbwa951xyshhvdhwwhfyjmka66zr4zbc",
+        "version": "6.6.113",
+        "hash": "sha256:07n494cblmlfmn8l3kjalwlnb1f9xxxf8c31kkfr5lb1wk9cz58z",
         "lts": true
     },
     "6.12": {
-        "version": "6.12.53",
-        "hash": "sha256:1df0sahirxsby2imsbi04vcn2bimskl4l2r19v7sywz6ran0fdb6",
+        "version": "6.12.54",
+        "hash": "sha256:0qny8c4r9rf55bvchs5vjplfldngmydn0j47a97c9vpgj0rws38v",
         "lts": true
     },
     "6.16": {
@@ -40,8 +40,8 @@
         "lts": false
     },
     "6.17": {
-        "version": "6.17.3",
-        "hash": "sha256:16cld01iwn6hhayxh6f0z71rph0z3p3m4bsd49szddd5v0cqdk1y",
+        "version": "6.17.4",
+        "hash": "sha256:1nwi0hzikziwkxm9xzf819wb3lsz93i1ns1nzybpbfkgdqli42h1",
         "lts": false
     }
 }
diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix
index d5c5645e95bb..51e1981d509f 100644
--- a/pkgs/servers/openafs/1.8/default.nix
+++ b/pkgs/servers/openafs/1.8/default.nix
@@ -154,7 +154,6 @@ stdenv.mkDerivation {
     license = licenses.ipl10;
     platforms = platforms.linux;
     maintainers = [
-      maintainers.maggesi
       maintainers.spacefrogg
     ];
   };
diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix
index 93987d4d2023..566437fe7319 100644
--- a/pkgs/servers/openafs/1.8/module.nix
+++ b/pkgs/servers/openafs/1.8/module.nix
@@ -162,7 +162,6 @@ stdenv.mkDerivation {
     platforms = platforms.linux;
     maintainers = with maintainers; [
       andersk
-      maggesi
       spacefrogg
     ];
     broken = kernel.isHardened;
diff --git a/pkgs/tools/package-management/nix/dependencies.nix b/pkgs/tools/package-management/nix/dependencies.nix
index 7f3b5780607a..ed5a63ce3ecf 100644
--- a/pkgs/tools/package-management/nix/dependencies.nix
+++ b/pkgs/tools/package-management/nix/dependencies.nix
@@ -34,12 +34,5 @@ regular@{
       # only a stripped down version is built which takes a lot less resources to build
       requiredSystemFeatures = [ ];
     };
-
-    libgit2 = pkgs.libgit2.overrideAttrs (old: {
-      # Drop the SSH buffer overflow patch to avoid rebuilding Nix
-      patches = lib.filter (p: !lib.hasSuffix "fix-ssh-custom-heap-buffer-overflow.patch" (toString p)) (
-        old.patches or [ ]
-      );
-    });
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47389bbfde1a..0caba841055a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8334,13 +8334,12 @@ with pkgs;
   watcherclient = with python313Packages; toPythonApplication python-watcherclient;
   zunclient = with python313Packages; toPythonApplication python-zunclient;
 
-  inherit (callPackages ../development/libraries/libressl { })
+  inherit (callPackages ../by-name/li/libressl { })
     libressl_4_0
     libressl_4_1
+    libressl_4_2
     ;
 
-  libressl = libressl_4_1;
-
   openssl = openssl_3_6;
 
   openssl_legacy = openssl.override {