emacs-packages: Make org packages overrideable
This commit is contained in:
parent
316f68552b
commit
b6ccc1a6b0
|
@ -2,22 +2,23 @@
|
|||
|
||||
# Updating
|
||||
|
||||
To update the list of packages from ELPA,
|
||||
To update the list of packages from Org (ELPA),
|
||||
|
||||
1. Clone https://github.com/ttuegel/emacs2nix
|
||||
2. Run `./org-packages.sh` from emacs2nix
|
||||
3. Copy the new org-packages.json file into Nixpkgs
|
||||
4. `git commit -m "org-packages $(date -Idate)"`
|
||||
1. Run `./update-org`.
|
||||
2. Check for evaluation errors: `nix-instantiate ../../../.. -A emacsPackagesNg.orgPackages`.
|
||||
3. `git commit -m "org-packages $(date -Idate)" -- org-generated.nix`
|
||||
|
||||
*/
|
||||
|
||||
{ }:
|
||||
{ lib }:
|
||||
|
||||
self:
|
||||
self: let
|
||||
|
||||
let
|
||||
generateOrg = lib.makeOverridable ({
|
||||
generated ? ./org-generated.nix
|
||||
}: let
|
||||
|
||||
imported = import ./org-generated.nix {
|
||||
imported = import generated {
|
||||
inherit (self) callPackage;
|
||||
};
|
||||
|
||||
|
@ -26,6 +27,6 @@ self:
|
|||
overrides = {
|
||||
};
|
||||
|
||||
orgPackages = super // overrides;
|
||||
in super // overrides);
|
||||
|
||||
in orgPackages
|
||||
in generateOrg { }
|
||||
|
|
|
@ -55,7 +55,9 @@ let
|
|||
mkMelpaStablePackages = melpaGeneric "stable";
|
||||
mkMelpaPackages = melpaGeneric "unstable";
|
||||
|
||||
mkOrgPackages = import ../applications/editors/emacs-modes/org-packages.nix { };
|
||||
mkOrgPackages = import ../applications/editors/emacs-modes/org-packages.nix {
|
||||
inherit lib;
|
||||
};
|
||||
|
||||
emacsWithPackages = import ../build-support/emacs/wrapper.nix {
|
||||
inherit lib lndir makeWrapper stdenv runCommand;
|
||||
|
|
Loading…
Reference in a new issue