diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2017-08-20T04·16-0700 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2017-08-20T04·16-0700 |
commit | 2c75945de58defcfae23cb30a9003695fbcd2f3d (patch) | |
tree | b1b23c11bd9dcb6f6ea8db4acc4c33da677f134a /nix.spec.in | |
parent | 898a3f729cb33d2ec5bf28db76c5a21b0e51e13f (diff) |
Remove nix-mode.el from Nix.
This removes the file nix-mode.el from Nix. The file is now available within the repository https://github.com/NixOS/nix-mode. Fixes #662 Fixes #1040 Fixes #1054 Fixes #1055 Closes #1119 Fixes #1419 NOTE: all of the above should be fixed within NixOS/nix-mode. If one of those hasn’t please reopen within NixOS/nix-mode and not within NixOS/nix.
Diffstat (limited to 'nix.spec.in')
-rw-r--r-- | nix.spec.in | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/nix.spec.in b/nix.spec.in index 88f0d04d3901..241e28f3678b 100644 --- a/nix.spec.in +++ b/nix.spec.in @@ -60,33 +60,6 @@ Requires: %{name} = %{version}-%{release} %description doc The %{name}-doc package contains documentation files for %{name}. - -%package -n emacs-%{name} -Summary: Nix mode for Emacs -%if 0%{?rhel} && 0%{?rhel} < 7 -Group: Applications/Editors -%endif -BuildArch: noarch -BuildRequires: emacs -Requires: emacs(bin) >= %{_emacs_version} - -%description -n emacs-%{name} -This package provides a major mode for editing Nix expressions. - -%package -n emacs-%{name}-el -Summary: Elisp source files for emacs-%{name} -%if 0%{?rhel} && 0%{?rhel} < 7 -Group: Applications/Editors -%endif -BuildArch: noarch -Requires: emacs-%{name} = %{version}-%{release} - -%description -n emacs-%{name}-el -This package contains the elisp source file for the Nix major mode for -GNU Emacs. You do not need to install this package to run Nix. Install -the emacs-%{name} package to edit Nix expressions with GNU Emacs. - - %prep %setup -q @@ -100,7 +73,6 @@ extraFlags= --docdir=%{_defaultdocdir}/%{name}-doc-%{version} \ $extraFlags make -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES -%{_emacs_bytecompile} misc/emacs/nix-mode.el %install @@ -126,9 +98,6 @@ done # (until this is fixed in the relevant Makefile) chmod -x $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/nix.sh -# Copy the byte-compiled mode file by hand -cp -p misc/emacs/nix-mode.elc $RPM_BUILD_ROOT%{_emacs_sitelispdir}/ - # we ship this file in the base package rm -f $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc-%{version}/README @@ -166,7 +135,6 @@ systemctl start nix-daemon.socket %{_prefix}/lib/systemd/system/nix-daemon.socket %{_prefix}/lib/systemd/system/nix-daemon.service %endif -%{_datadir}/emacs/site-lisp/nix-mode.el %{_datadir}/nix %{_mandir}/man1/*.1* %{_mandir}/man5/*.5* @@ -181,10 +149,3 @@ systemctl start nix-daemon.socket %files doc %docdir %{_defaultdocdir}/%{name}-doc-%{version} %{_defaultdocdir}/%{name}-doc-%{version} - -%files -n emacs-%{name} -%{_emacs_sitelispdir}/*.elc -#{_emacs_sitestartdir}/*.el - -%files -n emacs-%{name}-el -%{_emacs_sitelispdir}/*.el |