about summary refs log tree commit diff
path: root/pkgs/applications/editors/emacs-modes
diff options
context:
space:
mode:
authorAnthony Cowley <acowley@gmail.com>2019-12-03 15:04:08 -0500
committerAnthony Cowley <acowley@gmail.com>2019-12-03 15:04:08 -0500
commit3a35e4c7688c915d8c5db0a04b9c17172e73f322 (patch)
tree76cc77b7b603757ad2b9defcb5dd6a70b5dee855 /pkgs/applications/editors/emacs-modes
parentf1682a7f126d4d56dfbb96bb8c8c5582abb22828 (diff)
downloadnixlib-3a35e4c7688c915d8c5db0a04b9c17172e73f322.tar
nixlib-3a35e4c7688c915d8c5db0a04b9c17172e73f322.tar.gz
nixlib-3a35e4c7688c915d8c5db0a04b9c17172e73f322.tar.bz2
nixlib-3a35e4c7688c915d8c5db0a04b9c17172e73f322.tar.lz
nixlib-3a35e4c7688c915d8c5db0a04b9c17172e73f322.tar.xz
nixlib-3a35e4c7688c915d8c5db0a04b9c17172e73f322.tar.zst
nixlib-3a35e4c7688c915d8c5db0a04b9c17172e73f322.zip
emacs: do not use seq package from elpa for emacs >= 27
The `seq` package that comes with emacs 27 is newer than that provided
by ELPA. Various packages list `seq` as an input, causing it to be
imported from ELPA in addition to the (newer) version bundled with
emacs. Relying on the version packaged with emacs resolves the
conflict.

Fixes #73346
Diffstat (limited to 'pkgs/applications/editors/emacs-modes')
-rw-r--r--pkgs/applications/editors/emacs-modes/elpa-packages.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
index a6bea779eae0..a6d657199b98 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
@@ -40,6 +40,9 @@ self: let
       cl-lib = null; # builtin
       tle = null; # builtin
       advice = null; # builtin
+      seq = if lib.versionAtLeast self.emacs.version "27"
+            then null
+            else super.seq;
     };
 
     elpaPackages = super // overrides;