Merge pull request #67693 from matthewbauer/emacs-26-3

emacs: 26.2 -> 26.3; emacs-mac: 26.2-7.6 -> 26.3-7.7
This commit is contained in:
Matthew Bauer 2019-08-29 14:24:43 -04:00 committed by GitHub
commit d7443d1924
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions

View File

@ -31,12 +31,12 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "emacs-${version}${versionModifier}"; name = "emacs-${version}${versionModifier}";
version = "26.2"; version = "26.3";
versionModifier = ""; versionModifier = "";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/emacs/${name}.tar.xz"; url = "mirror://gnu/emacs/${name}.tar.xz";
sha256 = "13n5m60i47k96mpv5pp6km2ph9rv2m5lmbpzj929v02vpsfyc70m"; sha256 = "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

View File

@ -4,19 +4,19 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
emacsVersion = "26.2"; emacsVersion = "26.3";
emacsName = "emacs-${emacsVersion}"; emacsName = "emacs-${emacsVersion}";
macportVersion = "7.6"; macportVersion = "7.7";
name = "emacs-mac-${emacsVersion}-${macportVersion}"; name = "emacs-mac-${emacsVersion}-${macportVersion}";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/emacs/${emacsName}.tar.xz"; url = "mirror://gnu/emacs/${emacsName}.tar.xz";
sha256 = "13n5m60i47k96mpv5pp6km2ph9rv2m5lmbpzj929v02vpsfyc70m"; sha256 = "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d";
}; };
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 = "00szqb74ds89m34sx5mq0gxhsrz64j691sxyvqncj10hw17d0y61"; sha256 = "18jadknm47ymbl7skrgc7y8xsdldcbgnlfl7qpgzm1ym8d92as6j";
}; };
hiresSrc = fetchurl { hiresSrc = fetchurl {