Merge pull request #15941 from bendlas/update-emacs-packages

emacs-packages: update stable and unstable
2016-06-04 11:35:42 -05:00 · 2016-06-04 11:35:42 -05:00 · ebc49cee04
commit ebc49cee04
parent 66c73b3f36 893a50b957
3 changed files with 9113 additions and 8413 deletions
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@ -37,7 +37,7 @@ self:

    overrides = {
      ac-php = super.ac-php.override {
-        inherit (self.melpaPackages) company popup;
+        inherit (self.melpaPackages) popup;
      };

      # upstream issue: mismatched filename
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix