From 19baeea350d24632559b1bb8e3f40127757b2ec0 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 18 May 2022 15:03:53 +0200 Subject: chore(3p/sources): Bump channels & overlays to 2022-05-18 Included changes: * //3p/nixpkgs: pick bat from stable channel for cheddar * //3p/nixpkgs: drop emacs27 (no longer required) Change-Id: Idb677aa0e98d4b3aec189bdd7700324922246699 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5629 Tested-by: BuildkiteCI Autosubmit: tazjin Reviewed-by: sterni --- third_party/nixpkgs/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'third_party/nixpkgs') diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix index 23f09ff5f7..3471468c4c 100644 --- a/third_party/nixpkgs/default.nix +++ b/third_party/nixpkgs/default.nix @@ -26,11 +26,9 @@ let # instead (e.g. because something is broken in unstable). # Use `stableNixpkgs` from above. stableOverlay = _unstableSelf: _unstableSuper: { - - # emacs27 is gone from unstable, but people should upgrade at - # their own pace. - emacs27 = builtins.trace "emacs27 is deprecated, please migrate to emacs28" - stableNixpkgs.emacs27; + # bat syntaxes changed with syntect 5.0, but cheddar is still on 4.x + # TODO(tazjin): upgrade cheddar to syntect 5.0 + bat = stableNixpkgs.bat; }; # Overlay to expose the nixpkgs commits we are using to other Nix code. -- cgit 1.4.1