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: c8342644cf1c
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: 03bf8cd4870c
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 12, 2018

  1. nixos/rmilter: don't enable by default, if rspamd enabled 

    (cherry picked from commit b61dd2b)
    @avnik @Mic92
    avnik authored and Mic92 committed Oct 12, 2018
    Copy the full SHA
    29b9fee View commit details

  2. lib/types: enhances separatedString's description 

    The previous description "string" is misleading in the full options
manual pages; they are actually concatenated strings, with a specific
character.

The empty string version ("types.string") has been special-cased to
provide a better message.

(cherry picked from commit 0808c7c)
    @samueldr
    samueldr committed Oct 12, 2018
    Copy the full SHA
    03bf8cd View commit details
Showing with 5 additions and 2 deletions.
  1. +4 −1 lib/types.nix
  2. +1 −1 nixos/modules/services/mail/rmilter.nix
5 changes: 4 additions & 1 deletion lib/types.nix
View file
Original file line number Diff line number Diff line change
@@ -192,7 +192,10 @@ rec {
# separator between the values).
separatedString = sep: mkOptionType rec {
name = "separatedString";
description = "string";
description = if sep == ""
then "Concatenated string" # for types.string.
else "strings concatenated with ${builtins.toJSON sep}"
;
check = isString;
merge = loc: defs: concatStringsSep sep (getValues defs);
functor = (defaultFunctor name) // {
2 changes: 1 addition & 1 deletion nixos/modules/services/mail/rmilter.nix
View file
Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@ in

enable = mkOption {
type = types.bool;
default = cfg.rspamd.enable;
default = false;
description = "Whether to run the rmilter daemon.";
};