From f0f290e6cb6f58d4fdfefb740505e0b928b443cc Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Fri, 29 Dec 2017 18:28:25 -0500
Subject: [PATCH] melpaPackages: match version of magit-popup to magit

Related to https://github.com/magit/magit/issues/3286
---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 90b885d683d..61257c5b573 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -137,6 +137,12 @@ self:
       # upstream issue: missing file header
       maxframe = markBroken super.maxframe;
 
+      # version of magit-popup needs to match magit
+      # https://github.com/magit/magit/issues/3286
+      magit = super.magit.override {
+        inherit (self.melpaPackages) magit-popup;
+      };
+
       # missing OCaml
       merlin = markBroken super.merlin;