From 6b88df04c1986bf5c40433caa87f1dba8ce8971d Mon Sep 17 00:00:00 2001
From: sterni <sternenseemann@systemli.org>
Date: Fri, 16 Jul 2021 21:13:04 +0200
Subject: chore(3p/nixpkgs): update channels to 2021-07-25

* 3p/buzz: bump to latest master (1.6.0)

* 3p/emacs/explain-pause-mode: adjust to package-build update
  MELPA's package build now cares about git revisions, but calling VC
  commands in a nix build is usually a bad idea. Thus upstream nixpkgs
  passes `$commit` to the `buildPhase` and otherwise fails with an
  error message that doesn't really point to the issue. Upstream change:
  https://github.com/NixOS/nixpkgs/commit/9140d4b06ff09bce8dd8e384eeef832e7811d288

* 3p/overlays/emacs: udpate to 2021-07-25 to support the package-build
  update. Without this emacsPackages.xelb (for tazjin's exwm) would fail.

Change-Id: I7cd782fe7d66ed4ea78c529b79fe761d921f46a8
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3253
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: grfn <grfn@gws.fyi>
---
 third_party/nixpkgs/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'third_party/nixpkgs')

diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix
index edbeec8cb92a..597c3a89ffab 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 nixpkgs-unstable as of 2021-07-03.
+  # Tracking nixos-unstable as of 2021-07-25.
   unstableHashes = {
-    commit = "20887e4bbfdae3aed6bfa1f53ddf138ee325515e";
-    sha256 = "0hc79sv59appb7bynz5bzyqvrapyjdq63s79i649vxl93504kmnv";
+    commit = "dd14e5d78e90a2ccd6007e569820de9b4861a6c2";
+    sha256 = "1zmhwx1qqgl1wrrb9mjkck508887rldrnragvximhd7jrh1ya3fb";
   };
 
-  # Tracking nixos-21.05 as of 2021-06-02.
+  # Tracking nixos-21.05 as of 2021-07-25.
   stableHashes = {
-    commit = "eaba7870ffc3400eca4407baa24184b7fe337ec1";
-    sha256 = "115disiz4b08iw46cidc7lm0advrxn5g2ldmlrxd53zf03skyb2w";
+    commit = "973910f5c31b9ba6c171c33a8bd7199990b14c72";
+    sha256 = "1n1kibmn1fcjazaxp8lydwdx646lknqksv5b2fm33fdq2dvafvj7";
   };
 
   # import the nixos-unstable package set, or optionally use the
-- 
cgit 1.4.1