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

melpaPackages: don't import all of pkgs

Browse Source
This commit is contained in:
Thomas Tuegel 2015-12-16 20:41:08 -06:00
parent a4f4d1717d
commit 28af093438
2 changed files with 5 additions and 4 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

@ -1,8 +1,8 @@
pkgs: with pkgs; { lib }:
let let
inherit (stdenv.lib) makeScope mapAttrs; inherit (lib) makeScope mapAttrs;
json = builtins.readFile ./melpa-stable-packages.json; json = builtins.readFile ./melpa-stable-packages.json;
manifest = builtins.fromJSON json; manifest = builtins.fromJSON json;

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

@ -11655,8 +11655,9 @@ let
melpaStablePackages = melpaStablePackages =
import ../applications/editors/emacs-modes/melpa-stable-packages.nix pkgs; import ../applications/editors/emacs-modes/melpa-stable-packages.nix pkgs;
melpaPackages = melpaPackages = import ../applications/editors/emacs-modes/melpa-packages.nix {
import ../applications/editors/emacs-modes/melpa-packages.nix pkgs; inherit lib;
};
emacsWithPackages = callPackage ../build-support/emacs/wrapper.nix { }; emacsWithPackages = callPackage ../build-support/emacs/wrapper.nix { };
emacs24WithPackages = emacsWithPackages.override { emacs = emacs24; }; emacs24WithPackages = emacsWithPackages.override { emacs = emacs24; };