nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 15:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33191 from benley/magit-popup-version

Browse Source 
melpaPackages: match version of magit-popup to magit
This commit is contained in:
Yegor Timoshenko 2017-12-30 04:15:00 +03:00 committed by GitHub
commit 823e191804
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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
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;