2 files changed, 36 insertions, 30 deletions

diff --git a/pkgs/tools/networking/ssmtp/default.nix b/pkgs/tools/networking/ssmtp/default.nix
index 6957d43e791..ec309a4a2ce 100644
--- a/pkgs/tools/networking/ssmtp/default.nix
+++ b/pkgs/tools/networking/ssmtp/default.nix
@@ -1,12 +1,11 @@
-{lib, stdenv, fetchurl, tlsSupport ? true, openssl ? null}:
+{ lib, stdenv, fetchurl, tlsSupport ? true, openssl }:
 
-assert tlsSupport -> openssl != null;
-
-stdenv.mkDerivation {
-  name = "ssmtp-2.64";
+stdenv.mkDerivation rec {
+  pname = "ssmtp";
+  version = "2.64";
 
   src = fetchurl {
-    url = "mirror://debian/pool/main/s/ssmtp/ssmtp_2.64.orig.tar.bz2";
+    url = "mirror://debian/pool/main/s/ssmtp/ssmtp_${version}.orig.tar.bz2";
     sha256 = "0dps8s87ag4g3jr6dk88hs9zl46h3790marc5c2qw7l71k4pvhr2";
   };
 
@@ -19,16 +18,15 @@ stdenv.mkDerivation {
     (lib.enableFeature tlsSupport "ssl")
   ];
 
-  postConfigure =
-    ''
-      # Don't run the script that interactively generates a config file.
-      # Also don't install the broken, cyclic symlink /lib/sendmail.
-      sed -e '/INSTALLED_CONFIGURATION_FILE/d' \
-          -e 's|/lib/sendmail|$(TMPDIR)/sendmail|' \
-          -i Makefile
-      substituteInPlace Makefile \
-        --replace '$(INSTALL) -s' '$(INSTALL) -s --strip-program $(STRIP)'
-    '';
+  postConfigure = ''
+    # Don't run the script that interactively generates a config file.
+    # Also don't install the broken, cyclic symlink /lib/sendmail.
+    sed -e '/INSTALLED_CONFIGURATION_FILE/d' \
+        -e 's|/lib/sendmail|$(TMPDIR)/sendmail|' \
+        -i Makefile
+    substituteInPlace Makefile \
+      --replace '$(INSTALL) -s' '$(INSTALL) -s --strip-program $(STRIP)'
+  '';
 
   installFlags = [ "etcdir=$(out)/etc" ];
 
@@ -39,6 +37,7 @@ stdenv.mkDerivation {
   NIX_LDFLAGS = lib.optionalString tlsSupport "-lcrypto";
 
   meta = with lib; {
+    description = "simple MTA to deliver mail from a computer to a mail hub";
     platforms = platforms.linux;
     license = licenses.gpl2;
     maintainers = with maintainers; [ basvandijk ];
diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix
index c433d7d0a66..c5aaec66d9e 100644
--- a/pkgs/tools/networking/toxvpn/default.nix
+++ b/pkgs/tools/networking/toxvpn/default.nix
@@ -1,33 +1,40 @@
-{ lib, stdenv, fetchFromGitHub, cmake, nlohmann_json,
-  libtoxcore, libsodium, libcap, zeromq,
-  systemd ? null }:
-
-with lib;
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, nlohmann_json
+, libtoxcore
+, libsodium
+, libcap
+, zeromq
+, systemd
+}:
 
 stdenv.mkDerivation {
-  name = "toxvpn-2019-09-09";
+  name = "toxvpn";
+  version = "unstable-2019-09-09";
 
   src = fetchFromGitHub {
-    owner  = "cleverca22";
-    repo   = "toxvpn";
-    rev    = "45083dec172ce167f7ed84d571ec2822ebe4d51a";
+    owner = "cleverca22";
+    repo = "toxvpn";
+    rev = "45083dec172ce167f7ed84d571ec2822ebe4d51a";
     sha256 = "193crarrx6q0zd2p6dn67pzv8kngwi440zm1y54njgcz0v3fpxmb";
   };
 
   buildInputs = [ libtoxcore nlohmann_json libsodium zeromq ]
-    ++ optionals stdenv.isLinux [ libcap systemd ];
+    ++ lib.optionals stdenv.isLinux [ libcap systemd ];
 
   nativeBuildInputs = [ cmake ];
 
-  cmakeFlags = optional stdenv.isLinux [ "-DSYSTEMD=1" ];
+  cmakeFlags = lib.optional stdenv.isLinux [ "-DSYSTEMD=1" ];
 
   postInstall = "$out/bin/toxvpn -h";
 
   meta = with lib; {
     description = "A powerful tool that allows one to make tunneled point to point connections over Tox";
-    homepage    = "https://github.com/cleverca22/toxvpn";
-    license     = licenses.gpl3;
+    homepage = "https://github.com/cleverca22/toxvpn";
+    license = licenses.gpl3;
     maintainers = with maintainers; [ cleverca22 obadz toonn ];
-    platforms   = platforms.linux ++ platforms.darwin;
+    platforms = platforms.unix;
   };
 }