reorganize emacs related files
This commit is contained in:
parent
2c32576a91
commit
a444eff3f2
|
@ -9984,6 +9984,8 @@ let
|
|||
elvis = callPackage ../applications/editors/elvis { };
|
||||
|
||||
emacs = emacs24;
|
||||
emacsPackages = emacs24Packages;
|
||||
emacsMelpa = emacs24Melpa;
|
||||
|
||||
emacs24 = callPackage ../applications/editors/emacs-24 {
|
||||
# use override to enable additional features
|
||||
|
@ -10006,14 +10008,7 @@ let
|
|||
});
|
||||
emacs24Macport = self.emacs24Macport_24_4;
|
||||
|
||||
emacsMelpa = import ./emacs-melpa-packages.nix {
|
||||
inherit stdenv pkgs fetchurl fetchgit fetchFromGitHub emacs texinfo;
|
||||
external = {
|
||||
inherit (haskellngPackages) ghc-mod structured-haskell-mode;
|
||||
};
|
||||
};
|
||||
|
||||
emacsPackages = emacs: self: let callPackage = newScope self; in rec {
|
||||
emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec {
|
||||
inherit emacs;
|
||||
|
||||
autoComplete = callPackage ../applications/editors/emacs-modes/auto-complete { };
|
||||
|
@ -10176,7 +10171,16 @@ let
|
|||
cask = callPackage ../applications/editors/emacs-modes/cask { };
|
||||
};
|
||||
|
||||
emacs24Packages = recurseIntoAttrs (emacsPackages emacs24 pkgs.emacs24Packages);
|
||||
emacs24Packages = recurseIntoAttrs (emacsPackagesGen emacs24 pkgs.emacs24Packages);
|
||||
|
||||
emacsMelpaGen = emacs: import ./emacs-packages.nix {
|
||||
inherit stdenv pkgs fetchurl fetchgit fetchFromGitHub emacs texinfo;
|
||||
external = {
|
||||
inherit (haskellngPackages) ghc-mod structured-haskell-mode;
|
||||
};
|
||||
};
|
||||
|
||||
emacs24Melpa = emacsMelpaGen emacs24;
|
||||
|
||||
inherit (gnome3) empathy;
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
with stdenv.lib.licences;
|
||||
|
||||
let
|
||||
melpaBuild = import ../build-support/melpa {
|
||||
melpaBuild = import ../build-support/emacs/melpa.nix {
|
||||
inherit stdenv fetchurl emacs texinfo;
|
||||
};
|
||||
in
|
Loading…
Reference in a new issue