diff --git a/ci/OWNERS b/ci/OWNERS
index 8dcab7e6f2b8..5802a45de03c 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -370,13 +370,12 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /pkgs/applications/editors/vscode/extensions
 
 # PHP interpreter, packages, extensions, tests and documentation
-/doc/languages-frameworks/php.section.md          @aanderse @drupol @globin @ma27 @talyz
-/nixos/tests/php                                  @aanderse @drupol @globin @ma27 @talyz
-/pkgs/build-support/php/build-pecl.nix            @aanderse @drupol @globin @ma27 @talyz
-/pkgs/build-support/php                                     @drupol
-/pkgs/development/interpreters/php       @jtojnar @aanderse @drupol @globin @ma27 @talyz
-/pkgs/development/php-packages                    @aanderse @drupol @globin @ma27 @talyz
-/pkgs/top-level/php-packages.nix         @jtojnar @aanderse @drupol @globin @ma27 @talyz
+/doc/languages-frameworks/php.section.md          @aanderse @globin @ma27 @talyz
+/nixos/tests/php                                  @aanderse @globin @ma27 @talyz
+/pkgs/build-support/php/build-pecl.nix            @aanderse @globin @ma27 @talyz
+/pkgs/development/interpreters/php       @jtojnar @aanderse @globin @ma27 @talyz
+/pkgs/development/php-packages                    @aanderse @globin @ma27 @talyz
+/pkgs/top-level/php-packages.nix         @jtojnar @aanderse @globin @ma27 @talyz
 
 # Docker tools
 /pkgs/build-support/docker                   @roberth
diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index 2b7f59ae6b43..363804cce716 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -30,6 +30,7 @@ let
           "doc"
           "lib"
           "maintainers"
+          "modules"
           "nixos"
           "pkgs"
           ".version"
diff --git a/doc/doc-support/package.nix b/doc/doc-support/package.nix
index 8ed6865a1c90..8e5651864d48 100644
--- a/doc/doc-support/package.nix
+++ b/doc/doc-support/package.nix
@@ -15,12 +15,43 @@
   markdown-code-runner,
   roboto,
   treefmt,
