From 58f543f19f1a2eed8a46202b36a855836cfc9e0f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Nov 2009 17:36:43 +0000 Subject: [PATCH] * Remove some old Emacs versions. svn path=/nixpkgs/trunk/; revision=18470 --- pkgs/applications/editors/emacs-21/builder.sh | 12 ----- pkgs/applications/editors/emacs-21/crt.patch | 41 ---------------- .../applications/editors/emacs-21/default.nix | 28 ----------- pkgs/applications/editors/emacs-22/builder.sh | 27 ----------- .../applications/editors/emacs-22/default.nix | 48 ------------------- pkgs/top-level/all-packages.nix | 20 +------- pkgs/top-level/release.nix | 6 +-- 7 files changed, 2 insertions(+), 180 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-21/builder.sh delete mode 100644 pkgs/applications/editors/emacs-21/crt.patch delete mode 100644 pkgs/applications/editors/emacs-21/default.nix delete mode 100644 pkgs/applications/editors/emacs-22/builder.sh delete mode 100644 pkgs/applications/editors/emacs-22/default.nix diff --git a/pkgs/applications/editors/emacs-21/builder.sh b/pkgs/applications/editors/emacs-21/builder.sh deleted file mode 100644 index acd98aefd04..00000000000 --- a/pkgs/applications/editors/emacs-21/builder.sh +++ /dev/null @@ -1,12 +0,0 @@ -source $stdenv/setup - -myglibc=`cat ${NIX_GCC}/nix-support/orig-libc` -echo "glibc: $myglibc" - -postConfigure() { - cp $myglibc/lib/crt1.o src - cp $myglibc/lib/crti.o src - cp $myglibc/lib/crtn.o src -} - -genericBuild diff --git a/pkgs/applications/editors/emacs-21/crt.patch b/pkgs/applications/editors/emacs-21/crt.patch deleted file mode 100644 index 93f17643a1a..00000000000 --- a/pkgs/applications/editors/emacs-21/crt.patch +++ /dev/null @@ -1,41 +0,0 @@ -Only in emacs-21.3: configure.in~ -Only in emacs-21.3: patchfile -Only in emacs-21.3/src: Makefile.in~ -diff -rc emacs-orig/src/s/gnu-linux.h emacs-21.3/src/s/gnu-linux.h -*** emacs-orig/src/s/gnu-linux.h 2001-09-28 17:50:04.000000000 +0200 ---- emacs-21.3/src/s/gnu-linux.h 2004-10-06 13:13:19.000000000 +0200 -*************** -*** 173,179 **** - /* GNU/Linux usually has crt0.o in a non-standard place */ - #define START_FILES pre-crt0.o /usr/lib/crt0.o - #else -! #define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o - #endif - - #ifdef __ELF__ ---- 173,179 ---- - /* GNU/Linux usually has crt0.o in a non-standard place */ - #define START_FILES pre-crt0.o /usr/lib/crt0.o - #else -! #define START_FILES pre-crt0.o crt1.o crti.o - #endif - - #ifdef __ELF__ -*************** -*** 225,231 **** - #else - #undef LIB_GCC - #define LIB_GCC -! #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o - #endif - - /* Don't use -g in test compiles in configure. ---- 225,231 ---- - #else - #undef LIB_GCC - #define LIB_GCC -! #define LIB_STANDARD -lgcc -lc -lgcc crtn.o - #endif - - /* Don't use -g in test compiles in configure. -Only in emacs-21.3/src/s: gnu-linux.h~ diff --git a/pkgs/applications/editors/emacs-21/default.nix b/pkgs/applications/editors/emacs-21/default.nix deleted file mode 100644 index 9fc16594e26..00000000000 --- a/pkgs/applications/editors/emacs-21/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ xawSupport ? true -, xpmSupport ? true -, xaw3dSupport ? false -, stdenv, fetchurl, ncurses, x11, libXaw ? null, libXpm ? null, Xaw3d ? null -}: - -assert xawSupport && !xaw3dSupport -> libXaw != null; -assert xawSupport && xaw3dSupport -> Xaw3d != null; -assert xpmSupport -> libXpm != null; - -stdenv.mkDerivation { - name = "emacs-21.4a"; - builder = ./builder.sh; - src = fetchurl { - url = http://nixos.org/tarballs/emacs-21.4a.tar.gz; - md5 = "8f9d97cbd126121bd5d97e5e31168a87"; - }; - patches = [./crt.patch]; - buildInputs = [ - ncurses x11 - (if xawSupport then if xaw3dSupport then Xaw3d else libXaw else null) - (if xpmSupport then libXpm else null) - ]; - - meta = { - description = "All Hail Emacs, the ultimate editor"; - }; -} diff --git a/pkgs/applications/editors/emacs-22/builder.sh b/pkgs/applications/editors/emacs-22/builder.sh deleted file mode 100644 index 7a82f6552ef..00000000000 --- a/pkgs/applications/editors/emacs-22/builder.sh +++ /dev/null @@ -1,27 +0,0 @@ -source $stdenv/setup - -preConfigure() { - libc=$(cat ${NIX_GCC}/nix-support/orig-libc) - echo "libc: $libc" - - case "${system}" in - x86_64-*) glibclibdir=lib64 ;; - *) glibclibdir=lib ;; - esac - - for i in src/s/*.h src/m/*.h; do - substituteInPlace $i \ - --replace /usr/${glibclibdir}/crt1.o $libc/${glibclibdir}/crt1.o \ - --replace /usr/${glibclibdir}/crti.o $libc/${glibclibdir}/crti.o \ - --replace /usr/${glibclibdir}/crtn.o $libc/${glibclibdir}/crtn.o \ - --replace /usr/lib/crt1.o $libc/${glibclibdir}/crt1.o \ - --replace /usr/lib/crti.o $libc/${glibclibdir}/crti.o \ - --replace /usr/lib/crtn.o $libc/${glibclibdir}/crtn.o - done - - for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do - substituteInPlace $i --replace /bin/pwd pwd - done -} - -genericBuild diff --git a/pkgs/applications/editors/emacs-22/default.nix b/pkgs/applications/editors/emacs-22/default.nix deleted file mode 100644 index da3c4babbf6..00000000000 --- a/pkgs/applications/editors/emacs-22/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ xawSupport ? true -, xpmSupport ? true -, xaw3dSupport ? false -, gtkGUI ? false -, stdenv, fetchurl, x11, libXaw ? null, libXpm ? null, Xaw3d ? null -, pkgconfig ? null, gtk ? null -, ncurses -}: - -assert xawSupport && !xaw3dSupport -> libXaw != null; -assert xawSupport && xaw3dSupport -> Xaw3d != null; -assert xpmSupport -> libXpm != null; -assert gtkGUI -> pkgconfig != null && gtk != null; - -stdenv.mkDerivation rec { - name = "emacs-22.3"; - - builder = ./builder.sh; - - src = fetchurl { - url = "mirror://gnu/emacs/${name}.tar.gz"; - sha256 = "05hd89bchcpwzcx5la0alcp0wb7xywvnf98dxrshrqlfvccvgnbv"; - }; - - buildInputs = [ncurses x11] - ++ stdenv.lib.optional xawSupport (if xaw3dSupport then Xaw3d else libXaw) - ++ stdenv.lib.optional xpmSupport libXpm - ++ stdenv.lib.optionals gtkGUI [pkgconfig gtk]; - - configureFlags = - stdenv.lib.optional gtkGUI "--with-x-toolkit=gtk"; - - meta = { - description = "GNU Emacs, *the* text editor"; - - 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. - ''; - - homepage = http://www.gnu.org/software/emacs/; - license = "GPLv3+"; - - platforms = stdenv.lib.platforms.linux; # GTK & co. are needed. - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f66c381677..e5481bbf61c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6539,21 +6539,7 @@ let inherit fetchurl stdenv ncurses; }; - emacs = emacs22; - - emacs21 = import ../applications/editors/emacs-21 { - inherit fetchurl stdenv ncurses x11 Xaw3d; - inherit (xlibs) libXaw libXpm; - xaw3dSupport = true; - }; - - emacs22 = import ../applications/editors/emacs-22 { - inherit fetchurl stdenv ncurses pkgconfig x11 Xaw3d; - inherit (xlibs) libXaw libXpm; - inherit (gtkLibs) gtk; - xaw3dSupport = getPkgConfig "emacs" "xaw3dSupport" false; - gtkGUI = getPkgConfig "emacs" "gtkSupport" true; - }; + emacs = emacs23; emacs23 = import ../applications/editors/emacs-23 { inherit fetchurl stdenv ncurses pkgconfig x11 Xaw3d @@ -6648,12 +6634,8 @@ let }; }); - emacs22Packages = emacsPackages emacs22; emacs23Packages = emacsPackages emacs23; - # The forthcoming GNU Emacs 23 used to be referred to as `emacsUnicode' here. - emacsUnicode = emacs23; - evince = makeOverridable (import ../applications/misc/evince) { inherit fetchurl stdenv perl perlXMLParser gettext intltool pkgconfig poppler libspectre djvulibre libxslt diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 060f389e9e0..83891984096 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -146,7 +146,6 @@ in { e2fsprogs = linux; ejabberd = linux; elinks = linux; - emacs22 = gtkSupported; emacs23 = gtkSupported; enscript = all; eprover = linux; @@ -436,16 +435,13 @@ in { tools = linux; }; - emacs22Packages = { + emacs23Packages = { bbdb = linux; cedet = linux; ecb = linux; emacsw3m = linux; emms = linux; nxml = all; - }; - - emacs23Packages = emacs22Packages // { jdee = linux; };