diff options
| -rw-r--r-- | default.nix | 8 | ||||
| -rw-r--r-- | elisp.nix | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/default.nix b/default.nix index 665dfe1d5741..a0e355a9c08d 100644 --- a/default.nix +++ b/default.nix @@ -1,9 +1,9 @@ self: super: let - mkExDrv = emacsPackagesNg: name: args: let + mkExDrv = emacsPackages: name: args: let repoMeta = super.lib.importJSON (./repos/exwm/. + "/${name}.json"); - in emacsPackagesNg.melpaBuild (args // { + in emacsPackages.melpaBuild (args // { pname = name; ename = name; version = repoMeta.version; @@ -49,8 +49,8 @@ in { emacsWithPackagesFromUsePackage = import ./elisp.nix { pkgs = self; }; - emacsPackagesNgFor = emacs: ( - (super.emacsPackagesNgFor emacs).overrideScope'(eself: esuper: let + emacsPackagesFor = emacs: ( + (super.emacsPackagesFor emacs).overrideScope'(eself: esuper: let melpaStablePackages = esuper.melpaStablePackages.override { archiveJson = ./repos/melpa/recipes-archive-melpa.json; diff --git a/elisp.nix b/elisp.nix index aff72b7dc25e..23a7e5a36bf4 100644 --- a/elisp.nix +++ b/elisp.nix @@ -35,7 +35,7 @@ in { override ? (epkgs: epkgs) }: let packages = parsePackages config; - emacsPackages = pkgs.emacsPackagesNgGen package; + emacsPackages = pkgs.emacsPackagesGen package; emacsWithPackages = emacsPackages.emacsWithPackages; in emacsWithPackages (epkgs: let overriden = override epkgs; |