From 6c05554b8560c9992afb5996c7d0e1a1f590f50c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 21 Mar 2016 15:36:39 -0500 Subject: [PATCH] emacsPackagesNg: remove compatibility cl-lib ELPA has the compatibility library cl-lib-0.5 which interferes with the builtin cl-lib-1.0. --- .../applications/editors/emacs-modes/elpa-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix index 7fc8a06644f9..29cb586484a2 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix @@ -35,11 +35,11 @@ self: }; overrides = { - # These packages require emacs-25 - el-search = markBroken super.el-search; - iterators = markBroken super.iterators; - midi-kbd = markBroken super.midi-kbd; - stream = markBroken super.stream; + el-search = markBroken super.el-search; # requires emacs-25 + iterators = markBroken super.iterators; # requires emacs-25 + midi-kbd = markBroken super.midi-kbd; # requires emacs-25 + stream = markBroken super.stream; # requires emacs-25 + cl-lib = null; # builtin }; elpaPackages = super // overrides;