Merge remote-tracking branch 'origin/master' into staging-next

2025-08-21 15:22:18 +03:00
parent 5d84e97d28 63500796d3
commit 041aa01117
245 changed files with 904 additions and 689 deletions
--- 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
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -30,6 +30,7 @@ let
          "doc"
          "lib"
          "maintainers"
+          "modules"
          "nixos"
          "pkgs"
          ".version"
--- 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 = ''
--- 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
--- a/doc/modules/generic.chapter.md
+++ 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
--- a/doc/modules/index.md
+++ 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
--- 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"
  ],
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -1023,7 +1023,6 @@ with lib.maintainers;
  php = {
    members = [
      aanderse
-      drupol
      ma27
      piotrkwiecinski
      talyz
--- a/modules/README.md
+++ 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.
--- a/modules/generic/meta-maintainers.nix
+++ 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
+  ];
+}
--- a/modules/generic/meta-maintainers/test.nix
+++ 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
--- 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
--- 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
--- 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 = ''
--- 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 {
--- 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


--- 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
--- 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
+  ];
 }
--- a/nixos/modules/programs/projecteur.nix
+++ b/nixos/modules/programs/projecteur.nix
@@ -22,7 +22,6 @@ in
  meta = {
    maintainers = with lib.maintainers; [
      benneti
-      drupol
    ];
  };
 }
--- 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 = {
--- 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; [ ];
 }
--- 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; [ ];
 }
--- 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; [ ];
 }
--- 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 = {
--- 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;
--- 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 = [ ];
 }
--- 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;
  };
 }
--- 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 = [ ];
 }
--- 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.";
-    };
  };
 }
--- 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 =
--- 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 = [ ];
 }
--- 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 = {
--- 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
  ];

--- a/nixos/tests/fider.nix
+++ b/nixos/tests/fider.nix
@@ -27,7 +27,6 @@
  '';

  meta.maintainers = with lib.maintainers; [
-    drupol
    niklaskorz
  ];
 }
--- 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 = [ ];
 }
--- 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 = [ ];
 }
--- 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 = [ ];
 }
--- a/nixos/tests/litellm.nix
+++ b/nixos/tests/litellm.nix
@@ -22,6 +22,6 @@ in
  '';

  meta = with lib.maintainers; {
-    maintainers = [ drupol ];
+    maintainers = [ ];
  };
 }
--- 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 = [ ];
 }
--- 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 = [ ];
 }
--- 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"}'
            )
        )
      '';
--- 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 = [ ];
 }
--- 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 = [ ];
 }
--- 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"
--- 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 = [
--- 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; [ ];
  };
 })
--- 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; [ ];
  };
 }
--- 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 = [ ];
        };
      };

--- 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; [ ];
  };
 }
--- 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; [ ];
  };
 }
--- 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; [ ];
  };
 }
--- 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; [ ];
  };
 }
--- 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 = [ ];
  };
 }
--- 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; [ ];
  };
 }
--- 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 = [ ];
  };
 }
--- 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 = [ ];
  };
 }
--- 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 = [ ];
  };
 }
--- 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 = [ ];
  };
 }
--- 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";
--- 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="
      }
    }
  }
--- 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=";
  };
 }
--- 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;
  };
 })
--- 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
--- 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;
  };
 })
--- 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
    ];
  };
 })
--- 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; [ ];
  };
 }
--- 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=";
--- 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;
  };
 }
--- 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";
  };
--- 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;
  };
 })
--- 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";
  };
 })
--- 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; [ ];
  };
 })
--- 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;
  };
--- 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
--- 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;
--- 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; [ ];
  };
 }
--- 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";
--- 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()
 
--- 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
--- 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)
--- 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"],
--- 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"
--- 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
--- a/pkgs/by-name/et/etcd_3_6/package.nix
+++ 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
+  ];
+}
--- a/pkgs/by-name/et/etcd_3_6/update.sh
+++ 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
--- 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;
  };
 }
--- 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
    ];
  };
 }
--- 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;
  };
--- 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;
  };
 })
--- 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;
  };
 }
--- 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 =
--- 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;
  };
 })
--- 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
    ];
  };
--- 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=";
--- 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;
  };
--- 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 = [
--- 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";
  };
 }
--- 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; [ ];
  };
 })
--- 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"
--- 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"
--- a/Show More
+++ b/Show More