ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-22 04:57:56 +03:00
Code Issues Projects Releases Wiki Activity

elpaPackages: don't import all of pkgs

Browse Source
This commit is contained in:
Thomas Tuegel 2015-12-16 20:39:45 -06:00
parent f7ce3cdddb
commit a4f4d1717d
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/editors/emacs-modes/elpa-packages.nix
View File

@ -1,8 +1,8 @@
pkgs: with pkgs; { fetchurl, lib, stdenv, texinfo }:
let let
inherit (stdenv.lib) makeScope mapAttrs; inherit (lib) makeScope mapAttrs;
json = builtins.readFile ./elpa-packages.json; json = builtins.readFile ./elpa-packages.json;
manifest = builtins.fromJSON json; manifest = builtins.fromJSON json;
@ -40,12 +40,10 @@ self:
super = mapAttrs (mkPackage self) manifest; super = mapAttrs (mkPackage self) manifest;
elpaBuild = import ../../../build-support/emacs/melpa.nix { elpaBuild = import ../../../build-support/emacs/melpa.nix {
inherit (pkgs) lib stdenv fetchurl texinfo; inherit fetchurl lib stdenv texinfo;
inherit (self) emacs; inherit (self) emacs;
}; };
builtin = null;
markBroken = pkg: pkg.override { markBroken = pkg: pkg.override {
elpaBuild = args: self.elpaBuild (args // { elpaBuild = args: self.elpaBuild (args // {
meta = (args.meta or {}) // { broken = true; }; meta = (args.meta or {}) // { broken = true; };

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

@ -11648,8 +11648,9 @@ let
emacs24PackagesNg = recurseIntoAttrs (emacsPackagesNgGen emacs24); emacs24PackagesNg = recurseIntoAttrs (emacsPackagesNgGen emacs24);
elpaPackages = elpaPackages = import ../applications/editors/emacs-modes/elpa-packages.nix {
import ../applications/editors/emacs-modes/elpa-packages.nix pkgs; inherit fetchurl lib stdenv texinfo;
};
melpaStablePackages = melpaStablePackages =
import ../applications/editors/emacs-modes/melpa-stable-packages.nix pkgs; import ../applications/editors/emacs-modes/melpa-stable-packages.nix pkgs;