From 458e3c7116852f26df58f2047416c774c1d6141b Mon Sep 17 00:00:00 2001 From: Sebastian Wild Date: Mon, 9 Sep 2019 22:05:49 +0200 Subject: [PATCH] melpaPackages.elpy: bugfix After the elpy dummy package was removed (#68217) it was still referenced in the melpa packages and broke emacs builds that included elpy. --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 4 ---- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 5 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index fe440c146ae..838e57343c4 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 3e7d7639ec1..03bf0ed75f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17979,7 +17979,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