Unverified Commit 5ae8f56b authored by jopejoe1's avatar jopejoe1 Committed by GitHub
Browse files

various: use `mkPackageOption` (#445103)

parents e347d154 4ba3f60b

nixos/modules/programs/kubeswitch.nix

+1 −6
Original line number Diff line number Diff line
@@ -18,12 +18,7 @@ in 
        description = "The name of the command to use";

      };



      package = lib.mkOption {

        type = lib.types.package;

        default = pkgs.kubeswitch;

        defaultText = lib.literalExpression "pkgs.kubeswitch";

        description = "The package to install for kubeswitch";

      };

      package = lib.mkPackageOption pkgs "kubeswitch" { };

    };

  };

nixos/modules/security/tpm2.nix

+1 −6
Original line number Diff line number Diff line
@@ -58,12 +58,7 @@ in 
        Trusted Platform 2 userspace resource manager daemon

      '';



      package = lib.mkOption {

        description = "tpm2-abrmd package to use";

        type = lib.types.package;

        default = pkgs.tpm2-abrmd;

        defaultText = lib.literalExpression "pkgs.tpm2-abrmd";

      };

      package = lib.mkPackageOption pkgs "tpm2-abrmd" { };

    };



    pkcs11 = {

nixos/modules/services/continuous-integration/buildkite-agents.nix

+1 −6
Original line number Diff line number Diff line
@@ -38,12 +38,7 @@ let 
          description = "Whether to enable this buildkite agent";

        };



        package = lib.mkOption {

          default = pkgs.buildkite-agent;

          defaultText = lib.literalExpression "pkgs.buildkite-agent";

          description = "Which buildkite-agent derivation to use";

          type = lib.types.package;

        };

        package = lib.mkPackageOption pkgs "buildkite-agent" { };



        dataDir = lib.mkOption {

          default = "/var/lib/buildkite-agent-${name}";

nixos/modules/services/databases/chromadb.nix

+2 −8
Original line number Diff line number Diff line
@@ -9,10 +9,10 @@ let 
  cfg = config.services.chromadb;

  inherit (lib)

    mkEnableOption

    mkPackageOption

    mkOption

    mkIf

    types

    literalExpression

    ;

in

{
@@ -29,13 +29,7 @@ in 
    services.chromadb = {

      enable = mkEnableOption "ChromaDB, an open-source AI application database.";



      package = mkOption {

        type = types.package;

        example = literalExpression "pkgs.python3Packages.chromadb";

        default = pkgs.python3Packages.chromadb;

        defaultText = "pkgs.python3Packages.chromadb";

        description = "ChromaDB package to use.";

      };

      package = mkPackageOption pkgs [ "python3Packages" "chromadb" ] { };



      host = mkOption {

        type = types.str;

nixos/modules/services/databases/ferretdb.nix

+1 −7
Original line number Diff line number Diff line
@@ -18,13 +18,7 @@ in 
    services.ferretdb = {

      enable = lib.mkEnableOption "FerretDB, an Open Source MongoDB alternative";



      package = lib.mkOption {

        type = lib.types.package;

        example = lib.literalExpression "pkgs.ferretdb";

        default = pkgs.ferretdb;

        defaultText = "pkgs.ferretdb";

        description = "FerretDB package to use.";

      };

      package = lib.mkPackageOption pkgs "ferretdb" { };



      settings = lib.mkOption {

        type = lib.types.submodule {