public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'emacs-packages'

Browse Source
This commit is contained in:
Thomas Tuegel 2016-01-11 09:47:52 -06:00
commit ee9186c4d8
2 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/editors/emacs-modes/elpa-packages.nix
View File

@ -64,21 +64,10 @@ self:
}; };
elpaPackages = super // { elpaPackages = super // {
ace-window = markBroken super.ace-window; # These packages require emacs-25
ada-mode = markBroken super.ada-mode;
company-math = markBroken super.company-math;
company-statistics = markBroken super.company-statistics;
context-coloring = markBroken super.context-coloring;
dict-tree = markBroken super.dict-tree;
el-search = markBroken super.el-search; el-search = markBroken super.el-search;
ergoemacs-mode = markBroken super.ergoemacs-mode;
exwm = markBroken super.exwm;
gnugo = markBroken super.gnugo;
iterators = markBroken super.iterators; iterators = markBroken super.iterators;
midi-kbd = markBroken super.midi-kbd; midi-kbd = markBroken super.midi-kbd;
stream = markBroken super.stream; stream = markBroken super.stream;
tNFA = markBroken super.tNFA;
trie = markBroken super.trie;
xelb = markBroken super.xelb;
}; };
in elpaPackages // { inherit elpaBuild elpaPackages; } in elpaPackages // { inherit elpaBuild elpaPackages; }

14
pkgs/top-level/emacs-packages.nix
View File

@ -1801,20 +1801,6 @@ let
}; };
}; };
undo-tree = melpaBuild rec {
pname = "undo-tree";
version = "0.6.4";
src = fetchgit {
url = "http://www.dr-qubit.org/git/${pname}.git";
rev = "a3e81b682053a81e082139300ef0a913a7a610a2";
sha256 = "1qla7njkb7gx5aj87i8x6ni8jfk1k78ivwfiiws3gpbnyiydpx8y";
};
meta = {
description = "A port of Vim's undo tree functionality to Emacs";
license = gpl3Plus;
};
};
use-package = melpaBuild rec { use-package = melpaBuild rec {
pname = "use-package"; pname = "use-package";
version = "20151112"; version = "20151112";