about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2021-10-22T09·55+0200
committertazjin <mail@tazj.in>2021-10-22T11·46+0000
commit425637b63bf6b75908de4db0da90bfe410cd39ed (patch)
tree4413d932a457199496de44d6b3d443e994db6d3e
parent08d46ad293264a7c0d4642b49480f49fc18b85cd (diff)
chore(3p/nixpkgs): Bump nixpkgs and Emacs overlay r/2989
... bumping these in the same commit to avoid double-recompilation of
Emacs stuff.

Change-Id: Ieab114115b788c36e9d42246445cf17b960c11de
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3741
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
-rw-r--r--third_party/nixpkgs/default.nix12
-rw-r--r--third_party/overlays/emacs.nix6
2 files changed, 9 insertions, 9 deletions
diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix
index 0235e0cae13d..8fb130f97f97 100644
--- a/third_party/nixpkgs/default.nix
+++ b/third_party/nixpkgs/default.nix
@@ -13,16 +13,16 @@ let
   # nixos-unstable, and the current stable channel of the latest NixOS
   # release.
 
-  # Tracking nixos-unstable as of 2021-10-13.
+  # Tracking nixos-unstable as of 2021-10-19.
   unstableHashes = {
-    commit = "e4ef597edfd8a0ba5f12362932fc9b1dd01a0aef";
-    sha256 = "1w6y7ma2crcsfph60z8j1k3af0v2m110cbjrb62z287mn4skhqjs";
+    commit = "5f0194220f2402b06f7f79bba6351895facb5acb";
+    sha256 = "0h2j0ivbp3b84d38h8s06s2yvnwqy80f4i1a75jd11m45m804n3s";
   };
 
-  # Tracking nixos-21.05 as of 2021-10-11.
+  # Tracking nixos-21.05 as of 2021-10-21.
   stableHashes = {
-    commit = "93ca5ab64f78ce778c0bcecf9458263f0f6289b6";
-    sha256 = "1ii3f5fbl6rinnbypypkfsp2s72dp28vgif2akq0w8v5h8szyisd";
+    commit = "70904d4a9927a4d6e05c72c4aaac4370e05107f3";
+    sha256 = "08vvir0npyrdx85ypiannwzvyryqdw3749bghffhdsq2dgz1cx8z";
   };
 
   # import the nixos-unstable package set, or optionally use the
diff --git a/third_party/overlays/emacs.nix b/third_party/overlays/emacs.nix
index 43155d81b078..c43961129851 100644
--- a/third_party/overlays/emacs.nix
+++ b/third_party/overlays/emacs.nix
@@ -2,10 +2,10 @@
 { ... }:
 
 let
-  # from 2021-10-10
-  commit = "de51ad003df13d41a1107a1ed766eb226ef9382c";
+  # from 2021-10-22
+  commit = "e594a3e8a7d0fbed07a4ed61a7b3eb8f15ece547";
   src = builtins.fetchTarball {
     url = "https://github.com/nix-community/emacs-overlay/archive/${commit}.tar.gz";
-    sha256 = "1spfd7wx7lz48kk7cs91gjx6zhvlliqc6376rxkc4idfb0q43xih";
+    sha256 = "1qqph536mw60cvyzick2bzrampjm840nf3vb84mmmk6sdqlhglwf";
   };
 in import src