Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b74c26a17f18
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 59c4035e58e0
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 10, 2020

  1. nixos/spamassassin: allow initPreConf to be a path 

    Supporting a path here is important because it allows e.g. fetching a
configuration from a URL.  To do this and provide the configuration as
a string, IFD would be necessary.  It's just written into a path
anyway.
    @alyssais
    alyssais committed Jan 10, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    epiteff
    GPG key ID: 94F82827CA03B374
    Verified
    Learn about vigilant mode
    Copy the full SHA
    59c4035 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 nixos/modules/services/mail/spamassassin.nix
4 changes: 2 additions & 2 deletions nixos/modules/services/mail/spamassassin.nix
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,6 @@ with lib;
let
cfg = config.services.spamassassin;
spamassassin-local-cf = pkgs.writeText "local.cf" cfg.config;
spamassassin-init-pre = pkgs.writeText "init.pre" cfg.initPreConf;

spamdEnv = pkgs.buildEnv {
name = "spamd-env";
@@ -65,8 +64,9 @@ in
};

initPreConf = mkOption {
type = types.str;
type = with types; either str path;
description = "The SpamAssassin init.pre config.";
apply = val: if builtins.isPath val then val else pkgs.writeText "init.pre" val;
default =
''
#