Skip to content

Commit

Permalink
rename extraEmacsPackages to extraPackages + extra examples in README
Browse files Browse the repository at this point in the history
  • Loading branch information
acid-bong committed Dec 13, 2024
1 parent 07a1838 commit 78fd280
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
10 changes: 7 additions & 3 deletions README.org
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,16 @@ required in a user's config via =use-package= or =leaf=.
alwaysTangle = true;

# Optionally provide extra packages not in the configuration file.
extraEmacsPackages = epkgs: [
# This can also include extra executables to be run by Emacs (linters,
# language servers, formatters, etc)
extraPackages = epkgs: [
epkgs.cask
pkgs.shellcheck
];

# Optionally override derivations.
override = final: prev: {
weechat = prev.melpaPackages.weechat.overrideAttrs(old: {
weechat = prev.melpaPackages.weechat.overrideAttrs (old: {
patches = [ ./weechat-el.patch ];
});
};
Expand All @@ -146,10 +149,11 @@ can be handy for CI purposes:
let
emacsForCI = pkgs.emacsWithPackagesFromPackageRequires {
packageElisp = builtins.readFile ./flycheck.el;
extraEmacsPackages = epkgs: [
extraPackages = epkgs: [
epkgs.package-lint
];
};
in
pkgs.mkShell {
buildInputs = [ emacsForCI ];
}
Expand Down
4 changes: 2 additions & 2 deletions elisp.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ in
, alwaysEnsure ? false
# emulate `#+PROPERTY: header-args:emacs-lisp :tangle yes`
, alwaysTangle ? false
, extraEmacsPackages ? epkgs: [ ]
, extraPackages ? epkgs: [ ]
, package ? pkgs.emacs
, override ? (self: super: { })
}:
Expand Down Expand Up @@ -63,7 +63,7 @@ in
emacsWithPackages (epkgs:
let
usePkgs = map (name: epkgs.${name} or (mkPackageError name)) packages;
extraPkgs = extraEmacsPackages epkgs;
extraPkgs = extraPackages epkgs;
defaultInitFilePkg =
if !((builtins.isBool defaultInitFile) || (lib.isDerivation defaultInitFile))
then throw "defaultInitFile must be bool or derivation"
Expand Down
4 changes: 2 additions & 2 deletions packreq.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ let
parse = pkgs.callPackage ./parse.nix { };
in
{ packageElisp
, extraEmacsPackages ? epkgs: [ ]
, extraPackages ? epkgs: [ ]
, package ? pkgs.emacs
, override ? (self: super: { })
}:
Expand All @@ -25,6 +25,6 @@ in
emacsWithPackages (epkgs:
let
usePkgs = builtins.map (name: epkgs.${name}) packages;
extraPkgs = extraEmacsPackages epkgs;
extraPkgs = extraPackages epkgs;
in
[ epkgs.use-package ] ++ usePkgs ++ extraPkgs)

0 comments on commit 78fd280

Please sign in to comment.