diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-22 00:02:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-22 00:02:07 +0000 |
| commit | 9f3ace4591752351eed2a2d640d5366b72751c4d (patch) | |
| tree | d59a2791036ba69842e097e10007f62af53df03a /pkgs/top-level/emacs-packages.nix | |
| parent | 87cfb513c1454a2db75db9483d713eeca4341766 (diff) | |
| parent | 8020f53c688d440707d27e2d76a5d453b7f9665e (diff) | |
| download | nixpkgs-9f3ace4591752351eed2a2d640d5366b72751c4d.tar nixpkgs-9f3ace4591752351eed2a2d640d5366b72751c4d.tar.gz nixpkgs-9f3ace4591752351eed2a2d640d5366b72751c4d.tar.bz2 nixpkgs-9f3ace4591752351eed2a2d640d5366b72751c4d.tar.lz nixpkgs-9f3ace4591752351eed2a2d640d5366b72751c4d.tar.xz nixpkgs-9f3ace4591752351eed2a2d640d5366b72751c4d.tar.zst nixpkgs-9f3ace4591752351eed2a2d640d5366b72751c4d.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/top-level/emacs-packages.nix')
| -rw-r--r-- | pkgs/top-level/emacs-packages.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 34f99561601..4d4c172296a 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -30,6 +30,10 @@ let inherit lib; }; + mkNongnuPackages = { lib }: import ../applications/editors/emacs/elisp-packages/nongnu-packages.nix { + inherit lib; + }; + # Contains both melpa stable & unstable melpaGeneric = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/melpa-packages.nix { inherit lib pkgs; @@ -53,12 +57,14 @@ in makeScope pkgs'.newScope (self: makeOverridable ({ pkgs ? pkgs' , lib ? pkgs.lib , elpaPackages ? mkElpaPackages { inherit pkgs lib; } self + , nongnuPackages ? mkNongnuPackages { inherit lib; } self , melpaStablePackages ? melpaGeneric { inherit pkgs lib; } "stable" self , melpaPackages ? melpaGeneric { inherit pkgs lib; } "unstable" self , orgPackages ? mkOrgPackages { inherit lib; } self , manualPackages ? mkManualPackages { inherit pkgs lib; } self }: ({} // elpaPackages // { inherit elpaPackages; } + // nongnuPackages // { inherit nongnuPackages; } // melpaStablePackages // { inherit melpaStablePackages; } // melpaPackages // { inherit melpaPackages; } // orgPackages // { inherit orgPackages; } |