From b525bba371602e0009356a2f7585693ecdad0f47 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 15 Sep 2024 01:55:14 +0800 Subject: [PATCH] emacs.pkgs.elpaPackages: move builtin packages to common overrides --- .../editors/emacs/elisp-packages/elpa-common-overrides.nix | 5 +++++ .../editors/emacs/elisp-packages/elpa-packages.nix | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix index 82694607b094..88269fb5da14 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix @@ -6,6 +6,11 @@ let libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary; in { + cl-lib = null; # builtin + cl-print = null; # builtin + tle = null; # builtin + advice = null; # builtin + # TODO delete this when we get upstream fix https://debbugs.gnu.org/cgi/bugreport.cgi?bug=73241 eglot = super.eglot.overrideAttrs (old: { postInstall = diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index dc412e9b246d..cfe566a7f622 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -56,10 +56,6 @@ self: let then markBroken super.org-transclusion else super.org-transclusion; rcirc-menu = markBroken super.rcirc-menu; # Missing file header - cl-lib = null; # builtin - cl-print = null; # builtin - tle = null; # builtin - advice = null; # builtin # Compilation instructions for the Ada executables: # https://www.nongnu.org/ada-mode/ ada-mode = super.ada-mode.overrideAttrs (old: {