From 3a35e4c7688c915d8c5db0a04b9c17172e73f322 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Tue, 3 Dec 2019 15:04:08 -0500 Subject: 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 --- pkgs/applications/editors/emacs-modes/elpa-packages.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pkgs/applications/editors/emacs-modes') 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; -- cgit 1.4.1