maurice/snix
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

16
third_party/overlays/tvl.nix vendored
View file

@ -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 {