From 6742c9976a57c1bca1a427b02a6c02f3b744068b Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 4 Aug 2019 02:26:52 +0100
Subject: [PATCH] emacs-packages: Move shm

Use autogenerated modules from melpa instead
---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 4 ++++
 pkgs/top-level/emacs-packages.nix                        | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 5f05d3b2695..c44f302044c 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -151,6 +151,10 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # upstream issue: missing file header
         stgit = markBroken super.stgit;
 
+        shm = super.shm.overrideAttrs (attrs: {
+          propagatedUserEnvPkgs = [ external.structured-haskell-mode ];
+        });
+
         # upstream issue: missing file header
         tawny-mode = markBroken super.tawny-mode;
 
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 900cd3e01ca..920f6757f60 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -410,9 +410,6 @@ let
     stgit = callPackage ../applications/editors/emacs-modes/stgit { };
 
     structured-haskell-mode = self.shm;
-    shm = (melpaPackages self).shm.overrideAttrs (attrs: {
-      propagatedUserEnvPkgs = [ external.structured-haskell-mode ];
-    });
 
     thingatpt-plus = callPackage ../applications/editors/emacs-modes/thingatpt-plus { };