emacs: 24.5 -> 25.1
This commit removes all references to emacs24 with the exception of emacs24-macports. The two folders in `pkgs/applications/editors` named `emacs-24` and `emacs-24` are consolidated to a new `emacs` folder. Various parts in nixpkgs also referenced `emacs24Packages` (pinned to `emacs24`) explicitly where `emacsPackages` (non-pinned) is more appropriate. These references get fixed by this commit too.
This commit is contained in:
@@ -773,7 +773,7 @@ self: super: {
|
||||
local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-${drv.version}/elisp" )
|
||||
pushd >/dev/null $lispdir
|
||||
for i in *.el; do
|
||||
emacs -Q -L . -L ${pkgs.emacs24Packages.haskellMode}/share/emacs/site-lisp \
|
||||
emacs -Q -L . -L ${pkgs.emacsPackages.haskellMode}/share/emacs/site-lisp \
|
||||
--batch --eval "(byte-compile-disable-warning 'cl-functions)" \
|
||||
-f batch-byte-compile $i
|
||||
done
|
||||
@@ -790,7 +790,7 @@ self: super: {
|
||||
local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-${drv.version}/elisp" )
|
||||
pushd >/dev/null $lispdir
|
||||
for i in *.el; do
|
||||
emacs -Q -L . -L ${pkgs.emacs24Packages.haskellMode}/share/emacs/site-lisp \
|
||||
emacs -Q -L . -L ${pkgs.emacsPackages.haskellMode}/share/emacs/site-lisp \
|
||||
--batch --eval "(byte-compile-disable-warning 'cl-functions)" \
|
||||
-f batch-byte-compile $i
|
||||
done
|
||||
|
||||
Reference in New Issue
Block a user