Unverified Commit 93ebabef authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #234930 from NickCao/maddy 

maddy: 0.6.3 -> 0.7.0
parents b2e41a5b 63f73b32

nixos/modules/services/mail/maddy.nix

+4 −3
Original line number Diff line number Diff line
@@ -335,12 +335,13 @@ in { 
      };



      secrets = lib.mkOption {

        type = lib.types.path;

        type = with types; listOf path;

        description = lib.mdDoc ''

          A file containing the various secrets. Should be in the format

          A list of files containing the various secrets. Should be in the format

          expected by systemd's `EnvironmentFile` directory. Secrets can be

          referenced in the format `{env:VAR}`.

        '';

        default = [ ];

      };



    };
@@ -379,7 +380,7 @@ in { 
            User = cfg.user;

            Group = cfg.group;

            StateDirectory = [ "maddy" ];

            EnvironmentFile = lib.mkIf (cfg.secrets != null) "${cfg.secrets}";

            EnvironmentFile = cfg.secrets;

          };

          restartTriggers = [ config.environment.etc."maddy/maddy.conf".source ];

          wantedBy = [ "multi-user.target" ];

pkgs/servers/maddy/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -2,16 +2,16 @@ 


buildGoModule rec {

  pname = "maddy";

  version = "0.6.3";

  version = "0.7.0";



  src = fetchFromGitHub {

    owner = "foxcpp";

    repo = "maddy";

    rev = "v${version}";

    sha256 = "sha256-vf+jkXerdwvQhtyiOObBRxh8sYMEcgXC5vNzm5wquBs=";

    sha256 = "sha256-EMw07yTFP0aBSuGDWivB8amuxWLFHhYV6J9faTEW5z4=";

  };



  vendorSha256 = "sha256-10cLNl9jWYX8XIKQkCxJ+/ymZC1YJRHUJWZQhq7zeV4=";

  vendorSha256 = "sha256-LyfkETZPkhJKN8CEivNp7Se4IBpzyAtmCM1xil4n2po=";



  tags = [ "libpam" ];