From 648911fee3b6147c1d544f9fa65073077366b6bb Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 23 Jul 2018 06:29:28 -0500
Subject: [PATCH] melpa-packages: Fix evaluation

---
 .../editors/emacs-modes/melpa-packages.nix    | 27 ++++---------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index e8e69dcfbb3..2e474ed3410 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -75,28 +75,16 @@ self:
       # upstream issue: missing file header
       elmine = markBroken super.elmine;
 
-      # upstream issue: missing dependency redshank
-      emr = markBroken super.emr;
-
       ess-R-data-view = super.ess-R-data-view.override {
         inherit (self.melpaPackages) ess ctable popup;
       };
 
-      # upstream issue: missing dependency highlight
-      evil-search-highlight-persist = markBroken super.evil-search-highlight-persist;
-
-      # upstream issue: missing dependency highlight
-      floobits  = markBroken super.floobits;
-
       # missing OCaml
       flycheck-ocaml = markBroken super.flycheck-ocaml;
 
       # Expects bash to be at /bin/bash
       flycheck-rtags = markBroken super.flycheck-rtags;
 
-      # upstream issue: missing dependency
-      fold-dwim-org = markBroken super.fold-dwim-org;
-
       # build timeout
       graphene = markBroken super.graphene;
 
@@ -158,9 +146,6 @@ self:
             (attrs.nativeBuildInputs or []) ++ [ external.git ];
          }));
 
-      # upstream issue: missing dependency
-      org-readme = markBroken super.org-readme;
-
       # upstream issue: truncated file
       powershell = markBroken super.powershell;
 
@@ -173,9 +158,6 @@ self:
       # upstream issue: missing file footer
       seoul256-theme = markBroken super.seoul256-theme;
 
-      # upstream issue: missing dependency highlight
-      sonic-pi  = markBroken super.sonic-pi;
-
       spaceline = super.spaceline.override {
         inherit (self.melpaPackages) powerline;
       };
@@ -198,9 +180,6 @@ self:
       # upstream issue: missing file header
       voca-builder = markBroken super.voca-builder;
 
-      # upstream issue: missing dependency
-      weechat-alert = markBroken super.weechat-alert;
-
       # upstream issue: missing file header
       window-numbering = markBroken super.window-numbering;
 
@@ -216,6 +195,10 @@ self:
       });
     };
 
-    melpaPackages = super // overrides;
+    melpaPackages =
+      removeAttrs (super // overrides)
+      [
+        "show-marks"  # missing dependency: fm
+      ];
   in
     melpaPackages // { inherit melpaPackages; }