about summary refs log tree commit diff
path: root/third_party/nixpkgs/default.nix
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2022-05-18T13·03+0200
committerclbot <clbot@tvl.fyi>2022-05-19T14·10+0000
commit19baeea350d24632559b1bb8e3f40127757b2ec0 (patch)
treeee4eb306387c63679e99bc0ceb84f20e6e3b8f11 /third_party/nixpkgs/default.nix
parent19669bd53ee2c52d42168bfc3c5a4c29beb47584 (diff)
chore(3p/sources): Bump channels & overlays to 2022-05-18 r/4101
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 <tazjin@tvl.su>
Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'third_party/nixpkgs/default.nix')
-rw-r--r--third_party/nixpkgs/default.nix8
1 files changed, 3 insertions, 5 deletions
diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix
index 23f09ff5f716..3471468c4cfd 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.