diff options
| author | Yegor Timoshenko <yegortimoshenko@gmail.com> | 2017-12-30 04:15:00 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-30 04:15:00 +0300 |
| commit | 823e191804ce39e107d0e0ae1ed853df8aec61ad (patch) | |
| tree | d54cd1be06601c609b5aee8cf097a7e1d2667dfe /pkgs/applications | |
| parent | 6f3a431af46e9b87e987f34dba81c35e77c835d9 (diff) | |
| parent | f0f290e6cb6f58d4fdfefb740505e0b928b443cc (diff) | |
| download | nixlib-823e191804ce39e107d0e0ae1ed853df8aec61ad.tar nixlib-823e191804ce39e107d0e0ae1ed853df8aec61ad.tar.gz nixlib-823e191804ce39e107d0e0ae1ed853df8aec61ad.tar.bz2 nixlib-823e191804ce39e107d0e0ae1ed853df8aec61ad.tar.lz nixlib-823e191804ce39e107d0e0ae1ed853df8aec61ad.tar.xz nixlib-823e191804ce39e107d0e0ae1ed853df8aec61ad.tar.zst nixlib-823e191804ce39e107d0e0ae1ed853df8aec61ad.zip | |
Merge pull request #33191 from benley/magit-popup-version
melpaPackages: match version of magit-popup to magit
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; |