diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-16 15:15:03 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-16 15:15:03 -0400 |
| commit | f7776ce336528f6b4b2bdd10c26d810f55694399 (patch) | |
| tree | 49fb57176b7c373183e49cff259f28e1567a8b0c | |
| parent | d5b52f3ce01080c0b8f00a98b35c28af39b68561 (diff) | |
| download | nixlib-f7776ce336528f6b4b2bdd10c26d810f55694399.tar nixlib-f7776ce336528f6b4b2bdd10c26d810f55694399.tar.gz nixlib-f7776ce336528f6b4b2bdd10c26d810f55694399.tar.bz2 nixlib-f7776ce336528f6b4b2bdd10c26d810f55694399.tar.lz nixlib-f7776ce336528f6b4b2bdd10c26d810f55694399.tar.xz nixlib-f7776ce336528f6b4b2bdd10c26d810f55694399.tar.zst nixlib-f7776ce336528f6b4b2bdd10c26d810f55694399.zip | |
emacs-mac: 26.1 -> 26.2
| -rw-r--r-- | pkgs/applications/editors/emacs/clean-env-macport.patch | 15 | ||||
| -rw-r--r-- | pkgs/applications/editors/emacs/macport.nix | 10 |
2 files changed, 5 insertions, 20 deletions
diff --git a/pkgs/applications/editors/emacs/clean-env-macport.patch b/pkgs/applications/editors/emacs/clean-env-macport.patch deleted file mode 100644 index 7b4cb9d52667..000000000000 --- a/pkgs/applications/editors/emacs/clean-env-macport.patch +++ /dev/null @@ -1,15 +0,0 @@ -Dump temacs in an empty environment to prevent -dev paths from ending -up in the dumped image. - -diff -ru -x '*~' emacs-25.3/src/Makefile.in emacs-25.3-new/src/Makefile.in ---- emacs-25.3/src/Makefile.in 2017-04-14 17:02:47.000000000 +0200 -+++ emacs-25.3-new/src/Makefile.in 2017-09-25 19:03:02.173861038 +0200 -@@ -532,7 +532,7 @@ - ifeq ($(CANNOT_DUMP),yes) - ln -f temacs$(EXEEXT) $@ - else -- 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/macport.nix b/pkgs/applications/editors/emacs/macport.nix index fb7892aec994..33c5da8642c4 100644 --- a/pkgs/applications/editors/emacs/macport.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -4,19 +4,19 @@ }: stdenv.mkDerivation rec { - emacsVersion = "26.1"; + emacsVersion = "26.2"; emacsName = "emacs-${emacsVersion}"; - macportVersion = "7.4"; + macportVersion = "7.6"; name = "emacs-mac-${emacsVersion}-${macportVersion}"; src = fetchurl { url = "mirror://gnu/emacs/${emacsName}.tar.xz"; - sha256 = "0b6k1wq44rc8gkvxhi1bbjxbz3cwg29qbq8mklq2az6p1hjgrx0w"; + sha256 = "13n5m60i47k96mpv5pp6km2ph9rv2m5lmbpzj929v02vpsfyc70m"; }; macportSrc = fetchurl { url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz"; - sha256 = "1xl3rfqw1f3jil20xf6iy0f1hdk9adj8rnv7xhcjq4pymj4w8ka6"; + sha256 = "00szqb74ds89m34sx5mq0gxhsrz64j691sxyvqncj10hw17d0y61"; }; hiresSrc = fetchurl { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "0f2wzdw2a3ac581322b2y79rlj3c9f33ddrq9allj97r1si6v5xk"; }; - patches = [ ./clean-env-macport.patch ]; + patches = [ ./clean-env.patch ]; enableParallelBuilding = true; |