From 32b75c45c527ec4469e6f0848e3b097c2f7b1fd6 Mon Sep 17 00:00:00 2001 From: sterni Date: Tue, 21 Jun 2022 22:29:03 +0200 Subject: chore(3p/sources): Bump channels & overlays * //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 Reviewed-by: tazjin --- third_party/overlays/tvl.nix | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'third_party/overlays/tvl.nix') diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index fbc48e1565..b2ef0eee3e 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -74,22 +74,6 @@ in }; })); - # bump nixpkgs-fmt to a version that doesn't touch whitespace in - # strings - nixpkgs-fmt = super.nixpkgs-fmt.overrideAttrs (old: rec { - src = self.fetchFromGitHub { - owner = "nix-community"; - repo = "nixpkgs-fmt"; - rev = "5ae8532b82eb040ca6b21ae2d02d9e88f604e76a"; - sha256 = "0hjkbcgz62793hzfzlaxyah8a2c1k79n1k891lg7kfw8mkbq0w4p"; - }; - - cargoDeps = old.cargoDeps.overrideAttrs (_: { - inherit src; - outputHash = "10if2lmv8d95j3walq3ggx3y423yfy4yl9vplw3apd0s671bly8b"; - }); - }); - # upgrade home-manager until the service-generation fix has landed upstream # https://github.com/nix-community/home-manager/issues/2846 home-manager = super.home-manager.overrideAttrs (old: rec { -- cgit 1.4.1