dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

melpa-packages: 2019-04-08

Browse Source
This commit is contained in:
Alexey Shmalko 2019-04-08 11:11:36 +03:00
parent 0c0954781e
commit 3eafca2f9f
No known key found for this signature in database
GPG Key ID: DCEF7BCCEB3066C3
2 changed files with 4281 additions and 2658 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6933
pkgs/applications/editors/emacs-modes/melpa-generated.nix generated
View File

File diff suppressed because it is too large Load Diff

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

@ -133,11 +133,7 @@ self:
maxframe = markBroken super.maxframe; maxframe = markBroken super.maxframe;
magit = magit =
(super.magit.override { super.magit.overrideAttrs (attrs: {
# version of magit-popup needs to match magit
# https://github.com/magit/magit/issues/3286
inherit (self.melpaPackages) magit-popup;
}).overrideAttrs (attrs: {
# searches for Git at build time # searches for Git at build time
nativeBuildInputs = nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ]; (attrs.nativeBuildInputs or []) ++ [ external.git ];