From 3a9a707fd40c7b04a0d5a7d358ed45b30dd9052d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 6 Feb 2017 16:44:15 -0600 Subject: [PATCH] emacs24macport: remove --- nixos/modules/services/editors/emacs.xml | 5 +- .../editors/emacs/macport-24.5.nix | 91 ------------------- .../emacs/{macport-25.1.nix => macport.nix} | 0 pkgs/top-level/all-packages.nix | 14 +-- 4 files changed, 8 insertions(+), 102 deletions(-) delete mode 100644 pkgs/applications/editors/emacs/macport-24.5.nix rename pkgs/applications/editors/emacs/{macport-25.1.nix => macport.nix} (100%) diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index 89f09ed08449..9d6395ebd74c 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -79,10 +79,11 @@ - emacs24Macport + emacsMacport + emacs25Macport - 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. diff --git a/pkgs/applications/editors/emacs/macport-24.5.nix b/pkgs/applications/editors/emacs/macport-24.5.nix deleted file mode 100644 index 33d24242db79..000000000000 --- a/pkgs/applications/editors/emacs/macport-24.5.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, gettext -, AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit -, autoconf, automake -, ImageCaptureCore, GSS, ImageIO # These may be optional -}: - -stdenv.mkDerivation rec { - emacsName = "emacs-24.5"; - name = "${emacsName}-mac-5.15"; - - builder = ./builder.sh; - - src = fetchurl { - url = "mirror://gnu/emacs/${emacsName}.tar.xz"; - sha256 = "0kn3rzm91qiswi0cql89kbv6mqn27rwsyjfb8xmwy9m5s8fxfiyx"; - }; - - macportSrc = fetchurl { - url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz"; - sha256 = "1r47bm1pf5av2yr37byz91y7bp6vdw9smahiy18g5qp4jp6mz193"; - }; - - enableParallelBuilding = true; - - buildInputs = [ ncurses libxml2 gnutls pkgconfig texinfo gettext autoconf automake ]; - - propagatedBuildInputs = [ - AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit - ImageCaptureCore GSS ImageIO # may be optional - ]; - - postUnpack = '' - mv $emacsName $name - tar xzf $macportSrc - mv $name $emacsName - ''; - - postPatch = '' - patch -p1 < patch-mac - sed -i 's|/usr/share/locale|${gettext}/share/locale|g' lisp/international/mule-cmds.el - ''; - - configureFlags = [ - "LDFLAGS=-L${ncurses.out}/lib" - "--with-xml2=yes" - "--with-gnutls=yes" - "--with-mac" - "--enable-mac-app=$$out/Applications" - ]; - - CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090"; - LDFLAGS = "-O3 -L${ncurses.out}/lib"; - - postInstall = '' - mkdir -p $out/share/emacs/site-lisp/ - cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el - ''; - - doCheck = true; - - meta = with stdenv.lib; { - description = "GNU Emacs 24, the extensible, customizable text editor"; - homepage = http://www.gnu.org/software/emacs/; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ jwiegley ]; - platforms = platforms.darwin; - - longDescription = '' - GNU Emacs is an extensible, customizable text editor—and more. At its - core is an interpreter for Emacs Lisp, a dialect of the Lisp - programming language with extensions to support text editing. - - The features of GNU Emacs include: content-sensitive editing modes, - including syntax coloring, for a wide variety of file types including - plain text, source code, and HTML; complete built-in documentation, - including a tutorial for new users; full Unicode support for nearly all - human languages and their scripts; highly customizable, using Emacs - Lisp code or a graphical interface; a large number of extensions that - add other functionality, including a project planner, mail and news - reader, debugger interface, calendar, and more. Many of these - 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 - 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. - ''; - }; -} diff --git a/pkgs/applications/editors/emacs/macport-25.1.nix b/pkgs/applications/editors/emacs/macport.nix similarity index 100% rename from pkgs/applications/editors/emacs/macport-25.1.nix rename to pkgs/applications/editors/emacs/macport.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d38479b26d56..2f0826f08d74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12934,19 +12934,15 @@ with pkgs; withGTK3 = false; })); - emacs24Macport_24_5 = lowPrio (callPackage ../applications/editors/emacs/macport-24.5.nix { + emacsMacport = emacs25Macport; + emacs25Macport = callPackage ../applications/editors/emacs/macport.nix { inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit ImageCaptureCore GSS ImageIO; - }); - emacs24Macport = self.emacs24Macport_24_5; + }; - emacs25Macport_25_1 = lowPrio (callPackage ../applications/editors/emacs/macport-25.1.nix { - inherit (darwin.apple_sdk.frameworks) - AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit - ImageCaptureCore GSS ImageIO; - }); - emacs25Macport = self.emacs25Macport_25_1; + # for backwards compatibility + emacs25Macport_25_1 = emacs25Macport; emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec { inherit emacs;