melpaPackages: match version of magit-popup to magit

Related to https://github.com/magit/magit/issues/3286
7 years ago · f0f290e6cb
parent 99b49592bc
commit f0f290e6cb
1 changed files with 6 additions and 0 deletions
--- 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;