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

reorganize emacs related files

Browse Source
This commit is contained in:
Jan Malakhovski 2015-03-02 23:37:43 +00:00
parent 2c32576a91
commit a444eff3f2
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/build-support/melpa/default.nix → pkgs/build-support/emacs/melpa.nix
View File

0
pkgs/build-support/melpa/melpa2nix.el → pkgs/build-support/emacs/melpa2nix.el
View File

0
pkgs/build-support/melpa/setup-hook.sh → pkgs/build-support/emacs/setup-hook.sh
View File

22
pkgs/top-level/all-packages.nix
View File

@ -9984,6 +9984,8 @@ let
elvis = callPackage ../applications/editors/elvis { }; elvis = callPackage ../applications/editors/elvis { };
emacs = emacs24; emacs = emacs24;
emacsPackages = emacs24Packages;
emacsMelpa = emacs24Melpa;
emacs24 = callPackage ../applications/editors/emacs-24 { emacs24 = callPackage ../applications/editors/emacs-24 {
# use override to enable additional features # use override to enable additional features
@ -10006,14 +10008,7 @@ let
}); });
emacs24Macport = self.emacs24Macport_24_4; emacs24Macport = self.emacs24Macport_24_4;
emacsMelpa = import ./emacs-melpa-packages.nix { emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec {
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 {
inherit emacs; inherit emacs;
autoComplete = callPackage ../applications/editors/emacs-modes/auto-complete { }; autoComplete = callPackage ../applications/editors/emacs-modes/auto-complete { };
@ -10176,7 +10171,16 @@ let
cask = callPackage ../applications/editors/emacs-modes/cask { }; 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; inherit (gnome3) empathy;

2
pkgs/top-level/emacs-melpa-packages.nix → pkgs/top-level/emacs-packages.nix
View File

@ -16,7 +16,7 @@
with stdenv.lib.licences; with stdenv.lib.licences;
let let
melpaBuild = import ../build-support/melpa { melpaBuild = import ../build-support/emacs/melpa.nix {
inherit stdenv fetchurl emacs texinfo; inherit stdenv fetchurl emacs texinfo;
}; };
in in