summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2018-11-23 22:30:29 +0000
committerGitHub <noreply@github.com>2018-11-23 22:30:29 +0000
commit5e159d463b641e8c66a8244030e5e33081a1907b (patch)
treef90adf63c5ec7f5bb6f17d340d5fe0dd81275eac /pkgs
parentf11297acb904beea02d587dba4db609fa36effb7 (diff)
parent0483ce0eeeb7c859e58a287d6f1a0d4e959efffb (diff)
downloadnixpkgs-5e159d463b641e8c66a8244030e5e33081a1907b.tar
nixpkgs-5e159d463b641e8c66a8244030e5e33081a1907b.tar.gz
nixpkgs-5e159d463b641e8c66a8244030e5e33081a1907b.tar.bz2
nixpkgs-5e159d463b641e8c66a8244030e5e33081a1907b.tar.lz
nixpkgs-5e159d463b641e8c66a8244030e5e33081a1907b.tar.xz
nixpkgs-5e159d463b641e8c66a8244030e5e33081a1907b.tar.zst
nixpkgs-5e159d463b641e8c66a8244030e5e33081a1907b.zip
Merge pull request #49228 from Ekleog/rss2email-module
rss2email module: init 
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/networking/feedreaders/rss2email/default.nix9
-rw-r--r--pkgs/servers/mail/system-sendmail/default.nix36
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 45 insertions, 2 deletions
diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix
index 4152c2772e1..4d17cc8bddd 100644
--- a/pkgs/applications/networking/feedreaders/rss2email/default.nix
+++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix
@@ -1,11 +1,13 @@
-{ pythonPackages, fetchurl, lib }:
+{ pythonPackages, fetchurl, lib, nixosTests }:
 
 with pythonPackages;
 
 buildPythonApplication rec {
   name = "${pname}-${version}";
   pname = "rss2email";
-  version = "3.9";
+  version = "3.9"; # TODO: on next bump, the manpage will be updated.
+  # Update nixos/modules/services/mail/rss2email.nix to point to it instead of
+  # to the online r2e.1
 
   propagatedBuildInputs = [ feedparser beautifulsoup4 html2text ];
 
@@ -44,4 +46,7 @@ buildPythonApplication rec {
     license = licenses.gpl2;
     maintainers = with maintainers; [ jb55 Profpatsch ];
   };
+  passthru.tests = {
+    smoke-test = nixosTests.rss2email;
+  };
 }
diff --git a/pkgs/servers/mail/system-sendmail/default.nix b/pkgs/servers/mail/system-sendmail/default.nix
new file mode 100644
index 00000000000..0e290f13518
--- /dev/null
+++ b/pkgs/servers/mail/system-sendmail/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, writeText }:
+
+let script = writeText "script" ''
+  #!/bin/sh
+
+  if command -v sendmail > /dev/null 2>&1 && [ "$(command -v sendmail)" != "{{MYPATH}}" ]; then
+    exec sendmail "$@"
+  elif [ -x /run/wrappers/bin/sendmail ]; then
+    exec /run/wrappers/bin/sendmail "$@"
+  elif [ -x /run/current-system/sw/bin/sendmail ]; then
+    exec /run/current-system/sw/bin/sendmail "$@"
+  else
+    echo "Unable to find system sendmail." >&2
+    exit 1
+  fi
+''; in
+stdenv.mkDerivation {
+  name = "system-sendmail-1.0";
+
+  src = script;
+
+  phases = [ "buildPhase" ];
+  buildPhase = ''
+    mkdir -p $out/bin
+    < $src sed "s#{{MYPATH}}#$out/bin/sendmail#" > $out/bin/sendmail
+    chmod +x $out/bin/sendmail
+  '';
+
+  meta = with stdenv.lib; {
+    description = ''
+      A sendmail wrapper that calls the system sendmail. Do not install as system-wide sendmail!
+    '';
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ ekleog ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3f51b2f8aeb..2e410bf9d67 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13517,6 +13517,8 @@ with pkgs;
 
   pshs = callPackage ../servers/http/pshs { };
 
+  system-sendmail = lowPrio (callPackage ../servers/mail/system-sendmail { });
+
   # PulseAudio daemons
 
   pulseaudio = callPackage ../servers/pulseaudio {