mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(3p/sources): Bump channels & overlays

Browse source 
* //3p/overlays/tvl: nixpkgs-fmt 1.3.0 contains the fix we care about,
  so we can drop the override.

* //3p/nixpkgs: use awscli2 from stable nixpkgs as it's broken in
  unstable at the moment. Waiting on:
  https://nixpk.gs/pr-tracker.html?pr=178313

Change-Id: I9bb605d7940e53ebac80e3357799a3827a9415be
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5890
Tested-by: BuildkiteCI
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
sterni 2022-06-21 22:29:03 +02:00 • committed by clbot
parent 807e7ec55f
commit 32b75c45c5
3 changed files with 18 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

10
third_party/nixpkgs/default.nix vendored
View file

@ -45,9 +45,13 @@ let
# instead (e.g. because something is broken in unstable).
# Use `stableNixpkgs` from above.
stableOverlay = _unstableSelf: _unstableSuper: {
# 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;
inherit (stableNixpkgs)
# bat syntaxes changed with syntect 5.0, but cheddar is still on 4.x
# TODO(tazjin): upgrade cheddar to syntect 5.0
bat
# TODO(sterni): Temporarily use awscli2 from stable, since it broke in unstable
awscli2
;
};
# Overlay to expose the nixpkgs commits we are using to other Nix code.