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/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:
sterni 2022-04-26 15:32:10 +02:00
parent 96aea32084
commit 574d33a2de
6 changed files with 53 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

26
third_party/overlays/haskell/default.nix vendored
View file

@ -9,6 +9,14 @@ self: super: # overlay parameters for the nixpkgs overlay
let
overrides = hsSelf: hsSuper: with self.haskell.lib.compose; {
# No overrides for the default package set necessary at the moment
# TODO(sterni): upstreamable?
generic-arbitrary = appendPatch
(self.fetchpatch {
name = "generic-arbitrary-no-negative-resize.patch";
url = "https://github.com/typeable/generic-arbitrary/commit/c13d119d8ad0d43860ecdb93b357b0239e366a6c.patch";
sha256 = "1jgbd2jn575icqw9nfdzh57nacm3pn8n53ka52129pnfjqfzyhsi";
})
hsSuper.generic-arbitrary;
};
in
{
@ -18,15 +26,17 @@ in
haskell = lib.recursiveUpdate super.haskell {
packages.ghc8107 = super.haskell.packages.ghc8107.override {
overrides = hsSelf: hsSuper: with self.haskell.lib.compose; {
# TODO(sterni): TODO(grfn): patch xanthous to work with random-fu 0.3.*,
# so we can use GHC 9.0.2 and benefit from upstream binary cache.
random-fu = hsSelf.callPackage ./extra-pkgs/random-fu-0.2.nix { };
rvar = hsSelf.callPackage ./extra-pkgs/rvar-0.2.nix { };
overrides = lib.composeExtensions overrides (
hsSelf: hsSuper: with self.haskell.lib.compose; {
# TODO(sterni): TODO(grfn): patch xanthous to work with random-fu 0.3.*,
# so we can use GHC 9.0.2 and benefit from upstream binary cache.
random-fu = hsSelf.callPackage ./extra-pkgs/random-fu-0.2.nix { };
rvar = hsSelf.callPackage ./extra-pkgs/rvar-0.2.nix { };
# TODO(sterni): upstream this
universe-base = addBuildDepend hsSelf.OneTuple hsSuper.universe-base;
};
# TODO(sterni): upstream this
universe-base = addBuildDepend hsSelf.OneTuple hsSuper.universe-base;
}
);
};
};
}

22
third_party/overlays/tvl.nix vendored
View file

@ -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;
});
};
};
}