mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-16 15:58:36 +00:00
Merge branch 'emacs-packages'
This commit is contained in:
commit
ee9186c4d8
|
@ -64,21 +64,10 @@ self:
|
|||
};
|
||||
|
||||
elpaPackages = super // {
|
||||
ace-window = markBroken super.ace-window;
|
||||
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;
|
||||
# These packages require emacs-25
|
||||
el-search = markBroken super.el-search;
|
||||
ergoemacs-mode = markBroken super.ergoemacs-mode;
|
||||
exwm = markBroken super.exwm;
|
||||
gnugo = markBroken super.gnugo;
|
||||
iterators = markBroken super.iterators;
|
||||
midi-kbd = markBroken super.midi-kbd;
|
||||
stream = markBroken super.stream;
|
||||
tNFA = markBroken super.tNFA;
|
||||
trie = markBroken super.trie;
|
||||
xelb = markBroken super.xelb;
|
||||
};
|
||||
in elpaPackages // { inherit elpaBuild elpaPackages; }
|
||||
|
|
|
@ -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 {
|
||||
pname = "use-package";
|
||||
version = "20151112";
|
||||
|
|
Loading…
Reference in a new issue