Merge pull request #29394 from acowley/emacsMacport-25.3

emacsMacport: emacs-25.2 => 25.3, macport-6.3 => 6.7
This commit is contained in:
Joachim F 2017-09-15 16:37:35 +00:00 committed by GitHub
commit 666f60bdb0

View File

@ -4,21 +4,21 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
emacsVersion = "25.2"; emacsVersion = "25.3";
emacsName = "emacs-${emacsVersion}"; emacsName = "emacs-${emacsVersion}";
macportVersion = "6.3"; macportVersion = "6.7";
name = "emacs-mac-${emacsVersion}-${macportVersion}"; name = "emacs-mac-${emacsVersion}-${macportVersion}";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = "mirror:///gnu/emacs/${emacsName}.tar.xz"; url = "mirror:///gnu/emacs/${emacsName}.tar.xz";
sha256 = "1ykkq0xl28ljdg61bm6gzy04ww86ajms98gix72qg6cpr6a53dar"; sha256 = "02y00y9q42g1iqgz5qhmsja75hwxd88yrn9zp14lanay0zkwafi5";
}; };
macportSrc = fetchurl { macportSrc = fetchurl {
url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz"; url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz";
sha256 = "1dz11frk3ya3842lb89ixzpns9bz5f9njxdkyvjy75gfymqfhhzv"; sha256 = "0fivrasvigszr31w8wg8kb808hmqv2cc8klrm9n0hdxwg5fs5d0y";
}; };
hiresSrc = fetchurl { hiresSrc = fetchurl {