diff options
| author | adisbladis <adisbladis@gmail.com> | 2019-09-12 20:38:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-12 20:38:55 +0100 |
| commit | 76e4d0e0f79af8ff6a34526249bdc8a0cf4874c0 (patch) | |
| tree | f86923eb6eac857f30aed24a96a6ef2fc9c2d3f3 | |
| parent | 0588d2d9de3fd8e16993ec4ebf882849db47f375 (diff) | |
| parent | 458e3c7116852f26df58f2047416c774c1d6141b (diff) | |
Merge pull request #68376 from wildsebastian/remove-elpy-from-melpa
melpaPackages.elpy: bugfix
| -rw-r--r-- | pkgs/applications/editors/emacs-modes/melpa-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index fe440c146ae8e..838e57343c43a 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -68,10 +68,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac inherit (self.melpaPackages) easy-kill; }; - elpy = super.elpy.overrideAttrs(old: { - propagatedUserEnvPkgs = old.propagatedUserEnvPkgs ++ [ external.elpy ]; - }); - emacsql-sqlite = super.emacsql-sqlite.overrideAttrs(old: { buildInputs = old.buildInputs ++ [ pkgs.sqlite ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 280041646b4f2..09dc9caafa614 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17962,7 +17962,6 @@ in external = { inherit (haskellPackages) ghc-mod structured-haskell-mode Agda hindent; - inherit (pythonPackages) elpy; inherit autoconf automake editorconfig-core-c git libffi libpng pkgconfig poppler rtags w3m zlib substituteAll rustPlatform cmake llvmPackages |