diff options
| author | Moritz Ulrich <moritz@tarn-vedra.de> | 2016-09-18 13:34:28 +0200 |
|---|---|---|
| committer | Moritz Ulrich <moritz@tarn-vedra.de> | 2016-09-18 13:38:21 +0200 |
| commit | 01e44ac1f9af1d42ee9b5000426b780f2a03c948 (patch) | |
| tree | 04b811bb05a6e2deb657805409c96b03e84c4d8c /pkgs/development/haskell-modules | |
| parent | 20fb07dc4ae8a4dc186779f01f3a65e6cc6eed33 (diff) | |
| download | nixpkgs-01e44ac1f9af1d42ee9b5000426b780f2a03c948.tar nixpkgs-01e44ac1f9af1d42ee9b5000426b780f2a03c948.tar.gz nixpkgs-01e44ac1f9af1d42ee9b5000426b780f2a03c948.tar.bz2 nixpkgs-01e44ac1f9af1d42ee9b5000426b780f2a03c948.tar.lz nixpkgs-01e44ac1f9af1d42ee9b5000426b780f2a03c948.tar.xz nixpkgs-01e44ac1f9af1d42ee9b5000426b780f2a03c948.tar.zst nixpkgs-01e44ac1f9af1d42ee9b5000426b780f2a03c948.zip | |
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.
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6f48eabe674..af2469100f4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -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 |