From 47d3b98b4b3f52e862fe62186ec5dcbb0a233202 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 3 Aug 2019 20:48:11 +0100
Subject: melpa-packages: Add ability to ovveride melpa JSON archive location

This enables using the melpa json generator in an overlay
---
 pkgs/top-level/emacs-packages.nix | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

(limited to 'pkgs/top-level/emacs-packages.nix')

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index e1b93954448..23e00708949 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -49,13 +49,18 @@ let
     inherit lib stdenv texinfo;
   };
 
-  melpaStablePackages = import ../applications/editors/emacs-modes/melpa-stable-packages.nix {
+  # Contains both melpa stable & unstable
+  melpaGeneric = import ../applications/editors/emacs-modes/melpa-packages.nix {
     inherit external lib;
   };
 
-  melpaPackages = import ../applications/editors/emacs-modes/melpa-packages.nix {
-    inherit external lib;
-  };
+  melpaStablePackages = self: let
+    m = melpaGeneric "stable" self;
+  in {melpaStablePackages = m;} // m;
+
+  melpaPackages = self: let
+    m = melpaGeneric "unstable" self;
+  in {melpaPackages = m;} // m;
 
   orgPackages = import ../applications/editors/emacs-modes/org-packages.nix { };
 
@@ -455,12 +460,11 @@ let
 
   };
 
-in
-  lib.makeScope newScope (self:
-    {}
-    // elpaPackages self
-    // melpaStablePackages self
-    // melpaPackages self
-    // orgPackages self
-    // packagesFun self
-  )
+in lib.makeScope newScope (self:
+  removeAttrs ({}
+  // elpaPackages self
+  // melpaStablePackages self
+  // melpaPackages self
+  // orgPackages self
+  // packagesFun self) [ "override" "overrideDerivation" ]
+)
-- 
cgit 1.4.1