diff options
| author | Benjamin Staffin <benley@gmail.com> | 2017-12-29 18:28:25 -0500 |
|---|---|---|
| committer | Benjamin Staffin <benley@gmail.com> | 2017-12-29 18:42:28 -0500 |
| commit | f0f290e6cb6f58d4fdfefb740505e0b928b443cc (patch) | |
| tree | 9d3da15932f15929d943a184ba7cbf8588d0bba8 /pkgs/applications | |
| parent | 99b49592bc902b7254fe7897580012ce26f9dee4 (diff) | |
| download | nixlib-f0f290e6cb6f58d4fdfefb740505e0b928b443cc.tar nixlib-f0f290e6cb6f58d4fdfefb740505e0b928b443cc.tar.gz nixlib-f0f290e6cb6f58d4fdfefb740505e0b928b443cc.tar.bz2 nixlib-f0f290e6cb6f58d4fdfefb740505e0b928b443cc.tar.lz nixlib-f0f290e6cb6f58d4fdfefb740505e0b928b443cc.tar.xz nixlib-f0f290e6cb6f58d4fdfefb740505e0b928b443cc.tar.zst nixlib-f0f290e6cb6f58d4fdfefb740505e0b928b443cc.zip | |
melpaPackages: match version of magit-popup to magit
Related to https://github.com/magit/magit/issues/3286
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 90b885d683de..61257c5b5735 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; |