diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-16 20:43:43 -0600 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-17 07:23:50 -0600 |
commit | 78d68b8c149d7c7a2f6f48d25ae61e5ec66212d7 (patch) | |
tree | 9782072a1c42da8550c935f341917d8276d752a7 | |
parent | a338959da6fb976345aac467e2c0d2f9b2c4ac46 (diff) |
emacsPackagesNg: don't expose package functions
Remove elpaPackages, melpaStablePackages, and melpaPackages from the top-level.
-rw-r--r-- | pkgs/top-level/all-packages.nix | 14 | ||||
-rw-r--r-- | pkgs/top-level/emacs-packages.nix | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e748f0b2fb02f..5559135e2422d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11629,7 +11629,7 @@ let inherit lib newScope stdenv; inherit fetchFromGitHub fetchgit fetchhg fetchurl; - inherit emacs elpaPackages melpaPackages melpaStablePackages; + inherit emacs texinfo; trivialBuild = callPackage ../build-support/emacs/trivial.nix { inherit emacs; @@ -11648,18 +11648,6 @@ let 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 { }; emacs24WithPackages = emacsWithPackages.override { emacs = emacs24; }; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index cb6da618768c5..727ceb24c8a28 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -35,7 +35,7 @@ , lib, newScope, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg -, emacs, elpaPackages, melpaPackages, melpaStablePackages +, emacs, texinfo , trivialBuild , melpaBuild @@ -46,6 +46,18 @@ with lib.licenses; 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; { inherit emacs melpaBuild trivialBuild; |