git.iko.soy/typeable/nixpkgs
on master help sign in
emacs-mac: 26.1 -> 26.2
commitf7776ce336528f6b4b2bdd10c26d810f55694399 authorMatthew Bauer <mjbauer95@gmail.com> dateTue 16 Apr 2019, 15:15 (8 years ago) parentd5b52f3
2 files changed+5−20
pkgs/applications/editors/emacs/clean-env-macport.patch−15 pkgs/applications/editors/emacs/macport.nix+5−5
pkgs/applications/editors/emacs/clean-env-macport.patchdeleted−15
@@ -1,15 +0,0 @@
1−Dump temacs in an empty environment to prevent -dev paths from ending
2−up in the dumped image.
3−
4−diff -ru -x '*~' emacs-25.3/src/Makefile.in emacs-25.3-new/src/Makefile.in
5−--- emacs-25.3/src/Makefile.in 2017-04-14 17:02:47.000000000 +0200
6−+++ emacs-25.3-new/src/Makefile.in 2017-09-25 19:03:02.173861038 +0200
7−@@ -532,7 +532,7 @@
8− ifeq ($(CANNOT_DUMP),yes)
9− ln -f temacs$(EXEEXT) $@
10− else
11−- LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump
12−+ env -i LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump
13− ifneq ($(PAXCTL_dumped),)
14− $(PAXCTL_dumped) $@
15− endif
pkgs/applications/editors/emacs/macport.nix+5−5
@@ -4,19 +4,19 @@
44}:
55
66stdenv.mkDerivation rec {
7− emacsVersion = "26.1";
7+ emacsVersion = "26.2";
88 emacsName = "emacs-${emacsVersion}";
9− macportVersion = "7.4";
9+ macportVersion = "7.6";
1010 name = "emacs-mac-${emacsVersion}-${macportVersion}";
1111
1212 src = fetchurl {
1313 url = "mirror://gnu/emacs/${emacsName}.tar.xz";
14− sha256 = "0b6k1wq44rc8gkvxhi1bbjxbz3cwg29qbq8mklq2az6p1hjgrx0w";
14+ sha256 = "13n5m60i47k96mpv5pp6km2ph9rv2m5lmbpzj929v02vpsfyc70m";
1515 };
1616
1717 macportSrc = fetchurl {
1818 url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz";
19− sha256 = "1xl3rfqw1f3jil20xf6iy0f1hdk9adj8rnv7xhcjq4pymj4w8ka6";
19+ sha256 = "00szqb74ds89m34sx5mq0gxhsrz64j691sxyvqncj10hw17d0y61";
2020 };
2121
2222 hiresSrc = fetchurl {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 sha256 = "0f2wzdw2a3ac581322b2y79rlj3c9f33ddrq9allj97r1si6v5xk";
2525 };
2626
27− patches = [ ./clean-env-macport.patch ];
27+ patches = [ ./clean-env.patch ];
2828
2929 enableParallelBuilding = true;
3030