From 546c8ffef81ebd375252bb31c15620a0801eadeb Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:29 +0000 Subject: [PATCH] ssmtp: move defaults to package file --- pkgs/tools/networking/ssmtp/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/ssmtp/default.nix b/pkgs/tools/networking/ssmtp/default.nix index 22f60bfcee5..ebe31dc8b5a 100644 --- a/pkgs/tools/networking/ssmtp/default.nix +++ b/pkgs/tools/networking/ssmtp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, tlsSupport ? false, openssl ? null}: +{stdenv, fetchurl, tlsSupport ? true, openssl ? null}: assert tlsSupport -> openssl != null; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9fdb03560d0..bee9676158b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5551,9 +5551,7 @@ in sslmate = callPackage ../development/tools/sslmate { }; - ssmtp = callPackage ../tools/networking/ssmtp { - tlsSupport = true; - }; + ssmtp = callPackage ../tools/networking/ssmtp { }; ssocr = callPackage ../applications/misc/ssocr { };