public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

melpaPackages: match version of magit-popup to magit

Browse Source 
Related to https://github.com/magit/magit/issues/3286
This commit is contained in:
Benjamin Staffin 2017-12-29 18:28:25 -05:00
parent 99b49592bc
commit f0f290e6cb
No known key found for this signature in database
GPG Key ID: A490C0134E09AF4A
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/editors/emacs-modes/melpa-packages.nix
View File

@ -137,6 +137,12 @@ self:
# upstream issue: missing file header # upstream issue: missing file header
maxframe = markBroken super.maxframe; 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 # missing OCaml
merlin = markBroken super.merlin; merlin = markBroken super.merlin;