summary refs log tree commit diff
path: root/nixos/modules/services/editors
diff options
context:
space:
mode:
authorDaiderd Jordan <daiderd@gmail.com>2017-03-18 22:19:20 +0100
committerGitHub <noreply@github.com>2017-03-18 22:19:20 +0100
commita48df6fba6f04dda95e3274f0207dadfb533a951 (patch)
tree6550c61025e07b056ac092920b628ef166b094fb /nixos/modules/services/editors
parent776614abb7d8418b1f6d77ecb1422c51d3df8134 (diff)
parent3a9a707fd40c7b04a0d5a7d358ed45b30dd9052d (diff)
downloadnixpkgs-a48df6fba6f04dda95e3274f0207dadfb533a951.tar
nixpkgs-a48df6fba6f04dda95e3274f0207dadfb533a951.tar.gz
nixpkgs-a48df6fba6f04dda95e3274f0207dadfb533a951.tar.bz2
nixpkgs-a48df6fba6f04dda95e3274f0207dadfb533a951.tar.lz
nixpkgs-a48df6fba6f04dda95e3274f0207dadfb533a951.tar.xz
nixpkgs-a48df6fba6f04dda95e3274f0207dadfb533a951.tar.zst
nixpkgs-a48df6fba6f04dda95e3274f0207dadfb533a951.zip
Merge pull request #22508 from matthewbauer/remove-emacs24macport
emacs24macport: remove
Diffstat (limited to 'nixos/modules/services/editors')
-rw-r--r--nixos/modules/services/editors/emacs.xml5
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml
index 89f09ed0844..9d6395ebd74 100644
--- a/nixos/modules/services/editors/emacs.xml
+++ b/nixos/modules/services/editors/emacs.xml
@@ -79,10 +79,11 @@
             </listitem>
           </varlistentry>
           <varlistentry>
-            <term><varname>emacs24Macport</varname></term>
+            <term><varname>emacsMacport</varname></term>
+            <term><varname>emacs25Macport</varname></term>
             <listitem>
               <para>
-                Emacs 24 with the "Mac port" patches, providing a more
+                Emacs 25 with the "Mac port" patches, providing a more
                 native look and feel under OS X.
               </para>
             </listitem>