about summary refs log tree commit diff
path: root/pkgs/applications/editors/emacs
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2019-02-24 18:54:32 -0500
committerMatthew Bauer <mjbauer95@gmail.com>2019-02-24 18:54:32 -0500
commit73061742af6f8731543890044d2697ab56dc2cbc (patch)
tree16fecd6aff968241de5d71e6b8585134915d9470 /pkgs/applications/editors/emacs
parentdffba878e135960d14f12392a52eb24194539dd7 (diff)
parente08a891d34b1be533196b171d7995efbc69353e0 (diff)
downloadnixlib-73061742af6f8731543890044d2697ab56dc2cbc.tar
nixlib-73061742af6f8731543890044d2697ab56dc2cbc.tar.gz
nixlib-73061742af6f8731543890044d2697ab56dc2cbc.tar.bz2
nixlib-73061742af6f8731543890044d2697ab56dc2cbc.tar.lz
nixlib-73061742af6f8731543890044d2697ab56dc2cbc.tar.xz
nixlib-73061742af6f8731543890044d2697ab56dc2cbc.tar.zst
nixlib-73061742af6f8731543890044d2697ab56dc2cbc.zip
Merge remote-tracking branch 'NixOS/master' into staging
Diffstat (limited to 'pkgs/applications/editors/emacs')
-rw-r--r--pkgs/applications/editors/emacs/25.nix2
-rw-r--r--pkgs/applications/editors/emacs/default.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/editors/emacs/25.nix b/pkgs/applications/editors/emacs/25.nix
index d9f0b211f159..852faeb7918b 100644
--- a/pkgs/applications/editors/emacs/25.nix
+++ b/pkgs/applications/editors/emacs/25.nix
@@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
     description = "The extensible, customizable GNU text editor";
     homepage    = https://www.gnu.org/software/emacs/;
     license     = licenses.gpl3Plus;
-    maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny jwiegley ];
+    maintainers = with maintainers; [ lovek323 peti the-kenny jwiegley ];
     platforms   = platforms.all;
 
     longDescription = ''
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index 4a48cde571ae..6f56ba6cf492 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -133,7 +133,7 @@ stdenv.mkDerivation rec {
     description = "The extensible, customizable GNU text editor";
     homepage    = https://www.gnu.org/software/emacs/;
     license     = licenses.gpl3Plus;
-    maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny jwiegley ];
+    maintainers = with maintainers; [ lovek323 peti the-kenny jwiegley ];
     platforms   = platforms.all;
 
     longDescription = ''