diff --git a/doc/package-specific-user-notes.xml b/doc/package-specific-user-notes.xml
index 196c760251f..a176f4d1395 100644
--- a/doc/package-specific-user-notes.xml
+++ b/doc/package-specific-user-notes.xml
@@ -6,7 +6,7 @@
answer some of the frequently asked questions
related to Nixpkgs use.
- Some useful information related to package use
+ Some useful information related to package use
can be found in package-specific development notes.
@@ -196,7 +196,7 @@ overrides = self: super: rec {
haskell-mode = self.melpaPackages.haskell-mode;
...
};
-((emacsPackagesNgGen emacs).overrideScope' overrides).emacsWithPackages (p: with p; [
+((emacsPackagesGen emacs).overrideScope' overrides).emacsWithPackages (p: with p; [
# here both these package will use haskell-mode of our own choice
ghc-mod
dante
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 166be1f1c28..002bb371168 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -338,10 +338,17 @@
For nginx, the dependencies are still automatically managed when is enabled just like before. What changed is that nginx now directly depends on the specific certificates that it needs,
instead of depending on the catch-all acme-certificates.target. This target unit was also removed from the codebase.
This will mean nginx will no longer depend on certificates it isn't explicitly managing and fixes a bug with certificate renewal
- ordering racing with nginx restarting which could lead to nginx getting in a broken state as described at
+ ordering racing with nginx restarting which could lead to nginx getting in a broken state as described at
NixOS/nixpkgs#60180.
+
+
+ The old deprecated emacs package sets have been dropped.
+ What used to be called emacsPackagesNg is now simply called emacsPackages.
+
+
+
diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml
index acd69f18376..8ced302bad1 100644
--- a/nixos/modules/services/editors/emacs.xml
+++ b/nixos/modules/services/editors/emacs.xml
@@ -9,6 +9,7 @@
Damien Cassou @DamienCassou
Thomas Tuegel @ttuegel
Rodney Lorrimar @rvl
+ Adam Hoese @adisbladis
-->
Emacs is an
@@ -130,15 +131,6 @@
Emacs packages through nixpkgs.
-
-
- This documentation describes the new Emacs packages framework in NixOS
- 16.03 (emacsPackagesNg) which should not be confused
- with the previous and deprecated framework
- (emacs24Packages).
-
-
-
The first step to declare the list of packages you want in your Emacs
installation is to create a dedicated derivation. This can be done in a
@@ -164,7 +156,7 @@ $ ./result/bin/emacs
let
myEmacs = pkgs.emacs;
- emacsWithPackages = (pkgs.emacsPackagesNgGen myEmacs).emacsWithPackages;
+ emacsWithPackages = (pkgs.emacsPackagesGen myEmacs).emacsWithPackages;
in
emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [
magit # ; Integrate git <C-x g>
@@ -262,10 +254,10 @@ in
Querying Emacs packages
" -qaP -A emacsPackagesNg.elpaPackages
-nix-env -f "" -qaP -A emacsPackagesNg.melpaPackages
-nix-env -f "" -qaP -A emacsPackagesNg.melpaStablePackages
-nix-env -f "" -qaP -A emacsPackagesNg.orgPackages
+nix-env -f "" -qaP -A emacsPackages.elpaPackages
+nix-env -f "" -qaP -A emacsPackages.melpaPackages
+nix-env -f "" -qaP -A emacsPackages.melpaStablePackages
+nix-env -f "" -qaP -A emacsPackages.orgPackages
]]>
diff --git a/pkgs/applications/editors/emacs-modes/auto-complete/default.nix b/pkgs/applications/editors/emacs-modes/auto-complete/default.nix
deleted file mode 100644
index 40f172316ef..00000000000
--- a/pkgs/applications/editors/emacs-modes/auto-complete/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, emacs }:
-
-stdenv.mkDerivation rec {
- name = "auto-complete-1.3.1";
-
- src = fetchurl {
- url = "http://cx4a.org/pub/auto-complete/${name}.tar.bz2";
- sha256 = "124qxfp0pcphwlmrasbfrci48brxnrzc38h4wcf2sn20x1mvcrlj";
- };
-
- buildInputs = [ emacs ];
-
- preInstall = ''
- install -d $out/share/emacs/site-lisp
- '';
-
- installFlags = "DIR=$(out)/share/emacs/site-lisp";
-
- postInstall = ''
- ln -s javascript-mode $out/share/emacs/site-lisp/ac-dict/js2-mode
- '';
-
- meta = {
- description = "Auto-complete extension for Emacs";
- homepage = http://cx4a.org/software/auto-complete/;
- license = stdenv.lib.licenses.gpl3Plus;
-
- platforms = stdenv.lib.platforms.all;
- };
-}
diff --git a/pkgs/applications/editors/emacs-modes/bbdb/3.nix b/pkgs/applications/editors/emacs-modes/bbdb/3.nix
deleted file mode 100644
index d20ab53bf7e..00000000000
--- a/pkgs/applications/editors/emacs-modes/bbdb/3.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, emacs }:
-
-stdenv.mkDerivation rec {
- name = "bbdb-3.1.2";
-
- src = fetchurl {
- url = "https://download.savannah.gnu.org/releases/bbdb/${name}.tar.gz";
- sha256 = "1gs16bbpiiy01w9pyg12868r57kx1v3hnw04gmqsmpc40l1hyy05";
- };
-
- buildInputs = [ emacs ];
-
- # Hack to disable documentation as there is no way to tell bbdb to
- # NOT build pdfs. I really don't want to pull in TexLive here...
- preConfigure = ''
- substituteInPlace ./Makefile.in \
- --replace "SUBDIRS = lisp doc tex" "SUBDIRS = lisp"
- '';
-
- meta = {
- homepage = https://savannah.nongnu.org/projects/bbdb/;
- description = "The Insidious Big Brother Database (BBDB), a contact management utility for Emacs, version 3";
- license = "GPL";
- };
-}
diff --git a/pkgs/applications/editors/emacs-modes/bbdb/default.nix b/pkgs/applications/editors/emacs-modes/bbdb/default.nix
deleted file mode 100644
index 689bcfc9adf..00000000000
--- a/pkgs/applications/editors/emacs-modes/bbdb/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{stdenv, fetchurl, emacs, texinfo, ctags}:
-
-stdenv.mkDerivation rec {
- name = "bbdb-2.36";
-
- src = fetchurl {
- # not using mirror:// because it produces a different file
- url = "http://bbdb.sourceforge.net/${name}.tar.gz";
- sha256 = "1rmw94l71ahfbynyy0bijfy488q9bl5ksl4zpvg7j9dbmgbh296r";
- };
-
- patches = [ ./install-infodir.patch ];
-
- buildInputs = [emacs texinfo ctags];
- configureFlags = [ "--with-package-dir=$$out/share/emacs/site-lisp" ];
- preInstall = "mkdir -p $out/info";
- installTargets = "install-pkg texinfo";
- postInstall = ''
- mv $out/info $out/share/
- mv "$out/share/emacs/site-lisp/lisp/bbdb/"* $out/share/emacs/site-lisp/
- mv $out/share/emacs/site-lisp/etc/bbdb $out/share/
- rm -rf $out/share/emacs/site-lisp/{lisp,etc}
- mv bits $out/share/bbdb/
- # Make optional modules from bbdb available for import, but symlink
- # them into the site-lisp directory to make it obvious that they are
- # not a genuine part of the distribution.
- ln -s "$out/share/bbdb/bits/"*.el $out/share/emacs/site-lisp/
- '';
-
- meta = {
- homepage = http://bbdb.sourceforge.net/;
- description = "The Insidious Big Brother Database (BBDB), a contact management utility for Emacs";
- license = "GPL";
- };
-}
diff --git a/pkgs/applications/editors/emacs-modes/bbdb/install-infodir.patch b/pkgs/applications/editors/emacs-modes/bbdb/install-infodir.patch
deleted file mode 100644
index 31ae6b26698..00000000000
--- a/pkgs/applications/editors/emacs-modes/bbdb/install-infodir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- bbdb-2.35/texinfo/Makefile.in 2001-11-20 09:00:12.000000000 +0100
-+++ bbdb-2.35/texinfo/Makefile.in 2008-02-20 12:07:36.000000000 +0100
-@@ -27,22 +27,22 @@ all: info bbdb.dvi
- install-pkg: uninstall-pkg info
- @if test "x$(SYMLINKS)" = "xno" ; then \
- for i in `ls bbdb.info* ` ; do \
-- $(INSTALL_DATA) $$i $(PACKAGEDIR)/info/ ; \
-+ $(INSTALL_DATA) $$i $(infodir)/ ; \
- done ; \
- else \
- if test "x$(LINKPATH)" = "x" ; then \
- for i in `ls bbdb.info* ` ; do \
-- $(LN_S) `pwd`/$$i $(PACKAGEDIR)/info/$$i ; \
-+ $(LN_S) `pwd`/$$i $(infodir)/$$i ; \
- done ; \
- else \
- for i in `ls bbdb.info* ` ; do \
-- $(LN_S) $(LINKPATH)/texinfo/$$i $(PACKAGEDIR)/info/$$i ; \
-+ $(LN_S) $(LINKPATH)/texinfo/$$i $(infodir)/$$i ; \
- done ; \
- fi ; \
- fi
-
- uninstall-pkg:
-- -$(RM) $(PACKAGEDIR)/info/bbdb.info*
-+ -$(RM) $(infodir)/bbdb.info*
-
- info: bbdb.info
diff --git a/pkgs/applications/editors/emacs-modes/calfw/default.nix b/pkgs/applications/editors/emacs-modes/calfw/default.nix
deleted file mode 100644
index b8c61bb97af..00000000000
--- a/pkgs/applications/editors/emacs-modes/calfw/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ fetchgit, stdenv, emacs }:
-
-# TODO: byte-compile in build phase - a buildEmacsPackage that does
-# that would be nice
-
-stdenv.mkDerivation rec {
- name = "calfw-1.3-5-ga9b6615";
-
- src = fetchgit {
- url = "git://github.com/kiwanami/emacs-calfw.git";
- rev = "a9b6615b6666bbebe78257c557fd9a2e3a325d8d";
- sha256 = "524acc8fec7e64ebe0d370ddb1d96eee6a409d650b79011fa910c35225a7f393";
- };
-
- buildInputs = [ emacs ];
-
- installPhase =
- ''
- mkdir -p "$out/share/doc/${name}"
- cp -v readme.md "$out/share/doc/${name}"
-
- mkdir -p "$out/share/emacs/site-lisp/"
- cp *.el "$out/share/emacs/site-lisp/"
- '';
-
- meta = {
- description = "A calendar framework for Emacs";
-
- license = stdenv.lib.licenses.gpl3Plus;
-
- maintainers = with stdenv.lib.maintainers; [ ];
- platforms = stdenv.lib.platforms.unix;
- };
-}
diff --git a/pkgs/applications/editors/emacs-modes/cask/default.nix b/pkgs/applications/editors/emacs-modes/cask/default.nix
deleted file mode 100644
index 34120db6aa7..00000000000
--- a/pkgs/applications/editors/emacs-modes/cask/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ stdenv, fetchFromGitHub, emacs, python }:
-
-stdenv.mkDerivation rec {
- version = "0.8.4";
- name = "cask-${version}";
-
- src = fetchFromGitHub {
- owner = "cask";
- repo = "cask";
- rev = "v${version}";
- sha256 = "1p37lq8xpyq0rc7phxgsw3b73h8vf9rkpa5959rb5k46w6ps9686";
- };
-
- buildInputs = [ emacs python ];
-
- # byte-compiling emacs files automatically triggers cask's bootstrap
- # mechanism, what we don't want.
- dontBuild = true;
-
- installPhase = ''
- install -d "$out/share/emacs/site-lisp"
- install cask*.el* "$out/share/emacs/site-lisp"
-
- install -d "$out/bin"
- install bin/cask "$out/bin"
-
- # We also need to install cask's templates in order for 'cask
- # init' to work properly.
- install -d "$out/templates"
- install templates/* "$out/templates"
-
- # In order to work with cask's hard coded file paths (during bootstrap),
- # we have to create these links.
- ln -s "$out/share/emacs/site-lisp/"* "$out"
-
- # This file disables cask's self-updating function.
- touch "$out/.no-upgrade"
- '';
-
- meta = with stdenv.lib; {
- description = "Project management tool for Emacs";
- longDescription =
- ''
- Cask is a project management tool for Emacs that helps automate the
- package development cycle; development, dependencies, testing,
- building, packaging and more. Cask can also be used to manage
- dependencies for your local Emacs configuration.
- '';
- homepage = https://github.com/cask/cask;
- license = licenses.gpl3Plus;
- platforms = platforms.all;
- maintainers = [ ];
- };
-}
diff --git a/pkgs/applications/editors/emacs-modes/cedet/default.nix b/pkgs/applications/editors/emacs-modes/cedet/default.nix
index e350dc08e71..5fbe095c4f3 100644
--- a/pkgs/applications/editors/emacs-modes/cedet/default.nix
+++ b/pkgs/applications/editors/emacs-modes/cedet/default.nix
@@ -44,5 +44,8 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2Plus;
homepage = http://cedet.sourceforge.net/;
+
+ # Fails with `semantic-idle.el:42:1:Error: Invalid function: class-p`
+ broken = true;
};
}
diff --git a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
index 6b51f117ad8..fb3de6ea3d9 100644
--- a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
+++ b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
@@ -30,5 +30,8 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.samuelrivas ];
license = licenses.mit;
platforms = platforms.all;
+
+ # Fails with `solarized-definitions.el:786:1:Warning: the function `rotatef' is not known to`
+ broken = true;
};
}
diff --git a/pkgs/applications/editors/emacs-modes/color-theme/default.nix b/pkgs/applications/editors/emacs-modes/color-theme/default.nix
deleted file mode 100644
index 407b9e58f0b..00000000000
--- a/pkgs/applications/editors/emacs-modes/color-theme/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{stdenv, fetchurl, emacs}:
-
-stdenv.mkDerivation rec {
- name = "color-theme-6.6.0";
-
- src = fetchurl {
- url = "mirror://savannah/color-theme/${name}.tar.gz";
- sha256 = "0yx1ghcjc66s1rl0v3d4r1k88ifw591hf814ly3d73acvh15zlsn";
- };
-
- # patches from http://aur.archlinux.org/packages.php?ID=54883
- patches = [ ./fix-build.patch ./gnus-bug.diff ];
-
- buildInputs = [ emacs ];
-
- installFlags = [ "ELISPDIR=$(out)/share/emacs/site-lisp" ];
- installTargets = "install-bin";
-
- meta = {
- description = "Emacs-lisp mode for skinning your Emacs";
- homepage = https://www.nongnu.org/color-theme;
- license = stdenv.lib.licenses.gpl2Plus;
-
- platforms = stdenv.lib.platforms.all;
- };
-}
diff --git a/pkgs/applications/editors/emacs-modes/color-theme/fix-build.patch b/pkgs/applications/editors/emacs-modes/color-theme/fix-build.patch
deleted file mode 100644
index cfc237c8cdc..00000000000
--- a/pkgs/applications/editors/emacs-modes/color-theme/fix-build.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/Makefile 2009-05-15 18:22:49.000000000 +0200
-+++ b/Makefile 2009-05-16 08:59:36.000000000 +0200
-@@ -15,6 +15,7 @@
- TARGET = $(patsubst %.el,%.elc,$(SPECIAL) $(SOURCE))
- MANUAL = color-theme
- MISC = AUTHORS COPYING ChangeLog Makefile.defs Makefile $(AUTOLOADFILE).in
-+LOADPATH = "$(shell pwd)" "$(shell pwd)/themes"
- #AUTHORS CREDITS HISTORY NEWS README Makefile ChangeLog \
- #ChangeLog.2005 ChangeLog.2004 ChangeLog.2003 ChangeLog.2002 \
- #ChangeLog.2001 servers.pl color-theme-auto.in color-theme.texi
-@@ -47,7 +48,7 @@
-
- %.elc: %.el
- @$(EMACS) $(OPTIONCOMPILE) \
-- --eval '(setq load-path (cons "." load-path))' \
-+ --eval '(setq load-path (append load-path (list $(LOADPATH))))' \
- -f batch-byte-compile $<
-
- %.info: %.texi
diff --git a/pkgs/applications/editors/emacs-modes/color-theme/gnus-bug.diff b/pkgs/applications/editors/emacs-modes/color-theme/gnus-bug.diff
deleted file mode 100644
index 9d227df562e..00000000000
--- a/pkgs/applications/editors/emacs-modes/color-theme/gnus-bug.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur color-theme-6.6.0.orig/color-theme.el color-theme-6.6.0.new/color-theme.el
---- color-theme-6.6.0.orig/color-theme.el 2011-11-18 01:17:29.000000000 +0100
-+++ color-theme-6.6.0.new/color-theme.el 2011-11-18 01:24:07.000000000 +0100
-@@ -73,9 +73,10 @@
- "Non-nil if running XEmacs.")
-
- ;; Add this since it appears to miss in emacs-2x
--(or (fboundp 'replace-in-string)
-- (defun replace-in-string (target old new)
-- (replace-regexp-in-string old new target)))
-+(if (fboundp 'replace-in-string)
-+ (defalias 'color-theme-replace-in-string 'replace-in-string)
-+ (defsubst color-theme-replace-in-string (target old new &optional literal)
-+ (replace-regexp-in-string old new target nil literal)))
-
- ;; face-attr-construct has a problem in Emacs 20.7 and older when
- ;; dealing with inverse-video faces. Here is a short test to check
-@@ -1626,8 +1627,8 @@
- (add-to-list 'color-themes
- (list ',n
- (upcase-initials
-- (replace-in-string
-- (replace-in-string
-+ (color-theme-replace-in-string
-+ (color-theme-replace-in-string
- (symbol-name ',n) "^color-theme-" "") "-" " "))
- ,author))
- (defun ,n ()
diff --git a/pkgs/applications/editors/emacs-modes/cryptol/default.nix b/pkgs/applications/editors/emacs-modes/cryptol/default.nix
deleted file mode 100644
index 5b408ad7999..00000000000
--- a/pkgs/applications/editors/emacs-modes/cryptol/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, emacs }:
-
-stdenv.mkDerivation rec {
- name = "cryptol-mode-${version}";
- version = "0.1.0";
-
- src = fetchurl {
- url = "https://github.com/thoughtpolice/cryptol-mode/archive/v${version}.tar.gz";
- sha256 = "1qyrqvfgpg1nyk1clv7v94r3amm02613hrak5732xzn6iak81cc0";
- };
-
- buildInputs = [ emacs ];
-
- installPhase = ''
- install -d $out/share/emacs/site-lisp
- install *.el *.elc $out/share/emacs/site-lisp
- '';
-
- meta = {
- description = "Emacs major mode for Cryptol";
- homepage = "https://thoughtpolice/cryptol-mode";
- license = stdenv.lib.licenses.gpl3Plus;
- platforms = stdenv.lib.platforms.all;
- maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
- };
-}
diff --git a/pkgs/applications/editors/emacs-modes/d/default.nix b/pkgs/applications/editors/emacs-modes/d/default.nix
deleted file mode 100644
index 28736acded2..00000000000
--- a/pkgs/applications/editors/emacs-modes/d/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{stdenv, fetchurl, emacs}:
-
-# Note: Don't have a version, using date as fallback.
-let version = "20150111";
-
-in stdenv.mkDerivation {
- name = "emacs-d-${version}";
-
- src = fetchurl {
- url = "https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode/archive/53efec4d83c7cee8227597f010fe7fc400ff05f1.tar.gz";
- sha256 = "0vb0za51lc6qf1qgqisap4vzk36caa5k17zajjn034rhjsqfw0w7";
- };
-
- buildInputs = [ emacs ];
-
- buildPhase = ''
- emacs -L . --batch -f batch-byte-compile *.el
- '';
-
- installPhase = ''
- install -d $out/share/emacs/site-lisp
- install *.el *.elc $out/share/emacs/site-lisp
- '';
-
- meta = {
- description = "Major mode for editing D code";
- homepage = https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode;
- license = stdenv.lib.licenses.gpl2;
- platforms = stdenv.lib.platforms.all;
- };
-
-}
diff --git a/pkgs/applications/editors/emacs-modes/darcsum/darcs_context b/pkgs/applications/editors/emacs-modes/darcsum/darcs_context
deleted file mode 100644
index 7e9de1ed80b..00000000000
--- a/pkgs/applications/editors/emacs-modes/darcsum/darcs_context
+++ /dev/null
@@ -1,7 +0,0 @@
-
-Context:
-
-[TAG 1.3
-Simon Michael **20131103203640
- Ignore-this: d12bac373e4aa0e5ffe6c390e1dfe269
-]
diff --git a/pkgs/applications/editors/emacs-modes/darcsum/default.nix b/pkgs/applications/editors/emacs-modes/darcsum/default.nix
deleted file mode 100644
index 0a1c2c77b2a..00000000000
--- a/pkgs/applications/editors/emacs-modes/darcsum/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-# To automatically load darcsum when needed, add the following to your emacs init file:
-#
-# (autoload 'darcsum-changes "darcsum" nil t)
-# (autoload 'darcsum-whatsnew "darcsum" nil t)
-# (autoload 'darcsum-view "darcsum" nil t)
-#
-# (These lines were copied from 50darcsum.el in the darcsum repository.)
-
-
-{ fetchdarcs, stdenv }:
-
-stdenv.mkDerivation {
- name = "darcsum-1.3";
-
- src = fetchdarcs {
- url = http://hub.darcs.net/simon/darcsum;
- context = ./darcs_context;
- sha256 = "18dyk2apmnjapd604a5njfqwjri1mc7lgjaajy9phicpibgdrwzh";
- };
-
- phases = [ "unpackPhase" "installPhase" ];
-
- installPhase = ''
- install -d "$out/share/emacs/site-lisp"
- install darcsum.el "$out/share/emacs/site-lisp"
- '';
-
- meta = {
- description = "A pcl-cvs like interface for managing darcs patches";
- homepage = http://hub.darcs.net/simon/darcsum;
- license = stdenv.lib.licenses.gpl2Plus;
- maintainers = [ stdenv.lib.maintainers.falsifian ];
- };
-}
diff --git a/pkgs/applications/editors/emacs-modes/ecb/default.nix b/pkgs/applications/editors/emacs-modes/ecb/default.nix
deleted file mode 100644
index 807bb91f850..00000000000
--- a/pkgs/applications/editors/emacs-modes/ecb/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ fetchurl, stdenv, emacs, cedet, jdee, texinfo }:
-
-stdenv.mkDerivation rec {
- name = "ecb-2.40";
-
- src = fetchurl {
- url = "mirror://sourceforge/ecb/${name}.tar.gz";
- sha256 = "0gp56ixfgnyk2j1fps4mk1yv1vpz81kivb3gq9f56jw4kdlhjrjs";
- };
-
- buildInputs = [ emacs ];
- propagatedBuildInputs = [ cedet jdee ];
- propagatedUserEnvPkgs = propagatedBuildInputs;
-
- patchPhase = ''
- sed -i "Makefile" \
- -e 's|CEDET[[:blank:]]*=.*$|CEDET = ${cedet}/share/emacs/site-lisp|g ;
- s|INSTALLINFO[[:blank:]]*=.*$|INSTALLINFO = ${texinfo}/bin/install-info|g ;
- s|MAKEINFO[[:blank:]]*=.*$|MAKEINFO = ${texinfo}/bin/makeinfo|g ;
- s|common/cedet.el|cedet.el|g'
- '';
-
- installPhase = ''
- mkdir -p "$out/share/emacs/site-lisp"
- cp -rv *.el *.elc ecb-images "$out/share/emacs/site-lisp"
-
- mkdir -p "$out/share/info"
- cp -v info-help/*.info* "$out/share/info"
- '';
-
- meta = {
- description = "ECB, the Emacs Code browser";
-
- longDescription = ''
- ECB stands for "Emacs Code Browser". While Emacs already has
- good editing support for many modes, its browsing support is
- somewhat lacking. That's where ECB comes in: it displays a
- number of informational windows that allow for easy source code
- navigation and overview.
- '';
-
- license = stdenv.lib.licenses.gpl2Plus;
-
- homepage = http://ecb.sourceforge.net/;
-
- maintainers = [ ];
- };
-}
diff --git a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
index 66ac9a3d77e..23a9b3b1920 100644
--- a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
+++ b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
@@ -26,5 +26,10 @@ clangStdenv.mkDerivation {
homepage = https://github.com/Golevka/emacs-clang-complete-async;
description = "An emacs plugin to complete C and C++ code using libclang";
license = clangStdenv.lib.licenses.gpl3Plus;
+
+ # Fails with:
+ # ./src/completion.h:5:10: fatal error: 'clang-c/Index.h' file not found
+ # include
+ broken = true;
};
}
diff --git a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
deleted file mode 100644
index 8e1d7092e6a..00000000000
--- a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{ fetchcvs, stdenv, emacs, w3m, imagemagick, texinfo, autoreconfHook }:
-
-let date = "2013-03-21"; in
-stdenv.mkDerivation rec {
- name = "emacs-w3m-cvs${date}";
-
- # Get the source from CVS because the previous release (1.4.4) is old and
- # doesn't work with GNU Emacs 23.
- src = fetchcvs {
- inherit date;
- cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot";
- module = "emacs-w3m";
- sha256 = "1lmcj8rf83w13q8q68hh7sa1abc2m6j2zmfska92xdp7hslhdgc5";
- };
-
- nativeBuildInputs = [ autoreconfHook ];
- buildInputs = [ emacs w3m texinfo ];
-
- # XXX: Should we do the same for xpdf/evince, gv, gs, etc.?
- patchPhase = ''
- sed -i "w3m.el" \
- -e 's|defcustom w3m-command nil|defcustom w3m-command "${w3m}/bin/w3m"|g ;
- s|(w3m-which-command "display")|"${imagemagick.out}/bin/display"|g'
-
- sed -i "w3m-image.el" \
- -e 's|(w3m-which-command "convert")|"${imagemagick.out}/bin/convert"|g ;
- s|(w3m-which-command "identify")|"${imagemagick.out}/bin/identify"|g'
- '';
-
- configureFlags = [
- "--with-lispdir=$(out)/share/emacs/site-lisp"
- "--with-icondir=$(out)/share/emacs/site-lisp/images/w3m"
- ];
-
- postInstall = ''
- cd "$out/share/emacs/site-lisp"
- for i in ChangeLog*
- do
- mv -v "$i" "w3m-$i"
- done
- '';
-
- meta = {
- description = "Emacs-w3m, a simple Emacs interface to the w3m web browser";
-
- longDescription = ''
- Emacs/W3 used to be known as the most popular WEB browser on Emacs, but
- it worked so slowly that we wanted a simple and speedy alternative.
-
- w3m is a pager with WWW capability, developed by Akinori ITO. Although
- it is a pager, it can be used as a text-mode WWW browser. Then we
- developed a simple Emacs interface to w3m.
- '';
-
- license = stdenv.lib.licenses.gpl2Plus;
-
- homepage = http://emacs-w3m.namazu.org/;
-
- maintainers = [ ];
- };
-}
diff --git a/pkgs/applications/editors/emacs-modes/emms/default.nix b/pkgs/applications/editors/emacs-modes/emms/default.nix
deleted file mode 100644
index f966989b5a3..00000000000
--- a/pkgs/applications/editors/emacs-modes/emms/default.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{ stdenv, fetchurl, emacs, texinfo
-, mpg321, vorbis-tools, taglib, mp3info, alsaUtils }:
-
-# XXX: EMMS also supports Xine, MPlayer, Jack, etc.
-
-stdenv.mkDerivation rec {
- name = "emms-3.0";
-
- src = fetchurl {
- # These guys don't use ftp.gnu.org...
- url = "https://www.gnu.org/software/emms/download/${name}.tar.gz";
- sha256 = "151mfx97x15lfpd1qc2sqbvhwhvg46axgh15qyqmdy42vh906xav";
- };
-
- buildInputs = [ emacs texinfo ];
-
- configurePhase = ''
- sed -i "Makefile" -e "s|PREFIX *=.*\$|PREFIX = $out|g ;
- s|/usr/sbin/install-info|install-info|g ;
- s|/usr/include/taglib|${taglib}/include/taglib|g ;
- s|/usr/lib|${taglib}/lib|g ;
- s|^all:\(.*\)\$|all:\1 emms-print-metadata|g"
- mkdir -p "$out/share/man/man1"
-
- sed -i "emms-player-mpg321-remote.el" \
- -e 's|emms-player-mpg321-remote-command[[:blank:]]\+"mpg321"|emms-player-mpg321-remote-command "${mpg321}/bin/mpg321"|g'
- sed -i "emms-player-simple.el" \
- -e 's|"ogg123"|"${vorbis-tools}/bin/ogg123"|g'
- sed -i "emms-info-ogginfo.el" \
- -e 's|emms-info-ogginfo-program-name[[:blank:]]\+"ogginfo"|emms-info-ogginfo-program-name "${vorbis-tools}/bin/ogginfo"|g'
- sed -i "emms-info-libtag.el" \
- -e "s|\"emms-print-metadata\"|\"$out/bin/emms-print-metadata\"|g"
- sed -i "emms-volume-amixer.el" \
- -e 's|"amixer"|"${alsaUtils}/bin/amixer"|g'
-
- # Use the libtag info back-end for MP3s since we're building it.
- sed -i "emms-setup.el" \
- -e 's|emms-info-mp3info|emms-info-libtag|g'
-
- # But use mp3info for the tag editor.
- sed -i "emms-info-mp3info.el" \
- -e 's|emms-info-mp3info-program-name[[:blank:]]\+"mp3info"|emms-info-mp3info-program-name "${mp3info}/bin/mp3info"|g'
- sed -i "emms-tag-editor.el" \
- -e 's|"mp3info"|"${mp3info}/bin/mp3info"|g'
- '';
-
- postInstall = ''
- mkdir -p "$out/bin" && cp emms-print-metadata "$out/bin"
- '';
-
- meta = {
- description = "GNU EMMS, The Emacs Multimedia System";
-
- longDescription = ''
- EMMS is the Emacs Multimedia System. It tries to be a clean and
- small application to play multimedia files from Emacs using
- external players. Many of it's ideas are derived from
- MpthreePlayer, but it tries to be more general and cleaner.
-
- The fact that EMMS is based on external players makes it
- powerful, because it supports all formats that those players
- support, with no effort from your side.
- '';
-
- homepage = https://www.gnu.org/software/emms/;
-
- license = stdenv.lib.licenses.gpl3Plus;
-
- maintainers = [ ];
- platforms = stdenv.lib.platforms.unix;
- broken = true;
- };
-}
diff --git a/pkgs/applications/editors/emacs-modes/ensime/default.nix b/pkgs/applications/editors/emacs-modes/ensime/default.nix
deleted file mode 100644
index d776103a662..00000000000
--- a/pkgs/applications/editors/emacs-modes/ensime/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, emacs, unzip, autoComplete, dash, s, scalaMode2, sbtMode }:
-
-stdenv.mkDerivation {
- name = "emacs-ensime-2014-09-04";
-
- src = fetchurl {
- url = "https://github.com/ensime/ensime-emacs/archive/d3820a3f362975f6e14b817988ec07bfef2b4dad.zip";
- sha256 = "0gwr0r92z2hh2x8g0hpxaar2vvfk1b91cp6v04gaasw0fvl5i7g5";
- };
-
- buildInputs = [ emacs unzip ];
- propagatedUserEnvPkgs = [ autoComplete dash s scalaMode2 sbtMode ];
-
- buildPhase = ''
- emacs -L . -L ${autoComplete}/share/emacs/site-lisp --batch -f batch-byte-compile *.el
- '';
-
- installPhase = ''
- install -d $out/share/emacs/site-lisp
- install *.el *.elc $out/share/emacs/site-lisp
- '';
-}
diff --git a/pkgs/applications/editors/emacs-modes/erlang/default.nix b/pkgs/applications/editors/emacs-modes/erlang/default.nix
deleted file mode 100644
index 463d7fc7e15..00000000000
--- a/pkgs/applications/editors/emacs-modes/erlang/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, erlang }:
-
-stdenv.mkDerivation {
-
- name = "erlang-mode-${erlang.version}";
-
- buildInputs = [ ];
-
- inherit erlang;
-
- buildCommand = ''
- mkdir -p "$out/share/emacs/site-lisp"
- cp "$erlang/lib/erlang/lib/tools"*/emacs/*.el $out/share/emacs/site-lisp/
- '';
-
- # emacs highlighting */
-
- meta = with stdenv.lib; {
- homepage = https://github.com/erlang/otp;
- description = "Erlang mode for Emacs";
- license = licenses.asl20;
- platforms = platforms.unix;
- maintainers = [ maintainers.samuelrivas ];
- };
-}
diff --git a/pkgs/applications/editors/emacs-modes/ess/default.nix b/pkgs/applications/editors/emacs-modes/ess/default.nix
deleted file mode 100644
index ce335a5d482..00000000000
--- a/pkgs/applications/editors/emacs-modes/ess/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, emacs, texinfo }:
-
-stdenv.mkDerivation rec {
- name = "ess-14.09";
-
- src = fetchurl {
- url = "http://ess.r-project.org/downloads/ess/${name}.tgz";
- sha256 = "0wa507jfmq3k7x0vigd2yzb4j2190ix4wnnpv7ql4bjy0vfvmwdn";
- };
-
- buildInputs = [ emacs texinfo ];
-
- configurePhase = "makeFlags=PREFIX=$out";
-
- meta = {
- description = "Emacs Speaks Statistics";
- homepage = http://ess.r-project.org/;
- license = stdenv.lib.licenses.gpl2Plus;
- hydraPlatforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix b/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix
deleted file mode 100644
index eae338d241d..00000000000
--- a/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, emacs }:
-
-stdenv.mkDerivation rec {
- name = "flymake-cursor-0.1.5";
-
- src = fetchurl {
- url = "http://www.emacswiki.org/emacs/download/flymake-cursor.el";
- sha256 = "10cpzrd588ya52blghxss5zkn6x8hc7bx1h0qbcdlybbmkjgpkxr";
- };
-
- phases = [ "buildPhase" "installPhase"];
-
- buildInputs = [ emacs ];
-
- buildPhase = ''
- cp $src flymake-cursor.el
- emacs --batch -f batch-byte-compile flymake-cursor.el
- '';
-
- installPhase = ''
- install -d $out/share/emacs/site-lisp
- install flymake-cursor.el flymake-cursor.elc $out/share/emacs/site-lisp
- '';
-
- meta = {
- description = "Displays flymake error msg in minibuffer after delay";
- homepage = http://www.emacswiki.org/emacs/flymake-cursor.el;
- license = stdenv.lib.licenses.publicDomain;
- };
-}
diff --git a/pkgs/applications/editors/emacs-modes/gh/default.nix b/pkgs/applications/editors/emacs-modes/gh/default.nix
deleted file mode 100644
index aa59eace2ae..00000000000
--- a/pkgs/applications/editors/emacs-modes/gh/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchgit, emacs, pcache, logito }:
-
-stdenv.mkDerivation rec {
- name = "gh-0.5.3";
-
- src = fetchgit {
- url = "https://github.com/sigma/gh.el.git";
- rev = "ef03b63d063ec22f03af449aa955c98dfad7f80e";
- sha256 = "1pciq16vl5l4kvj08q4ib1jzk2bb2y1makcsyaw8k9jblqviw756";
- };
-
- buildInputs = [ emacs ];
- propagatedUserEnvPkgs = [ pcache logito ];
-
- patchPhase = ''
- sed -i Makefile \
- -e "s|^ *EFLAGS *=|& -L ${pcache}/share/emacs/site-lisp -L ${logito}/share/emacs/site-lisp --eval '(setq user-emacs-directory \"./\")'|" \
- -e "s|/usr/local|$out|" \
- -e "s|/site-lisp/\$(PKGNAME)|/site-lisp|"
- '';
-
- buildPhase = "make lisp";
-
- meta = {
- description = "A (very early) GitHub client library for Emacs";
- homepage = https://github.com/sigma/gh.el;
- license = stdenv.lib.licenses.gpl2Plus;
-
- platforms = stdenv.lib.platforms.all;
- };
-}
diff --git a/pkgs/applications/editors/emacs-modes/gist/default.nix b/pkgs/applications/editors/emacs-modes/gist/default.nix
deleted file mode 100644
index 08471247f08..00000000000
--- a/pkgs/applications/editors/emacs-modes/gist/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, fetchgit, emacs, gh, pcache, logito }:
-
-stdenv.mkDerivation rec {
- name = "gist-1.0";
-
- src = fetchgit {
- url = "https://github.com/sigma/gist.el.git";
- rev = "bbb457e4eaaf5f96cfaaa4f63021e3e542bfbfed";
- sha256 = "469f9df52076d0c6038183cff4b9415bca98de66c08814a60b69729b44bdf294";
- };
-
- buildInputs = [ emacs ];
-
- buildPhase = ''
- emacs -L ${gh}/share/emacs/site-lisp \
- -L ${pcache}/share/emacs/site-lisp \
- -L ${logito}/share/emacs/site-lisp \
- --eval '(setq user-emacs-directory "./")' \
- --batch -f batch-byte-compile gist.el
- '';
-
- propagatedUserEnvPkgs = [ gh pcache logito ];
-
- installPhase = ''
- install -d $out/share/emacs/site-lisp
- install gist.el gist.elc $out/share/emacs/site-lisp
- '';
-
- meta = {
- description = "Emacs integration for gist.github.com";
- homepage = https://github.com/sigma/gist.el;
- license = stdenv.lib.licenses.gpl2Plus;
-
- platforms = stdenv.lib.platforms.all;
- };
-}
diff --git a/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix b/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix
deleted file mode 100644
index a08f138bed9..00000000000
--- a/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, emacs }:
-
-stdenv.mkDerivation rec {
- name = "graphviz-dot-mode-0.3.3";
-
- src = fetchurl {
- url = "http://www.graphviz.org/Misc/graphviz-dot-mode.el";
- sha256 = "6465c18cfaa519a063cf664207613f70b0a17ac5eabcfaa949b3c4c289842953";
- };
-
- buildInputs = [ emacs ];
-
- dontUnpack = true;
-
- installPhase = ''
- mkdir -p "$out/share/emacs/site-lisp"
- cp -v ${src} "$out/share/emacs/site-lisp/graphviz-dot-mode.el"
- emacs -batch --eval '(setq load-path (cons "." load-path))' -f batch-byte-compile "$out/share/emacs/site-lisp/graphviz-dot-mode.el"
- '';
-
- meta = {
- homepage = http://www.graphviz.org/;
- description = "An emacs mode for the DOT Language, used by graphviz";
- };
-}
diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix
deleted file mode 100644
index 6b10766bedb..00000000000
--- a/pkgs/applications/editors/emacs-modes/haskell/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, fetchFromGitHub, emacs, texinfo }:
-
-# Use "emacsMelpa.haskell-mode" instead.
-
-let
- version = "13.14-169-g0d3569d"; # git describe --tags
-in
-stdenv.mkDerivation {
- name = "haskell-mode-${version}";
-
- src = fetchFromGitHub {
- owner = "haskell";
- repo = "haskell-mode";
- rev = "v${version}";
- sha256 = "0v5iy9wy05hf44wy7qs0c9q0v34m4k6wrqg4kyvji61568k1yx3k";
- };
-
- buildInputs = [ emacs texinfo ];
-
- makeFlags = "VERSION=v${version} GIT_VERSION=v${version}";
-
- installPhase = ''
- mkdir -p $out/share/emacs/site-lisp
- cp *.el *.elc *.hs $out/share/emacs/site-lisp/
- mkdir -p $out/share/info
- cp -v *.info* $out/share/info/
- '';
-
- # The test suite must run *after* copying the generated files to $out
- # because "make check" implies "make clean".
- doInstallCheck = true;
- installCheckTarget = "check";
-
- meta = {
- homepage = https://github.com/haskell/haskell-mode;
- description = "Haskell mode for Emacs";
-
- platforms = stdenv.lib.platforms.unix;
- maintainers = [ stdenv.lib.maintainers.peti ];
- broken = true; # no longer compiles and this package is obsolete anyway
- };
-}
diff --git a/pkgs/applications/editors/emacs-modes/hol_light/default.nix b/pkgs/applications/editors/emacs-modes/hol_light/default.nix
index c32669239f8..38457af120b 100644
--- a/pkgs/applications/editors/emacs-modes/hol_light/default.nix
+++ b/pkgs/applications/editors/emacs-modes/hol_light/default.nix
@@ -22,5 +22,8 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+
+ # Fails trying to fetch dependencies in build
+ # broken = true;
};
}
diff --git a/pkgs/applications/editors/emacs-modes/htmlize/default.nix b/pkgs/applications/editors/emacs-modes/htmlize/default.nix
deleted file mode 100644
index c16f449c3a2..00000000000
--- a/pkgs/applications/editors/emacs-modes/htmlize/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation {
- name = "htmlize-1.47";
-
- src = fetchFromGitHub {
- owner = "emacsmirror";
- repo = "htmlize";
- rev = "release/1.47";
- name = "htmlize-1.47-src";
- sha256 = "1vkqxgirc82vc44g7xhhr041arf93yirjin3h144kjyfkgkplnkp";
- };
-
- installPhase = ''
- mkdir -p $out/share/emacs/site-lisp
- cp htmlize.el $out/share/emacs/site-lisp/
- '';
-
- meta = {
- description = "Convert buffer text and decorations to HTML";
- };
-}
diff --git a/pkgs/applications/editors/emacs-modes/idris/default.nix b/pkgs/applications/editors/emacs-modes/idris/default.nix
deleted file mode 100644
index 2e168b3abf7..00000000000
--- a/pkgs/applications/editors/emacs-modes/idris/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl, emacs }:
-
-stdenv.mkDerivation rec {
- name = "${pname}-${version}";
- pname = "idris-mode";
- version = "0.9.18";
-
- src = fetchurl {
- url = "https://github.com/idris-hackers/${pname}/archive/${version}.tar.gz";
- sha256 = "06rw5lrxqqnw0kni3x9jm73x352d1vb683d41v8x3yzqfa2sxmwg";
- };
-
- buildInputs = [ emacs ];
-
- buildPhase = ''
- emacs -L . --batch -f batch-byte-compile *.el
- '';
-
- installPhase = ''
- install -d $out/share/emacs/site-lisp
- install *.el *.elc $out/share/emacs/site-lisp
- '';
-
- meta = {
- description = "Emacs major mode for Idris";
- homepage = https://github.com/idris-hackers/idris-mode;
- license = stdenv.lib.licenses.gpl3;
-
- platforms = stdenv.lib.platforms.all;
- };
-}
diff --git a/pkgs/applications/editors/emacs-modes/jabber/default.nix b/pkgs/applications/editors/emacs-modes/jabber/default.nix
deleted file mode 100644
index c0ddbc88cf2..00000000000
--- a/pkgs/applications/editors/emacs-modes/jabber/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl, emacs }:
-stdenv.mkDerivation rec {
- pname = "emacs-jabber";
- version = "0.8.0";
- name = "${pname}-${version}";
- src = fetchurl {
- url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
- sha256 = "75e3b7853de4783b8ab8270dcbe6a1e4f576224f77f7463116532e11c6498c26";
- };
- buildInputs = [ emacs ];
- meta = with stdenv.lib; {
- description = "A Jabber client for Emacs";
- longDescription = ''
- jabber.el is a Jabber client for Emacs. It may seem strange to have a
- chat client in an editor, but consider that chatting is, after all, just
- a special case of text editing.
- '';
- homepage = http://emacs-jabber.sourceforge.net/;
- license = licenses.gpl2Plus;
- maintainers = with maintainers; [ astsmtl ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/applications/editors/emacs-modes/jade/default.nix b/pkgs/applications/editors/emacs-modes/jade/default.nix
deleted file mode 100644
index 925fa54c735..00000000000
--- a/pkgs/applications/editors/emacs-modes/jade/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchgit, emacs }:
-
-stdenv.mkDerivation {
- name = "jade-mode-0-20120802";
-
- src = fetchgit {
- url = "https://github.com/brianc/jade-mode.git";
- rev = "275ab149edb0f6bcfae6ac17ba456f3351191604";
- sha256 = "3cd2bebcd66e59d60b8e5e538e65a8ffdfc9a53b86443090a284e8329d7cb09b";
- };
-
- buildInputs = [ emacs ];
-
- buildPhase = ''
- emacs --batch -L . -f batch-byte-compile *.el
- '';
-
- installPhase = ''
- mkdir -p $out/share/emacs/site-lisp
- cp *.el *.elc $out/share/emacs/site-lisp/
- '';
-
- meta = {
- description = "Emacs major mode for jade and stylus";
- homepage = https://github.com/brianc/jade-mode;
- license = stdenv.lib.licenses.gpl2Plus;
-
- platforms = stdenv.lib.platforms.all;
- };
-}
diff --git a/pkgs/applications/editors/emacs-modes/jdee/build-properties.patch b/pkgs/applications/editors/emacs-modes/jdee/build-properties.patch
deleted file mode 100644
index d0a733b912e..00000000000
--- a/pkgs/applications/editors/emacs-modes/jdee/build-properties.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Make sure `build.properties' is honored.
-
---- jde/build.xml
-+++ jde/build.xml
-@@ -14,6 +14,7 @@
-
-
-
-+
-
-
-
diff --git a/pkgs/applications/editors/emacs-modes/jdee/cedet-paths.patch b/pkgs/applications/editors/emacs-modes/jdee/cedet-paths.patch
deleted file mode 100644
index 8c866e2d1db..00000000000
--- a/pkgs/applications/editors/emacs-modes/jdee/cedet-paths.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-JDE insists on seeing CEDET's source tree layout, with various
-sub-directories (`common', `eieio', etc.). However, the installed CEDET
-is flat, with everything under ${cedet}/share/emacs/site-lisp.
-
---- jde/config/build.el (revision 90)
-+++ jde/config/build.el (working copy)
-@@ -50,10 +50,5 @@ PATHS are sub directories under CEDET-DI
- (jde-make-autoloads-and-compile (expand-file-name "@{build.lisp.dir}")
- "@{src.lisp.dir}"
- "@{cedet.dir}"
-- '("common"
-- "eieio"
-- "semantic"
-- "semantic/bovine"
-- "speedbar"
-- )
-+ '(".")
- "@{build.lisp.autoload.libname}")
diff --git a/pkgs/applications/editors/emacs-modes/jdee/default.nix b/pkgs/applications/editors/emacs-modes/jdee/default.nix
deleted file mode 100644
index 306fe66823c..00000000000
--- a/pkgs/applications/editors/emacs-modes/jdee/default.nix
+++ /dev/null
@@ -1,99 +0,0 @@
-{ fetchsvn, stdenv, emacs, cedet, ant }:
-
-let
- revision = "137";
-in
- stdenv.mkDerivation rec {
- name = "jdee-svn${revision}";
-
- # Last release is too old, so use SVN.
- # See http://www.emacswiki.org/emacs/JavaDevelopmentEnvironment .
- src = fetchsvn {
- url = "https://jdee.svn.sourceforge.net/svnroot/jdee/trunk/jdee";
- rev = revision;
- sha256 = "1z1y957glbqm7z3dhah9h4jysw3173pq1gpx5agfwcw614n516xz";
- };
-
- patchFlags = "-p1 --ignore-whitespace";
-
- patches = [
- ./build-properties.patch
- ./cedet-paths.patch ./elib-avltree.patch
- ./java-directory.patch
- ];
-
- configurePhase = ''
- mkdir -p "dist"
- cat > build.properties <