+  nixosOptionsDoc,
 }:
 stdenvNoCC.mkDerivation (
   finalAttrs:
   let
     inherit (finalAttrs.finalPackage.optionsDoc) optionsJSON;
     inherit (finalAttrs.finalPackage) epub lib-docs pythonInterpreterTable;
+
+    # Make anything from lib (the module system internals) invisible
+    hide-lib =
+      opt:
+      opt
+      // {
+        visible = if lib.all (decl: decl == "lib/modules.nix") opt.declarations then false else opt.visible;
+      };
+
+    toURL =
+      decl:
+      let
+        declStr = toString decl;
+        root = toString (../..);
+        subpath = lib.removePrefix "/" (lib.removePrefix root declStr);
+      in
+      if lib.hasPrefix root declStr then
+        {
+          url = "https://github.com/NixOS/nixpkgs/blob/master/${subpath}";
+          name = "nixpkgs/${subpath}";
+        }
+      else
+        decl;
+
+    mapURLs = opt: opt // { declarations = map toURL opt.declarations; };
+
+    docs.generic.meta-maintainers = nixosOptionsDoc {
+      inherit (lib.evalModules { modules = [ ../../modules/generic/meta-maintainers.nix ]; }) options;
+      transformOptions = opt: hide-lib (mapURLs opt);
+    };
   in
   {
     name = "nixpkgs-manual";
@@ -49,6 +80,7 @@ stdenvNoCC.mkDerivation (
       ln -s ${optionsJSON}/share/doc/nixos/options.json ./config-options.json
       ln -s ${treefmt.functionsDoc.markdown} ./packages/treefmt-functions.section.md
       ln -s ${treefmt.optionsDoc.optionsJSON}/share/doc/nixos/options.json ./treefmt-options.json
+      ln -s ${docs.generic.meta-maintainers.optionsJSON}/share/doc/nixos/options.json ./options-modules-generic-meta-maintainers.json
     '';
 
     buildPhase = ''
diff --git a/doc/manual.md.in b/doc/manual.md.in
index 160c6eaead3c..8d75d0fe459e 100644
--- a/doc/manual.md.in
+++ b/doc/manual.md.in
@@ -11,6 +11,7 @@ lib.md
 stdenv.md
 toolchains.md
 build-helpers.md
+modules/index.md
 development.md
 contributing.md
 interoperability.md
diff --git a/doc/modules/generic.chapter.md b/doc/modules/generic.chapter.md
new file mode 100644
index 000000000000..2a14812160e0
--- /dev/null
+++ b/doc/modules/generic.chapter.md
@@ -0,0 +1,16 @@
+
+# Generic {#modules-generic}
+
+Generic modules can be imported to extend configurations of any [class].
+
+## `meta-maintainers.nix` {#modules-generic-meta-maintainers}
+
+The options below become available when using `imports = [ (nixpkgs + "/modules/generic/meta-maintainers.nix") ];`.
+
+```{=include=} options
+id-prefix: opt-modules-generic-meta-maintainers-
+list-id: configuration-variable-list
+source: ../options-modules-generic-meta-maintainers.json
+```
+
+[class]: https://nixos.org/manual/nixpkgs/unstable/#module-system-lib-evalModules-param-class
diff --git a/doc/modules/index.md b/doc/modules/index.md
new file mode 100644
index 000000000000..af4897f11d6d
--- /dev/null
+++ b/doc/modules/index.md
@@ -0,0 +1,12 @@
+# Modules {#modules}
+
+The Nixpkgs repository provides [Module System] modules for various purposes.
+
+The following sections are organized by [module class].
+
+```{=include=} chapters
+generic.chapter.md
+```
+
+[Module System]: https://nixos.org/manual/nixpkgs/unstable/#module-system
+[module class]: https://nixos.org/manual/nixpkgs/unstable/#module-system-lib-evalModules-param-class
diff --git a/doc/redirects.json b/doc/redirects.json
index 8210470b5bcb..685e93538f85 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -130,6 +130,15 @@
   "minor-ghc-deprecation": [
     "index.html#minor-ghc-deprecation"
   ],
+  "modules": [
+    "index.html#modules"
+  ],
+  "modules-generic": [
+    "index.html#modules-generic"
+  ],
+  "modules-generic-meta-maintainers": [
+    "index.html#modules-generic-meta-maintainers"
+  ],
   "neovim": [
     "index.html#neovim"
   ],
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 6cbbf8f719e1..d954ae67ccd4 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -1023,7 +1023,6 @@ with lib.maintainers;
   php = {
     members = [
       aanderse
-      drupol
       ma27
       piotrkwiecinski
       talyz
diff --git a/modules/README.md b/modules/README.md
new file mode 100644
index 000000000000..777ab9839949
--- /dev/null
+++ b/modules/README.md
@@ -0,0 +1,9 @@
+# `<nixpkgs>/modules`
+
+This directory hosts subdirectories representing each module [class](https://nixos.org/manual/nixpkgs/stable/#module-system-lib-evalModules-param-class) for which the `nixpkgs` repository has user-importable modules.
+
+Exceptions:
+- `_class = "nixos";` modules go in the `<nixpkgs>/nixos/modules` tree
+- modules whose only purpose is to test code in this repository
+
+The emphasis is on _importable_ modules, i.e. ones that aren't inherent to and built into the Module System application.
diff --git a/modules/generic/meta-maintainers.nix b/modules/generic/meta-maintainers.nix
new file mode 100644
index 000000000000..fb66174cf621
--- /dev/null
+++ b/modules/generic/meta-maintainers.nix
@@ -0,0 +1,63 @@
+# Test:
+#   ./meta-maintainers/test.nix
+{ lib, ... }:
+let
+  inherit (lib)
+    mkOption
+    mkOptionType
+    types
+    ;
+
+  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
+{
+  _class = null; # not specific to NixOS
+  options = {
+    meta = {
+      maintainers = mkOption {
+        type = listOfMaintainers;
+        default = [ ];
+        example = lib.literalExpression ''[ lib.maintainers.alice lib.maintainers.bob ]'';
+        description = ''
+          List of maintainers of each module.
+          This option should be defined at most once per module.
+
+          The option value is not a list of maintainers, but an attribute set that maps module file names to lists of maintainers.
+        '';
+      };
+    };
+  };
+  meta.maintainers = with lib.maintainers; [
+    pierron
+    roberth
+  ];
+}
diff --git a/modules/generic/meta-maintainers/test.nix b/modules/generic/meta-maintainers/test.nix
new file mode 100644
index 000000000000..73a431c34327
--- /dev/null
+++ b/modules/generic/meta-maintainers/test.nix
@@ -0,0 +1,34 @@
+# Run:
+#   $ nix-instantiate --eval 'modules/generic/meta-maintainers/test.nix'
+#
+# Expected output:
+#   { }
+#
+# Debugging:
+#   drop .test from the end of this file, then use nix repl on it
+rec {
+  lib = import ../../../lib;
+
+  example = lib.evalModules {
+    modules = [
+      ../meta-maintainers.nix
+      {
+        _file = "eelco.nix";
+        meta.maintainers = [ lib.maintainers.eelco ];
+      }
+    ];
+  };
+
+  test =
+    assert
+      example.config.meta.maintainers == {
+        ${toString ../meta-maintainers.nix} = [
+          lib.maintainers.pierron
+          lib.maintainers.roberth
+        ];
+        "eelco.nix" = [ lib.maintainers.eelco ];
+      };
+    { };
+
+}
+.test
diff --git a/nixos/lib/eval-cacheable-options.nix b/nixos/lib/eval-cacheable-options.nix
index 73cf5eda32ec..9641d8d8d422 100644
--- a/nixos/lib/eval-cacheable-options.nix
+++ b/nixos/lib/eval-cacheable-options.nix
@@ -49,6 +49,7 @@ let
     version = release;
     revision = "release-${release}";
     prefix = modulesPath;
+    extraSources = [ (dirOf nixosPath) ];
   };
 in
 docs.optionsNix
diff --git a/nixos/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix
index 2a208d27d766..7c961d795087 100644
--- a/nixos/lib/make-iso9660-image.nix
+++ b/nixos/lib/make-iso9660-image.nix
@@ -76,6 +76,10 @@ stdenv.mkDerivation {
   name = isoName;
   __structuredAttrs = true;
 
+  # the image will be self-contained so we can drop references
+  # to the closure that was used to build it
+  unsafeDiscardReferences.out = true;
+
   buildCommandPath = ./make-iso9660-image.sh;
   nativeBuildInputs = [
     xorriso
diff --git a/nixos/lib/make-squashfs.nix b/nixos/lib/make-squashfs.nix
index de74c881d6e4..84adb5793502 100644
--- a/nixos/lib/make-squashfs.nix
+++ b/nixos/lib/make-squashfs.nix
@@ -27,6 +27,10 @@ stdenv.mkDerivation {
   name = "${fileName}${lib.optionalString (!hydraBuildProduct) ".img"}";
   __structuredAttrs = true;
 
+  # the image will be self-contained so we can drop references
+  # to the closure that was used to build it
+  unsafeDiscardReferences.out = true;
+
   nativeBuildInputs = [ squashfsTools ];
 
   buildCommand = ''
diff --git a/nixos/lib/make-system-tarball.nix b/nixos/lib/make-system-tarball.nix
index 9fb77230cf63..9f1e3bd1e874 100644
--- a/nixos/lib/make-system-tarball.nix
+++ b/nixos/lib/make-system-tarball.nix
@@ -39,7 +39,13 @@ in
 
 stdenv.mkDerivation {
   name = "tarball";
-  builder = ./make-system-tarball.sh;
+  __structuredAttrs = true;
+
+  # the tarball will be self-contained so we can drop references
+  # to the closure that was used to build it
+  unsafeDiscardReferences.out = true;
+
+  buildCommandPath = ./make-system-tarball.sh;
   nativeBuildInputs = extraInputs;
 
   inherit
@@ -49,11 +55,9 @@ stdenv.mkDerivation {
     compressCommand
     ;
 
-  # !!! should use XML.
   sources = map (x: x.source) contents;
   targets = map (x: x.target) contents;
 
-  # !!! should use XML.
   inherit symlinks objects;
 
   closureInfo = closureInfo {
diff --git a/nixos/lib/make-system-tarball.sh b/nixos/lib/make-system-tarball.sh
index 8fadc79a13dc..ea24dcf9842d 100644
--- a/nixos/lib/make-system-tarball.sh
+++ b/nixos/lib/make-system-tarball.sh
@@ -1,10 +1,3 @@
-sources_=($sources)
-targets_=($targets)
-
-objects=($objects)
-symlinks=($symlinks)
-
-
 # Remove the initial slash from a path, since genisofs likes it that way.
 stripSlash() {
     res="$1"
@@ -12,10 +5,10 @@ stripSlash() {
 }
 
 # Add the individual files.
-for ((i = 0; i < ${#targets_[@]}; i++)); do
-    stripSlash "${targets_[$i]}"
+for ((i = 0; i < ${#targets[@]}; i++)); do
+    stripSlash "${targets[$i]}"
     mkdir -p "$(dirname "$res")"
-    cp -a "${sources_[$i]}" "$res"
+    cp -a "${sources[$i]}" "$res"
 done
 
 
diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix
index 3a60ae3286d2..7dd2a481004a 100644
--- a/nixos/modules/misc/documentation.nix
+++ b/nixos/modules/misc/documentation.nix
@@ -116,18 +116,34 @@ let
           && (t == "directory" -> baseNameOf n != "tests")
           && (t == "file" -> hasSuffix ".nix" n)
         );
+        prefixRegex = "^" + lib.strings.escapeRegex (toString pkgs.path) + "($|/(modules|nixos)($|/.*))";
+        filteredModules = builtins.path {
+          name = "source";
+          inherit (pkgs) path;
+          filter =
+            n: t:
+            builtins.match prefixRegex n != null
+            && cleanSourceFilter n t
+            && (t == "directory" -> baseNameOf n != "tests")
+            && (t == "file" -> hasSuffix ".nix" n);
+        };
       in
       pkgs.runCommand "lazy-options.json"
-        {
+        rec {
           libPath = filter (pkgs.path + "/lib");
           pkgsLibPath = filter (pkgs.path + "/pkgs/pkgs-lib");
-          nixosPath = filter (pkgs.path + "/nixos");
+          nixosPath = filteredModules + "/nixos";
           NIX_ABORT_ON_WARN = warningsAreErrors;
           modules =
             "[ "
             + concatMapStringsSep " " (p: ''"${removePrefix "${modulesPath}/" (toString p)}"'') docModules.lazy
             + " ]";
           passAsFile = [ "modules" ];
+          disallowedReferences = [
+            filteredModules
+            libPath
+            pkgsLibPath
+          ];
         }
         ''
           export NIX_STORE_DIR=$TMPDIR/store
diff --git a/nixos/modules/misc/meta.nix b/nixos/modules/misc/meta.nix
index 1e75a84452f8..20a2c99904d1 100644
--- a/nixos/modules/misc/meta.nix
+++ b/nixos/modules/misc/meta.nix
@@ -1,39 +1,5 @@
 { lib, ... }:
 let
-  maintainer = lib.mkOptionType {
-    name = "maintainer";
-    check = email: lib.elem email (lib.attrValues lib.maintainers);
-    merge =
-      loc: defs:
-      lib.listToAttrs (lib.singleton (lib.nameValuePair (lib.last defs).file (lib.last defs).value));
-  };
-
-  listOfMaintainers = lib.types.listOf maintainer // {
-    # Returns list of
-    #   { "module-file" = [
-    #        "maintainer1 <first@nixos.org>"
-    #        "maintainer2 <second@nixos.org>" ];
-    #   }
-    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
-        )
-      );
-  };
-
   docFile = lib.types.path // {
     # Returns tuples of
     #   { file = "module location"; value = <path/to/doc.xml>; }
@@ -42,20 +8,11 @@ let
 in
 
 {
+  imports = [ ../../../modules/generic/meta-maintainers.nix ];
+
   options = {
     meta = {
 
-      maintainers = lib.mkOption {
-        type = listOfMaintainers;
-        internal = true;
-        default = [ ];
-        example = lib.literalExpression ''[ lib.maintainers.all ]'';
-        description = ''
-          List of maintainers of each module.  This option should be defined at
-          most once per module.
-        '';
-      };
-
       doc = lib.mkOption {
         type = docFile;
         internal = true;
@@ -84,5 +41,8 @@ in
     };
   };
 
-  meta.maintainers = lib.singleton lib.maintainers.pierron;
+  meta.maintainers = with lib.maintainers; [
+    pierron
+    roberth
+  ];
 }
diff --git a/nixos/modules/programs/projecteur.nix b/nixos/modules/programs/projecteur.nix
index 7c96403a1f29..01e8d71dd124 100644
--- a/nixos/modules/programs/projecteur.nix
+++ b/nixos/modules/programs/projecteur.nix
@@ -22,7 +22,6 @@ in
   meta = {
     maintainers = with lib.maintainers; [
       benneti
-      drupol
     ];
   };
 }
diff --git a/nixos/modules/services/databases/chromadb.nix b/nixos/modules/services/databases/chromadb.nix
index d8d60078cf45..6610f58ec73e 100644
--- a/nixos/modules/services/databases/chromadb.nix
+++ b/nixos/modules/services/databases/chromadb.nix
@@ -17,7 +17,7 @@ let
 in
 {
 
-  meta.maintainers = with lib.maintainers; [ drupol ];
+  meta.maintainers = with lib.maintainers; [ ];
 
   options = {
     services.chromadb = {
diff --git a/nixos/modules/services/misc/docling-serve.nix b/nixos/modules/services/misc/docling-serve.nix
index 0a1ac874e04a..2d4fd4a6a1c0 100644
--- a/nixos/modules/services/misc/docling-serve.nix
+++ b/nixos/modules/services/misc/docling-serve.nix
@@ -127,5 +127,5 @@ in
     networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; };
   };
 
-  meta.maintainers = with lib.maintainers; [ drupol ];
+  meta.maintainers = with lib.maintainers; [ ];
 }
diff --git a/nixos/modules/services/misc/litellm.nix b/nixos/modules/services/misc/litellm.nix
index 621d7e9542cf..4b43768da61d 100644
--- a/nixos/modules/services/misc/litellm.nix
+++ b/nixos/modules/services/misc/litellm.nix
@@ -178,5 +178,5 @@ in
     networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; };
   };
 
-  meta.maintainers = with lib.maintainers; [ drupol ];
+  meta.maintainers = with lib.maintainers; [ ];
 }
diff --git a/nixos/modules/services/misc/orthanc.nix b/nixos/modules/services/misc/orthanc.nix
index d1a8f97ac006..69543c41ead8 100644
--- a/nixos/modules/services/misc/orthanc.nix
+++ b/nixos/modules/services/misc/orthanc.nix
@@ -130,5 +130,5 @@ in
     time.timeZone = lib.mkDefault "UTC";
   };
 
-  meta.maintainers = with lib.maintainers; [ drupol ];
+  meta.maintainers = with lib.maintainers; [ ];
 }
diff --git a/nixos/modules/services/search/tika.nix b/nixos/modules/services/search/tika.nix
index 5ddd1a551e49..f72c2b081f71 100644
--- a/nixos/modules/services/search/tika.nix
+++ b/nixos/modules/services/search/tika.nix
@@ -18,7 +18,7 @@ let
     ;
 in
 {
-  meta.maintainers = [ lib.maintainers.drupol ];
+  meta.maintainers = [ ];
 
   options = {
     services.tika = {
diff --git a/nixos/modules/services/web-apps/fider.nix b/nixos/modules/services/web-apps/fider.nix
index e81bba18d7b5..5274c3f2dce1 100644
--- a/nixos/modules/services/web-apps/fider.nix
+++ b/nixos/modules/services/web-apps/fider.nix
@@ -117,7 +117,6 @@ in
 
   meta = {
     maintainers = with lib.maintainers; [
-      drupol
       niklaskorz
     ];
     # doc = ./fider.md;
diff --git a/nixos/modules/services/web-apps/glance.nix b/nixos/modules/services/web-apps/glance.nix
index 4f96b550fb6e..bfa5670650dd 100644
--- a/nixos/modules/services/web-apps/glance.nix
+++ b/nixos/modules/services/web-apps/glance.nix
@@ -237,5 +237,5 @@ in
   };
 
   meta.doc = ./glance.md;
-  meta.maintainers = [ lib.maintainers.drupol ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/modules/services/web-apps/honk.nix b/nixos/modules/services/web-apps/honk.nix
index 15d8b5acc3b2..7fc1f38240ec 100644
--- a/nixos/modules/services/web-apps/honk.nix
+++ b/nixos/modules/services/web-apps/honk.nix
@@ -152,7 +152,7 @@ in
   };
 
   meta = {
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     doc = ./honk.md;
   };
 }
diff --git a/nixos/modules/services/web-apps/openvscode-server.nix b/nixos/modules/services/web-apps/openvscode-server.nix
index e315729b8153..db9931d8247c 100644
--- a/nixos/modules/services/web-apps/openvscode-server.nix
+++ b/nixos/modules/services/web-apps/openvscode-server.nix
@@ -232,5 +232,5 @@ in
     users.groups."${defaultGroup}" = lib.mkIf (cfg.group == defaultGroup) { };
   };
 
-  meta.maintainers = [ lib.maintainers.drupol ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/modules/system/service/portable/service.nix b/nixos/modules/system/service/portable/service.nix
index 339a99d7a856..a2d86274ec29 100644
--- a/nixos/modules/system/service/portable/service.nix
+++ b/nixos/modules/system/service/portable/service.nix
@@ -10,6 +10,7 @@ in
   # https://nixos.org/manual/nixos/unstable/#modular-services
   _class = "service";
   imports = [
+    ../../../../../modules/generic/meta-maintainers.nix
     ../../../misc/assertions.nix
     ./config-data.nix
   ];
@@ -43,9 +44,5 @@ in
         '';
       };
     };
-    # TODO: use https://github.com/NixOS/nixpkgs/pull/431450
-    meta = lib.mkOption {
-      description = "The maintainers of this module. This is currently a placeholder option whose value may not evaluate to anything useful until https://github.com/NixOS/nixpkgs/pull/431450 is available and used here.";
-    };
   };
 }
diff --git a/nixos/tests/chromadb.nix b/nixos/tests/chromadb.nix
index be04d10e74de..de8454d5d131 100644
--- a/nixos/tests/chromadb.nix
+++ b/nixos/tests/chromadb.nix
@@ -6,7 +6,7 @@ let
 in
 {
   name = "chromadb";
-  meta.maintainers = [ lib.maintainers.drupol ];
+  meta.maintainers = [ ];
 
   nodes = {
     machine =
diff --git a/nixos/tests/code-server.nix b/nixos/tests/code-server.nix
index e4c9c8397740..25a0f56b70ec 100644
--- a/nixos/tests/code-server.nix
+++ b/nixos/tests/code-server.nix
@@ -20,5 +20,5 @@
     machine.succeed("curl -k --fail http://localhost:4444", timeout=10)
   '';
 
-  meta.maintainers = [ lib.maintainers.drupol ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/tests/docling-serve.nix b/nixos/tests/docling-serve.nix
index ff31e003283b..d1636c0210c5 100644
--- a/nixos/tests/docling-serve.nix
+++ b/nixos/tests/docling-serve.nix
@@ -5,7 +5,7 @@ in
 {
   name = "docling-serve";
   meta = with lib.maintainers; {
-    maintainers = [ drupol ];
+    maintainers = [ ];
   };
 
   nodes = {
diff --git a/nixos/tests/drupal.nix b/nixos/tests/drupal.nix
index 894cceb678d8..6c143e00de01 100644
--- a/nixos/tests/drupal.nix
+++ b/nixos/tests/drupal.nix
@@ -51,7 +51,6 @@ in
 {
   name = "drupal";
   meta.maintainers = [
-    lib.maintainers.drupol
     lib.maintainers.OulipianSummer
   ];
 
diff --git a/nixos/tests/fider.nix b/nixos/tests/fider.nix
index 6db4777ce2bd..f27727750844 100644
--- a/nixos/tests/fider.nix
+++ b/nixos/tests/fider.nix
@@ -27,7 +27,6 @@
   '';
 
   meta.maintainers = with lib.maintainers; [
-    drupol
     niklaskorz
   ];
 }
diff --git a/nixos/tests/glance.nix b/nixos/tests/glance.nix
index 254173e1eb71..dce1c29a4f06 100644
--- a/nixos/tests/glance.nix
+++ b/nixos/tests/glance.nix
@@ -80,5 +80,5 @@
     assert location == "Nivelles, Belgium"
   '';
 
-  meta.maintainers = [ lib.maintainers.drupol ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/tests/guacamole-server.nix b/nixos/tests/guacamole-server.nix
index 280742f5ad0b..5bd6a0bc7d33 100644
--- a/nixos/tests/guacamole-server.nix
+++ b/nixos/tests/guacamole-server.nix
@@ -19,5 +19,5 @@
     machine.wait_for_open_port(4822)
   '';
 
-  meta.maintainers = [ lib.maintainers.drupol ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/tests/honk.nix b/nixos/tests/honk.nix
index bc552f6dff40..c455fff8ecfd 100644
--- a/nixos/tests/honk.nix
+++ b/nixos/tests/honk.nix
@@ -30,5 +30,5 @@
     machine.wait_for_open_port(8080)
   '';
 
-  meta.maintainers = [ lib.maintainers.drupol ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/tests/litellm.nix b/nixos/tests/litellm.nix
index 96d67f9521a0..12fb24aba4cd 100644
--- a/nixos/tests/litellm.nix
+++ b/nixos/tests/litellm.nix
@@ -22,6 +22,6 @@ in
   '';
 
   meta = with lib.maintainers; {
-    maintainers = [ drupol ];
+    maintainers = [ ];
   };
 }
diff --git a/nixos/tests/openvscode-server.nix b/nixos/tests/openvscode-server.nix
index 89d3817b2cf3..a0693176943a 100644
--- a/nixos/tests/openvscode-server.nix
+++ b/nixos/tests/openvscode-server.nix
@@ -20,5 +20,5 @@
     machine.succeed("curl -k --fail http://localhost:3000", timeout=10)
   '';
 
-  meta.maintainers = [ lib.maintainers.drupol ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/tests/orthanc.nix b/nixos/tests/orthanc.nix
index 127568942de9..c2583effb4de 100644
--- a/nixos/tests/orthanc.nix
+++ b/nixos/tests/orthanc.nix
@@ -23,5 +23,5 @@
     machine.wait_for_open_port(4242)
   '';
 
-  meta.maintainers = [ lib.maintainers.drupol ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix
index cbfd5426af07..d406ee93506e 100644
--- a/nixos/tests/prometheus-exporters.nix
+++ b/nixos/tests/prometheus-exporters.nix
@@ -1603,12 +1603,12 @@ let
         wait_for_open_port(9374)
         wait_until_succeeds(
             "curl -sSf localhost:9374/metrics | grep '{}' | grep -v ' 0$'".format(
-                'smokeping_requests_total{host="127.0.0.1",ip="127.0.0.1",source=""} '
+                'smokeping_requests_total{host="127.0.0.1",ip="127.0.0.1",source="",tos="0"} '
             )
         )
         wait_until_succeeds(
             "curl -sSf localhost:9374/metrics | grep '{}'".format(
-                'smokeping_response_ttl{host="127.0.0.1",ip="127.0.0.1",source=""}'
+                'smokeping_response_ttl{host="127.0.0.1",ip="127.0.0.1",source="",tos="0"}'
             )
         )
       '';
diff --git a/nixos/tests/rebuilderd.nix b/nixos/tests/rebuilderd.nix
index 9f168e9d8974..9b0788f7d2a9 100644
--- a/nixos/tests/rebuilderd.nix
+++ b/nixos/tests/rebuilderd.nix
@@ -34,5 +34,5 @@
     machine_custom_config.wait_for_open_port(1234)
   '';
 
-  meta.maintainers = [ lib.maintainers.drupol ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/tests/tika.nix b/nixos/tests/tika.nix
index 39cd3ec33c41..15fe65960299 100644
--- a/nixos/tests/tika.nix
+++ b/nixos/tests/tika.nix
@@ -19,5 +19,5 @@
     machine.wait_for_open_port(9998)
   '';
 
-  meta.maintainers = [ lib.maintainers.drupol ];
+  meta.maintainers = [ ];
 }
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index ae4227f412cf..b7413bfb101a 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -20,8 +20,8 @@ let
     sha256Hash = "sha256-jzh0xrEZU4zdlse8tlVV/uqBEz4lH2k2XSHd13d3vng=";
   };
   betaVersion = {
-    version = "2025.1.2.10"; # "Android Studio Narwhal Feature Drop | 2025.1.2 RC 1"
-    sha256Hash = "sha256-qA7iu4nK+29aHKsUmyQWuwV0SFnv5cYQvFq5CAMKyKw=";
+    version = "2025.1.3.5"; # "Android Studio Narwhal 3 Feature Drop | 2025.1.3 RC 1"
+    sha256Hash = "sha256-3LkcpvuoUhY/kRpoqYnwfx1cdPvvdBMEFXtRLYmqTk4=";
   };
   latestVersion = {
     version = "2025.1.4.1"; # "Android Studio Narwhal 4 Feature Drop | 2025.1.4 Canary 1"
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/holo-layer/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/holo-layer/package.nix
index 1a71df35daa9..082579c45068 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/holo-layer/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/holo-layer/package.nix
@@ -31,13 +31,13 @@ in
 melpaBuild {
 
   pname = "holo-layer";
-  version = "0-unstable-2025-06-13";
+  version = "0-unstable-2025-08-13";
 
   src = fetchFromGitHub {
     owner = "manateelazycat";
     repo = "holo-layer";
-    rev = "464b6996268a81fa3b524ced02a60fcc266f8965";
-    hash = "sha256-uTxfnhtDybWx+Na4fj5TJuZh+tKoNuSZ03IR9ErvI7s=";
+    rev = "6584d8057a264f199e0cf6e90095fa63d36e6049";
+    hash = "sha256-80uGyQltHBtrEtG/hkhHP5qbBfShw5BDyfR3GUHlhJk=";
   };
 
   packageRequires = [
diff --git a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix
index 4a908685ec8d..419127692d0a 100644
--- a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix
@@ -17,6 +17,6 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
     downloadPage = "https://marketplace.visualstudio.com/items?itemName=AmazonWebServices.amazon-q-vscode";
     homepage = "https://github.com/aws/aws-toolkit-vscode";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 })
diff --git a/pkgs/applications/editors/vscode/extensions/anweber.vscode-httpyac/default.nix b/pkgs/applications/editors/vscode/extensions/anweber.vscode-httpyac/default.nix
index 7d897a5fd8d1..8403ac814a43 100644
--- a/pkgs/applications/editors/vscode/extensions/anweber.vscode-httpyac/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anweber.vscode-httpyac/default.nix
@@ -23,6 +23,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     downloadPage = "https://marketplace.visualstudio.com/items?itemName=anweber.vscode-httpyac";
     homepage = "https://github.com/AnWeber/vscode-httpyac/";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 8565c2435054..a77d0a338345 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -749,7 +749,7 @@ let
           description = "PHP code intelligence for Visual Studio Code";
           license = lib.licenses.unfree;
           downloadPage = "https://marketplace.visualstudio.com/items?itemName=bmewburn.vscode-intelephense-client";
-          maintainers = [ lib.maintainers.drupol ];
+          maintainers = [ ];
         };
       };
 
@@ -978,7 +978,7 @@ let
           downloadPage = "https://marketplace.visualstudio.com/items?itemName=chris-hayes.chatgpt-reborn";
           homepage = "https://github.com/christopher-hayes/vscode-chatgpt-reborn";
           license = lib.licenses.isc;
-          maintainers = [ lib.maintainers.drupol ];
+          maintainers = [ ];
         };
         mktplcRef = {
           name = "chatgpt-reborn";
@@ -1028,7 +1028,7 @@ let
           downloadPage = "https://marketplace.visualstudio.com/items?itemName=coder.coder-remote";
           homepage = "https://github.com/coder/vscode-coder";
           license = lib.licenses.mit;
-          maintainers = [ lib.maintainers.drupol ];
+          maintainers = [ ];
         };
       };
 
@@ -1966,7 +1966,7 @@ let
           downloadPage = "https://marketplace.visualstudio.com/items?itemName=genieai.chatgpt-vscode";
           homepage = "https://github.com/ai-genie/chatgpt-vscode";
           license = lib.licenses.isc;
-          maintainers = [ lib.maintainers.drupol ];
+          maintainers = [ ];
         };
         mktplcRef = {
           name = "chatgpt-vscode";
@@ -2025,7 +2025,7 @@ let
           downloadPage = "https://marketplace.visualstudio.com/items?itemName=github.vscode-github-actions";
           homepage = "https://github.com/github/vscode-github-actions";
           license = lib.licenses.mit;
-          maintainers = [ lib.maintainers.drupol ];
+          maintainers = [ ];
         };
       };
 
@@ -2149,7 +2149,7 @@ let
           downloadPage = "https://marketplace.visualstudio.com/items?itemName=griimick.vhs";
           homepage = "https://github.com/griimick/vscode-vhs";
           license = lib.licenses.mit;
-          maintainers = [ lib.maintainers.drupol ];
+          maintainers = [ ];
         };
       };
 
@@ -4635,7 +4635,7 @@ let
           downloadPage = "https://marketplace.visualstudio.com/items?itemName=Tailscale.vscode-tailscale";
           homepage = "https://github.com/tailscale-dev/vscode-tailscale";
           license = lib.licenses.mit;
-          maintainers = [ lib.maintainers.drupol ];
+          maintainers = [ ];
         };
       };
 
diff --git a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix
index 7d00d71b9ab4..00686d1a12bb 100644
--- a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix
@@ -14,6 +14,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     downloadPage = "https://marketplace.visualstudio.com/items?itemName=mongodb.mongodb-vscode";
     homepage = "https://github.com/mongodb-js/vscode";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix
index 31ba7b47435b..2b64ededde1e 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix
@@ -17,6 +17,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.mypy-type-checker";
     homepage = "https://github.com/microsoft/vscode-mypy";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.vscode-remote-extensionpack/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.vscode-remote-extensionpack/default.nix
index 6543e905f64b..feac9ec1b2a1 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.vscode-remote-extensionpack/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.vscode-remote-extensionpack/default.nix
@@ -15,6 +15,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     description = "Visual Studio Code extension pack that lets you open any folder in a container, on a remote machine, or in WSL and take advantage of VS Code's full feature set";
     homepage = "https://github.com/Microsoft/vscode-remote-release";
     license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix
index 8fbf3af493e6..ed6563fb7421 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix
@@ -15,6 +15,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     description = "Visual Studio Code extension to help developers and AI engineers build AI apps";
     homepage = "https://github.com/Microsoft/windows-ai-studio";
     license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
index 4131ccb0c77c..11f1c14bf5b2 100644
--- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
@@ -32,6 +32,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     downloadPage = "https://marketplace.visualstudio.com/items?itemName=myriad-dreamin.tinymist";
     homepage = "https://github.com/myriad-dreamin/tinymist";
     license = lib.licenses.asl20;
-    maintainers = [ lib.maintainers.drupol ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/editors/vscode/extensions/pylyzer.pylyzer/default.nix b/pkgs/applications/editors/vscode/extensions/pylyzer.pylyzer/default.nix
index b360b5fbeb5f..707f7f4d8db8 100644
--- a/pkgs/applications/editors/vscode/extensions/pylyzer.pylyzer/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/pylyzer.pylyzer/default.nix
@@ -13,6 +13,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     downloadPage = "https://marketplace.visualstudio.com/items?itemName=pylyzer.pylyzer";
     homepage = "https://github.com/mtshiba/pylyzer/";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/editors/vscode/extensions/robocorp.robotframework-lsp/default.nix b/pkgs/applications/editors/vscode/extensions/robocorp.robotframework-lsp/default.nix
index 353b353d22ed..939a1de513c0 100644
--- a/pkgs/applications/editors/vscode/extensions/robocorp.robotframework-lsp/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/robocorp.robotframework-lsp/default.nix
@@ -16,6 +16,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     downloadPage = "https://marketplace.visualstudio.com/items?itemName=myriad-dreamin.tinymist";
     homepage = "https://github.com/myriad-dreamin/tinymist";
     license = lib.licenses.asl20;
-    maintainers = [ lib.maintainers.drupol ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
index 747397fefaa2..5bd5f108be26 100644
--- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
@@ -16,6 +16,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     downloadPage = "https://github.com/cline/cline";
     homepage = "https://github.com/cline/cline";
     license = lib.licenses.asl20;
-    maintainers = [ lib.maintainers.drupol ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
index 9dd4cb4e3777..079afeaf0cc4 100644
--- a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
@@ -68,6 +68,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
       "x86_64-linux"
       "x86_64-darwin"
     ];
-    maintainers = [ lib.maintainers.drupol ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
index b146f9026926..12956ebdfd30 100644
--- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
@@ -48,6 +48,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
       "x86_64-linux"
       "x86_64-darwin"
     ];
-    maintainers = [ lib.maintainers.drupol ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
index bd72f0532a6d..aa9713c232e9 100644
--- a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
+++ b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mame2003-plus";
-  version = "0-unstable-2025-06-28";
+  version = "0-unstable-2025-08-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mame2003-plus-libretro";
-    rev = "04fb75e4f1291a490574168f3a04f9455e4a008d";
-    hash = "sha256-dMfLK47DojJwSvd7KMW0D0azgQalRW8mBJqYJHTA6ew=";
+    rev = "3f778c3a06172f01a9ac6c08812f46bd0173187a";
+    hash = "sha256-drSulDZxs6xei/XksMviVvqWjihBTdZTkrIsO2v+7wM=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index c06465b9ecb2..b529df32de1c 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -803,7 +803,7 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "139.0.7258.127",
+    "version": "139.0.7258.138",
     "deps": {
       "depot_tools": {
         "rev": "ea7a0baff0d8554cf6d38f525b4e7882c2b4ec18",
@@ -815,16 +815,16 @@
         "hash": "sha256-gwptzuirIdPAV9XCaAT09aM/fY7d6xgBU7oSu9C4tmE="
       },
       "ungoogled-patches": {
-        "rev": "139.0.7258.127-1",
-        "hash": "sha256-CdzvDG4ZGRHVnRsLUDD8gWLzcwJJAqEZdEraqVYgs2U="
+        "rev": "139.0.7258.138-1",
+        "hash": "sha256-dmkUQHG9E0owKBIZi/e0mC5lc07rmU1muzP63PLdtTs="
       },
       "npmHash": "sha256-R2gOpfPOUAmnsnUTIvzDPHuHNzL/b2fwlyyfTrywEcI="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "5dc2cf9cf870d324cd9fba708f26d2572cc6d4d8",
-        "hash": "sha256-YcOVErOKKruc3kPuXhmeibo3KL+Rrny1FEwF769+aEU=",
+        "rev": "884e54ea8d42947ed636779015c5b4815e069838",
+        "hash": "sha256-MCBHB1ms3H8AXqiIDHH7C+8/NDcgsn3pDx7mKtGdfbc=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -899,8 +899,8 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "5f3636345f1d8afd495e2fcc474fd81e91c4866b",
-        "hash": "sha256-fx+QD0T85Js9jPQx2aghJU8UOL6WbR0bOkGY2i87A3w="
+        "rev": "96492b317e27ba4106ed00f5faa4534cfeaa0b8f",
+        "hash": "sha256-TE8vYLNnAzVkGQZ2ZYuNHnu8fwp2Qv4ANP0btgrKYSQ="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -1434,8 +1434,8 @@
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "2d6f1aa4be9c33b013c322b2bc9cd99a682243b6",
-        "hash": "sha256-VysJkpCRRYNdCStnXvo6wyMCv1gLHecMwefKiwypARc="
+        "rev": "4abe0638e35d34b6fdb70f1f5ce0f0e1879a021e",
+        "hash": "sha256-hy06/Sy+rEzNyFv9R2Kg9kX7XIpCbQwCr5VjEH9CtKM="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -1599,8 +1599,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "505ec917b67c535519bebec58c62a34f145dd49f",
-        "hash": "sha256-fsf8j2Spe++vSnuO8763eWWmMhYqcyybpILb7OkkXq4="
+        "rev": "4d36678284f92d381f411c7947588d7a09989ca4",
+        "hash": "sha256-X5k2R7/sS3/C2S5hC1ILSquWjnPol3Pk+xe1suzgnFs="
       }
     }
   }
diff --git a/pkgs/build-support/fetchdebianpatch/tests.nix b/pkgs/build-support/fetchdebianpatch/tests.nix
index 58f3b395d1fc..9cc4c6dd844d 100644
--- a/pkgs/build-support/fetchdebianpatch/tests.nix
+++ b/pkgs/build-support/fetchdebianpatch/tests.nix
@@ -5,7 +5,7 @@
     pname = "pysimplesoap";
     version = "1.16.2";
     debianRevision = "5";
-    patch = "Add-quotes-to-SOAPAction-header-in-SoapClient";
+    patch = "Add-quotes-to-SOAPAction-header-in-SoapClient.patch";
     hash = "sha256-xA8Wnrpr31H8wy3zHSNfezFNjUJt1HbSXn3qUMzeKc0=";
   };
 
@@ -13,7 +13,7 @@
     pname = "libfile-pid-perl";
     version = "1.01";
     debianRevision = "2";
-    patch = "missing-pidfile";
+    patch = "missing-pidfile.patch";
     hash = "sha256-VBsIYyCnjcZLYQ2Uq2MKPK3kF2wiMKvnq0m727DoavM=";
   };
 }
diff --git a/pkgs/build-support/php/pkgs/composer-phar.nix b/pkgs/build-support/php/pkgs/composer-phar.nix
index b07c25beec55..90884d9a5256 100644
--- a/pkgs/build-support/php/pkgs/composer-phar.nix
+++ b/pkgs/build-support/php/pkgs/composer-phar.nix
@@ -52,7 +52,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://getcomposer.org/";
     license = lib.licenses.mit;
     mainProgram = "composer";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/aa/aaaaxy/package.nix b/pkgs/by-name/aa/aaaaxy/package.nix
index 331a6f1c98d6..524f79281fb7 100644
--- a/pkgs/by-name/aa/aaaaxy/package.nix
+++ b/pkgs/by-name/aa/aaaaxy/package.nix
@@ -22,17 +22,17 @@
 
 buildGoModule rec {
   pname = "aaaaxy";
-  version = "1.6.271";
+  version = "1.6.283";
 
   src = fetchFromGitHub {
     owner = "divVerent";
     repo = "aaaaxy";
     tag = "v${version}";
-    hash = "sha256-/nSJ1FT9FE856yrupbouRzqpRzZhKfYAq1fVBBvMVmY=";
+    hash = "sha256-OBF5oPWoctosL1uR6/I/uNM3F39d14dmz8TKOxp5FIs=";
     fetchSubmodules = true;
   };
 
-  vendorHash = "sha256-DJvlyfCynz+M5BQ4XDYcdzb3QP5ycDPcF4B+fQ4FRRA=";
+  vendorHash = "sha256-g37+5IquBaRMGw48V/pCsJaeKlGR5a2Hj3NFcrolQ7g=";
 
   buildInputs = [
     alsa-lib
diff --git a/pkgs/by-name/ap/apache-orc/package.nix b/pkgs/by-name/ap/apache-orc/package.nix
index 344a867dea46..b2c82e2872b5 100644
--- a/pkgs/by-name/ap/apache-orc/package.nix
+++ b/pkgs/by-name/ap/apache-orc/package.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Smallest, fastest columnar storage for Hadoop workloads";
     homepage = "https://github.com/apache/orc/";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/ap/aporetic-bin/package.nix b/pkgs/by-name/ap/aporetic-bin/package.nix
index a0b62ae3f690..2186d38eb4b3 100644
--- a/pkgs/by-name/ap/aporetic-bin/package.nix
+++ b/pkgs/by-name/ap/aporetic-bin/package.nix
@@ -33,7 +33,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [
       DamienCassou
-      drupol
     ];
   };
 })
diff --git a/pkgs/by-name/as/asciinema-automation/package.nix b/pkgs/by-name/as/asciinema-automation/package.nix
index abdaddde453d..de7dc64b042b 100644
--- a/pkgs/by-name/as/asciinema-automation/package.nix
+++ b/pkgs/by-name/as/asciinema-automation/package.nix
@@ -44,6 +44,6 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://github.com/PierreMarchand20/asciinema_automation";
     license = lib.licenses.mit;
     mainProgram = "asciinema-automation";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/au/autobase/package.nix b/pkgs/by-name/au/autobase/package.nix
index 8b3272781cf6..b5fee21e8bc6 100644
--- a/pkgs/by-name/au/autobase/package.nix
+++ b/pkgs/by-name/au/autobase/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "autobase";
-  version = "7.17.3";
+  version = "7.18.0";
 
   src = fetchFromGitHub {
     owner = "holepunchto";
     repo = "autobase";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RTbK1U63gNuUN81ceJVjFzqNtg0kfvfq8DiLEpDXJq0=";
+    hash = "sha256-EnRF0dRgLM0NPWhlXnIlpULx1NEbK4VRq+atGJYUNsU=";
   };
 
   npmDepsHash = "sha256-H9Xy1VD7WQvi0+86v6CMcmc0L3mB6KuSCtgQSF4AlkY=";
diff --git a/pkgs/by-name/ba/bashly/package.nix b/pkgs/by-name/ba/bashly/package.nix
index 8611d5938935..cf3041554ce3 100644
--- a/pkgs/by-name/ba/bashly/package.nix
+++ b/pkgs/by-name/ba/bashly/package.nix
@@ -17,7 +17,7 @@ bundlerApp {
     homepage = "https://github.com/DannyBen/bashly";
     license = lib.licenses.mit;
     mainProgram = "bashly";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/bl/bluesky-pds/package.nix b/pkgs/by-name/bl/bluesky-pds/package.nix
index ece0d582c89f..f287f60f9262 100644
--- a/pkgs/by-name/bl/bluesky-pds/package.nix
+++ b/pkgs/by-name/bl/bluesky-pds/package.nix
@@ -11,6 +11,7 @@
   pkg-config,
   nixosTests,
   lib,
+  nix-update-script,
 }:
 
 let
@@ -20,13 +21,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pds";
-  version = "0.4.158";
+  version = "0.4.169";
 
   src = fetchFromGitHub {
     owner = "bluesky-social";
     repo = "pds";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TesrTKAP2wIQ+H6srvVbS6GF/7Be2xJa1dn/krScPOs=";
+    hash = "sha256-CInfhE9PeAbScVtMvvEyA5f6q0WIChTHf49/vh+Kqwc=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/service";
@@ -51,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
       sourceRoot
       ;
     fetcherVersion = 1;
-    hash = "sha256-+ESVGrgXNCQWOhqH4PM5lKQKcxE/5zxRmIboDZxgxcc=";
+    hash = "sha256-bBGumJBpTWaSPpo4WUNvdF2PCOS6w60Xn6kgS12y6PU=";
   };
 
   buildPhase = ''
@@ -80,8 +81,9 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  passthru.tests = {
-    inherit (nixosTests) pds;
+  passthru = {
+    tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit (nixosTests) bluesky-pds; };
+    updateScript = nix-update-script { };
   };
 
   meta = {
@@ -91,7 +93,10 @@ stdenv.mkDerivation (finalAttrs: {
       mit
       asl20
     ];
-    maintainers = with lib.maintainers; [ t4ccer ];
+    maintainers = with lib.maintainers; [
+      t4ccer
+      isabelroses
+    ];
     platforms = lib.platforms.unix;
     mainProgram = "pds";
   };
diff --git a/pkgs/by-name/cm/cmph/package.nix b/pkgs/by-name/cm/cmph/package.nix
index 9b4b5ef8c0bc..42cda24f7625 100644
--- a/pkgs/by-name/cm/cmph/package.nix
+++ b/pkgs/by-name/cm/cmph/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
       mpl11
     ];
     mainProgram = "cmph";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 })
diff --git a/pkgs/by-name/co/composer-require-checker/package.nix b/pkgs/by-name/co/composer-require-checker/package.nix
index a9e200dc1a5f..4e0d8460ad77 100644
--- a/pkgs/by-name/co/composer-require-checker/package.nix
+++ b/pkgs/by-name/co/composer-require-checker/package.nix
@@ -27,7 +27,7 @@ php.buildComposerProject2 (finalAttrs: {
     homepage = "https://github.com/maglnet/ComposerRequireChecker/";
     changelog = "https://github.com/maglnet/ComposerRequireChecker/releases/tag/${finalAttrs.version}";
     license = with lib.licenses; [ mit ];
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "composer-require-checker";
   };
 })
