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

emacs-packages: Make org packages overrideable

Browse Source
This commit is contained in:
adisbladis 2019-08-18 10:58:17 +01:00
parent 316f68552b
commit b6ccc1a6b0
No known key found for this signature in database
GPG Key ID: 110BFAD44C6249B7
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,22 +2,23 @@
# Updating # 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 1. Run `./update-org`.
2. Run `./org-packages.sh` from emacs2nix 2. Check for evaluation errors: `nix-instantiate ../../../.. -A emacsPackagesNg.orgPackages`.
3. Copy the new org-packages.json file into Nixpkgs 3. `git commit -m "org-packages $(date -Idate)" -- org-generated.nix`
4. `git commit -m "org-packages $(date -Idate)"`
*/ */
{ }: { lib }:
self: self: let
let generateOrg = lib.makeOverridable ({
generated ? ./org-generated.nix
}: let
imported = import ./org-generated.nix { imported = import generated {
inherit (self) callPackage; inherit (self) callPackage;
}; };
@ -26,6 +27,6 @@ self:
overrides = { overrides = {
}; };
orgPackages = super // overrides; in super // overrides);
in orgPackages in generateOrg { }

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

@ -55,7 +55,9 @@ let
mkMelpaStablePackages = melpaGeneric "stable"; mkMelpaStablePackages = melpaGeneric "stable";
mkMelpaPackages = melpaGeneric "unstable"; 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 { emacsWithPackages = import ../build-support/emacs/wrapper.nix {
inherit lib lndir makeWrapper stdenv runCommand; inherit lib lndir makeWrapper stdenv runCommand;