From acb3135613fe446a0d04f793b0ddcba459d42463 Mon Sep 17 00:00:00 2001 From: Leon Isenberg Date: Fri, 24 Mar 2017 22:16:50 +0100 Subject: [PATCH 1/2] emacsMacport: correct description --- pkgs/applications/editors/emacs/macport.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix index 90812fb802c5..f0f19dce6e30 100644 --- a/pkgs/applications/editors/emacs/macport.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -92,8 +92,8 @@ stdenv.mkDerivation rec { extensions are distributed with GNU Emacs; others are available separately. - This is "Mac port" addition to GNU Emacs 24. This provides a native - GUI support for Mac OS X 10.4 - 10.11. Note that Emacs 23 and later + This is "Mac port" addition to GNU Emacs 25. This provides a native + GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later already contain the official GUI support via the NS (Cocoa) port for Mac OS X 10.4 and later. So if it is good enough for you, then you don't need to try this. From f20a10b451768bfffc9d18c2a3a5b3a6af5fdb6b Mon Sep 17 00:00:00 2001 From: Leon Isenberg Date: Fri, 24 Mar 2017 22:16:39 +0100 Subject: [PATCH 2/2] emacsMacport: change naming scheme Changed name from emacs-25.1-mac-6.1 to emacs-mac-25.1-6.1. The former scheme confused compareVersions from nix and consequently nix-env -u. --- pkgs/applications/editors/emacs/macport.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix index f0f19dce6e30..34729783cce4 100644 --- a/pkgs/applications/editors/emacs/macport.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -4,8 +4,10 @@ }: stdenv.mkDerivation rec { - emacsName = "emacs-25.1"; - name = "${emacsName}-mac-6.1"; + emacsVersion = "25.1"; + emacsName = "emacs-${emacsVersion}"; + macportVersion = "6.1"; + name = "emacs-mac-${emacsVersion}-${macportVersion}"; builder = ./builder.sh; @@ -15,7 +17,7 @@ stdenv.mkDerivation rec { }; macportSrc = fetchurl { - url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz"; + url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz"; sha256 = "1zwxh7zsvwcg221mpjh0dhpdas3j9mc5q92pprf8yljl7clqvg62"; }; @@ -35,7 +37,7 @@ stdenv.mkDerivation rec { postUnpack = '' mv $sourceRoot $name - tar xzf $macportSrc + tar xzf $macportSrc -C $name --strip-components=1 mv $name $sourceRoot # extract retina image resources