Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3e10c3705ff9
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 026d0c8ae569
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Sep 16, 2018

  1. exim: parametrise package 

    This allows the definition of a custom derivation of Exim,
which can be used to enable custom features such as LDAP and PAM support.

The default behaviour remains unchanged (defaulting to pkgs.exim).

(cherry picked from commit d73ed42)
    @pacien @Mic92
    pacien authored and Mic92 committed Sep 16, 2018
    Copy the full SHA
    026d0c8 View commit details
Showing with 14 additions and 4 deletions.
  1. +14 −4 nixos/modules/services/mail/exim.nix
18 changes: 14 additions & 4 deletions nixos/modules/services/mail/exim.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

let
inherit (lib) mkIf mkOption singleton types;
inherit (pkgs) coreutils exim;
inherit (pkgs) coreutils;
cfg = config.services.exim;
in

@@ -57,6 +57,16 @@ in
'';
};

package = mkOption {
type = types.package;
default = pkgs.exim;
defaultText = "pkgs.exim";
description = ''
The Exim derivation to use.
This can be used to enable features such as LDAP or PAM support.
'';
};

};

};
@@ -74,7 +84,7 @@ in
spool_directory = ${cfg.spoolDir}
${cfg.config}
'';
systemPackages = [ exim ];
systemPackages = [ cfg.package ];
};

users.users = singleton {
@@ -89,14 +99,14 @@ in
gid = config.ids.gids.exim;
};

security.wrappers.exim.source = "${exim}/bin/exim";
security.wrappers.exim.source = "${cfg.package}/bin/exim";

systemd.services.exim = {
description = "Exim Mail Daemon";
wantedBy = [ "multi-user.target" ];
restartTriggers = [ config.environment.etc."exim.conf".source ];
serviceConfig = {
ExecStart = "${exim}/bin/exim -bdf -q30m";
ExecStart = "${cfg.package}/bin/exim -bdf -q30m";
ExecReload = "${coreutils}/bin/kill -HUP $MAINPID";
};
preStart = ''