public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #68376 from wildsebastian/remove-elpy-from-melpa

Browse Source 
melpaPackages.elpy: bugfix
This commit is contained in:
adisbladis 2019-09-12 20:38:55 +01:00 committed by GitHub
commit 76e4d0e0f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,10 +68,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
inherit (self.melpaPackages) easy-kill; inherit (self.melpaPackages) easy-kill;
}; };
elpy = super.elpy.overrideAttrs(old: {
propagatedUserEnvPkgs = old.propagatedUserEnvPkgs ++ [ external.elpy ];
});
emacsql-sqlite = super.emacsql-sqlite.overrideAttrs(old: { emacsql-sqlite = super.emacsql-sqlite.overrideAttrs(old: {
buildInputs = old.buildInputs ++ [ pkgs.sqlite ]; buildInputs = old.buildInputs ++ [ pkgs.sqlite ];

1
pkgs/top-level/all-packages.nix
View File

@ -17962,7 +17962,6 @@ in
external = { external = {
inherit (haskellPackages) inherit (haskellPackages)
ghc-mod structured-haskell-mode Agda hindent; ghc-mod structured-haskell-mode Agda hindent;
inherit (pythonPackages) elpy;
inherit inherit
autoconf automake editorconfig-core-c git libffi libpng pkgconfig autoconf automake editorconfig-core-c git libffi libpng pkgconfig
poppler rtags w3m zlib substituteAll rustPlatform cmake llvmPackages poppler rtags w3m zlib substituteAll rustPlatform cmake llvmPackages