diff --git a/pkgs/by-name/de/departure-mono/package.nix b/pkgs/by-name/de/departure-mono/package.nix
index e3aefa976abc..5516d0f5d098 100644
--- a/pkgs/by-name/de/departure-mono/package.nix
+++ b/pkgs/by-name/de/departure-mono/package.nix
@@ -32,6 +32,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://departuremono.com/";
     license = lib.licenses.ofl;
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 })
diff --git a/pkgs/by-name/de/deskreen/package.nix b/pkgs/by-name/de/deskreen/package.nix
index 255d9b0a309c..b8f091919bee 100644
--- a/pkgs/by-name/de/deskreen/package.nix
+++ b/pkgs/by-name/de/deskreen/package.nix
@@ -41,7 +41,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     mainProgram = "deskreen";
     maintainers = with lib.maintainers; [
       leo248
-      drupol
     ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/do/docstrfmt/package.nix b/pkgs/by-name/do/docstrfmt/package.nix
index 2fcfdbc28169..6079d3367db0 100644
--- a/pkgs/by-name/do/docstrfmt/package.nix
+++ b/pkgs/by-name/do/docstrfmt/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "docstrfmt";
-  version = "1.10.0";
+  version = "1.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "LilSpazJoekp";
     repo = "docstrfmt";
     tag = "v${version}";
-    hash = "sha256-L7zz9FJRSiBWthME0zsUWHxeA+zVuxQpkyEVbNSSEQs=";
+    hash = "sha256-5Yx+omXZSlpJSzA4dTY/JdfmHQshM7qI++OVvqYg1jc=";
   };
 
   build-system = [
@@ -31,11 +31,6 @@ python3.pkgs.buildPythonApplication rec {
     toml
   ];
 
-  pythonRelaxDeps = [
-    "black"
-    "docutils"
-  ];
-
   nativeCheckInputs = with python3.pkgs; [
     pytestCheckHook
     pytest-aiohttp
diff --git a/pkgs/by-name/dr/drupal/package.nix b/pkgs/by-name/dr/drupal/package.nix
index 035f56694a78..057b85fc6a79 100644
--- a/pkgs/by-name/dr/drupal/package.nix
+++ b/pkgs/by-name/dr/drupal/package.nix
@@ -39,7 +39,6 @@ php.buildComposerProject2 (finalAttrs: {
     license = lib.licenses.mit;
     homepage = "https://drupal.org/";
     maintainers = with lib.maintainers; [
-      drupol
       OulipianSummer
     ];
     platforms = php.meta.platforms;
diff --git a/pkgs/by-name/du/dura/package.nix b/pkgs/by-name/du/dura/package.nix
index 7714681b696b..c6e27d0c0a97 100644
--- a/pkgs/by-name/du/dura/package.nix
+++ b/pkgs/by-name/du/dura/package.nix
@@ -47,6 +47,6 @@ rustPlatform.buildRustPackage rec {
     '';
     homepage = "https://github.com/tkellogg/dura";
     license = licenses.asl20;
-    maintainers = with maintainers; [ drupol ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix
index 8e42f2df491e..d76b94b09ac6 100644
--- a/pkgs/by-name/en/ente-auth/package.nix
+++ b/pkgs/by-name/en/ente-auth/package.nix
@@ -18,14 +18,14 @@ let
 in
 flutter324.buildFlutterApplication rec {
   pname = "ente-auth";
-  version = "4.4.3";
+  version = "4.4.4";
 
   src = fetchFromGitHub {
     owner = "ente-io";
     repo = "ente";
     sparseCheckout = [ "mobile/apps/auth" ];
     tag = "auth-v${version}";
-    hash = "sha256-6LTGmSCMlLynYtYCsJiALsRMm9vLUD9HaGnfHu0r6Rw=";
+    hash = "sha256-VpxF6BMofCgMWcxsscbYC3uYse0QZyTBf84zN03leC4=";
   };
 
   sourceRoot = "${src.name}/mobile/apps/auth";
diff --git a/pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch b/pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch
index a241949a0c99..7d4812daecfb 100644
--- a/pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch
+++ b/pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch
@@ -45,12 +45,12 @@ index 9867dc3a46dbe780eb3c02bad8f6a22a2c7fd97e..ff8685e0e437aee447218e912f1cf3e4
          extra_pip_args = ["--require-hashes"],
      )
 diff --git a/bazel/repositories_extra.bzl b/bazel/repositories_extra.bzl
-index 7a9d3bbb53b567a8f398abaefe5ff044056d4d21..a5b75718de667883824e4320e2d563830b02f5d2 100644
+index 84e2a69c092fa4c824401a52b2c39a49f83d0837..e5afd5743613ad5fdbf7b28a99b6d1b5902566ac 100644
 --- a/bazel/repositories_extra.bzl
 +++ b/bazel/repositories_extra.bzl
-@@ -3,19 +3,11 @@ load("@bazel_features//:deps.bzl", "bazel_features_deps")
- load("@com_google_protobuf//bazel/private:proto_bazel_features.bzl", "proto_bazel_features")
+@@ -4,19 +4,11 @@ load("@com_google_protobuf//bazel/private:proto_bazel_features.bzl", "proto_baze
  load("@emsdk//:deps.bzl", emsdk_deps = "deps")
+ load("@envoy_examples//bazel:env.bzl", "envoy_examples_env")
  load("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:crates.bzl", "crate_repositories")
 -load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains")
 +load("@rules_python//python:repositories.bzl", "py_repositories")
@@ -69,7 +69,7 @@ index 7a9d3bbb53b567a8f398abaefe5ff044056d4d21..a5b75718de667883824e4320e2d56383
          ignore_root_user_error = False):
      bazel_features_deps()
      emsdk_deps()
-@@ -23,13 +15,6 @@ def envoy_dependencies_extra(
+@@ -24,13 +16,6 @@ def envoy_dependencies_extra(
      crate_repositories()
      py_repositories()
  
diff --git a/pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch b/pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch
index cb8c5d20b671..e4d7e0926092 100644
--- a/pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch
+++ b/pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch
@@ -10,10 +10,10 @@ Signed-off-by: Luke Granger-Brown <git@lukegb.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl
-index aef33aa103dc1136e63e165fb9ee6a267f52ba54..c5aefca14b729b548c4e90857202eb82576b507d 100644
+index 4615eed5c9ade5279f8174cf1bd3987a8b2d52f1..10be4b0b3f65e486c1dc8419337a5cf823431774 100644
 --- a/bazel/dependency_imports.bzl
 +++ b/bazel/dependency_imports.bzl
-@@ -22,7 +22,7 @@ load("@rules_rust//rust:defs.bzl", "rust_common")
+@@ -24,7 +24,7 @@ load("@rules_rust//rust:defs.bzl", "rust_common")
  load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains", "rust_repository_set")
  
  # go version for rules_go
diff --git a/pkgs/by-name/en/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch b/pkgs/by-name/en/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch
index 684e73b5c838..e8113b102ee7 100644
--- a/pkgs/by-name/en/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch
+++ b/pkgs/by-name/en/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch
@@ -10,18 +10,18 @@ Signed-off-by: Luke Granger-Brown <git@lukegb.com>
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl
-index c5aefca14b729b548c4e90857202eb82576b507d..6938ce63abb53661e8d1fb71eaaab03ba0cc37c6 100644
+index 10be4b0b3f65e486c1dc8419337a5cf823431774..b0badb3ccab3b112043bd8616770f8014238d396 100644
 --- a/bazel/dependency_imports.bzl
 +++ b/bazel/dependency_imports.bzl
-@@ -30,7 +30,11 @@ YQ_VERSION = "4.24.4"
- BUF_VERSION = "v1.50.0"
- 
- def envoy_dependency_imports(go_version = GO_VERSION, jq_version = JQ_VERSION, yq_version = YQ_VERSION, buf_version = BUF_VERSION):
+@@ -38,7 +38,11 @@ def envoy_dependency_imports(
+         yq_version = YQ_VERSION,
+         buf_sha = BUF_SHA,
+         buf_version = BUF_VERSION):
 -    rules_foreign_cc_dependencies()
 +    rules_foreign_cc_dependencies(
 +        register_default_tools=False,  # no prebuilt toolchains
-+	    register_built_tools=False,  # nor from source
-+	    register_preinstalled_tools=True,  # use host tools (default)
++        register_built_tools=False,  # nor from source
++        register_preinstalled_tools=True,  # use host tools (default)
 +    )
      go_rules_dependencies()
      go_register_toolchains(go_version)
diff --git a/pkgs/by-name/en/envoy/0004-nixpkgs-bump-rules_rust-to-0.60.0.patch b/pkgs/by-name/en/envoy/0004-nixpkgs-bump-rules_rust-to-0.60.0.patch
index 40b808952e3d..b9aac1e2252f 100644
--- a/pkgs/by-name/en/envoy/0004-nixpkgs-bump-rules_rust-to-0.60.0.patch
+++ b/pkgs/by-name/en/envoy/0004-nixpkgs-bump-rules_rust-to-0.60.0.patch
@@ -9,10 +9,10 @@ Signed-off-by: Luke Granger-Brown <git@lukegb.com>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
-index 6904bc93bdda3ee2308f13d61e62295fa11d799b..e4574878a566cceb4dc2343f3cade0350ea5e5ff 100644
+index 1293e432c815071ed55721760e583ac0e9f40108..664f8c8e2bf4641e7862e9321fd6f91d162c3c17 100644
 --- a/bazel/repository_locations.bzl
 +++ b/bazel/repository_locations.bzl
-@@ -1465,8 +1465,8 @@ REPOSITORY_LOCATIONS_SPEC = dict(
+@@ -1528,8 +1528,8 @@ REPOSITORY_LOCATIONS_SPEC = dict(
          project_name = "Bazel rust rules",
          project_desc = "Bazel rust rules (used by Wasm)",
          project_url = "https://github.com/bazelbuild/rules_rust",
@@ -23,7 +23,7 @@ index 6904bc93bdda3ee2308f13d61e62295fa11d799b..e4574878a566cceb4dc2343f3cade035
          # Note: rules_rust should point to the releases, not archive to avoid the hassle of bootstrapping in crate_universe.
          # This is described in https://bazelbuild.github.io/rules_rust/crate_universe.html#setup, otherwise bootstrap
          # is required which in turn requires a system CC toolchains, not the bazel controlled ones.
-@@ -1477,7 +1477,7 @@ REPOSITORY_LOCATIONS_SPEC = dict(
+@@ -1540,7 +1540,7 @@ REPOSITORY_LOCATIONS_SPEC = dict(
              "dataplane_ext",
          ],
          extensions = ["envoy.wasm.runtime.wasmtime"],
diff --git a/pkgs/by-name/en/envoy/package.nix b/pkgs/by-name/en/envoy/package.nix
index e1ddae74bffe..37a5037e0c41 100644
--- a/pkgs/by-name/en/envoy/package.nix
+++ b/pkgs/by-name/en/envoy/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  bazel_6,
+  bazel_7,
   bazel-gazelle,
   buildBazelPackage,
   fetchFromGitHub,
@@ -16,7 +16,7 @@
   jdk,
   ninja,
   patchelf,
-  python3,
+  python312,
   linuxHeaders,
   nixosTests,
   runCommandLocal,
@@ -34,24 +34,26 @@ let
     # However, the version string is more useful for end-users.
     # These are contained in a attrset of their own to make it obvious that
     # people should update both.
-    version = "1.34.2";
-    rev = "c657e59fac461e406c8fdbe57ced833ddc236ee1";
-    hash = "sha256-f9JsgHEyOg1ZoEb7d3gy3+qoovpA3oOx6O8yL0U8mhI=";
+    version = "1.35.1";
+    rev = "6e9539d0366baf85baf9acb3e618cb3384765f13";
+    hash = "sha256-c1c8j/BCRrvAEqjt4EQ/d7zsM1zUe4Qr5EHzpuGblIk=";
   };
 
   # these need to be updated for any changes to fetchAttrs
   depsHash =
     {
-      x86_64-linux = "sha256-CczmVD/3tWR3LygXc3cTAyrMPZUTajqtRew85wBM5mY=";
-      aarch64-linux = "sha256-GemlfXHlaHPn1/aBxj2Ve9tuwsEdlQQCU1v57378Dgs=";
+      x86_64-linux = "sha256-E6yUSd00ngmjaMds+9UVZLtcYhzeS8F9eSIkC1mZSps=";
+      aarch64-linux = "sha256-ivboOrV/uORKVHRL3685aopcElGvzsxgVcUmYsBwzXY=";
     }
     .${stdenv.system} or (throw "unsupported system ${stdenv.system}");
 
+  python3 = python312;
+
 in
 buildBazelPackage rec {
   pname = "envoy";
   inherit (srcVer) version;
-  bazel = bazel_6;
+  bazel = bazel_7;
 
   src = applyPatches {
     src = fetchFromGitHub {
@@ -97,11 +99,11 @@ buildBazelPackage rec {
       --replace-fail 'crate_universe_dependencies()' 'crate_universe_dependencies(rust_toolchain_cargo_template="@@//bazel/nix:cargo", rust_toolchain_rustc_template="@@//bazel/nix:rustc")' \
       --replace-fail 'crates_repository(' 'crates_repository(rust_toolchain_cargo_template="@@//bazel/nix:cargo", rust_toolchain_rustc_template="@@//bazel/nix:rustc",'
 
-    # patch rules_rust for envoy specifics, but also to support old Bazel
-    # (Bazel 6 doesn't have ctx.watch, but ctx.path is sufficient for our use)
+    # patch rules_rust for envoy specifics
     cp ${./rules_rust.patch} bazel/rules_rust.patch
     substituteInPlace bazel/repositories.bzl \
-      --replace-fail ', "@envoy//bazel:rules_rust_ppc64le.patch"' ""
+      --replace-fail ', "@envoy//bazel:rules_rust_ppc64le.patch"' "" \
+      --replace-fail '"@envoy//bazel:emsdk.patch"' ""
 
     substitute ${./rules_rust_extra.patch} bazel/nix/rules_rust_extra.patch \
       --subst-var-by bash "$(type -p bash)"
@@ -130,11 +132,23 @@ buildBazelPackage rec {
     postPatch = ''
       ${postPatch}
 
+      echo "common --repository_cache=\"$bazelOut/external/repository_cache\"" >> .bazelrc
+
       substituteInPlace bazel/dependency_imports.bzl \
         --replace-fail 'crate_universe_dependencies(' 'crate_universe_dependencies(bootstrap=True, ' \
         --replace-fail 'crates_repository(' 'crates_repository(generator="@@cargo_bazel_bootstrap//:cargo-bazel", '
     '';
     preInstall = ''
+      mkdir $NIX_BUILD_TOP/empty
+      pushd $NIX_BUILD_TOP/empty
+      touch MODULE.bazel
+      # Unfortunately, we need to fetch a lot of irrelevant junk to make this work.
+      # This really bloats the size of the FOD.
+      # TODO: lukegb - figure out how to make this suck less.
+      bazel fetch --repository_cache="$bazelOut/external/repository_cache"
+      bazel sync --repository_cache="$bazelOut/external/repository_cache"
+      popd
+
       # Strip out the path to the build location (by deleting the comment line).
       find $bazelOut/external -name requirements.bzl | while read requirements; do
         sed -i '/# Generated from /d' "$requirements"
@@ -151,7 +165,6 @@ buildBazelPackage rec {
         $bazelOut/external/rules_rust/util/process_wrapper/private/process_wrapper.sh \
         $bazelOut/external/rules_rust/crate_universe/src/metadata/cargo_tree_rustc_wrapper.sh
 
-      rm -r $bazelOut/external/go_sdk
       rm -r $bazelOut/external/local_jdk
       rm -r $bazelOut/external/bazel_gazelle_go_repository_tools/bin
 
@@ -175,7 +188,11 @@ buildBazelPackage rec {
     dontUseCmakeConfigure = true;
     dontUseGnConfigure = true;
     dontUseNinjaInstall = true;
+    bazel = null;
     preConfigure = ''
+      echo "common --repository_cache=\"$bazelOut/external/repository_cache\"" >> .bazelrc
+      echo "common --repository_disable_download" >> .bazelrc
+
       # Make executables work, for the most part.
       find $bazelOut/external -type f -executable | while read execbin; do
         file "$execbin" | grep -q ': ELF .*, dynamically linked,' || continue
@@ -211,6 +228,9 @@ buildBazelPackage rec {
   removeLocalConfigCc = true;
   removeLocal = false;
   bazelTargets = [ "//source/exe:envoy-static" ];
+  bazelFlags = [
+    "--repo_env=BAZEL_HTTP_RULES_URLS_AS_DEFAULT_CANONICAL_ID=0"
+  ];
   bazelBuildFlags = [
     "-c opt"
     "--spawn_strategy=standalone"
diff --git a/pkgs/by-name/en/envoy/rules_rust.patch b/pkgs/by-name/en/envoy/rules_rust.patch
index 7261cb2fc760..7bb2353a8e61 100644
--- a/pkgs/by-name/en/envoy/rules_rust.patch
+++ b/pkgs/by-name/en/envoy/rules_rust.patch
@@ -5,61 +5,10 @@ Subject: [PATCH] rules_rust base
 
 Signed-off-by: Luke Granger-Brown <git@lukegb.com>
 ---
- cargo/private/cargo_bootstrap.bzl |  8 ++++----
- crate_universe/extensions.bzl     | 10 +++++-----
  crate_universe/src/lockfile.rs    |  4 ++--
  rust/private/rustc.bzl            |  4 ++--
  4 files changed, 13 insertions(+), 13 deletions(-)
 
-diff --git cargo/private/cargo_bootstrap.bzl cargo/private/cargo_bootstrap.bzl
-index a8021c49d62037ef32c7c64d5bb4a5efe3a8b4aa..f63d7c23ae0bddc9f3fece347a3a2b5b0afe6d8d 100644
---- cargo/private/cargo_bootstrap.bzl
-+++ cargo/private/cargo_bootstrap.bzl
-@@ -173,13 +173,13 @@ def _detect_changes(repository_ctx):
-     # 'consumed' which means changes to it will trigger rebuilds
- 
-     for src in repository_ctx.attr.srcs:
--        repository_ctx.watch(src)
-+        repository_ctx.path(src)
- 
--    repository_ctx.watch(repository_ctx.attr.cargo_lockfile)
--    repository_ctx.watch(repository_ctx.attr.cargo_toml)
-+    repository_ctx.path(repository_ctx.attr.cargo_lockfile)
-+    repository_ctx.path(repository_ctx.attr.cargo_toml)
- 
-     if repository_ctx.attr.cargo_config:
--        repository_ctx.watch(repository_ctx.attr.cargo_config)
-+        repository_ctx.path(repository_ctx.attr.cargo_config)
- 
- def _cargo_bootstrap_repository_impl(repository_ctx):
-     # Pretend to Bazel that this rule's input files have been used, so that it will re-run the rule if they change.
-diff --git crate_universe/extensions.bzl crate_universe/extensions.bzl
-index a749b10c8d469bd316d78034059c94b1fd98dbef..8f8c84dac1ec330d5e8e6abbd930387cb6c9f29e 100644
---- crate_universe/extensions.bzl
-+++ crate_universe/extensions.bzl
-@@ -957,17 +957,17 @@ def _crate_impl(module_ctx):
-                 fail("Spec specified for repo {}, but the module defined repositories {}".format(repo, local_repos))
- 
-         for cfg in mod.tags.from_cargo + mod.tags.from_specs:
--            # Preload all external repositories. Calling `module_ctx.watch` will cause restarts of the implementation
-+            # Preload all external repositories. Calling `module_ctx.path` will cause restarts of the implementation
-             # function of the module extension when the file has changed.
-             if cfg.cargo_lockfile:
--                module_ctx.watch(cfg.cargo_lockfile)
-+                module_ctx.path(cfg.cargo_lockfile)
-             if cfg.lockfile:
--                module_ctx.watch(cfg.lockfile)
-+                module_ctx.path(cfg.lockfile)
-             if cfg.cargo_config:
--                module_ctx.watch(cfg.cargo_config)
-+                module_ctx.path(cfg.cargo_config)
-             if hasattr(cfg, "manifests"):
-                 for m in cfg.manifests:
--                    module_ctx.watch(m)
-+                    module_ctx.path(m)
- 
-             cargo_path, rustc_path = _get_host_cargo_rustc(module_ctx, host_triple, cfg.host_tools_repo)
-             cargo_bazel_fn = new_cargo_bazel_fn(
 diff --git crate_universe/src/lockfile.rs crate_universe/src/lockfile.rs
 index 3e0ce6265fda6fbdd9e3e989e3e4e4443b615b8c..0fafcea8fbc7a590676d34d2c4ca8c413b953955 100644
 --- crate_universe/src/lockfile.rs
diff --git a/pkgs/by-name/et/etcd_3_6/package.nix b/pkgs/by-name/et/etcd_3_6/package.nix
new file mode 100644
index 000000000000..c7f75ac9d091
--- /dev/null
+++ b/pkgs/by-name/et/etcd_3_6/package.nix
@@ -0,0 +1,148 @@
+{
+  applyPatches,
+  buildGoModule,
+  fetchFromGitHub,
+  fetchpatch,
+  installShellFiles,
+  k3s,
+  lib,
+  nixosTests,
+  stdenv,
+  symlinkJoin,
+}:
+
+let
+  version = "3.6.4";
+  etcdSrcHash = "sha256-otz+06cOD2MVnMZWKId1GN+MeZfnDbdudiYfVCKdzuo=";
+  etcdCtlVendorHash = "sha256-kTH+s/SY+xwo6kt6iPJ7XDhin0jPk0FBr0eOe/717bE=";
+  etcdUtlVendorHash = "sha256-P0yx9YMMD9vT7N6LOlo26EAOi+Dj33p3ZjAYEoaL19A=";
+  etcdServerVendorHash = "sha256-kgbCT1JxI98W89veCItB7ZfW4d9D3/Ip3tOuFKEX9v4=";
+
+  src = applyPatches {
+    src = fetchFromGitHub {
+      owner = "etcd-io";
+      repo = "etcd";
+      tag = "v${version}";
+      hash = etcdSrcHash;
+    };
+    patches = [
+      (fetchpatch {
+        url = "https://github.com/etcd-io/etcd/commit/31650ab0c8df43af05fc4c13b48ffee59271eec7.patch";
+        hash = "sha256-Q94HOLFx2fnb61wMQsAUT4sIBXfxXqW9YEayukQXX18=";
+      })
+    ];
+  };
+
+  env = {
+    CGO_ENABLED = 0;
+  };
+
+  meta = {
+    description = "Distributed reliable key-value store for the most critical data of a distributed system";
+    downloadPage = "https://github.com/etcd-io/etcd";
+    license = lib.licenses.asl20;
+    homepage = "https://etcd.io/";
+    maintainers = with lib.maintainers; [ dtomvan ];
+    platforms = lib.platforms.darwin ++ lib.platforms.linux;
+  };
+
+  etcdserver = buildGoModule {
+    pname = "etcdserver";
+
+    inherit
+      env
+      meta
+      src
+      version
+      ;
+
+    vendorHash = etcdServerVendorHash;
+
+    __darwinAllowLocalNetworking = true;
+
+    modRoot = "./server";
+
+    preInstall = ''
+      mv $GOPATH/bin/{server,etcd}
+    '';
+
+    # We set the GitSHA to `GitNotFound` to match official build scripts when
+    # git is unavailable. This is to avoid doing a full Git Checkout of etcd.
+    # User facing version numbers are still available in the binary, just not
+    # the sha it was built from.
+    ldflags = [ "-X go.etcd.io/etcd/api/v3/version.GitSHA=GitNotFound" ];
+  };
+
+  etcdutl = buildGoModule {
+    pname = "etcdutl";
+
+    inherit
+      env
+      meta
+      src
+      version
+      ;
+
+    vendorHash = etcdUtlVendorHash;
+
+    __darwinAllowLocalNetworking = true;
+
+    modRoot = "./etcdutl";
+
+    nativeBuildInputs = [ installShellFiles ];
+
+    postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+      for shell in bash fish zsh; do
+        installShellCompletion --cmd etcdutl \
+          --$shell <($out/bin/etcdutl completion $shell)
+      done
+    '';
+  };
+
+  etcdctl = buildGoModule {
+    pname = "etcdctl";
+
+    inherit
+      env
+      meta
+      src
+      version
+      ;
+
+    vendorHash = etcdCtlVendorHash;
+
+    modRoot = "./etcdctl";
+
+    nativeBuildInputs = [ installShellFiles ];
+
+    postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+      for shell in bash fish zsh; do
+        installShellCompletion --cmd etcdctl \
+          --$shell <($out/bin/etcdctl completion $shell)
+      done
+    '';
+  };
+in
+symlinkJoin {
+  name = "etcd-${version}";
+
+  inherit meta version;
+
+  passthru = {
+    deps = {
+      inherit etcdserver etcdutl etcdctl;
+    };
+    # Fix-Me: Tests for etcd 3.6 needs work.
+    # tests = {
+    #   inherit (nixosTests) etcd etcd-cluster;
+    #   k3s = k3s.passthru.tests.etcd;
+    # };
+    updateScript = ./update.sh;
+  };
+
+  paths = [
+    etcdserver
+    etcdutl
+    etcdctl
+  ];
+}
diff --git a/pkgs/by-name/et/etcd_3_6/update.sh b/pkgs/by-name/et/etcd_3_6/update.sh
new file mode 100755
index 000000000000..1330f88d9085
--- /dev/null
+++ b/pkgs/by-name/et/etcd_3_6/update.sh
@@ -0,0 +1,74 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl gnugrep gnused jq nurl
+
+set -x -eu -o pipefail
+
+MAJOR_VERSION=3
+MINOR_VERSION=6
+
+ETCD_PATH="$(dirname "$0")"
+ETCD_VERSION_MAJOR_MINOR=${MAJOR_VERSION}.${MINOR_VERSION}
+ETCD_PKG_NAME=etcd_${MAJOR_VERSION}_${MINOR_VERSION}
+NIXPKGS_PATH="$(git rev-parse --show-toplevel)"
+
+LATEST_TAG=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} \
+    --silent https://api.github.com/repos/etcd-io/etcd/releases \
+    | jq -r 'map(select(.prerelease == false))' \
+    | jq -r 'map(.tag_name)' \
+    | grep "v${ETCD_VERSION_MAJOR_MINOR}." \
+    | sed 's|[", ]||g' \
+    | sort -rV | head -n1 )
+
+LATEST_VERSION=$(echo ${LATEST_TAG} | sed 's/^v//')
+
+OLD_VERSION="$(nix-instantiate --eval -E "with import $NIXPKGS_PATH {}; \
+    $ETCD_PKG_NAME.version or (builtins.parseDrvName $ETCD_PKG_NAME.name).version" | tr -d '"')"
+
+if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then
+    echo "Attempting to update etcd from $OLD_VERSION to $LATEST_VERSION"
+    ETCD_SRC_HASH=$(nix-prefetch-url --quiet --unpack https://github.com/etcd-io/etcd/archive/refs/tags/${LATEST_TAG}.tar.gz)
+    ETCD_SRC_HASH=$(nix hash to-sri --type sha256 $ETCD_SRC_HASH)
+
+    setKV () {
+        sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "$ETCD_PATH/default.nix"
+    }
+
+    setKV version $LATEST_VERSION
+    setKV etcdSrcHash $ETCD_SRC_HASH
+
+    getAndSetVendorHash () {
+        local EMPTY_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" # Hash from lib.fakeHash
+        local VENDOR_HASH=$EMPTY_HASH
+        local PKG_KEY=$1
+        local INNER_PKG=$2
+
+        setKV $PKG_KEY $EMPTY_HASH
+
+        set +e
+        VENDOR_HASH=$(nurl -e "(import ${NIXPKGS_PATH}/. {}).$ETCD_PKG_NAME.passthru.deps.$INNER_PKG.goModules")
+        set -e
+
+        if [ -n "${VENDOR_HASH:-}" ]; then
+            setKV $PKG_KEY $VENDOR_HASH
+        else
+            echo "Update failed. $PKG_KEY is empty."
+            exit 1
+        fi
+    }
+
+    getAndSetVendorHash etcdServerVendorHash etcdserver
+    getAndSetVendorHash etcdUtlVendorHash etcdutl
+    getAndSetVendorHash etcdCtlVendorHash etcdctl
+
+    # `git` flag here is to be used by local maintainers to speed up the bump process
+    if [ $# -eq 1 ] && [ "$1" = "git" ]; then
+        git switch -c "package-$ETCD_PKG_NAME-$LATEST_VERSION"
+        git add "$ETCD_PATH"/default.nix
+        git commit -m "$ETCD_PKG_NAME: $OLD_VERSION -> $LATEST_VERSION
+
+Release: https://github.com/etcd-io/etcd/releases/tag/$LATEST_TAG"
+    fi
+
+else
+    echo "etcd is already up-to-date at $OLD_VERSION"
+fi
diff --git a/pkgs/by-name/et/etlegacy-assets/package.nix b/pkgs/by-name/et/etlegacy-assets/package.nix
index 3fc776a80ee1..82a397798d94 100644
--- a/pkgs/by-name/et/etlegacy-assets/package.nix
+++ b/pkgs/by-name/et/etlegacy-assets/package.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
       for the popular online FPS game Wolfenstein: Enemy Territory - whose
       gameplay is still considered unmatched by many, despite its great age.
     '';
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/et/etlegacy-unwrapped/package.nix b/pkgs/by-name/et/etlegacy-unwrapped/package.nix
index c5d7ef2b9235..b9e18dee9b2c 100644
--- a/pkgs/by-name/et/etlegacy-unwrapped/package.nix
+++ b/pkgs/by-name/et/etlegacy-unwrapped/package.nix
@@ -117,7 +117,6 @@ stdenv.mkDerivation {
     '';
     maintainers = with lib.maintainers; [
       ashleyghooper
-      drupol
     ];
   };
 }
diff --git a/pkgs/by-name/et/etlegacy/package.nix b/pkgs/by-name/et/etlegacy/package.nix
index c2f225a73471..82831ad81481 100644
--- a/pkgs/by-name/et/etlegacy/package.nix
+++ b/pkgs/by-name/et/etlegacy/package.nix
@@ -42,7 +42,6 @@ symlinkJoin {
     mainProgram = "etl";
     maintainers = with lib.maintainers; [
       ashleyghooper
-      drupol
     ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/ex/excalifont/package.nix b/pkgs/by-name/ex/excalifont/package.nix
index 01f0c7add920..83c2eef0647a 100644
--- a/pkgs/by-name/ex/excalifont/package.nix
+++ b/pkgs/by-name/ex/excalifont/package.nix
@@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://plus.excalidraw.com/excalifont";
     description = "Font based on the original handwritten Virgil font carefully curated to improve legibility while preserving its hand-drawn nature";
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     license = lib.licenses.ofl;
   };
 })
diff --git a/pkgs/by-name/fc/fcast-client/package.nix b/pkgs/by-name/fc/fcast-client/package.nix
index c04a16675092..d4750afa4cb4 100644
--- a/pkgs/by-name/fc/fcast-client/package.nix
+++ b/pkgs/by-name/fc/fcast-client/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
       receiver devices or integrate the FCast protocol into their own apps.
     '';
     mainProgram = "fcast";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/fe/feishu/package.nix b/pkgs/by-name/fe/feishu/package.nix
index 5d572402d2e6..e8a862df4675 100644
--- a/pkgs/by-name/fe/feishu/package.nix
+++ b/pkgs/by-name/fe/feishu/package.nix
@@ -65,12 +65,12 @@
 let
   sources = {
     x86_64-linux = fetchurl {
-      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/fc10b1c0/Feishu-linux_x64-7.46.11.deb";
-      sha256 = "sha256-xcTSyRoRGlXn++KRmXtqNBI6diY00v0UUZe3RxCewFk=";
+      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/72e0cee3/Feishu-linux_x64-7.46.12.deb";
+      sha256 = "sha256-qdaWx4vQQWJtEX+3xo6oGp82sblsWb1jB96w8djc7wM=";
     };
     aarch64-linux = fetchurl {
-      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/ccc36dfd/Feishu-linux_arm64-7.46.11.deb";
-      sha256 = "sha256-pOA1WAhkIFn4H9sZye6ges2U5DvDDmLAOllD5qAklmg=";
+      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/ea20b00e/Feishu-linux_arm64-7.46.12.deb";
+      sha256 = "sha256-zh65+v9JWRv631hQDSnKwH1C8I35ddRpq8kcnhRe4wo=";
     };
   };
 
@@ -133,7 +133,7 @@ let
   ];
 in
 stdenv.mkDerivation {
-  version = "7.46.11";
+  version = "7.46.12";
   pname = "feishu";
 
   src =
diff --git a/pkgs/by-name/fg/fg-virgil/package.nix b/pkgs/by-name/fg/fg-virgil/package.nix
index 793ade9d99f6..698c81c547b3 100644
--- a/pkgs/by-name/fg/fg-virgil/package.nix
+++ b/pkgs/by-name/fg/fg-virgil/package.nix
@@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://github.com/excalidraw/virgil";
     description = "Font that powers Excalidraw";
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     license = lib.licenses.ofl;
   };
 })
diff --git a/pkgs/by-name/fi/fider/package.nix b/pkgs/by-name/fi/fider/package.nix
index 20c46a97d6ac..fb0b1fd9ede2 100644
--- a/pkgs/by-name/fi/fider/package.nix
+++ b/pkgs/by-name/fi/fider/package.nix
@@ -76,7 +76,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     license = lib.licenses.agpl3Only;
     mainProgram = "fider";
     maintainers = with lib.maintainers; [
-      drupol
       niklaskorz
     ];
   };
diff --git a/pkgs/by-name/fl/fly/package.nix b/pkgs/by-name/fl/fly/package.nix
index fe22077812fa..087f3bc7e927 100644
--- a/pkgs/by-name/fl/fly/package.nix
+++ b/pkgs/by-name/fl/fly/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "fly";
-  version = "7.14.0";
+  version = "7.14.1";
 
   src = fetchFromGitHub {
     owner = "concourse";
     repo = "concourse";
     rev = "v${version}";
-    hash = "sha256-7CXxaqfwFfxq6v0IKxkK08WkICBTLGf7ME1WuZzrG8w=";
+    hash = "sha256-Q+j41QhhibyE+a7iOgMKm2SeXhNV8ek97P014Wje9NQ=";
   };
 
   vendorHash = "sha256-2busKAFaQYE82XKCAx8BGOMjjs8WzqIxdpz+J45maoc=";
diff --git a/pkgs/by-name/ga/garamond-libre/package.nix b/pkgs/by-name/ga/garamond-libre/package.nix
index 68b66f90fee2..4069de4d101a 100644
--- a/pkgs/by-name/ga/garamond-libre/package.nix
+++ b/pkgs/by-name/ga/garamond-libre/package.nix
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec {
   meta = with lib; {
     homepage = "https://github.com/dbenjaminmiller/garamond-libre";
     description = "Garamond Libre font family";
-    maintainers = with maintainers; [ drupol ];
+    maintainers = with maintainers; [ ];
     license = licenses.x11;
     platforms = platforms.all;
   };
diff --git a/pkgs/by-name/ge/geographiclib/package.nix b/pkgs/by-name/ge/geographiclib/package.nix
index 0946a02be91a..b178db335ad2 100644
--- a/pkgs/by-name/ge/geographiclib/package.nix
+++ b/pkgs/by-name/ge/geographiclib/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "geographiclib";
-  version = "2.5";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     owner = "geographiclib";
     repo = "geographiclib";
     tag = "v${version}";
-    hash = "sha256-hFheJ6Q1GEfqPVq7t4SHN/n2JniqCQUzwl7GEVG0jgo=";
+    hash = "sha256-ZXIRLLvCsVp8RnChjLiAfD38CJFqV8sv/PAEORsF6oc=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/gh/ghmap/package.nix b/pkgs/by-name/gh/ghmap/package.nix
index 5e55b3069696..407a1397c96b 100644
--- a/pkgs/by-name/gh/ghmap/package.nix
+++ b/pkgs/by-name/gh/ghmap/package.nix
@@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec {
     description = "Python tool for mapping GitHub events to contributor activities";
     homepage = "https://github.com/uhourri/ghmap";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "ghmap";
   };
 }
diff --git a/pkgs/by-name/gi/github-mcp-server/package.nix b/pkgs/by-name/gi/github-mcp-server/package.nix
index 8472ab13e32b..5c710851b830 100644
--- a/pkgs/by-name/gi/github-mcp-server/package.nix
+++ b/pkgs/by-name/gi/github-mcp-server/package.nix
@@ -38,6 +38,6 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/github/github-mcp-server";
     license = lib.licenses.mit;
     mainProgram = "github-mcp-server";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 })
diff --git a/pkgs/by-name/gu/guacamole-client/package.nix b/pkgs/by-name/gu/guacamole-client/package.nix
index e3d2ea9b51be..f021c16eb1e3 100644
--- a/pkgs/by-name/gu/guacamole-client/package.nix
+++ b/pkgs/by-name/gu/guacamole-client/package.nix
@@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     description = "Clientless remote desktop gateway";
     homepage = "https://guacamole.apache.org/";
     license = lib.licenses.asl20;
-    maintainers = [ lib.maintainers.drupol ];
+    maintainers = [ ];
     platforms = [
       "x86_64-linux"
       "i686-linux"
diff --git a/pkgs/by-name/gu/guacamole-server/package.nix b/pkgs/by-name/gu/guacamole-server/package.nix
index 196924749629..c9c7fefe3ae0 100644
--- a/pkgs/by-name/gu/guacamole-server/package.nix
+++ b/pkgs/by-name/gu/guacamole-server/package.nix
@@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://guacamole.apache.org/";
     license = lib.licenses.asl20;
     mainProgram = "guacd";
-    maintainers = [ lib.maintainers.drupol ];
+    maintainers = [ ];
     platforms = [
       "x86_64-linux"
       "i686-linux"
diff --git a/pkgs/by-name/ha/harbor-cli/package.nix b/pkgs/by-name/ha/harbor-cli/package.nix
index 0c0829f6f5b5..a1f07b9a3ba5 100644
--- a/pkgs/by-name/ha/harbor-cli/package.nix
+++ b/pkgs/by-name/ha/harbor-cli/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "harbor-cli";
-  version = "0.0.9";
+  version = "0.0.10";
 
   src = fetchFromGitHub {
     owner = "goharbor";
     repo = "harbor-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3LgFhSG/k4cnpxiYaXTPr52n1cntIG2qfLkYaOyaqGw=";
+    hash = "sha256-KIICM26SYmzySt5oqiFpsEGVw/ORJZ3K11VANWa81lw=";
   };
 
-  vendorHash = "sha256-QnKSzWa/XTrA83d/DXcS5PE59CL4wD2sISNDV5pBIfM=";
+  vendorHash = "sha256-Y2UIQWH78qsw1UE6NgeTm1Tdno78Bg6oxA9GyPLDjkQ=";
 
   excludedPackages = [
     "dagger"
diff --git a/pkgs/by-name/he/hedgedoc-cli/package.nix b/pkgs/by-name/he/hedgedoc-cli/package.nix
index 8585407a45d3..72fcaac474bf 100644
--- a/pkgs/by-name/he/hedgedoc-cli/package.nix
+++ b/pkgs/by-name/he/hedgedoc-cli/package.nix
@@ -51,6 +51,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/hedgedoc/cli";
     license = lib.licenses.agpl3Only;
     mainProgram = "hedgedoc-cli";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 })
diff --git a/pkgs/by-name/ht/httpyac/package.nix b/pkgs/by-name/ht/httpyac/package.nix
index df8d7f93362d..ece9ca1cab3b 100644
--- a/pkgs/by-name/ht/httpyac/package.nix
+++ b/pkgs/by-name/ht/httpyac/package.nix
@@ -34,7 +34,7 @@ buildNpmPackage rec {
     homepage = "https://github.com/anweber/httpyac";
     license = lib.licenses.mit;
     mainProgram = "httpyac";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/hu/hubot-sans/package.nix b/pkgs/by-name/hu/hubot-sans/package.nix
index de93d39b075e..5fc0ba0f47ce 100644
--- a/pkgs/by-name/hu/hubot-sans/package.nix
+++ b/pkgs/by-name/hu/hubot-sans/package.nix
@@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       of a typeface to be incorporated into one single file, and are supported
       by all major browsers.
     '';
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/hy/hypercore/package.nix b/pkgs/by-name/hy/hypercore/package.nix
index d82f77b601ed..ad845b3360cf 100644
--- a/pkgs/by-name/hy/hypercore/package.nix
+++ b/pkgs/by-name/hy/hypercore/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "hypercore";
-  version = "11.12.1";
+  version = "11.13.0";
 
   src = fetchFromGitHub {
     owner = "holepunchto";
     repo = "hypercore";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-AhmOT+ehyfut8QkwbcdHITOrWKfLPsjDx9zjBv9xeB4=";
+    hash = "sha256-YaSmKjJKWkA4UUK/1LF9wqS4PvdFHrrc+yzvz+QmL0A=";
   };
 
   npmDepsHash = "sha256-ZJxVmQWKgHyKkuYfGIlANXFcROjI7fibg6mxIhDZowM=";
diff --git a/pkgs/by-name/ic/icestudio/package.nix b/pkgs/by-name/ic/icestudio/package.nix
index 2049a7e7c996..190dce1b53d7 100644
--- a/pkgs/by-name/ic/icestudio/package.nix
+++ b/pkgs/by-name/ic/icestudio/package.nix
@@ -13,13 +13,13 @@
 
 let
   # Use unstable because it has improvements for finding python
-  version = "0.12-unstable-2025-08-03";
+  version = "0.12-unstable-2025-08-19";
 
   src = fetchFromGitHub {
     owner = "FPGAwars";
     repo = "icestudio";
-    rev = "4497a9aa0ae02950c4396a8d7083b07d46271855";
-    hash = "sha256-QV/ulq/SIN6Ph7BXq0XGSivCg+Ej0VaPafZgEhOhtnI=";
+    rev = "8bc0391117bd3639881ed947e49e4cd37c199a95";
+    hash = "sha256-GWG6FvBiowgiW7MWKxCOivmDbb5YveZR6Nn3foLifwY=";
   };
 
   collection = fetchurl {
diff --git a/pkgs/by-name/io/ioquake3/package.nix b/pkgs/by-name/io/ioquake3/package.nix
index 5e659b2e3404..7565199dc9e6 100644
--- a/pkgs/by-name/io/ioquake3/package.nix
+++ b/pkgs/by-name/io/ioquake3/package.nix
@@ -128,7 +128,6 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "ioquake3";
     maintainers = with lib.maintainers; [
       abbradar
-      drupol
       rvolosatovs
     ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/ip/ipscan/package.nix b/pkgs/by-name/ip/ipscan/package.nix
index d53918f86823..9180269a4e4c 100644
--- a/pkgs/by-name/ip/ipscan/package.nix
+++ b/pkgs/by-name/ip/ipscan/package.nix
@@ -12,13 +12,13 @@
   glib,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ipscan";
-  version = "3.9.1";
+  version = "3.9.2";
 
   src = fetchurl {
-    url = "https://github.com/angryip/ipscan/releases/download/${version}/ipscan_${version}_amd64.deb";
-    hash = "sha256-UPkUwZV3NIeVfL3yYvqOhm4X5xW+40GOlZGy8WGhYmk=";
+    url = "https://github.com/angryip/ipscan/releases/download/${finalAttrs.version}/ipscan_${finalAttrs.version}_amd64.deb";
+    hash = "sha256-5H6QCT7Z3EOJks/jLBluTCgJbqpRMW5iheds9nl4ktU=";
   };
 
   nativeBuildInputs = [
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/share
-    cp usr/lib/ipscan/ipscan-linux64-${version}.jar $out/share/${pname}-${version}.jar
+    cp usr/lib/ipscan/ipscan-linux64-${finalAttrs.version}.jar $out/share/${finalAttrs.pname}-${finalAttrs.version}.jar
 
     makeWrapper ${jre}/bin/java $out/bin/ipscan \
       --prefix LD_LIBRARY_PATH : "$out/lib/:${
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
           glib
         ]
       }" \
-      --add-flags "-Xmx256m -cp $out/share/${pname}-${version}.jar:${swt}/jars/swt.jar net.azib.ipscan.Main"
+      --add-flags "-Xmx256m -cp $out/share/${finalAttrs.pname}-${finalAttrs.version}.jar:${swt}/jars/swt.jar net.azib.ipscan.Main"
 
     mkdir -p $out/share/applications
     cp usr/share/applications/ipscan.desktop $out/share/applications/ipscan.desktop
@@ -55,8 +55,8 @@ stdenv.mkDerivation rec {
     description = "Angry IP Scanner - fast and friendly network scanner";
     mainProgram = "ipscan";
     homepage = "https://angryip.org";
-    downloadPage = "https://github.com/angryip/ipscan/releases/tag/${version}";
-    changelog = "https://github.com/angryip/ipscan/blob/${version}/CHANGELOG";
+    downloadPage = "https://github.com/angryip/ipscan/releases/tag/${finalAttrs.version}";
+    changelog = "https://github.com/angryip/ipscan/blob/${finalAttrs.version}/CHANGELOG";
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
     license = lib.licenses.gpl2Only;
     platforms = [ "x86_64-linux" ];
@@ -65,4 +65,4 @@ stdenv.mkDerivation rec {
       totoroot
     ];
   };
-}
+})
diff --git a/pkgs/by-name/is/issue2md/package.nix b/pkgs/by-name/is/issue2md/package.nix
index 1333d2d936e8..fa57938ea476 100644
--- a/pkgs/by-name/is/issue2md/package.nix
+++ b/pkgs/by-name/is/issue2md/package.nix
@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
     description = "CLI tool to convert GitHub issue into Markdown file";
     homepage = "https://github.com/bigwhite/issue2md";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "issue2md";
   };
 })
diff --git a/pkgs/by-name/ke/keycloak/package.nix b/pkgs/by-name/ke/keycloak/package.nix
index e1eb318be548..29416d37277a 100644
--- a/pkgs/by-name/ke/keycloak/package.nix
+++ b/pkgs/by-name/ke/keycloak/package.nix
@@ -24,11 +24,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "keycloak";
-  version = "26.3.2";
+  version = "26.3.3";
 
   src = fetchzip {
     url = "https://github.com/keycloak/keycloak/releases/download/${finalAttrs.version}/keycloak-${finalAttrs.version}.zip";
-    hash = "sha256-LC12W13plMu8byU0kuFkNipUMOK1TLOphr1MFK0Qzcc=";
+    hash = "sha256-5+KmaLz6pZjgOI3CoXk1wC/LXiYzRiV2s2l0Jkwb45M=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/le/lexbor/package.nix b/pkgs/by-name/le/lexbor/package.nix
index a10068899b83..f7a54bb353a0 100644
--- a/pkgs/by-name/le/lexbor/package.nix
+++ b/pkgs/by-name/le/lexbor/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/lexbor/lexbor";
     changelog = "https://github.com/lexbor/lexbor/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "lexbor";
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/lo/lock/package.nix b/pkgs/by-name/lo/lock/package.nix
index 9bb3dda26a7f..82d4a4b955c5 100644
--- a/pkgs/by-name/lo/lock/package.nix
+++ b/pkgs/by-name/lo/lock/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lock";
-  version = "1.7.1";
+  version = "1.7.3";
 
   src = fetchFromGitHub {
     owner = "konstantintutsch";
     repo = "Lock";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RYsdULExsLLp0NDa3OAf52H+WIypYZT2AUci0ytwHNw=";
+    hash = "sha256-NxSw77GpcLoLfbD46QECORdJKWBfWS8zQE+SU3J9GK8=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/lo/loguru/package.nix b/pkgs/by-name/lo/loguru/package.nix
index 84fe218859c7..0077135547d1 100644
--- a/pkgs/by-name/lo/loguru/package.nix
+++ b/pkgs/by-name/lo/loguru/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
     description = "Lightweight C++ logging library";
     homepage = "https://github.com/emilk/loguru";
     license = lib.licenses.unlicense;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/ma/mathemagix/package.nix b/pkgs/by-name/ma/mathemagix/package.nix
index 26165f55eb13..06165a100fee 100644
--- a/pkgs/by-name/ma/mathemagix/package.nix
+++ b/pkgs/by-name/ma/mathemagix/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Free computer algebra and analysis system consisting of a high level language with a compiler and a series of mathematical libraries";
     homepage = "https://www.mathemagix.org/";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/mc/mcphost/package.nix b/pkgs/by-name/mc/mcphost/package.nix
index f583d7888578..b8945c80e96c 100644
--- a/pkgs/by-name/mc/mcphost/package.nix
+++ b/pkgs/by-name/mc/mcphost/package.nix
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
     description = "CLI host application that enables Large Language Models (LLMs) to interact with external tools through the Model Context Protocol (MCP)";
     homepage = "https://github.com/mark3labs/mcphost";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "mcphost";
   };
 })
diff --git a/pkgs/by-name/mo/mona-sans/package.nix b/pkgs/by-name/mo/mona-sans/package.nix
index c7942b3ef057..4c45eae71bd8 100644
--- a/pkgs/by-name/mo/mona-sans/package.nix
+++ b/pkgs/by-name/mo/mona-sans/package.nix
@@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       by all major browsers, allowing for performance benefits and granular
       design control of the typeface's weight, width, and slant.
     '';
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/mo/mongodb-ce/package.nix b/pkgs/by-name/mo/mongodb-ce/package.nix
index f3c0e0fd0339..a1d6f5c8b932 100644
--- a/pkgs/by-name/mo/mongodb-ce/package.nix
+++ b/pkgs/by-name/mo/mongodb-ce/package.nix
@@ -121,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: {
       This pre-compiled binary distribution package provides the MongoDB daemon (mongod) and the MongoDB Shard utility
       (mongos).
     '';
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.attrNames finalAttrs.passthru.sources;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
diff --git a/pkgs/by-name/ne/newcomputermodern/package.nix b/pkgs/by-name/ne/newcomputermodern/package.nix
index 06ea40899539..eb7fcb7f0ebb 100644
--- a/pkgs/by-name/ne/newcomputermodern/package.nix
+++ b/pkgs/by-name/ne/newcomputermodern/package.nix
@@ -47,7 +47,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     # equivalent to the LaTeX Project Public License (LPPL), version 1.3c or
     # later." - GUST website
     license = lib.licenses.lppl13c;
-    maintainers = [ lib.maintainers.drupol ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/ne/nextcloud-client/package.nix b/pkgs/by-name/ne/nextcloud-client/package.nix
index c60b3bcfa1aa..b565c29ff149 100644
--- a/pkgs/by-name/ne/nextcloud-client/package.nix
+++ b/pkgs/by-name/ne/nextcloud-client/package.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation rec {
   pname = "nextcloud-client";
-  version = "3.17.0";
+  version = "3.17.1";
 
   outputs = [
     "out"
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     owner = "nextcloud-releases";
     repo = "desktop";
     tag = "v${version}";
-    hash = "sha256-NbnC6rbpHJvPOufyNaf36JMpKE5IN4vXSLJWkrINtk8=";
+    hash = "sha256-HXi3DDjOFLY9G+aK+QrkmLvLwL6s9lAT+8jVpG87eNM=";
   };
 
   patches = [
diff --git a/pkgs/by-name/nh/nh/package.nix b/pkgs/by-name/nh/nh/package.nix
index 358bb25f5556..5bf694b29995 100644
--- a/pkgs/by-name/nh/nh/package.nix
+++ b/pkgs/by-name/nh/nh/package.nix
@@ -67,7 +67,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     license = lib.licenses.eupl12;
     mainProgram = "nh";
     maintainers = with lib.maintainers; [
-      drupol
       NotAShelf
       viperML
     ];
diff --git a/pkgs/by-name/op/open-pdf-sign/package.nix b/pkgs/by-name/op/open-pdf-sign/package.nix
index 3cbd501e7b15..923df6d2e0a6 100644
--- a/pkgs/by-name/op/open-pdf-sign/package.nix
+++ b/pkgs/by-name/op/open-pdf-sign/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Digitally sign PDF files from your commandline";
     homepage = "https://github.com/open-pdf-sign/open-pdf-sign";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.unix;
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
     mainProgram = "open-pdf-sign";
diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix
index 7b669979aa97..6fb4a2175a6b 100644
--- a/pkgs/by-name/op/open-webui/package.nix
+++ b/pkgs/by-name/op/open-webui/package.nix
@@ -246,7 +246,6 @@ python3Packages.buildPythonApplication rec {
     '';
     mainProgram = "open-webui";
     maintainers = with lib.maintainers; [
-      drupol
       shivaraj-bh
     ];
   };
diff --git a/pkgs/by-name/op/openarena/package.nix b/pkgs/by-name/op/openarena/package.nix
index 4e50dde79c47..36e90519bf0b 100644
--- a/pkgs/by-name/op/openarena/package.nix
+++ b/pkgs/by-name/op/openarena/package.nix
@@ -115,7 +115,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl2Plus;
     mainProgram = "openarena";
     maintainers = with lib.maintainers; [
-      drupol
       wyvie
     ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/or/orthanc-framework/package.nix b/pkgs/by-name/or/orthanc-framework/package.nix
index e19bd8331e79..1767ce9181bd 100644
--- a/pkgs/by-name/or/orthanc-framework/package.nix
+++ b/pkgs/by-name/or/orthanc-framework/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "SDK for building Orthanc plugins and related applications";
     homepage = "https://www.orthanc-server.com/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix b/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix
index e05ca1302a72..97f005210d66 100644
--- a/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix
+++ b/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix
@@ -93,7 +93,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Plugin that extends Orthanc with support for the DICOMweb protocols";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
-      drupol
       dvcorreia
     ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/or/orthanc/package.nix b/pkgs/by-name/or/orthanc/package.nix
index 620f45361c8b..fa710876d1a9 100644
--- a/pkgs/by-name/or/orthanc/package.nix
+++ b/pkgs/by-name/or/orthanc/package.nix
@@ -127,7 +127,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://www.orthanc-server.com/";
     license = lib.licenses.gpl3Plus;
     mainProgram = "Orthanc";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/ow/owi/package.nix b/pkgs/by-name/ow/owi/package.nix
index d1e52452ccac..968af0d915b8 100644
--- a/pkgs/by-name/ow/owi/package.nix
+++ b/pkgs/by-name/ow/owi/package.nix
@@ -15,14 +15,14 @@ let
 in
 ocamlPackages.buildDunePackage rec {
   pname = "owi";
-  version = "0.2-unstable-2025-07-23";
+  version = "0.2-unstable-2025-08-18";
 
   src = fetchFromGitHub {
     owner = "ocamlpro";
     repo = "owi";
-    rev = "bcebeb15de0a4968d1cb59970ee4a0c635e78bf4";
+    rev = "40c6434ecdb0cf7248b98670526e18dc007b425b";
     fetchSubmodules = true;
-    hash = "sha256-MOgh5Q5Ai1Nk8DllUswiOk+Qu+hMRp7Q6mYPNSUs/1A=";
+    hash = "sha256-N/DO3vml7vzOjPi81LPOL+ZuI8CewAhANM9j4nuRbyU=";
   };
 
   nativeBuildInputs = with ocamlPackages; [
diff --git a/pkgs/by-name/pa/pack/package.nix b/pkgs/by-name/pa/pack/package.nix
index 1ac1d813cbf5..2d57430ac5d5 100644
--- a/pkgs/by-name/pa/pack/package.nix
+++ b/pkgs/by-name/pa/pack/package.nix
@@ -45,6 +45,6 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/buildpacks/pack/";
     license = lib.licenses.asl20;
     mainProgram = "pack";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 })
diff --git a/pkgs/by-name/ph/phel/package.nix b/pkgs/by-name/ph/phel/package.nix
index 6dc91e2276f4..d804ecd31740 100644
--- a/pkgs/by-name/ph/phel/package.nix
+++ b/pkgs/by-name/ph/phel/package.nix
@@ -28,6 +28,6 @@ php.buildComposerProject2 (finalAttrs: {
     homepage = "https://github.com/phel-lang/phel-lang";
     license = lib.licenses.mit;
     mainProgram = "phel";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 })
diff --git a/pkgs/by-name/ph/phpdocumentor/package.nix b/pkgs/by-name/ph/phpdocumentor/package.nix
index bc19bf28c7d1..5cc8ee5c88be 100644
--- a/pkgs/by-name/ph/phpdocumentor/package.nix
+++ b/pkgs/by-name/ph/phpdocumentor/package.nix
@@ -40,6 +40,6 @@ php.buildComposerProject2 (finalAttrs: {
     homepage = "https://phpdoc.org";
     license = lib.licenses.mit;
     mainProgram = "phpdoc";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 })
diff --git a/pkgs/by-name/pr/prettypst/package.nix b/pkgs/by-name/pr/prettypst/package.nix
index c02c74f503b5..aef965df3f4d 100644
--- a/pkgs/by-name/pr/prettypst/package.nix
+++ b/pkgs/by-name/pr/prettypst/package.nix
@@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/antonWetzel/prettypst";
     license = lib.licenses.mit;
     mainProgram = "prettypst";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/ra/rabbit/package.nix b/pkgs/by-name/ra/rabbit/package.nix
index e05fc323ee84..b07920007695 100644
--- a/pkgs/by-name/ra/rabbit/package.nix
+++ b/pkgs/by-name/ra/rabbit/package.nix
@@ -80,6 +80,6 @@ python3'.pkgs.buildPythonApplication {
     homepage = "https://github.com/natarajan-chidambaram/RABBIT";
     license = lib.licenses.asl20;
     mainProgram = "rabbit";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/re/rebuilderd/package.nix b/pkgs/by-name/re/rebuilderd/package.nix
index f70a08186153..04fc805c0649 100644
--- a/pkgs/by-name/re/rebuilderd/package.nix
+++ b/pkgs/by-name/re/rebuilderd/package.nix
@@ -113,7 +113,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Independent verification of binary packages - reproducible builds";
     homepage = "https://github.com/kpcyrd/rebuilderd";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "rebuilderd";
   };
 })
diff --git a/pkgs/by-name/re/recordbox/package.nix b/pkgs/by-name/re/recordbox/package.nix
index d5be70da5d91..cc5f6b7c69b3 100644
--- a/pkgs/by-name/re/recordbox/package.nix
+++ b/pkgs/by-name/re/recordbox/package.nix
@@ -8,6 +8,7 @@
   desktop-file-utils,
   fetchFromGitea,
   glib,
+  glycin-loaders,
   gst_all_1,
   gtk4,
   hicolor-icon-theme,
@@ -27,19 +28,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "recordbox";
-  version = "0.10.3";
+  version = "0.10.4";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "edestcroix";
     repo = "Recordbox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-o2cKVRpuAwE+/TI5mwtSvkCFaXN349GP9dDlgdh3Luk=";
+    hash = "sha256-9rrVlD+ODl+U9bPzbXGLQBLkbnfAm4SmJHRcVife33A=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-0/tKL5UW1QuhsddivU/r8n3T3xyRaGLRVpKuXcc4fmU=";
+    hash = "sha256-W60X69/fEq/X6AK1sbT6rb+SsF/oPzfUvrar0fihr88=";
   };
 
   strictDeps = true;
@@ -84,6 +85,22 @@ stdenv.mkDerivation (finalAttrs: {
   doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
   cargoCheckType = if (finalAttrs.mesonBuildType != "debug") then "release" else "debug";
 
+  # Workaround copied from https://github.com/NixOS/nixpkgs/blob/e39fe935fc7537bee0440935c12f5c847735a291/pkgs/by-name/lo/loupe/package.nix#L60-L74
+  preConfigure = ''
+    # Dirty approach to add patches after cargoSetupPostUnpackHook
+    # We should eventually use a cargo vendor patch hook instead
+    pushd ../$(stripHash $cargoDeps)/glycin-2.*
+      patch -p3 < ${glycin-loaders.passthru.glycinPathsPatch}
+    popd
+  '';
+  preFixup = ''
+    # Needed for the glycin crate to find loaders.
+    # https://gitlab.gnome.org/sophie-h/glycin/-/blob/0.1.beta.2/glycin/src/config.rs#L44
+    gappsWrapperArgs+=(
+      --prefix XDG_DATA_DIRS : "${glycin-loaders}/share"
+    )
+  '';
+
   checkPhase = ''
     runHook preCheck
 
diff --git a/pkgs/by-name/re/repro-env/package.nix b/pkgs/by-name/re/repro-env/package.nix
index 56d319a77326..aea545054766 100644
--- a/pkgs/by-name/re/repro-env/package.nix
+++ b/pkgs/by-name/re/repro-env/package.nix
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       asl20
       mit
     ];
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "repro-env";
   };
 })
diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix
index 8bbebaa4fcd9..d5ffb129de56 100644
--- a/pkgs/by-name/re/rerun/package.nix
+++ b/pkgs/by-name/re/rerun/package.nix
@@ -34,13 +34,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rerun";
-  version = "0.24.0";
+  version = "0.24.1";
 
   src = fetchFromGitHub {
     owner = "rerun-io";
     repo = "rerun";
     tag = finalAttrs.version;
-    hash = "sha256-OMSLCS1j55MYsC3pv4qPQjqO9nRgGj+AUOlcyESFXek=";
+    hash = "sha256-unPgvQcYhshdx5NGCl/pLh8UdJ9T6B8Fd0s8G1NSBmE=";
   };
 
   # The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '"rerun_sdk/rerun_cli/rerun"' '"rerun_sdk/rerun"'
   '';
 
-  cargoHash = "sha256-8XmOtB1U2SAOBchrpKMAv5I8mFvJniVVcmFPugtD4RI=";
+  cargoHash = "sha256-zdq8djnmH8srSd9sml7t6wsbxpTaT3x5/7hkDRgelbg=";
 
   cargoBuildFlags = [ "--package rerun-cli" ];
   cargoTestFlags = [ "--package rerun-cli" ];
diff --git a/pkgs/by-name/ro/robo/package.nix b/pkgs/by-name/ro/robo/package.nix
index 686150de5a62..5bb2a7c1c3b1 100644
--- a/pkgs/by-name/ro/robo/package.nix
+++ b/pkgs/by-name/ro/robo/package.nix
@@ -30,6 +30,6 @@ php82.buildComposerProject2 (finalAttrs: {
     homepage = "https://github.com/consolidation/robo";
     license = lib.licenses.mit;
     mainProgram = "robo";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 })
diff --git a/pkgs/by-name/ru/runmd/package.nix b/pkgs/by-name/ru/runmd/package.nix
index 3e67dc4d0fb7..eedb5b1895c1 100644
--- a/pkgs/by-name/ru/runmd/package.nix
+++ b/pkgs/by-name/ru/runmd/package.nix
@@ -24,7 +24,7 @@ buildNpmPackage (finalAttrs: {
     homepage = "https://github.com/broofa/runmd";
     changelog = "https://github.com/broofa/runmd/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "runmd";
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/by-name/sb/sbom4python/package.nix b/pkgs/by-name/sb/sbom4python/package.nix
index 16efe8a59bca..46b2f98a9d46 100644
--- a/pkgs/by-name/sb/sbom4python/package.nix
+++ b/pkgs/by-name/sb/sbom4python/package.nix
@@ -48,6 +48,6 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://github.com/anthonyharrison/sbom4python";
     license = lib.licenses.asl20;
     mainProgram = "sbom4python";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix
index 12b440445643..7ec3c8e430cf 100644
--- a/pkgs/by-name/se/searxng/package.nix
+++ b/pkgs/by-name/se/searxng/package.nix
@@ -13,14 +13,14 @@ in
 python.pkgs.toPythonModule (
   python.pkgs.buildPythonApplication rec {
     pname = "searxng";
-    version = "0-unstable-2025-08-03";
+    version = "0-unstable-2025-08-20";
     pyproject = true;
 
     src = fetchFromGitHub {
       owner = "searxng";
       repo = "searxng";
-      rev = "2e62eb5d68d875c49e32229103a4fd75fe26c104";
-      hash = "sha256-UKGPkaG2agXZhEi2h8g2gXHHEDmDSzL/f9B+l5WZVvE=";
+      rev = "41a4a3e224f5fa90522253da4236dd9a6f4083cb";
+      hash = "sha256-NJ8B7P03pzkQYObLANOEUU+B9VLYXTLlZP2X3WoXpYM=";
     };
 
     nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ];
diff --git a/pkgs/by-name/sr/src-cli/package.nix b/pkgs/by-name/sr/src-cli/package.nix
index 6dbf68b07e89..7d0215c57b3a 100644
--- a/pkgs/by-name/sr/src-cli/package.nix
+++ b/pkgs/by-name/sr/src-cli/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "src-cli";
-  version = "6.6.0";
+  version = "6.7.0";
 
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "src-cli";
     rev = version;
-    hash = "sha256-9jqlbqZ62wds+VOt5OT9XYu/v6ETaYGCqY7qJu3UsWg=";
+    hash = "sha256-uWbzHb0UIDly1r0f+AYNLCsduie7b0T6P1ZiUdrUBho=";
   };
 
   vendorHash = "sha256-bpfDnVqJoJi9WhlA6TDWAhBRkbbQn1BHfnLJ8BTmhGM=";
diff --git a/pkgs/by-name/sy/symfony-cli/package.nix b/pkgs/by-name/sy/symfony-cli/package.nix
index 521a2f8d3ec2..a50c69b2234f 100644
--- a/pkgs/by-name/sy/symfony-cli/package.nix
+++ b/pkgs/by-name/sy/symfony-cli/package.nix
@@ -65,6 +65,6 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/symfony-cli/symfony-cli";
     license = lib.licenses.agpl3Plus;
     mainProgram = "symfony";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 })
diff --git a/pkgs/by-name/tr/trezor-suite/package.nix b/pkgs/by-name/tr/trezor-suite/package.nix
index a74bcb96223e..de362986aa18 100644
--- a/pkgs/by-name/tr/trezor-suite/package.nix
+++ b/pkgs/by-name/tr/trezor-suite/package.nix
@@ -10,7 +10,7 @@
 
 let
   pname = "trezor-suite";
-  version = "25.7.4";
+  version = "25.8.2";
 
   suffix =
     {
@@ -24,8 +24,8 @@ let
     hash =
       {
         # curl -Lfs https://github.com/trezor/trezor-suite/releases/download/v${version}/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'
-        aarch64-linux = "sha512-7QkyyeCDEEvNbH5qU+oS7ACLgE3lbXLJfeFeyofnfUdNOg68PJKM7ptQms0G/NN4xM0ME6trzbUucQI8QUfo4Q==";
-        x86_64-linux = "sha512-MOi/lTxPnMajP06lyfNKBuUTFWzHE61kitowfYryXVhomO3ww7eC5mE5pYzHRIbH7TE+kZm5eUL1hGO2JElPRw==";
+        aarch64-linux = "sha512-bVLTYCT8jkjeJMHWPvzFVkGB69Z46nvebtEDh5HfqYgd3Xwov+s1BHlr82XjN4+0cdKJchXnyKVTShO32+at5A==";
+        x86_64-linux = "sha512-wtMTW2Wj6dPsgUupXsHuP2/RS3Yp10bcCjkBfVIDfLrlClKFDHRLt9mNGtSdFfZM791NyDWsjU4xdi082BduSw==";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };
diff --git a/pkgs/by-name/tr/triton-llvm/package.nix b/pkgs/by-name/tr/triton-llvm/package.nix
index 5b4d78f24822..2d0b979f8494 100644
--- a/pkgs/by-name/tr/triton-llvm/package.nix
+++ b/pkgs/by-name/tr/triton-llvm/package.nix
@@ -64,7 +64,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "triton-llvm";
-  version = "21.0.0-git"; # See https://github.com/llvm/llvm-project/blob/main/cmake/Modules/LLVMVersion.cmake
+  version = "21.0.0-unstable-2025-06-10"; # See https://github.com/llvm/llvm-project/blob/main/cmake/Modules/LLVMVersion.cmake
 
   outputs = [
     "out"
@@ -80,8 +80,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "llvm";
     repo = "llvm-project";
-    rev = "a66376b0dc3b2ea8a84fda26faca287980986f78";
-    hash = "sha256-7xUPozRerxt38UeJxA8kYYxOQ4+WzDREndD2+K0BYkU=";
+    rev = "8957e64a20fc7f4277565c6cfe3e555c119783ce";
+    hash = "sha256-ljdwHPLGZv72RBPBg5rs7pZczsB+WJhdCeHJxoi4gJQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ty/typst/package.nix b/pkgs/by-name/ty/typst/package.nix
index b12e685eafe6..dffa2109626d 100644
--- a/pkgs/by-name/ty/typst/package.nix
+++ b/pkgs/by-name/ty/typst/package.nix
@@ -71,7 +71,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     license = lib.licenses.asl20;
     mainProgram = "typst";
     maintainers = with lib.maintainers; [
-      drupol
       figsoda
       kanashimia
       RossSmyth
diff --git a/pkgs/by-name/ty/typstwriter/package.nix b/pkgs/by-name/ty/typstwriter/package.nix
index 16ad4e47970e..31a46f054d73 100644
--- a/pkgs/by-name/ty/typstwriter/package.nix
+++ b/pkgs/by-name/ty/typstwriter/package.nix
@@ -41,6 +41,6 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://github.com/Bzero/typstwriter";
     license = lib.licenses.mit;
     mainProgram = "typstwriter";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix
index c46865f7bdf8..b0a4920344c4 100644
--- a/pkgs/by-name/ty/typstyle/package.nix
+++ b/pkgs/by-name/ty/typstyle/package.nix
@@ -41,7 +41,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     license = lib.licenses.asl20;
     mainProgram = "typstyle";
     maintainers = with lib.maintainers; [
-      drupol
       prince213
     ];
   };
diff --git a/pkgs/by-name/ur/urbanterror/package.nix b/pkgs/by-name/ur/urbanterror/package.nix
index 9418695c9be8..c27a6a63fe40 100644
--- a/pkgs/by-name/ur/urbanterror/package.nix
+++ b/pkgs/by-name/ur/urbanterror/package.nix
@@ -115,9 +115,7 @@ stdenv.mkDerivation {
       realism". This results in a very unique, enjoyable and addictive game.
     '';
     mainProgram = "urbanterror";
-    maintainers = with lib.maintainers; [
-      drupol
-    ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/uu/uutils-diffutils/package.nix b/pkgs/by-name/uu/uutils-diffutils/package.nix
index 72e2c891ee3d..7ec5565d7ad9 100644
--- a/pkgs/by-name/uu/uutils-diffutils/package.nix
+++ b/pkgs/by-name/uu/uutils-diffutils/package.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/uutils/diffutils";
     license = lib.licenses.mit;
     mainProgram = "diffutils";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/uu/uutils-findutils/package.nix b/pkgs/by-name/uu/uutils-findutils/package.nix
index 3eb69c73b304..4ca34b96f303 100644
--- a/pkgs/by-name/uu/uutils-findutils/package.nix
+++ b/pkgs/by-name/uu/uutils-findutils/package.nix
@@ -45,7 +45,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "find";
     maintainers = with lib.maintainers; [
       defelo
-      drupol
     ];
     platforms = lib.platforms.unix;
   };
diff --git a/pkgs/by-name/va/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch b/pkgs/by-name/va/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch
index ae0b3f37d505..d1662530f751 100644
--- a/pkgs/by-name/va/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch
+++ b/pkgs/by-name/va/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch
@@ -66,8 +66,8 @@ index c019f30ff..ba7e40076 100755
 -
  env = nil
  begin
-   require 'log4r'
-@@ -114,9 +91,6 @@ begin
+   require 'vagrant'
+@@ -113,9 +90,6 @@ begin
    require 'vagrant/util/platform'
    require 'vagrant/util/experimental'
  
@@ -81,7 +81,7 @@ diff --git a/lib/vagrant.rb b/lib/vagrant.rb
 index f790039d3..97e67e3b8 100644
 --- a/lib/vagrant.rb
 +++ b/lib/vagrant.rb
-@@ -59,7 +59,7 @@ require "vagrant/plugin/manager"
+@@ -64,7 +64,7 @@ require "vagrant/plugin/manager"
  # See https://github.com/rest-client/rest-client/issues/34#issuecomment-290858
  # for more information
  class VagrantLogger < Log4r::Logger
@@ -94,7 +94,7 @@ diff --git a/lib/vagrant/bundler.rb b/lib/vagrant/bundler.rb
 index eb2caabb0..d75f54362 100644
 --- a/lib/vagrant/bundler.rb
 +++ b/lib/vagrant/bundler.rb
-@@ -189,11 +189,8 @@ module Vagrant
+@@ -192,11 +192,8 @@
      attr_reader :env_plugin_gem_path
      # @return [Pathname] Vagrant environment data path
      attr_reader :environment_data_path
@@ -106,7 +106,7 @@ index eb2caabb0..d75f54362 100644
        @plugin_gem_path = Vagrant.user_data_path.join("gems", RUBY_VERSION).freeze
        @logger = Log4r::Logger.new("vagrant::bundler")
      end
-@@ -290,6 +287,7 @@ module Vagrant
+@@ -298,6 +295,7 @@
          # Never allow dependencies to be remotely satisfied during init
          request_set.remote = false
  
@@ -114,7 +114,7 @@ index eb2caabb0..d75f54362 100644
          begin
            @logger.debug("resolving solution from available specification set")
            # Resolve the request set to ensure proper activation order
-@@ -652,6 +650,7 @@ module Vagrant
+@@ -672,6 +670,7 @@
          self_spec.activate
          @logger.info("Activated vagrant specification version - #{self_spec.version}")
        end
@@ -122,20 +122,20 @@ index eb2caabb0..d75f54362 100644
        # discover all the gems we have available
        list = {}
        if Gem.respond_to?(:default_specifications_dir)
-@@ -660,16 +659,10 @@ module Vagrant
+@@ -680,16 +679,10 @@
          spec_dir = Gem::Specification.default_specifications_dir
        end
        directories = [spec_dir]
 -      if Vagrant.in_bundler?
 -        Gem::Specification.find_all{true}.each do |spec|
--          list[spec.full_name] = spec
+-          list[spec.name] = spec
 -        end
 -      else
 -        builtin_specs.each do |spec|
--          list[spec.full_name] = spec
+-          list[spec.name] = spec
 -        end
 +      Gem::Specification.find_all{true}.each do |spec|
-+        list[spec.full_name] = spec
++        list[spec.name] = spec
        end
 -      if Vagrant.in_installer?
 +      if(!Object.const_defined?(:Bundler))
@@ -146,7 +146,7 @@ diff --git a/lib/vagrant/errors.rb b/lib/vagrant/errors.rb
 index 5cb861c06..782615bc4 100644
 --- a/lib/vagrant/errors.rb
 +++ b/lib/vagrant/errors.rb
-@@ -636,18 +636,6 @@ module Vagrant
+@@ -691,18 +691,6 @@ module Vagrant
        error_key(:provisioner_winrm_unsupported)
      end
  
@@ -169,7 +169,7 @@ diff --git a/lib/vagrant/plugin/manager.rb b/lib/vagrant/plugin/manager.rb
 index b73f07f9c..9058e68b3 100644
 --- a/lib/vagrant/plugin/manager.rb
 +++ b/lib/vagrant/plugin/manager.rb
-@@ -179,26 +179,8 @@ module Vagrant
+@@ -182,26 +182,8 @@ module Vagrant
          result
        rescue Gem::GemNotFoundException
          raise Errors::PluginGemNotFound, name: name
@@ -202,7 +202,7 @@ diff --git a/templates/locales/en.yml b/templates/locales/en.yml
 index edae9b477..782904f49 100644
 --- a/templates/locales/en.yml
 +++ b/templates/locales/en.yml
-@@ -794,9 +794,9 @@ en:
+@@ -875,9 +875,9 @@ en:
          matching this provider. For example, if you're using VirtualBox,
          the clone environment must also be using VirtualBox.
        cloud_init_not_found: |-
@@ -214,7 +214,7 @@ index edae9b477..782904f49 100644
          cloud init command '%{cmd}' failed on guest '%{guest_name}'.
        command_deprecated: |-
          The command 'vagrant %{name}' has been deprecated and is no longer functional
-@@ -1245,30 +1245,6 @@ en:
+@@ -1347,30 +1347,6 @@ en:
          following command:
  
            vagrant plugin install --local
@@ -245,7 +245,7 @@ index edae9b477..782904f49 100644
        powershell_not_found: |-
          Failed to locate the powershell executable on the available PATH. Please
          ensure powershell is installed and available on the local PATH, then
-@@ -3015,7 +2998,7 @@ en:
+@@ -3183,7 +3159,7 @@ en:
      pushes:
        file:
          no_destination: "File destination must be specified."
@@ -258,7 +258,7 @@ diff --git a/test/unit/bin/vagrant_test.rb b/test/unit/bin/vagrant_test.rb
 index dbbd52112..bc11309aa 100644
 --- a/test/unit/bin/vagrant_test.rb
 +++ b/test/unit/bin/vagrant_test.rb
-@@ -30,7 +30,6 @@ describe "vagrant bin" do
+@@ -33,7 +33,6 @@ describe "vagrant bin" do
      allow(Kernel).to receive(:exit)
      allow(Vagrant::Environment).to receive(:new).and_return(env)
      allow(Vagrant).to receive(:in_installer?).and_return(true)
@@ -270,50 +270,50 @@ diff --git a/test/unit/vagrant/bundler_test.rb b/test/unit/vagrant/bundler_test.
 index 69f425c66..00cedc021 100644
 --- a/test/unit/vagrant/bundler_test.rb
 +++ b/test/unit/vagrant/bundler_test.rb
-@@ -778,46 +778,42 @@ describe Vagrant::Bundler do
+@@ -809,46 +809,42 @@ describe Vagrant::Bundler do
        end
      end
  
 -    context "when bundler is not defined" do
 -      before { expect(Vagrant).to receive(:in_bundler?).and_return(false) }
+-
+-      context "when running inside the installer" do
+-        before { expect(Vagrant).to receive(:in_installer?).and_return(true) }
 +    context "when run time dependencies are defined" do
 +      let(:vagrant_dep_specs) { [double("spec", name: "vagrant-dep", requirement: double("spec-req", as_list: []))] }
  
--      context "when running inside the installer" do
--        before { expect(Vagrant).to receive(:in_installer?).and_return(true) }
+-        it "should load gem specification directories" do
+-          expect(Gem::Specification).to receive(:dirs).and_return(spec_dirs)
+-          subject.send(:vagrant_internal_specs)
+-        end
 +      it "should call #gem to activate the dependencies" do
 +        expect(subject).to receive(:gem).with("vagrant-dep", any_args)
 +        subject.send(:vagrant_internal_specs)
 +      end
 +    end
  
--        it "should load gem specification directories" do
--          expect(Gem::Specification).to receive(:dirs).and_return(spec_dirs)
--          subject.send(:vagrant_internal_specs)
--        end
-+    context "when bundler is not defined" do
-+      before { expect(Object).to receive(:const_defined?).with(:Bundler).and_return(false) }
- 
 -        context "when checking paths" do
 -          let(:spec_dirs) { [double("spec-dir", start_with?: in_user_dir)] }
 -          let(:in_user_dir) { true }
 -          let(:user_dir) { double("user-dir") }
++    context "when bundler is not defined" do
++      before { expect(Object).to receive(:const_defined?).with(:Bundler).and_return(false) }
+ 
+-          before { allow(Gem).to receive(:user_dir).and_return(user_dir) }
 +      it "should load gem specification directories" do
 +        expect(Gem::Specification).to receive(:dirs).and_return(spec_dirs)
 +        subject.send(:vagrant_internal_specs)
 +      end
  
--          before { allow(Gem).to receive(:user_dir).and_return(user_dir) }
+-          it "should check if path is within local user directory" do
+-            expect(spec_dirs.first).to receive(:start_with?).with(user_dir).and_return(false)
+-            subject.send(:vagrant_internal_specs)
+-          end
 +      context "when checking paths" do
 +        let(:spec_dirs) { [double("spec-dir", start_with?: in_user_dir)] }
 +        let(:in_user_dir) { true }
 +        let(:user_dir) { double("user-dir") }
  
--          it "should check if path is within local user directory" do
--            expect(spec_dirs.first).to receive(:start_with?).with(user_dir).and_return(false)
--            subject.send(:vagrant_internal_specs)
--          end
--
 -          context "when path is not within user directory" do
 -            let(:in_user_dir) { false }
 +        before { allow(Gem).to receive(:user_dir).and_return(user_dir) }
diff --git a/pkgs/by-name/va/vagrant/gemset.nix b/pkgs/by-name/va/vagrant/gemset.nix
index 9958730f0e5c..bef31fe3b087 100644
--- a/pkgs/by-name/va/vagrant/gemset.nix
+++ b/pkgs/by-name/va/vagrant/gemset.nix
@@ -44,10 +44,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1lvcp8bsd35g57f7wz4jigcw2sryzzwrpcgjwwf3chmjrjcww5in";
+      sha256 = "sha256-mo1IS+L9QJag6QoM0+RJoFvDqjP4rJ5Nbc72rBRVtuw=";
       type = "gem";
     };
-    version = "4.1.0";
+    version = "5.1.0";
   };
   concurrent-ruby = {
     groups = [ "default" ];
@@ -59,6 +59,16 @@
     };
     version = "1.3.4";
   };
+  csv = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "sha256-C70d79wxE0q+/tAnpjmzcjwnU4YhUPTD7mHKtxsg1n0=";
+      type = "gem";
+    };
+    version = "3.3.0";
+  };
   date = {
     groups = [ "default" ];
     platforms = [ ];
@@ -837,10 +847,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0x5l2pn4x92734k6i2wcjbn2klmwgkiqaajvxadh35k74dgnyh18";
+      sha256 = "sha256-xG2dy203UZnKB0ZbxnZp7o8EGuqlXdfa/m3k3Zeydkc=";
       type = "gem";
     };
-    version = "0.1.1";
+    version = "0.2.0";
   };
   webrick = {
     groups = [ "development" ];
diff --git a/pkgs/by-name/va/vagrant/package.nix b/pkgs/by-name/va/vagrant/package.nix
index 7459bb1f2bbe..bdb91a248c0d 100644
--- a/pkgs/by-name/va/vagrant/package.nix
+++ b/pkgs/by-name/va/vagrant/package.nix
@@ -16,9 +16,9 @@
 let
   # NOTE: bumping the version and updating the hash is insufficient;
   # you must use bundix to generate a new gemset.nix in the Vagrant source.
-  version = "2.4.3";
+  version = "2.4.8";
   url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz";
-  hash = "sha256-ZQWdSCV5lBL8XUnOvCFwJAFk+tw30q2lRTHR93qeZ2I=";
+  hash = "sha256-AVagvZKbVT4RWrCJdskhABTunRM9tBb5+jovYM/VF+0=";
 
   deps = bundlerEnv rec {
     name = "${pname}-${version}";
@@ -72,7 +72,6 @@ buildRubyGem rec {
   buildInputs = [ openssl ];
 
   patches = [
-    ./unofficial-installation-nowarn.patch
     ./use-system-bundler-version.patch
     ./0004-Support-system-installed-plugins.patch
     ./0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch
diff --git a/pkgs/by-name/va/vagrant/unofficial-installation-nowarn.patch b/pkgs/by-name/va/vagrant/unofficial-installation-nowarn.patch
deleted file mode 100644
index 0ea8b51ef527..000000000000
--- a/pkgs/by-name/va/vagrant/unofficial-installation-nowarn.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/bin/vagrant b/bin/vagrant
-index 7ca30b391..d3f4ea61a 100755
---- a/bin/vagrant
-+++ b/bin/vagrant
-@@ -221,11 +221,6 @@ begin
-       end
-     end
- 
--    if !Vagrant.in_installer? && !Vagrant.very_quiet?
--      # If we're not in the installer, warn.
--      env.ui.warn(I18n.t("vagrant.general.not_in_installer") + "\n", prefix: false)
--    end
--
-     # Acceptable experimental flag values include:
-     #
-     # Unset  - Disables experimental features
diff --git a/pkgs/by-name/wo/worldpainter/package.nix b/pkgs/by-name/wo/worldpainter/package.nix
index 7d90139cbcaf..36ca74e99b48 100644
--- a/pkgs/by-name/wo/worldpainter/package.nix
+++ b/pkgs/by-name/wo/worldpainter/package.nix
@@ -10,11 +10,11 @@
 }:
 stdenv.mkDerivation rec {
   pname = "worldpainter";
-  version = "2.25.1";
+  version = "2.26.0";
 
   src = fetchurl {
     url = "https://www.worldpainter.net/files/${pname}_${version}.tar.gz";
-    hash = "sha256-AfqMerBvDfMw1WTeQVcPPt1nvBv7+66TolFCX4lFNVY=";
+    hash = "sha256-/ppESrYoNbtxSWaCaKgwvtrW8IGLwigYgQuHF5F/26A=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 22d04a3499bc..87ab43d84af7 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -419,8 +419,8 @@ in
   };
 
   ruby_3_2 = generic {
-    version = rubyVersion "3" "2" "8" "";
-    hash = "sha256-d6zdjPu+H45XO15lNuA8UQPfmJ3AX6aMcPARgzw1YHU=";
+    version = rubyVersion "3" "2" "9" "";
+    hash = "sha256-q7rZjbmusVJ3Ow01ho5QADuMRn89BhUld8Tf7Z2I7So=";
     cargoHash = "sha256-CMVx5/+ugDNEuLAvyPN0nGHwQw6RXyfRsMO9I+kyZpk=";
   };
 
diff --git a/pkgs/development/php-packages/composer-local-repo-plugin/default.nix b/pkgs/development/php-packages/composer-local-repo-plugin/default.nix
index d6199a568659..863937cb635c 100644
--- a/pkgs/development/php-packages/composer-local-repo-plugin/default.nix
+++ b/pkgs/development/php-packages/composer-local-repo-plugin/default.nix
@@ -27,7 +27,7 @@ php.buildComposerWithPlugin {
     homepage = "https://github.com/nix-community/composer-local-repo-plugin";
     license = lib.licenses.mit;
     mainProgram = "composer";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/php-packages/cyclonedx-php-composer/default.nix b/pkgs/development/php-packages/cyclonedx-php-composer/default.nix
index d3af20b63bc7..892cc6776231 100644
--- a/pkgs/development/php-packages/cyclonedx-php-composer/default.nix
+++ b/pkgs/development/php-packages/cyclonedx-php-composer/default.nix
@@ -27,7 +27,7 @@ php.buildComposerWithPlugin {
     homepage = "https://github.com/CycloneDX/cyclonedx-php-composer";
     license = lib.licenses.asl20;
     mainProgram = "composer";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/php-packages/meminfo/default.nix b/pkgs/development/php-packages/meminfo/default.nix
index bee2be6fd614..f6512b74a527 100644
--- a/pkgs/development/php-packages/meminfo/default.nix
+++ b/pkgs/development/php-packages/meminfo/default.nix
@@ -24,6 +24,6 @@ buildPecl rec {
     description = "PHP extension to get insight about memory usage";
     homepage = "https://github.com/BitOne/php-meminfo";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/php-packages/spx/default.nix b/pkgs/development/php-packages/spx/default.nix
index b56996b944f7..bea2aad00759 100644
--- a/pkgs/development/php-packages/spx/default.nix
+++ b/pkgs/development/php-packages/spx/default.nix
@@ -29,6 +29,6 @@ buildPecl {
     description = "Simple & straight-to-the-point PHP profiling extension with its built-in web UI";
     homepage = "https://github.com/NoiseByNorthwest/php-spx";
     license = lib.licenses.php301;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/attrs-strict/default.nix b/pkgs/development/python-modules/attrs-strict/default.nix
index 7657c8b72abb..cec021f15ab3 100644
--- a/pkgs/development/python-modules/attrs-strict/default.nix
+++ b/pkgs/development/python-modules/attrs-strict/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     description = "Python package which contains runtime validation for attrs data classes based on the types existing in the typing module";
     homepage = "https://github.com/bloomberg/attrs-strict";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/azure-ai-documentintelligence/default.nix b/pkgs/development/python-modules/azure-ai-documentintelligence/default.nix
index c3547c8ad680..1742a01ddaa5 100644
--- a/pkgs/development/python-modules/azure-ai-documentintelligence/default.nix
+++ b/pkgs/development/python-modules/azure-ai-documentintelligence/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     description = "Azure AI Document Intelligence client library for Python";
     homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/documentintelligence/azure-ai-documentintelligence/azure/ai/documentintelligence";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/backrefs/default.nix b/pkgs/development/python-modules/backrefs/default.nix
index 41d43f18495c..50a8892698e6 100644
--- a/pkgs/development/python-modules/backrefs/default.nix
+++ b/pkgs/development/python-modules/backrefs/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/facelessuser/backrefs";
     changelog = "https://github.com/facelessuser/backrefs/releases/tag/${src.tag}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/captum/default.nix b/pkgs/development/python-modules/captum/default.nix
index a39f00634ac4..c4db2ba36bb2 100644
--- a/pkgs/development/python-modules/captum/default.nix
+++ b/pkgs/development/python-modules/captum/default.nix
@@ -74,6 +74,6 @@ buildPythonPackage rec {
     description = "Model interpretability and understanding for PyTorch";
     homepage = "https://github.com/pytorch/captum";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cffconvert/default.nix b/pkgs/development/python-modules/cffconvert/default.nix
index c7dba79bb5cb..f7538f6827c4 100644
--- a/pkgs/development/python-modules/cffconvert/default.nix
+++ b/pkgs/development/python-modules/cffconvert/default.nix
@@ -52,6 +52,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/citation-file-format/cffconvert";
     license = lib.licenses.asl20;
     mainProgram = "cffconvert";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/cobble/default.nix b/pkgs/development/python-modules/cobble/default.nix
index 8423a9f5e525..4d37d4fd8c86 100644
--- a/pkgs/development/python-modules/cobble/default.nix
+++ b/pkgs/development/python-modules/cobble/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
     description = "Create Python data objects";
     homepage = "https://github.com/mwilliamson/python-cobble";
     license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/deepsearch-toolkit/default.nix b/pkgs/development/python-modules/deepsearch-toolkit/default.nix
index 876837e372d0..06de3b98e473 100644
--- a/pkgs/development/python-modules/deepsearch-toolkit/default.nix
+++ b/pkgs/development/python-modules/deepsearch-toolkit/default.nix
@@ -89,6 +89,6 @@ buildPythonPackage rec {
     description = "Interact with the Deep Search platform for new knowledge explorations and discoveries";
     homepage = "https://github.com/DS4SD/deepsearch-toolkit";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/docling-core/default.nix b/pkgs/development/python-modules/docling-core/default.nix
index 86a9ed2a01e4..017638c9d268 100644
--- a/pkgs/development/python-modules/docling-core/default.nix
+++ b/pkgs/development/python-modules/docling-core/default.nix
@@ -83,6 +83,6 @@ buildPythonPackage rec {
     description = "Python library to define and validate data types in Docling";
     homepage = "https://github.com/DS4SD/docling-core";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/docling-ibm-models/default.nix b/pkgs/development/python-modules/docling-ibm-models/default.nix
index fb07db2fed49..a0279abb7c6d 100644
--- a/pkgs/development/python-modules/docling-ibm-models/default.nix
+++ b/pkgs/development/python-modules/docling-ibm-models/default.nix
@@ -91,6 +91,6 @@ buildPythonPackage rec {
     description = "Docling IBM models";
     homepage = "https://github.com/DS4SD/docling-ibm-models";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/docling-parse/default.nix b/pkgs/development/python-modules/docling-parse/default.nix
index 9257f95adfa8..990083f9d54d 100644
--- a/pkgs/development/python-modules/docling-parse/default.nix
+++ b/pkgs/development/python-modules/docling-parse/default.nix
@@ -96,6 +96,6 @@ buildPythonPackage rec {
     description = "Simple package to extract text with coordinates from programmatic PDFs";
     homepage = "https://github.com/DS4SD/docling-parse";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/docling-serve/default.nix b/pkgs/development/python-modules/docling-serve/default.nix
index 0b0230b88d39..b8398621e836 100644
--- a/pkgs/development/python-modules/docling-serve/default.nix
+++ b/pkgs/development/python-modules/docling-serve/default.nix
@@ -103,6 +103,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/docling-project/docling-serve";
     license = lib.licenses.mit;
     mainProgram = "docling-serve";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/filesplit/default.nix b/pkgs/development/python-modules/filesplit/default.nix
deleted file mode 100644
index 6c5f1bc14c93..000000000000
--- a/pkgs/development/python-modules/filesplit/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-}:
-
-buildPythonPackage rec {
-  pname = "filesplit";
-  version = "4.1.0";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "ram-jayapalan";
-    repo = "filesplit";
-    tag = "v${version}";
-    hash = "sha256-QttXCK/IalnOVilWQaE0FYhFglQ1nXDLUX3nOFI5Vrc=";
-  };
-
-  build-system = [ setuptools ];
-
-  pythonImportsCheck = [ "filesplit" ];
-
-  meta = {
-    description = "Split file into multiple chunks based on the given size";
-    homepage = "https://github.com/ram-jayapalan/filesplit";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
-  };
-}
diff --git a/pkgs/development/python-modules/firecrawl-py/default.nix b/pkgs/development/python-modules/firecrawl-py/default.nix
index 10d957fecdea..35858d74ca5e 100644
--- a/pkgs/development/python-modules/firecrawl-py/default.nix
+++ b/pkgs/development/python-modules/firecrawl-py/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage rec {
     homepage = "https://firecrawl.dev";
     changelog = "https://github.com/mendableai/firecrawl/releases/tag/${src.tag}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/funk/default.nix b/pkgs/development/python-modules/funk/default.nix
index b8de6edd7912..110fb233b152 100644
--- a/pkgs/development/python-modules/funk/default.nix
+++ b/pkgs/development/python-modules/funk/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/mwilliamson/funk";
     changelog = "https://github.com/mwilliamson/funk/blob/${src.tag}/NEWS";
     license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/gawd/default.nix b/pkgs/development/python-modules/gawd/default.nix
index 48bc3a3a8679..be3191ac6bb8 100644
--- a/pkgs/development/python-modules/gawd/default.nix
+++ b/pkgs/development/python-modules/gawd/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     mainProgram = "gawd";
     homepage = "https://github.com/pooya-rostami/gawd";
     license = lib.licenses.lgpl3Only;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/gcp-storage-emulator/default.nix b/pkgs/development/python-modules/gcp-storage-emulator/default.nix
index aa60e1faeb2a..9d0434fa1779 100644
--- a/pkgs/development/python-modules/gcp-storage-emulator/default.nix
+++ b/pkgs/development/python-modules/gcp-storage-emulator/default.nix
@@ -51,7 +51,7 @@ buildPythonPackage rec {
     description = "Local emulator for Google Cloud Storage";
     homepage = "https://github.com/oittaa/gcp-storage-emulator";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "gcp-storage-emulator";
   };
 }
diff --git a/pkgs/development/python-modules/gitingest/default.nix b/pkgs/development/python-modules/gitingest/default.nix
index f78f92500c83..48fc94d64b0e 100644
--- a/pkgs/development/python-modules/gitingest/default.nix
+++ b/pkgs/development/python-modules/gitingest/default.nix
@@ -88,7 +88,7 @@ buildPythonPackage rec {
     description = "Replace 'hub' with 'ingest' in any github url to get a prompt-friendly extract of a codebase";
     homepage = "https://github.com/cyclotruc/gitingest";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     mainProgram = "gitingest";
   };
 }
diff --git a/pkgs/development/python-modules/langchain-aws/default.nix b/pkgs/development/python-modules/langchain-aws/default.nix
index b387a9fca61b..637117d0ef40 100644
--- a/pkgs/development/python-modules/langchain-aws/default.nix
+++ b/pkgs/development/python-modules/langchain-aws/default.nix
@@ -79,7 +79,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/langchain-ai/langchain-aws/";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      drupol
       natsukium
       sarahec
     ];
diff --git a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
index c1ea48e77f52..78fbcc0a8e0c 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
@@ -103,7 +103,6 @@ buildPythonPackage rec {
     changelog = "https://github.com/langchain-ai/langgraph/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      drupol
       sarahec
     ];
   };
diff --git a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix
index 471a1ff06322..67184f2a8eaf 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix
@@ -84,7 +84,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/langchain-ai/langgraph/tree/main/libs/checkpoint-sqlite";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      drupol
       sarahec
     ];
   };
diff --git a/pkgs/development/python-modules/langgraph-checkpoint/default.nix b/pkgs/development/python-modules/langgraph-checkpoint/default.nix
index d6518940027a..bfcedb58e168 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint/default.nix
@@ -73,7 +73,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/langchain-ai/langgraph/tree/main/libs/checkpoint";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      drupol
       sarahec
     ];
   };
diff --git a/pkgs/development/python-modules/lib4package/default.nix b/pkgs/development/python-modules/lib4package/default.nix
index 80b75dc97440..15bb0faee9bd 100644
--- a/pkgs/development/python-modules/lib4package/default.nix
+++ b/pkgs/development/python-modules/lib4package/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "Utility for handling package metadata to include in Software Bill of Materials (SBOMs)";
     homepage = "https://github.com/anthonyharrison/lib4package";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mammoth/default.nix b/pkgs/development/python-modules/mammoth/default.nix
index edb1a5299e50..b685c18d7c9e 100644
--- a/pkgs/development/python-modules/mammoth/default.nix
+++ b/pkgs/development/python-modules/mammoth/default.nix
@@ -52,6 +52,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/mwilliamson/python-mammoth";
     changelog = "https://github.com/mwilliamson/python-mammoth/blob/${src.tag}/NEWS";
     license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/markdown-inline-graphviz/default.nix b/pkgs/development/python-modules/markdown-inline-graphviz/default.nix
index 20a788e534d9..f6efdcd2581a 100644
--- a/pkgs/development/python-modules/markdown-inline-graphviz/default.nix
+++ b/pkgs/development/python-modules/markdown-inline-graphviz/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/cesaremorel/markdown-inline-graphviz/";
     changelog = "https://github.com/cesaremorel/markdown-inline-graphviz/releases/tag/${src.tag}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/markitdown/default.nix b/pkgs/development/python-modules/markitdown/default.nix
index 565602f2feff..fffe7059cbfc 100644
--- a/pkgs/development/python-modules/markitdown/default.nix
+++ b/pkgs/development/python-modules/markitdown/default.nix
@@ -86,6 +86,6 @@ buildPythonPackage rec {
     description = "Python tool for converting files and office documents to Markdown";
     homepage = "https://github.com/microsoft/markitdown";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/marko/default.nix b/pkgs/development/python-modules/marko/default.nix
index 7487b108564c..3f25358b2608 100644
--- a/pkgs/development/python-modules/marko/default.nix
+++ b/pkgs/development/python-modules/marko/default.nix
@@ -52,6 +52,6 @@ buildPythonPackage rec {
     description = "Markdown parser with high extensibility";
     homepage = "https://github.com/frostming/marko";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mean-average-precision/default.nix b/pkgs/development/python-modules/mean-average-precision/default.nix
index 7ab591ebd9e2..62df3a73b1aa 100644
--- a/pkgs/development/python-modules/mean-average-precision/default.nix
+++ b/pkgs/development/python-modules/mean-average-precision/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/bes-dev/mean_average_precision";
     changelog = "https://github.com/bes-dev/mean_average_precision/blob/${version}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mkdocs-backlinks/default.nix b/pkgs/development/python-modules/mkdocs-backlinks/default.nix
index a89223ed94a0..7f022675e0a0 100644
--- a/pkgs/development/python-modules/mkdocs-backlinks/default.nix
+++ b/pkgs/development/python-modules/mkdocs-backlinks/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     description = "Plugin for adding backlinks to mkdocs";
     homepage = "https://github.com/danodic-dev/mkdocs-backlinks/";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mkdocs-build-plantuml/default.nix b/pkgs/development/python-modules/mkdocs-build-plantuml/default.nix
index 22d6ccb201f5..dab90f15c710 100644
--- a/pkgs/development/python-modules/mkdocs-build-plantuml/default.nix
+++ b/pkgs/development/python-modules/mkdocs-build-plantuml/default.nix
@@ -42,6 +42,6 @@ buildPythonPackage rec {
     description = "MkDocs plugin to help generate your plantuml images locally or remotely as files (NOT inline)";
     homepage = "https://github.com/christo-ph/mkdocs_build_plantuml";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mkdocs-drawio-file/default.nix b/pkgs/development/python-modules/mkdocs-drawio-file/default.nix
index 5746e7601df3..44d6442ae200 100644
--- a/pkgs/development/python-modules/mkdocs-drawio-file/default.nix
+++ b/pkgs/development/python-modules/mkdocs-drawio-file/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     description = "Embedding files of Diagrams.net (Draw.io) into MkDocs";
     homepage = "https://github.com/onixpro/mkdocs-drawio-file/";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mkdocs-graphviz/default.nix b/pkgs/development/python-modules/mkdocs-graphviz/default.nix
index a0c402ec2c37..5455fc9821b2 100644
--- a/pkgs/development/python-modules/mkdocs-graphviz/default.nix
+++ b/pkgs/development/python-modules/mkdocs-graphviz/default.nix
@@ -42,6 +42,6 @@ buildPythonPackage rec {
     description = "Configurable Python markdown extension for graphviz and Mkdocs";
     homepage = "https://gitlab.com/rod2ik/mkdocs-graphviz";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mkdocs-markmap/default.nix b/pkgs/development/python-modules/mkdocs-markmap/default.nix
index 115eb1767908..46f805805ebd 100644
--- a/pkgs/development/python-modules/mkdocs-markmap/default.nix
+++ b/pkgs/development/python-modules/mkdocs-markmap/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage rec {
     description = "MkDocs plugin and extension to create mindmaps from markdown using markmap";
     homepage = "https://github.com/markmap/mkdocs_markmap";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mkdocs-puml/default.nix b/pkgs/development/python-modules/mkdocs-puml/default.nix
index b6d9ccfda794..acefa6dcaa60 100644
--- a/pkgs/development/python-modules/mkdocs-puml/default.nix
+++ b/pkgs/development/python-modules/mkdocs-puml/default.nix
@@ -56,6 +56,6 @@ buildPythonPackage rec {
     description = "Brings PlantUML to MkDocs";
     homepage = "https://github.com/MikhailKravets/mkdocs_puml";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/monkeytype/default.nix b/pkgs/development/python-modules/monkeytype/default.nix
index ce7e46d999e3..e06b53a38077 100644
--- a/pkgs/development/python-modules/monkeytype/default.nix
+++ b/pkgs/development/python-modules/monkeytype/default.nix
@@ -53,6 +53,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Instagram/MonkeyType/";
     changelog = "https://github.com/Instagram/MonkeyType/blob/${src.rev}/CHANGES.rst";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/objprint/default.nix b/pkgs/development/python-modules/objprint/default.nix
index 9dc78482d4cb..144c7f5113a2 100644
--- a/pkgs/development/python-modules/objprint/default.nix
+++ b/pkgs/development/python-modules/objprint/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/gaogaotiantian/objprint";
     changelog = "https://github.com/gaogaotiantian/objprint/releases/tag/${version}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/plotille/default.nix b/pkgs/development/python-modules/plotille/default.nix
index 48ffcf7156c5..d2f2255c2f29 100644
--- a/pkgs/development/python-modules/plotille/default.nix
+++ b/pkgs/development/python-modules/plotille/default.nix
@@ -61,6 +61,6 @@ buildPythonPackage rec {
     description = "Plot in the terminal using braille dots";
     homepage = "https://github.com/tammoippen/plotille";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/precisely/default.nix b/pkgs/development/python-modules/precisely/default.nix
index 76300d76ff67..7c306edb40c7 100644
--- a/pkgs/development/python-modules/precisely/default.nix
+++ b/pkgs/development/python-modules/precisely/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     description = "Matcher library for Python";
     homepage = "https://github.com/mwilliamson/python-precisely";
     license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/primp/default.nix b/pkgs/development/python-modules/primp/default.nix
index 3a7f8da6f22e..4a38ff8c6951 100644
--- a/pkgs/development/python-modules/primp/default.nix
+++ b/pkgs/development/python-modules/primp/default.nix
@@ -112,6 +112,6 @@ buildPythonPackage rec {
     description = "Python Requests IMPersonate, the fastest Python HTTP client that can impersonate web browsers";
     homepage = "https://github.com/deedy5/primp";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pygelf/default.nix b/pkgs/development/python-modules/pygelf/default.nix
index 975644043daf..6b31df89924c 100644
--- a/pkgs/development/python-modules/pygelf/default.nix
+++ b/pkgs/development/python-modules/pygelf/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     description = "Python logging handlers with GELF (Graylog Extended Log Format) support";
     homepage = "https://github.com/keeprocking/pygelf";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyghmi/default.nix b/pkgs/development/python-modules/pyghmi/default.nix
index a6ebb4714283..4aa4c116c2c4 100644
--- a/pkgs/development/python-modules/pyghmi/default.nix
+++ b/pkgs/development/python-modules/pyghmi/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "pyghmi";
-  version = "1.6.3";
+  version = "1.6.5";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-nPVOdK2zAqQoG8nB5eXcWOPC7V4Wd/hRQcjA3EU0xyE=";
+    hash = "sha256-g7QJFreMmO5NWvFmSQWFrHjPHpP6Gy4o31JDHSF2ob8=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pygments-style-github/default.nix b/pkgs/development/python-modules/pygments-style-github/default.nix
index 3c6945e66dfe..ffacae132031 100644
--- a/pkgs/development/python-modules/pygments-style-github/default.nix
+++ b/pkgs/development/python-modules/pygments-style-github/default.nix
@@ -26,6 +26,6 @@ buildPythonPackage rec {
     description = "Port of the github color scheme for pygments";
     homepage = "https://github.com/hugomaiavieira/pygments-style-github";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ drupol ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyorc/default.nix b/pkgs/development/python-modules/pyorc/default.nix
index bd2935ef7853..eeb3f9917c90 100644
--- a/pkgs/development/python-modules/pyorc/default.nix
+++ b/pkgs/development/python-modules/pyorc/default.nix
@@ -68,6 +68,6 @@ buildPythonPackage rec {
     description = "Python module for Apache ORC file format";
     homepage = "https://github.com/noirello/pyorc";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyroaring/default.nix b/pkgs/development/python-modules/pyroaring/default.nix
index d4978803306f..cf7186e34ab9 100644
--- a/pkgs/development/python-modules/pyroaring/default.nix
+++ b/pkgs/development/python-modules/pyroaring/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/Ezibenroc/PyRoaringBitMap";
     changelog = "https://github.com/Ezibenroc/PyRoaringBitMap/releases/tag/${src.tag}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyside6-fluent-widgets/default.nix b/pkgs/development/python-modules/pyside6-fluent-widgets/default.nix
deleted file mode 100644
index bdc66df7c5ef..000000000000
--- a/pkgs/development/python-modules/pyside6-fluent-widgets/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  setuptools,
-  pyside6,
-  pysidesix-frameless-window,
-  darkdetect,
-}:
-
-buildPythonPackage rec {
-  pname = "pyside6-fluent-widgets";
-  version = "1.8.6";
-  pyproject = true;
-
-  src = fetchPypi {
-    pname = "pyside6_fluent_widgets";
-    inherit version;
-    hash = "sha256-JuqZSYAGnmO/0GMIojpP3XB0mx4k/GecOkl/xsafOu8=";
-  };
-
-  build-system = [ setuptools ];
-
-  dependencies = [
-    pyside6
-    pysidesix-frameless-window
-    darkdetect
-  ];
-
-  # no tests
-  doCheck = false;
-
-  pythonImportsCheck = [ "qfluentwidgets" ];
-
-  meta = {
-    description = "Fluent design widgets library based on PySide6";
-    homepage = "https://github.com/zhiyiYo/PyQt-Fluent-Widgets";
-    platforms = lib.platforms.linux;
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ ];
-  };
-}
diff --git a/pkgs/development/python-modules/pysidesix-frameless-window/default.nix b/pkgs/development/python-modules/pysidesix-frameless-window/default.nix
deleted file mode 100644
index 4180793dee5d..000000000000
--- a/pkgs/development/python-modules/pysidesix-frameless-window/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  setuptools,
-  pyside6,
-}:
-
-buildPythonPackage rec {
-  pname = "pysidesix-frameless-window";
-  version = "0.7.3";
-  pyproject = true;
-
-  src = fetchPypi {
-    pname = "pysidesix_frameless_window";
-    inherit version;
-    hash = "sha256-6a9xyTQOYIo0WWuLXVrOvYGAdoFXJNbR21q4FLyDKEQ=";
-  };
-
-  build-system = [ setuptools ];
-
-  dependencies = [ pyside6 ];
-
-  # no tests
-  doCheck = false;
-
-  pythonImportsCheck = [ "qframelesswindow" ];
-
-  meta = {
-    description = "Frameless window based on PySide6";
-    homepage = "https://github.com/zhiyiYo/PyQt-Frameless-Window";
-    platforms = lib.platforms.linux;
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ ];
-  };
-}
diff --git a/pkgs/development/python-modules/pytest-kafka/default.nix b/pkgs/development/python-modules/pytest-kafka/default.nix
index ee4c323e8cef..7f85938f00b6 100644
--- a/pkgs/development/python-modules/pytest-kafka/default.nix
+++ b/pkgs/development/python-modules/pytest-kafka/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     description = "Pytest fixture factories for Zookeeper, Kafka server and Kafka consumer";
     homepage = "https://gitlab.com/karolinepauls/pytest-kafka";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-shared-session-scope/default.nix b/pkgs/development/python-modules/pytest-shared-session-scope/default.nix
index 3b698793a5e6..20ce15975c12 100644
--- a/pkgs/development/python-modules/pytest-shared-session-scope/default.nix
+++ b/pkgs/development/python-modules/pytest-shared-session-scope/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage rec {
     description = "Pytest session-scoped fixture that works with xdist";
     homepage = "https://pypi.org/project/pytest-shared-session-scope/";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pytorch-bench/default.nix b/pkgs/development/python-modules/pytorch-bench/default.nix
index e705028b1db8..015bdde64e02 100644
--- a/pkgs/development/python-modules/pytorch-bench/default.nix
+++ b/pkgs/development/python-modules/pytorch-bench/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage {
     description = "Benchmarking tool for torch";
     homepage = "https://github.com/MaximeGloesener/torch-benchmark";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/rerun-sdk/default.nix b/pkgs/development/python-modules/rerun-sdk/default.nix
index 7d93eb9cb1ae..c42d58374018 100644
--- a/pkgs/development/python-modules/rerun-sdk/default.nix
+++ b/pkgs/development/python-modules/rerun-sdk/default.nix
@@ -71,15 +71,6 @@ buildPythonPackage {
   inherit (rerun) addDlopenRunpaths addDlopenRunpathsPhase;
   postPhases = lib.optionals stdenv.hostPlatform.isLinux [ "addDlopenRunpathsPhase" ];
 
-  disabledTests = [
-    # numpy 2 incompatibility: AssertionError / IndexError
-    # Issue: https://github.com/rerun-io/rerun/issues/9105
-    # PR: https://github.com/rerun-io/rerun/pull/9109
-    "test_any_value"
-    "test_bad_any_value"
-    "test_none_any_value"
-  ];
-
   disabledTestPaths = [
     # "fixture 'benchmark' not found"
     "tests/python/log_benchmark/test_log_benchmark.py"
diff --git a/pkgs/development/python-modules/sbom2dot/default.nix b/pkgs/development/python-modules/sbom2dot/default.nix
index cdb9ee48e7df..b483d67e9e18 100644
--- a/pkgs/development/python-modules/sbom2dot/default.nix
+++ b/pkgs/development/python-modules/sbom2dot/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/anthonyharrison/sbom2dot";
     license = lib.licenses.asl20;
     mainProgram = "sbom2dot";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sbom4files/default.nix b/pkgs/development/python-modules/sbom4files/default.nix
index b6639fec5065..674b59934cd7 100644
--- a/pkgs/development/python-modules/sbom4files/default.nix
+++ b/pkgs/development/python-modules/sbom4files/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     description = "SBOM generator for files within a directory";
     homepage = "https://github.com/anthonyharrison/sbom4files";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sismic/default.nix b/pkgs/development/python-modules/sismic/default.nix
index c4b177050df0..fcd9a4edf8b9 100644
--- a/pkgs/development/python-modules/sismic/default.nix
+++ b/pkgs/development/python-modules/sismic/default.nix
@@ -54,6 +54,6 @@ buildPythonPackage rec {
     description = "Sismic Interactive Statechart Model Interpreter and Checker";
     homepage = "https://github.com/AlexandreDecan/sismic";
     license = lib.licenses.lgpl3Only;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sotabenchapi/default.nix b/pkgs/development/python-modules/sotabenchapi/default.nix
index b8a1b0b918da..305cc88839e9 100644
--- a/pkgs/development/python-modules/sotabenchapi/default.nix
+++ b/pkgs/development/python-modules/sotabenchapi/default.nix
@@ -47,6 +47,6 @@ buildPythonPackage {
     description = "Easily benchmark Machine Learning models on selected tasks and datasets";
     homepage = "https://pypi.org/project/sotabenchapi/";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sphinxcontrib-mscgen/default.nix b/pkgs/development/python-modules/sphinxcontrib-mscgen/default.nix
index a95cd57dec85..bb601c10845a 100644
--- a/pkgs/development/python-modules/sphinxcontrib-mscgen/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-mscgen/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "Sphinx extension using mscgen to render diagrams";
     homepage = "https://github.com/sphinx-contrib/mscgen";
     license = licenses.bola11;
-    maintainers = with maintainers; [ drupol ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/submitit/default.nix b/pkgs/development/python-modules/submitit/default.nix
index 2b8578c5bf44..1b552e87ecf6 100644
--- a/pkgs/development/python-modules/submitit/default.nix
+++ b/pkgs/development/python-modules/submitit/default.nix
@@ -57,6 +57,6 @@ buildPythonPackage rec {
     description = "Python 3.8+ toolbox for submitting jobs to Slurm";
     homepage = "https://github.com/facebookincubator/submitit";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/swh-auth/default.nix b/pkgs/development/python-modules/swh-auth/default.nix
index 5a5e7e4cc85b..c1ca7e78feb6 100644
--- a/pkgs/development/python-modules/swh-auth/default.nix
+++ b/pkgs/development/python-modules/swh-auth/default.nix
@@ -61,6 +61,6 @@ buildPythonPackage rec {
     description = "Set of utility libraries related to user authentication in applications and services based on the use of Keycloak and OpenID Connect";
     homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-auth";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/swh-core/default.nix b/pkgs/development/python-modules/swh-core/default.nix
index c56bbba926f7..19f994b86ffe 100644
--- a/pkgs/development/python-modules/swh-core/default.nix
+++ b/pkgs/development/python-modules/swh-core/default.nix
@@ -115,6 +115,6 @@ buildPythonPackage rec {
     homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-core";
     license = lib.licenses.gpl3Only;
     mainProgram = "swh";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/swh-export/default.nix b/pkgs/development/python-modules/swh-export/default.nix
index 6429bd8b475e..6af37b4972f5 100644
--- a/pkgs/development/python-modules/swh-export/default.nix
+++ b/pkgs/development/python-modules/swh-export/default.nix
@@ -85,6 +85,6 @@ buildPythonPackage rec {
     description = "Software Heritage dataset tools";
     homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-export";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/swh-journal/default.nix b/pkgs/development/python-modules/swh-journal/default.nix
index c3a0e223e125..912bdf6b9d36 100644
--- a/pkgs/development/python-modules/swh-journal/default.nix
+++ b/pkgs/development/python-modules/swh-journal/default.nix
@@ -49,6 +49,6 @@ buildPythonPackage rec {
     description = "Persistent logger of changes to the archive, with publish-subscribe support";
     homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-journal";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/swh-model/default.nix b/pkgs/development/python-modules/swh-model/default.nix
index ffbeb1a0f98b..3ae5fe994213 100644
--- a/pkgs/development/python-modules/swh-model/default.nix
+++ b/pkgs/development/python-modules/swh-model/default.nix
@@ -79,6 +79,6 @@ buildPythonPackage rec {
     description = "Implementation of the Data model of the Software Heritage project, used to archive source code artifacts";
     homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-model";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/swh-objstorage/default.nix b/pkgs/development/python-modules/swh-objstorage/default.nix
index 984267eb9a1e..d851dccf67ab 100644
--- a/pkgs/development/python-modules/swh-objstorage/default.nix
+++ b/pkgs/development/python-modules/swh-objstorage/default.nix
@@ -113,6 +113,6 @@ buildPythonPackage rec {
     description = "Content-addressable object storage for the Software Heritage project";
     homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-objstorage";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/swh-perfecthash/default.nix b/pkgs/development/python-modules/swh-perfecthash/default.nix
index 821b1c6bf255..fd682f64810a 100644
--- a/pkgs/development/python-modules/swh-perfecthash/default.nix
+++ b/pkgs/development/python-modules/swh-perfecthash/default.nix
@@ -57,6 +57,6 @@ buildPythonPackage rec {
     description = "Perfect hash table for software heritage object storage";
     homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-perfecthash";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/swh-scanner/default.nix b/pkgs/development/python-modules/swh-scanner/default.nix
index 5f34c0c20cc5..4354fed2cb34 100644
--- a/pkgs/development/python-modules/swh-scanner/default.nix
+++ b/pkgs/development/python-modules/swh-scanner/default.nix
@@ -84,6 +84,6 @@ buildPythonPackage rec {
     description = "Implementation of the Data model of the Software Heritage project, used to archive source code artifacts";
     homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-model";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/swh-scheduler/default.nix b/pkgs/development/python-modules/swh-scheduler/default.nix
index 349383c72de4..58ea17672678 100644
--- a/pkgs/development/python-modules/swh-scheduler/default.nix
+++ b/pkgs/development/python-modules/swh-scheduler/default.nix
@@ -83,6 +83,6 @@ buildPythonPackage rec {
     description = "Job scheduler for the Software Heritage project";
     homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-scheduler";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/swh-storage/default.nix b/pkgs/development/python-modules/swh-storage/default.nix
index a3eacef9837b..74b326af1e21 100644
--- a/pkgs/development/python-modules/swh-storage/default.nix
+++ b/pkgs/development/python-modules/swh-storage/default.nix
@@ -96,6 +96,6 @@ buildPythonPackage rec {
     description = "Abstraction layer over the archive, allowing to access all stored source code artifacts as well as their metadata";
     homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-storage";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/swh-web-client/default.nix b/pkgs/development/python-modules/swh-web-client/default.nix
index 79b68cc1b926..4391f8eb8ddf 100644
--- a/pkgs/development/python-modules/swh-web-client/default.nix
+++ b/pkgs/development/python-modules/swh-web-client/default.nix
@@ -61,6 +61,6 @@ buildPythonPackage rec {
     description = "Client for Software Heritage Web applications, via their APIs";
     homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-web-client";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/tempman/default.nix b/pkgs/development/python-modules/tempman/default.nix
index 1b6780adff64..2d2ea55d00bb 100644
--- a/pkgs/development/python-modules/tempman/default.nix
+++ b/pkgs/development/python-modules/tempman/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     description = "Create and clean up temporary directories";
     homepage = "https://github.com/mwilliamson/python-tempman";
     license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/torchbench/default.nix b/pkgs/development/python-modules/torchbench/default.nix
index 3593ae792130..85ffda667072 100644
--- a/pkgs/development/python-modules/torchbench/default.nix
+++ b/pkgs/development/python-modules/torchbench/default.nix
@@ -53,6 +53,6 @@ buildPythonPackage {
     description = "Easily benchmark machine learning models in PyTorch";
     homepage = "https://github.com/paperswithcode/torchbench";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/torchprofile/default.nix b/pkgs/development/python-modules/torchprofile/default.nix
index c4cee730aec0..4f7e51374aef 100644
--- a/pkgs/development/python-modules/torchprofile/default.nix
+++ b/pkgs/development/python-modules/torchprofile/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     description = "General and accurate MACs / FLOPs profiler for PyTorch models";
     homepage = "https://github.com/zhijian-liu/torchprofile";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/triton/0003-nvidia-cudart-a-systempath.patch b/pkgs/development/python-modules/triton/0003-nvidia-cudart-a-systempath.patch
index 144d84e151fe..66a757c77466 100644
--- a/pkgs/development/python-modules/triton/0003-nvidia-cudart-a-systempath.patch
+++ b/pkgs/development/python-modules/triton/0003-nvidia-cudart-a-systempath.patch
@@ -1,15 +1,5 @@
-From 6f92d54e5a544bc34bb07f2808d554a71cc0e4c3 Mon Sep 17 00:00:00 2001
-From: SomeoneSerge <else+aalto@someonex.net>
-Date: Sun, 13 Oct 2024 14:30:19 +0000
-Subject: [PATCH 3/3] nvidia: cudart a systempath
-
----
- third_party/nvidia/backend/driver.c  | 2 +-
- third_party/nvidia/backend/driver.py | 5 +++--
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
 diff --git a/third_party/nvidia/backend/driver.c b/third_party/nvidia/backend/driver.c
-index 44524da27..fbdf0d156 100644
+index ab24f7657..46dbaceb0 100644
 --- a/third_party/nvidia/backend/driver.c
 +++ b/third_party/nvidia/backend/driver.c
 @@ -1,4 +1,4 @@
@@ -19,28 +9,25 @@ index 44524da27..fbdf0d156 100644
  #include <stdbool.h>
  #define PY_SSIZE_T_CLEAN
 diff --git a/third_party/nvidia/backend/driver.py b/third_party/nvidia/backend/driver.py
-index 30fbadb2a..65c0562ed 100644
+index 47544bd8e..d57c6a70f 100644
 --- a/third_party/nvidia/backend/driver.py
 +++ b/third_party/nvidia/backend/driver.py
-@@ -10,7 +10,8 @@ from triton.backends.compiler import GPUTarget
+@@ -12,7 +12,8 @@ from triton.backends.compiler import GPUTarget
  from triton.backends.driver import GPUDriver
  
  dirname = os.path.dirname(os.path.realpath(__file__))
--include_dir = [os.path.join(dirname, "include")]
+-include_dirs = [os.path.join(dirname, "include")]
 +import shlex
-+include_dir = [*shlex.split("@cudaToolkitIncludeDirs@"), os.path.join(dirname, "include")]
++include_dirs = [*shlex.split("@cudaToolkitIncludeDirs@"), os.path.join(dirname, "include")]
  libdevice_dir = os.path.join(dirname, "lib")
  libraries = ['cuda']
  
-@@ -149,7 +150,7 @@ def make_launcher(constants, signature, ids):
-     # generate glue code
-     params = [i for i in signature.keys() if i not in constants]
+@@ -256,7 +257,7 @@ def make_launcher(constants, signature, tensordesc_meta):
+     params = [f"&arg{i}" for i, ty in signature.items() if ty != "constexpr"]
+     params.append("&global_scratch")
      src = f"""
 -#include \"cuda.h\"
 +#include <cuda.h>
  #include <stdbool.h>
  #include <Python.h>
  #include <dlfcn.h>
--- 
-2.46.0
-
diff --git a/pkgs/development/python-modules/triton/0004-nvidia-allow-static-ptxas-path.patch b/pkgs/development/python-modules/triton/0004-nvidia-allow-static-ptxas-path.patch
index 188133fe1408..47c1380af85a 100644
--- a/pkgs/development/python-modules/triton/0004-nvidia-allow-static-ptxas-path.patch
+++ b/pkgs/development/python-modules/triton/0004-nvidia-allow-static-ptxas-path.patch
@@ -1,14 +1,13 @@
-diff --git a/third_party/nvidia/backend/compiler.py b/third_party/nvidia/backend/compiler.py
-index 960334744..269e22e6e 100644
---- a/third_party/nvidia/backend/compiler.py
-+++ b/third_party/nvidia/backend/compiler.py
-@@ -38,6 +38,9 @@ def _path_to_binary(binary: str):
-         os.path.join(os.path.dirname(__file__), "bin", binary),
-     ]
- 
-+    import shlex
-+    paths.extend(shlex.split("@nixpkgsExtraBinaryPaths@"))
-+
-     for path in paths:
-         if os.path.exists(path) and os.path.isfile(path):
-             result = subprocess.check_output([path, "--version"], stderr=subprocess.STDOUT)
+diff --git a/python/triton/knobs.py b/python/triton/knobs.py
+index 30804b170..c6a3a737d 100644
+--- a/python/triton/knobs.py
++++ b/python/triton/knobs.py
+@@ -203,6 +203,8 @@ class env_nvidia_tool(env_base[str, NvidiaTool]):
+             # accessible.
+             self.default(),
+         ]
++        import shlex
++        paths.extend(shlex.split("@nixpkgsExtraBinaryPaths@"))
+         for path in paths:
+             if not path or not os.access(path, os.X_OK):
+                 continue
diff --git a/pkgs/development/python-modules/triton/default.nix b/pkgs/development/python-modules/triton/default.nix
index 680e8321af79..ab0db19f9bca 100644
--- a/pkgs/development/python-modules/triton/default.nix
+++ b/pkgs/development/python-modules/triton/default.nix
@@ -30,7 +30,7 @@
 
 buildPythonPackage rec {
   pname = "triton";
-  version = "3.3.1";
+  version = "3.4.0";
   pyproject = true;
 
   # Remember to bump triton-llvm as well!
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     owner = "triton-lang";
     repo = "triton";
     tag = "v${version}";
-    hash = "sha256-XLw7s5K0j4mfIvNMumlHkUpklSzVSTRyfGazZ4lLpn0=";
+    hash = "sha256-78s9ke6UV7Tnx3yCr0QZcVDqQELR4XoGgJY7olNJmjk=";
   };
 
   patches = [
@@ -60,20 +60,28 @@ buildPythonPackage rec {
     })
   ];
 
-  postPatch = ''
+  postPatch =
+    # Avoid downloading dependencies remove any downloads
+    ''
+      substituteInPlace setup.py \
+        --replace-fail "[get_json_package_info()]" "[]" \
+        --replace-fail "[get_llvm_package_info()]" "[]" \
+        --replace-fail 'yield ("triton.profiler", "third_party/proton/proton")' 'pass' \
+        --replace-fail "curr_version.group(1) != version" "False"
+    ''
     # Use our `cmakeFlags` instead and avoid downloading dependencies
-    # remove any downloads
-    substituteInPlace python/setup.py \
-      --replace-fail "[get_json_package_info()]" "[]"\
-      --replace-fail "[get_llvm_package_info()]" "[]"\
-      --replace-fail 'packages += ["triton/profiler"]' "pass"\
-      --replace-fail "curr_version.group(1) != version" "False"
-
+    + ''
+      substituteInPlace setup.py \
+        --replace-fail \
+          "cmake_args.extend(thirdparty_cmake_args)" \
+          "cmake_args.extend(thirdparty_cmake_args + os.environ.get('cmakeFlags', \"\").split())"
+    ''
     # Don't fetch googletest
-    substituteInPlace cmake/AddTritonUnitTest.cmake \
-      --replace-fail "include(\''${PROJECT_SOURCE_DIR}/unittest/googletest.cmake)" ""\
-      --replace-fail "include(GoogleTest)" "find_package(GTest REQUIRED)"
-  '';
+    + ''
+      substituteInPlace cmake/AddTritonUnitTest.cmake \
+        --replace-fail "include(\''${PROJECT_SOURCE_DIR}/unittest/googletest.cmake)" ""\
+        --replace-fail "include(GoogleTest)" "find_package(GTest REQUIRED)"
+    '';
 
   build-system = [ setuptools ];
 
@@ -92,6 +100,10 @@ buildPythonPackage rec {
     writableTmpDirAsHomeHook
   ];
 
+  cmakeFlags = [
+    (lib.cmakeFeature "LLVM_SYSPATH" "${llvm}")
+  ];
+
   buildInputs = [
     gtest
     libxml2.dev
@@ -113,19 +125,11 @@ buildPythonPackage rec {
     "-Wno-stringop-overread"
   ];
 
-  # Avoid GLIBCXX mismatch with other cuda-enabled python packages
-  preConfigure = ''
+  preConfigure =
     # Ensure that the build process uses the requested number of cores
-    export MAX_JOBS="$NIX_BUILD_CORES"
-
-    # Upstream's github actions patch setup.cfg to write base-dir. May be redundant
-    echo "
-    [build_ext]
-    base-dir=$PWD" >> python/setup.cfg
-
-    # The rest (including buildPhase) is relative to ./python/
-    cd python
-  '';
+    ''
+      export MAX_JOBS="$NIX_BUILD_CORES"
+    '';
 
   env = {
     TRITON_BUILD_PROTON = "OFF";
diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix
index 7a7d14b79d1c..a9b0787943bb 100644
--- a/pkgs/development/python-modules/xhtml2pdf/default.nix
+++ b/pkgs/development/python-modules/xhtml2pdf/default.nix
@@ -65,6 +65,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/xhtml2pdf/xhtml2pdf";
     license = lib.licenses.asl20;
     mainProgram = "xhtml2pdf";
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 479f6afa75a4..7e7eb2d7a1aa 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -223,6 +223,11 @@ rec {
   # and respect the compatibility matrix at
   # https://docs.gradle.org/current/userguide/compatibility.html
 
+  gradle_9 = gen {
+    version = "9.0.0";
+    hash = "sha256-j609eClspRgRPz0pAWYXx/k2fcAF+TK9nZO/RbpGBys=";
+    defaultJava = jdk21;
+  };
   gradle_8 = gen {
     version = "8.14.3";
     hash = "sha256-vXEQIhNJMGCVbsIp2Ua+7lcVjb2J0OYrkbyg+ixfNTE=";
diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix
index dbb40d3dd88c..efb6dd966ec1 100644
--- a/pkgs/os-specific/linux/evdi/default.nix
+++ b/pkgs/os-specific/linux/evdi/default.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
       lgpl21Only
       gpl2Only
     ];
-    maintainers = with lib.maintainers; [ drupol ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 518adc24238e..069f4b6c94a3 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -322,7 +322,7 @@ let
       NET_CLS_BPF = module;
       NET_ACT_BPF = module;
       NET_SCHED = yes;
-      NET_SCH_BPF = whenAtLeast "6.16" yes;
+      NET_SCH_BPF = whenAtLeast "6.16" (whenPlatformHasEBPFJit yes);
       L2TP_V3 = yes;
       L2TP_IP = module;
       L2TP_ETH = module;
diff --git a/pkgs/os-specific/linux/projecteur/default.nix b/pkgs/os-specific/linux/projecteur/default.nix
index f90d77f5a207..1ee127f15b80 100644
--- a/pkgs/os-specific/linux/projecteur/default.nix
+++ b/pkgs/os-specific/linux/projecteur/default.nix
@@ -53,7 +53,6 @@ mkDerivation rec {
     mainProgram = "projecteur";
     maintainers = with lib.maintainers; [
       benneti
-      drupol
     ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix
index 171fd6943e59..708a5f6c712d 100644
--- a/pkgs/servers/http/jetty/default.nix
+++ b/pkgs/servers/http/jetty/default.nix
@@ -57,7 +57,7 @@ in
   };
 
   jetty_12 = common {
-    version = "12.0.23";
-    hash = "sha256-oY6IU59ir52eM4qO2arOLErN4CEUCT0iRM4I9ip+m3I=";
+    version = "12.0.25";
+    hash = "sha256-rbLCP0EPPipaNMPtyelLIoK7RMHAZ9I6neV6BpGacWc=";
   };
 }
diff --git a/pkgs/servers/monitoring/prometheus/shelly-exporter.nix b/pkgs/servers/monitoring/prometheus/shelly-exporter.nix
index e5917819b631..b568ce760fe5 100644
--- a/pkgs/servers/monitoring/prometheus/shelly-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/shelly-exporter.nix
@@ -25,6 +25,6 @@ buildGoModule rec {
     mainProgram = "shelly_exporter";
     homepage = "https://github.com/aexel90/shelly_exporter";
     license = licenses.asl20;
-    maintainers = with maintainers; [ drupol ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/test/auto-patchelf-hook/package.nix b/pkgs/test/auto-patchelf-hook/package.nix
index 7f5919a1ea3e..21d99e5d75b8 100644
--- a/pkgs/test/auto-patchelf-hook/package.nix
+++ b/pkgs/test/auto-patchelf-hook/package.nix
@@ -100,4 +100,8 @@ stdenv.mkDerivation {
 
   doInstallCheck = true;
   inherit __structuredAttrs;
+  meta = {
+    # Downloads an x86_64-linux only binary
+    platforms = [ "x86_64-linux" ];
+  };
 }
diff --git a/pkgs/test/buildFHSEnv/default.nix b/pkgs/test/buildFHSEnv/default.nix
index ac0494fefb26..4637b8ea2a22 100644
--- a/pkgs/test/buildFHSEnv/default.nix
+++ b/pkgs/test/buildFHSEnv/default.nix
@@ -47,21 +47,28 @@ let
       };
       find_lib-in-FHS = "${find_libFHSEnv}/bin/${find_libFHSEnv.name}";
     in
-    runCommand "FHS-lib-test" { } ''
-      echo original ldd output is:
-      ${ldd} ${sharedObject}
-      lddOutput="$(${ldd-in-FHS} ${sharedObject})"
-      echo ldd output inside FHS is:
-      echo "$lddOutput"
-      if echo $lddOutput | grep -q "not found"; then
-        echo "shared object could not find all dependencies in the FHS!"
-        echo The libraries below where found in the FHS:
-        ${find_lib-in-FHS}
-        exit 1
-      else
-        echo $lddOutput > $out
-      fi
-    '';
+    runCommand "FHS-lib-test"
+      {
+        meta = {
+          # Downloads an x86_64-linux only binary
+          platforms = [ "x86_64-linux" ];
+        };
+      }
+      ''
+        echo original ldd output is:
+        ${ldd} ${sharedObject}
+        lddOutput="$(${ldd-in-FHS} ${sharedObject})"
+        echo ldd output inside FHS is:
+        echo "$lddOutput"
+        if echo $lddOutput | grep -q "not found"; then
+          echo "shared object could not find all dependencies in the FHS!"
+          echo The libraries below where found in the FHS:
+          ${find_lib-in-FHS}
+          exit 1
+        else
+          echo $lddOutput > $out
+        fi
+      '';
 
 in
 {
diff --git a/pkgs/test/stdenv-inputs/default.nix b/pkgs/test/stdenv-inputs/default.nix
index e52dd0a68c54..9ffe2e6479ce 100644
--- a/pkgs/test/stdenv-inputs/default.nix
+++ b/pkgs/test/stdenv-inputs/default.nix
@@ -42,14 +42,13 @@ in
 
 stdenv.mkDerivation {
   name = "stdenv-inputs-test";
-  phases = [ "buildPhase" ];
 
   buildInputs = [
     foo
     bar
   ];
 
-  buildPhase = ''
+  buildCommand = ''
     env
 
     printf "checking whether binaries are available... " >&2
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3a6ad49c511f..c18a83041739 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7103,10 +7103,12 @@ with pkgs;
 
   gradle_7-unwrapped = callPackage gradle-packages.gradle_7 { };
   gradle_8-unwrapped = callPackage gradle-packages.gradle_8 { };
+  gradle_9-unwrapped = callPackage gradle-packages.gradle_9 { };
   gradle-unwrapped = gradle_8-unwrapped;
 
   gradle_7 = wrapGradle gradle_7-unwrapped null;
   gradle_8 = wrapGradle gradle_8-unwrapped null;
+  gradle_9 = wrapGradle gradle_9-unwrapped null;
   gradle = wrapGradle gradle-unwrapped "gradle-unwrapped";
 
   griffe = with python3Packages; toPythonApplication griffe;
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index e80461875e93..ca0de16f4600 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -258,6 +258,7 @@ mapAliases ({
   fenics = throw "fenics has been removed, use fenics-dolfinx instead"; # added 2025-08-07
   filebrowser_safe = filebrowser-safe; # added 2024-01-03
   filemagic = throw "inactive since 2014, so use python-magic instead"; # added 2022-11-19
+  filesplit = throw "filesplit has been removed, since it is unmaintained"; # added 2025-08-20
   flaskbabel = flask-babel; # added 2023-01-19
   flask-babelex = throw "flask-babelex package has been removed, use flask-babel instead"; # added 2024-10-07
   flask_assets = flask-assets; # added 2023-08-23
@@ -627,6 +628,8 @@ mapAliases ({
   py-scrypt = scrypt; # added 2025-08-07
   pysha3 = throw "pysha3 has been removed, use safe-pysha3 instead"; # added 2023-05-20
   pysimplegui = throw "pysimplegui update to v5 broke the package, it now needs a license key to decrypt the source code"; # added 2024-09-16
+  pyside6-fluent-widgets = throw "pyside6-fluent-widgets has been removed, since it is unmaintained"; # added 2025-08-20
+  pysidesix-frameless-window = throw "pysidesix-frameless-window has been removed, since it is unmaintained"; # added 2025-08-20
   pysmart-smartx = pysmart; # added 2021-10-22
   pySmartDL = pysmartdl; # added 2023-10-11
   pysmi-lextudio = pysmi; # added 2024-07-18
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 46c1e76e888b..ebb6024432bc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5117,8 +5117,6 @@ self: super: with self; {
 
   files-to-prompt = callPackage ../development/python-modules/files-to-prompt { };
 
-  filesplit = callPackage ../development/python-modules/filesplit { };
-
   filetype = callPackage ../development/python-modules/filetype { };
 
   filterpy = callPackage ../development/python-modules/filterpy { };
@@ -13982,14 +13980,8 @@ self: super: with self; {
     callPackage ../development/python-modules/pyside6 { inherit (pkgs) cmake ninja; }
   );
 
-  pyside6-fluent-widgets = callPackage ../development/python-modules/pyside6-fluent-widgets { };
-
   pyside6-qtads = callPackage ../development/python-modules/pyside6-qtads { };
 
-  pysidesix-frameless-window =
-    callPackage ../development/python-modules/pysidesix-frameless-window
-      { };
-
   pysigma = callPackage ../development/python-modules/pysigma { };
 
   pysigma-backend-elasticsearch =