public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

emacs-packages: Add overriding capability to emacsPackagesNg 

This allows overriding the individual package sets composing
emacsPackagesNg.

Example:
```
myEmacsPackages = emacsPackagesNg.override {
  melpaPackages = {};
};
```
This commit is contained in:
adisbladis 2019-08-04 21:44:07 +01:00
parent d490bcdf0f
commit 97a069609f
No known key found for this signature in database
GPG Key ID: 110BFAD44C6249B7
3 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/editors/emacs-modes/elpa-packages.nix
View File

@ -50,4 +50,4 @@ self:
elpaPackages = super // overrides;
in elpaPackages // { inherit elpaBuild elpaPackages; }
in elpaPackages // { inherit elpaBuild; }

2
pkgs/applications/editors/emacs-modes/org-packages.nix
View File

@ -28,4 +28,4 @@ self:
orgPackages = super // overrides;
in orgPackages // { inherit orgPackages; }
in orgPackages

47
pkgs/top-level/emacs-packages.nix
View File

@ -46,7 +46,7 @@ with lib.licenses;
let
elpaPackages = import ../applications/editors/emacs-modes/elpa-packages.nix {
mkElpaPackages = import ../applications/editors/emacs-modes/elpa-packages.nix {
inherit lib stdenv texinfo;
};
@ -54,28 +54,16 @@ let
melpaGeneric = import ../applications/editors/emacs-modes/melpa-packages.nix {
inherit external lib pkgs;
};
mkMelpaStablePackages = melpaGeneric "stable";
mkMelpaPackages = melpaGeneric "unstable";
melpaStablePackages = self: let
m = melpaGeneric "stable" self;
in {melpaStablePackages = m;} // m;
melpaPackages = self: let
m = melpaGeneric "unstable" self;
in {melpaPackages = m;} // m;
orgPackages = import ../applications/editors/emacs-modes/org-packages.nix { };
mkOrgPackages = import ../applications/editors/emacs-modes/org-packages.nix { };
emacsWithPackages = import ../build-support/emacs/wrapper.nix {
inherit lib lndir makeWrapper stdenv runCommand;
};
packagesFun = self: with self; {
inherit emacs melpaBuild trivialBuild;
emacsWithPackages = emacsWithPackages self;
## START HERE
mkManualPackages = self: with self; {
elisp-ffi = melpaBuild rec {
pname = "elisp-ffi";
@ -221,11 +209,20 @@ let
};
in lib.makeScope newScope (self:
removeAttrs ({}
// elpaPackages self
// melpaStablePackages self
// melpaPackages self
// orgPackages self
// packagesFun self) [ "override" "overrideDerivation" ]
)
in lib.makeScope newScope (self: lib.makeOverridable ({
elpaPackages ? mkElpaPackages self
, melpaStablePackages ? mkMelpaStablePackages self
, melpaPackages ? mkMelpaPackages self
, orgPackages ? mkOrgPackages self
, manualPackages ? mkManualPackages self
}: ({}
// elpaPackages // { inherit elpaPackages; }
// melpaStablePackages // { inherit melpaStablePackages; }
// melpaPackages // { inherit melpaPackages; }
// orgPackages // { inherit orgPackages; }
// manualPackages
// {
inherit emacs melpaBuild trivialBuild;
emacsWithPackages = emacsWithPackages self;
})
) {})