chore(3p/sources): Bump channels & overlays
* //3p/farmhash: drop, as it is unused and started to fail
* //3p/overlays/tvl:
- patch barrier to work with gcc 11
- disable outdated test suite for python38Packages.backports-zoneinfo
which still assumes zoneinfo 2020a.
* //3p/overlays/haskell: patch generic-arbitrary to avoid neg resizes
* //users/grfn/achilles: disable CI due to linking trouble (ugh).
* //users/grfn/system/home/games: Disable DFHack for dwarf fortress as
it's now failing to build
Refs: ENG-328
Change-Id: I4e1ee8fd9525d4868b82f9bad8ca5f09e7fdb9d0
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5506
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
This commit is contained in:
parent
96aea32084
commit
574d33a2de
6 changed files with 53 additions and 30 deletions
22
third_party/overlays/tvl.nix
vendored
22
third_party/overlays/tvl.nix
vendored
|
|
@ -98,4 +98,26 @@ in
|
|||
sha256 = "07qa2qkbjczj3d0m03jpw85hfj35cbjm48xhifz3viy4khjw88vl";
|
||||
};
|
||||
});
|
||||
|
||||
# Fix compilation with GCC 11. Can be removed when
|
||||
# https://github.com/NixOS/nixpkgs/pull/170157 lands in channels.
|
||||
barrier = super.barrier.overrideAttrs (old: {
|
||||
patches = old.patches or [ ] ++ [
|
||||
(self.fetchpatch {
|
||||
name = "barrier-gcc-11.patch";
|
||||
url = "https://github.com/debauchee/barrier/commit/4b12265ae5d324b942698a3177e1d8b1749414d7.patch";
|
||||
sha256 = "02a1hm07xgbs4d3529r2yj9vgxn1mix4y367hyw5h11kpczk2cva";
|
||||
})
|
||||
];
|
||||
});
|
||||
|
||||
python38 = super.python38.override {
|
||||
packageOverrides = pySelf: pySuper: {
|
||||
backports-zoneinfo = pySuper.backports-zoneinfo.overridePythonAttrs (_: {
|
||||
# Outdated test-data, see https://github.com/pganssle/zoneinfo/pull/115
|
||||
# Can be dropped when https://github.com/NixOS/nixpkgs/pull/170450 lands.
|
||||
doCheck = false;
|
||||
});
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue