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

emacsPackagesNg: don't expose package functions

Browse Source 
Remove elpaPackages, melpaStablePackages, and melpaPackages from the
top-level.
This commit is contained in:
Thomas Tuegel 2015-12-16 20:43:43 -06:00
parent a338959da6
commit 78d68b8c14
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11629,7 +11629,7 @@ let
inherit lib newScope stdenv; inherit lib newScope stdenv;
inherit fetchFromGitHub fetchgit fetchhg fetchurl; inherit fetchFromGitHub fetchgit fetchhg fetchurl;
inherit emacs elpaPackages melpaPackages melpaStablePackages; inherit emacs texinfo;
trivialBuild = callPackage ../build-support/emacs/trivial.nix { trivialBuild = callPackage ../build-support/emacs/trivial.nix {
inherit emacs; inherit emacs;
@ -11648,18 +11648,6 @@ let
emacs24PackagesNg = recurseIntoAttrs (emacsPackagesNgGen emacs24); emacs24PackagesNg = recurseIntoAttrs (emacsPackagesNgGen emacs24);
elpaPackages = import ../applications/editors/emacs-modes/elpa-packages.nix {
inherit fetchurl lib stdenv texinfo;
};
melpaStablePackages = import ../applications/editors/emacs-modes/melpa-stable-packages.nix {
inherit lib;
};
melpaPackages = import ../applications/editors/emacs-modes/melpa-packages.nix {
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; };

14
pkgs/top-level/emacs-packages.nix
View File

@ -35,7 +35,7 @@
, lib, newScope, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg , lib, newScope, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg
, emacs, elpaPackages, melpaPackages, melpaStablePackages , emacs, texinfo
, trivialBuild , trivialBuild
, melpaBuild , melpaBuild
@ -46,6 +46,18 @@ with lib.licenses;
let let
elpaPackages = import ../applications/editors/emacs-modes/elpa-packages.nix {
inherit fetchurl lib stdenv texinfo;
};
melpaStablePackages = import ../applications/editors/emacs-modes/melpa-stable-packages.nix {
inherit lib;
};
melpaPackages = import ../applications/editors/emacs-modes/melpa-packages.nix {
inherit lib;
};
packagesFun = self: with self; { packagesFun = self: with self; {
inherit emacs melpaBuild trivialBuild; inherit emacs melpaBuild trivialBuild;