diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2015-03-02 23:37:43 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2015-03-03 05:31:38 +0000 |
| commit | a444eff3f29c292ffb62700572cbd4c9cdb3718b (patch) | |
| tree | 98220fdccdf149431ce79041745e2abf6757efe1 /pkgs/top-level | |
| parent | 2c32576a912af1d7d7311d6837f21d4aa8b2d8c7 (diff) | |
| download | nixlib-a444eff3f29c292ffb62700572cbd4c9cdb3718b.tar nixlib-a444eff3f29c292ffb62700572cbd4c9cdb3718b.tar.gz nixlib-a444eff3f29c292ffb62700572cbd4c9cdb3718b.tar.bz2 nixlib-a444eff3f29c292ffb62700572cbd4c9cdb3718b.tar.lz nixlib-a444eff3f29c292ffb62700572cbd4c9cdb3718b.tar.xz nixlib-a444eff3f29c292ffb62700572cbd4c9cdb3718b.tar.zst nixlib-a444eff3f29c292ffb62700572cbd4c9cdb3718b.zip | |
reorganize emacs related files
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 22 | ||||
| -rw-r--r-- | pkgs/top-level/emacs-packages.nix (renamed from pkgs/top-level/emacs-melpa-packages.nix) | 2 |
2 files changed, 14 insertions, 10 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 690ff3851e10..b5eed339f465 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; diff --git a/pkgs/top-level/emacs-melpa-packages.nix b/pkgs/top-level/emacs-packages.nix index e8f965a784a4..0be7a3adf470 100644 --- a/pkgs/top-level/emacs-melpa-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -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 |