From 429bbdb5ace7d1c68a851ab6fb132554aea46a95 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 28 Jul 2024 20:29:03 +0800 Subject: [PATCH] emacs: simplify manualPackages with packagesFromDirectoryRecursive --- .../emacs/elisp-packages/manual-packages.nix | 88 ++----------------- .../acm-terminal/{default.nix => package.nix} | 0 .../acm/{default.nix => package.nix} | 0 .../agda2-mode/{default.nix => package.nix} | 0 .../cask/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../consult-gh/{default.nix => package.nix} | 0 .../control-lock/{default.nix => package.nix} | 0 .../copilot/{default.nix => package.nix} | 0 .../ebuild-mode/{default.nix => package.nix} | 0 .../el-easydraw/{default.nix => package.nix} | 0 .../elisp-ffi/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../git-undo/{default.nix => package.nix} | 0 .../grid/{default.nix => package.nix} | 0 .../helm-words/{default.nix => package.nix} | 0 .../default.nix => hsc3-mode/package.nix} | 0 .../icicles/{default.nix => package.nix} | 0 .../idris2-mode/{default.nix => package.nix} | 0 .../isearch-plus/{default.nix => package.nix} | 0 .../isearch-prop/{default.nix => package.nix} | 0 .../jam-mode/{default.nix => package.nix} | 0 .../ligo-mode/{default.nix => package.nix} | 0 .../llvm-mode/{default.nix => package.nix} | 0 .../lspce/{default.nix => package.nix} | 0 .../mu4e/{default.nix => package.nix} | 0 .../notdeft/{default.nix => package.nix} | 0 .../ott-mode/{default.nix => package.nix} | 0 .../pod-mode/{default.nix => package.nix} | 0 .../prisma-mode/{default.nix => package.nix} | 0 .../default.nix => prolog-mode/package.nix} | 0 .../rect-mark/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../sv-kalender/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../tsc/{default.nix => package.nix} | 0 .../urweb-mode/{default.nix => package.nix} | 0 .../voicemacs/{default.nix => package.nix} | 0 .../wat-mode/{default.nix => package.nix} | 0 .../xapian-lite/{default.nix => package.nix} | 0 .../yes-no/{default.nix => package.nix} | 0 .../youtube-dl/{default.nix => package.nix} | 0 45 files changed, 5 insertions(+), 83 deletions(-) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda2-mode/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/{hsc3/default.nix => hsc3-mode/package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/icicles/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/jam-mode/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/{prolog/default.nix => prolog-mode/package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/treesit-grammars/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/wat-mode/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/{default.nix => package.nix} (100%) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/{default.nix => package.nix} (100%) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 7880d7f7a117..34469eb19628 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -4,111 +4,33 @@ self: let inherit (self) callPackage; in -{ +lib.packagesFromDirectoryRecursive { + inherit callPackage; + directory = ./manual-packages; +} +// { inherit (pkgs) emacspeak; - acm = callPackage ./manual-packages/acm { }; - - acm-terminal = callPackage ./manual-packages/acm-terminal { }; - - agda2-mode = callPackage ./manual-packages/agda2-mode { }; - - cask = callPackage ./manual-packages/cask { }; - codeium = callPackage ./manual-packages/codeium { inherit (pkgs) codeium; }; - consult-gh = callPackage ./manual-packages/consult-gh { }; - - control-lock = callPackage ./manual-packages/control-lock { }; - - copilot = callPackage ./manual-packages/copilot { }; - - ebuild-mode = callPackage ./manual-packages/ebuild-mode { }; - - el-easydraw = callPackage ./manual-packages/el-easydraw { }; - - elisp-ffi = callPackage ./manual-packages/elisp-ffi { }; - - emacs-conflict = callPackage ./manual-packages/emacs-conflict { }; - - evil-markdown = callPackage ./manual-packages/evil-markdown { }; - - font-lock-plus = callPackage ./manual-packages/font-lock-plus { }; - - git-undo = callPackage ./manual-packages/git-undo { }; - - grid = callPackage ./manual-packages/grid { }; - - helm-words = callPackage ./manual-packages/helm-words { }; - - icicles = callPackage ./manual-packages/icicles { }; - - idris2-mode = callPackage ./manual-packages/idris2-mode { }; - - isearch-plus = callPackage ./manual-packages/isearch-plus { }; - - isearch-prop = callPackage ./manual-packages/isearch-prop { }; - - jam-mode = callPackage ./manual-packages/jam-mode { }; - - ligo-mode = callPackage ./manual-packages/ligo-mode { }; - - llvm-mode = callPackage ./manual-packages/llvm-mode { }; - lsp-bridge = callPackage ./manual-packages/lsp-bridge { inherit (pkgs) basedpyright git go gopls python3; }; - lspce = callPackage ./manual-packages/lspce { }; - matrix-client = callPackage ./manual-packages/matrix-client { _map = self.map; }; - mu4e = callPackage ./manual-packages/mu4e { }; - - notdeft = callPackage ./manual-packages/notdeft { }; - - ott-mode = callPackage ./manual-packages/ott-mode { }; - - pod-mode = callPackage ./manual-packages/pod-mode { }; - - prisma-mode = callPackage ./manual-packages/prisma-mode { }; - structured-haskell-mode = self.shm; - sv-kalender = callPackage ./manual-packages/sv-kalender { }; - texpresso = callPackage ./manual-packages/texpresso { inherit (pkgs) texpresso; }; tree-sitter-langs = callPackage ./manual-packages/tree-sitter-langs { final = self; }; - treesit-grammars = callPackage ./manual-packages/treesit-grammars { }; - - tsc = callPackage ./manual-packages/tsc { }; - - urweb-mode = callPackage ./manual-packages/urweb-mode { }; - - voicemacs = callPackage ./manual-packages/voicemacs { }; - - wat-mode = callPackage ./manual-packages/wat-mode { }; - - xapian-lite = callPackage ./manual-packages/xapian-lite { }; - - yes-no = callPackage ./manual-packages/yes-no { }; - - youtube-dl = callPackage ./manual-packages/youtube-dl { }; - # From old emacsPackages (pre emacsPackagesNg) cedille = callPackage ./manual-packages/cedille { inherit (pkgs) cedille; }; - color-theme-solarized = callPackage ./manual-packages/color-theme-solarized { }; - hsc3-mode = callPackage ./manual-packages/hsc3 { }; - prolog-mode = callPackage ./manual-packages/prolog { }; - rect-mark = callPackage ./manual-packages/rect-mark { }; - session-management-for-emacs = callPackage ./manual-packages/session-management-for-emacs { }; - sunrise-commander = callPackage ./manual-packages/sunrise-commander { }; # camelCase aliases for some of the kebab-case expressions above colorThemeSolarized = self.color-theme-solarized; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda2-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda2-mode/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda2-mode/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda2-mode/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3-mode/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3-mode/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/icicles/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/icicles/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/icicles/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/icicles/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/jam-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/jam-mode/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/jam-mode/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/jam-mode/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog-mode/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog-mode/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/treesit-grammars/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/treesit-grammars/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/treesit-grammars/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/treesit-grammars/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/wat-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/wat-mode/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/wat-mode/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/wat-mode/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/package.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/package.nix