summary refs log tree commit diff
path: root/pkgs/build-support/emacs
diff options
context:
space:
mode:
authoradisbladis <adisbladis@gmail.com>2020-12-18 04:46:05 +0100
committeradisbladis <adisbladis@gmail.com>2021-01-13 17:13:10 +0100
commit4003f8cbc711493f061f993971557fe8b134eeb7 (patch)
treec80bcaf1ccd984ffe6e0631452d688f765e0de5c /pkgs/build-support/emacs
parent6347f78fd90364bc7dc3d998300b5921ed2b34ee (diff)
downloadnixpkgs-4003f8cbc711493f061f993971557fe8b134eeb7.tar
nixpkgs-4003f8cbc711493f061f993971557fe8b134eeb7.tar.gz
nixpkgs-4003f8cbc711493f061f993971557fe8b134eeb7.tar.bz2
nixpkgs-4003f8cbc711493f061f993971557fe8b134eeb7.tar.lz
nixpkgs-4003f8cbc711493f061f993971557fe8b134eeb7.tar.xz
nixpkgs-4003f8cbc711493f061f993971557fe8b134eeb7.tar.zst
nixpkgs-4003f8cbc711493f061f993971557fe8b134eeb7.zip
treewide: emacsPackages -> emacs.pkgs & emacsWithPackages -> emacs.pkgs.withPackages
The previous names are now aliases and shouldn't be used anywhere inside nixpkgs.
Diffstat (limited to 'pkgs/build-support/emacs')
-rw-r--r--pkgs/build-support/emacs/wrapper.nix14
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix
index ddd15065663..f34835eaf09 100644
--- a/pkgs/build-support/emacs/wrapper.nix
+++ b/pkgs/build-support/emacs/wrapper.nix
@@ -2,11 +2,11 @@
 
 # Usage
 
-`emacsWithPackages` takes a single argument: a function from a package
+`emacs.pkgs.withPackages` takes a single argument: a function from a package
 set to a list of packages (the packages that will be available in
 Emacs). For example,
 ```
-emacsWithPackages (epkgs: [ epkgs.evil epkgs.magit ])
+emacs.pkgs.withPackages (epkgs: [ epkgs.evil epkgs.magit ])
 ```
 All the packages in the list should come from the provided package
 set. It is possible to add any package to the list, but the provided
@@ -15,19 +15,19 @@ the correct version of Emacs.
 
 # Overriding
 
-`emacsWithPackages` inherits the package set which contains it, so the
+`emacs.pkgs.withPackages` inherits the package set which contains it, so the
 correct way to override the provided package set is to override the
-set which contains `emacsWithPackages`. For example, to override
-`emacsPackages.emacsWithPackages`,
+set which contains `emacs.pkgs.withPackages`. For example, to override
+`emacs.pkgs.emacs.pkgs.withPackages`,
 ```
 let customEmacsPackages =
-      emacsPackages.overrideScope' (self: super: {
+      emacs.pkgs.overrideScope' (self: super: {
         # use a custom version of emacs
         emacs = ...;
         # use the unstable MELPA version of magit
         magit = self.melpaPackages.magit;
       });
-in customEmacsPackages.emacsWithPackages (epkgs: [ epkgs.evil epkgs.magit ])
+in customEmacsPackages.emacs.pkgs.withPackages (epkgs: [ epkgs.evil epkgs.magit ])
 ```
 
 */