diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-28 11:35:20 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-28 11:35:20 -0400 |
| commit | ac23a7c459d8f6035fcadcac274ff40f1e21a7e9 (patch) | |
| tree | 28e89153b9a69e32a56f9c72053987199ac9bf64 /pkgs/applications/editors/emacs | |
| parent | 0b6c2cfc4d15eac58c8023e174edfb069b816a4e (diff) | |
| download | nixlib-ac23a7c459d8f6035fcadcac274ff40f1e21a7e9.tar nixlib-ac23a7c459d8f6035fcadcac274ff40f1e21a7e9.tar.gz nixlib-ac23a7c459d8f6035fcadcac274ff40f1e21a7e9.tar.bz2 nixlib-ac23a7c459d8f6035fcadcac274ff40f1e21a7e9.tar.lz nixlib-ac23a7c459d8f6035fcadcac274ff40f1e21a7e9.tar.xz nixlib-ac23a7c459d8f6035fcadcac274ff40f1e21a7e9.tar.zst nixlib-ac23a7c459d8f6035fcadcac274ff40f1e21a7e9.zip | |
emacs: 25.3 → 26.1
Diffstat (limited to 'pkgs/applications/editors/emacs')
| -rw-r--r-- | pkgs/applications/editors/emacs/at-fdcwd.patch | 15 | ||||
| -rw-r--r-- | pkgs/applications/editors/emacs/clean-env.patch | 4 | ||||
| -rw-r--r-- | pkgs/applications/editors/emacs/default.nix | 14 |
3 files changed, 4 insertions, 29 deletions
diff --git a/pkgs/applications/editors/emacs/at-fdcwd.patch b/pkgs/applications/editors/emacs/at-fdcwd.patch deleted file mode 100644 index 2d8099b73736..000000000000 --- a/pkgs/applications/editors/emacs/at-fdcwd.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h -index 84ede3e..8e8f42e 100644 ---- a/lib/careadlinkat.h -+++ b/lib/careadlinkat.h -@@ -23,6 +23,10 @@ - #include <fcntl.h> - #include <unistd.h> - -+#ifndef AT_FDCWD -+#define AT_FDCWD -2 -+#endif -+ - struct allocator; - - /* Assuming the current directory is FD, get the symbolic link value diff --git a/pkgs/applications/editors/emacs/clean-env.patch b/pkgs/applications/editors/emacs/clean-env.patch index f80efeeef706..7b4cb9d52667 100644 --- a/pkgs/applications/editors/emacs/clean-env.patch +++ b/pkgs/applications/editors/emacs/clean-env.patch @@ -8,8 +8,8 @@ diff -ru -x '*~' emacs-25.3/src/Makefile.in emacs-25.3-new/src/Makefile.in ifeq ($(CANNOT_DUMP),yes) ln -f temacs$(EXEEXT) $@ else -- LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump -+ env -i LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump +- LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump ++ env -i LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump ifneq ($(PAXCTL_dumped),) $(PAXCTL_dumped) $@ endif diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index ba243629cc3e..b82f97e445f6 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -26,28 +26,18 @@ let in stdenv.mkDerivation rec { name = "emacs-${version}${versionModifier}"; - version = "25.3"; + version = "26.1"; versionModifier = ""; src = fetchurl { url = "mirror://gnu/emacs/${name}.tar.xz"; - sha256 = "02y00y9q42g1iqgz5qhmsja75hwxd88yrn9zp14lanay0zkwafi5"; + sha256 = "0b6k1wq44rc8gkvxhi1bbjxbz3cwg29qbq8mklq2az6p1hjgrx0w"; }; enableParallelBuilding = true; patches = [ ./clean-env.patch - ] ++ lib.optionals stdenv.isDarwin [ - ./at-fdcwd.patch - - # Backport of the fix to - # https://lists.gnu.org/archive/html/bug-gnu-emacs/2017-04/msg00201.html - # Should be removed when switching to Emacs 26.1 - (fetchurl { - url = "https://gist.githubusercontent.com/aaronjensen/f45894ddf431ecbff78b1bcf533d3e6b/raw/6a5cd7f57341aba673234348d8b0d2e776f86719/Emacs-25-OS-X-use-vfork.patch"; - sha256 = "1nlsxiaynswqhy99jf4mw9x0sndhwcrwy8713kq1l3xqv9dbrzgj"; - }) ]; nativeBuildInputs = [ pkgconfig ] |