From a444eff3f29c292ffb62700572cbd4c9cdb3718b Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Mon, 2 Mar 2015 23:37:43 +0000
Subject: [PATCH] reorganize emacs related files

---
 .../{melpa/default.nix => emacs/melpa.nix}    |  0
 .../{melpa => emacs}/melpa2nix.el             |  0
 .../{melpa => emacs}/setup-hook.sh            |  0
 pkgs/top-level/all-packages.nix               | 22 +++++++++++--------
 ...-melpa-packages.nix => emacs-packages.nix} |  2 +-
 5 files changed, 14 insertions(+), 10 deletions(-)
 rename pkgs/build-support/{melpa/default.nix => emacs/melpa.nix} (100%)
 rename pkgs/build-support/{melpa => emacs}/melpa2nix.el (100%)
 rename pkgs/build-support/{melpa => emacs}/setup-hook.sh (100%)
 rename pkgs/top-level/{emacs-melpa-packages.nix => emacs-packages.nix} (99%)

diff --git a/pkgs/build-support/melpa/default.nix b/pkgs/build-support/emacs/melpa.nix
similarity index 100%
rename from pkgs/build-support/melpa/default.nix
rename to pkgs/build-support/emacs/melpa.nix
diff --git a/pkgs/build-support/melpa/melpa2nix.el b/pkgs/build-support/emacs/melpa2nix.el
similarity index 100%
rename from pkgs/build-support/melpa/melpa2nix.el
rename to pkgs/build-support/emacs/melpa2nix.el
diff --git a/pkgs/build-support/melpa/setup-hook.sh b/pkgs/build-support/emacs/setup-hook.sh
similarity index 100%
rename from pkgs/build-support/melpa/setup-hook.sh
rename to pkgs/build-support/emacs/setup-hook.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 690ff3851e1..b5eed339f46 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
similarity index 99%
rename from pkgs/top-level/emacs-melpa-packages.nix
rename to pkgs/top-level/emacs-packages.nix
index e8f965a784a..0be7a3adf47 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