about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2019-08-29 14:24:43 -0400
committerGitHub <noreply@github.com>2019-08-29 14:24:43 -0400
commitd7443d192425cc8bbc9a71a719a830182b27beae (patch)
treea0c24fb52be0850a15a177b572a4555f1ea92749
parentf86bbb218cacd968aecdd1374a42d23262c23d3b (diff)
parentabd1172a6fba7669de9487003e2de6d88b12b016 (diff)
downloadnixlib-d7443d192425cc8bbc9a71a719a830182b27beae.tar
nixlib-d7443d192425cc8bbc9a71a719a830182b27beae.tar.gz
nixlib-d7443d192425cc8bbc9a71a719a830182b27beae.tar.bz2
nixlib-d7443d192425cc8bbc9a71a719a830182b27beae.tar.lz
nixlib-d7443d192425cc8bbc9a71a719a830182b27beae.tar.xz
nixlib-d7443d192425cc8bbc9a71a719a830182b27beae.tar.zst
nixlib-d7443d192425cc8bbc9a71a719a830182b27beae.zip
Merge pull request #67693 from matthewbauer/emacs-26-3
emacs: 26.2 -> 26.3; emacs-mac: 26.2-7.6 -> 26.3-7.7
-rw-r--r--pkgs/applications/editors/emacs/default.nix4
-rw-r--r--pkgs/applications/editors/emacs/macport.nix8
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index 4c95681c43de..29a6a8773eff 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -31,12 +31,12 @@ let
 in
 stdenv.mkDerivation rec {
   name = "emacs-${version}${versionModifier}";
-  version = "26.2";
+  version = "26.3";
   versionModifier = "";
 
   src = fetchurl {
     url = "mirror://gnu/emacs/${name}.tar.xz";
-    sha256 = "13n5m60i47k96mpv5pp6km2ph9rv2m5lmbpzj929v02vpsfyc70m";
+    sha256 = "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix
index d51391595f47..649997171e9f 100644
--- a/pkgs/applications/editors/emacs/macport.nix
+++ b/pkgs/applications/editors/emacs/macport.nix
@@ -4,19 +4,19 @@
 }:
 
 stdenv.mkDerivation rec {
-  emacsVersion = "26.2";
+  emacsVersion = "26.3";
   emacsName = "emacs-${emacsVersion}";
-  macportVersion = "7.6";
+  macportVersion = "7.7";
   name = "emacs-mac-${emacsVersion}-${macportVersion}";
 
   src = fetchurl {
     url = "mirror://gnu/emacs/${emacsName}.tar.xz";
-    sha256 = "13n5m60i47k96mpv5pp6km2ph9rv2m5lmbpzj929v02vpsfyc70m";
+    sha256 = "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d";
   };
 
   macportSrc = fetchurl {
     url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz";
-    sha256 = "00szqb74ds89m34sx5mq0gxhsrz64j691sxyvqncj10hw17d0y61";
+    sha256 = "18jadknm47ymbl7skrgc7y8xsdldcbgnlfl7qpgzm1ym8d92as6j";
   };
 
   hiresSrc = fetchurl {