diff options
| author | Robin Gloster <mail@glob.in> | 2016-06-10 09:27:04 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-06-10 09:27:04 +0000 |
| commit | 8031cba2ab3146977141fc504bea2a1e03b5c126 (patch) | |
| tree | 0cd68c0007851dfed7d7f8247754b5c4b356704e /pkgs/applications/editors/emacs-modes/melpa-packages.nix | |
| parent | 2a5e64b69c83592caf900cb0b7213235e96368de (diff) | |
| parent | 656c48f141be5886c515a1a874a47472cbbac6bd (diff) | |
| download | nixpkgs-8031cba2ab3146977141fc504bea2a1e03b5c126.tar nixpkgs-8031cba2ab3146977141fc504bea2a1e03b5c126.tar.gz nixpkgs-8031cba2ab3146977141fc504bea2a1e03b5c126.tar.bz2 nixpkgs-8031cba2ab3146977141fc504bea2a1e03b5c126.tar.lz nixpkgs-8031cba2ab3146977141fc504bea2a1e03b5c126.tar.xz nixpkgs-8031cba2ab3146977141fc504bea2a1e03b5c126.tar.zst nixpkgs-8031cba2ab3146977141fc504bea2a1e03b5c126.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/applications/editors/emacs-modes/melpa-packages.nix')
| -rw-r--r-- | pkgs/applications/editors/emacs-modes/melpa-packages.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index a0482ef2874..026ba7caea3 100644 --- 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 |