diff options
| author | sterni <sternenseemann@systemli.org> | 2022-06-21T20·29+0200 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2022-06-22T14·28+0000 |
| commit | 32b75c45c527ec4469e6f0848e3b097c2f7b1fd6 (patch) | |
| tree | 0d2f7062c67f1418e3ef3de9039608aedfa151c3 /third_party/nixpkgs/default.nix | |
| parent | 807e7ec55f64e52218c27921b580cede6752785a (diff) | |
chore(3p/sources): Bump channels & overlays r/4253
* //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>
Diffstat (limited to 'third_party/nixpkgs/default.nix')
| -rw-r--r-- | third_party/nixpkgs/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix index 73b3b8b9538a..dbdd068a869b 100644 --- a/third_party/nixpkgs/default.nix +++ b/third_party/nixpkgs/default.nix @@ -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. |