about summary refs log tree commit diff
path: root/modules/shell
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-12-22 02:46:30 +0000
committerAlyssa Ross <hi@alyssa.is>2019-12-24 23:03:44 +0000
commit51a924a9c7d2bcf84705ac74f7c1d38d449cad4b (patch)
tree77093a0f8d5f87512eaecc015e4dc8aa308f0520 /modules/shell
parent462007d8d651f1f5bacb5ed58f1b1671a8515d5b (diff)
downloadnixlib-51a924a9c7d2bcf84705ac74f7c1d38d449cad4b.tar
nixlib-51a924a9c7d2bcf84705ac74f7c1d38d449cad4b.tar.gz
nixlib-51a924a9c7d2bcf84705ac74f7c1d38d449cad4b.tar.bz2
nixlib-51a924a9c7d2bcf84705ac74f7c1d38d449cad4b.tar.lz
nixlib-51a924a9c7d2bcf84705ac74f7c1d38d449cad4b.tar.xz
nixlib-51a924a9c7d2bcf84705ac74f7c1d38d449cad4b.tar.zst
nixlib-51a924a9c7d2bcf84705ac74f7c1d38d449cad4b.zip
modules/git: don't set sendemail.smtpServer
Since postfix is the MTA now, and it provides a sendmail program in
PATH, this doesn't need to be manually configured any more.
Diffstat (limited to 'modules/shell')
-rw-r--r--modules/shell/git/config.in2
-rw-r--r--modules/shell/git/default.nix8
2 files changed, 0 insertions, 10 deletions
diff --git a/modules/shell/git/config.in b/modules/shell/git/config.in
index c9983ba5014d..8e2243bec31b 100644
--- a/modules/shell/git/config.in
+++ b/modules/shell/git/config.in
@@ -50,5 +50,3 @@
     tool = opendiff
 [push]
     default = upstream
-[sendemail]
-    smtpServer = @smtpServer@
diff --git a/modules/shell/git/default.nix b/modules/shell/git/default.nix
index cbc86957f9ff..9b1d6efa8235 100644
--- a/modules/shell/git/default.nix
+++ b/modules/shell/git/default.nix
@@ -9,19 +9,11 @@ let
     python = pkgs.python3;
   };
 
-  # Git only supports absolute paths for this, so give it a wrapper
-  # program that execs the msmtp in PATH.
-  sendmail = pkgs.writeScript "git-sendmail" ''
-    #! ${pkgs.execline}/bin/execlineb -S0
-    msmtp $@
-  '';
-
   config = pkgs.substituteAll {
     src = ./config.in;
 
     inherit mozlz4_textconv;
     python = pkgs.python3;
-    smtpServer = sendmail;
     attributesfile = ./attributes;
     ignorefile = ./ignore;
     preferLocalBuild = true;