Commit 3dc5545d authored by Silvan Mosberger's avatar Silvan Mosberger
Browse files

modules/generic/meta-maintainers.nix: Check validity of meta.maintainers 

And fix a case where it wasn't valid
parent 516a14cd

modules/generic/meta-maintainers.nix

+8 −1
Original line number Diff line number Diff line
@@ -17,7 +17,14 @@ in 
  options = {

    meta = {

      maintainers = mkOption {

        type = sourceList;

        type =

          let

            allMaintainers = lib.attrValues lib.maintainers;

          in

          lib.types.addCheck sourceList (lib.all (v: lib.elem v allMaintainers))

          // {

            description = "list of lib.maintainers";

          };

        default = [ ];

        example = lib.literalExpression "[ lib.maintainers.alice lib.maintainers.bob ]";

        description = ''

modules/generic/meta-maintainers/test.nix

+9 −1
Original line number Diff line number Diff line
@@ -14,9 +14,17 @@ let 
  };

in

rec {

  lib = import ../../../lib;

  # Inject ghost into lib.maintainers so it passes the addCheck validation

  lib = (import ../../../lib).extend (

    final: prev: {

      maintainers = prev.maintainers // {

        inherit ghost;

      };

    }

  );



  example = lib.evalModules {

    specialArgs.lib = lib;

    modules = [

      ../meta-maintainers.nix

      {

nixos/modules/services/databases/clickhouse.nix

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ let 
in

{



  meta.maintainers = [ "thevar1able" ];

  meta.maintainers = with lib.maintainers; [ thevar1able ];



  ###### interface