473604f567
Please read b/108 to make sense of this. This gets rid of the explicit list of exposed packages from nixpkgs, and instead makes the entire package set available at `third_party.nixpkgs`. To accommodate this, a LOT of things have to be very slightly shuffled around. Some of this was done in already submitted CLs, but this change is unfortunately still quite noisy. Pay extra attention to: * overlay-like functionality that was partially moved to actual overlays (partially as in, the minimum required to get a green build) * modified uses of the package set path, esp. in NixOS systems Special notes: * xanthous has been disabled in CI because of issues with the Haskell overlay * //third_party/nix has been disabled because of other unclear dependency issues Both of these will be tackled in a followup CL. Change-Id: I2f9c60a4d275fdb5209264be0addfd7e06c53118 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2910 Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI
41 lines
1.4 KiB
Nix
41 lines
1.4 KiB
Nix
# Defines an overlay for overriding Haskell packages, for example to
|
|
# avoid breakage currently present in nixpkgs or to modify package
|
|
# versions.
|
|
|
|
{ ... }: # This file needs nothing from readTree
|
|
|
|
self: super: # overlay parameters for the nixpkgs overlay
|
|
|
|
let
|
|
overrides = hsSelf: hsSuper: with super.haskell.lib; rec {
|
|
generic-arbitrary = appendPatch hsSuper.generic-arbitrary
|
|
[ ./patches/generic-arbitrary-export-garbitrary.patch ];
|
|
|
|
# random = dontCheck (hsSuper.callHackageDirect {
|
|
# pkg = "random";
|
|
# ver = "1.2.0";
|
|
# sha256 = "06s3mmqbsfwv09j2s45qnd66nrxfp9280gnl9ng8yh128pfr7bjh";
|
|
# } {});
|
|
|
|
# random <1.2
|
|
test-framework = doJailbreak hsSuper.test-framework;
|
|
hashable = doJailbreak hsSuper.hashable;
|
|
test-framework-quickcheck2 = doJailbreak hsSuper.test-framework-quickcheck2;
|
|
|
|
# can be removed if we have the following PR or equivalent
|
|
# https://github.com/NixOS/nixpkgs/pull/116931
|
|
hedgehog-classes = overrideCabal hsSuper.hedgehog-classes (attrs: {
|
|
# remove version bound on semirings which is inside a
|
|
# conditional, so doJailbreak doesn't work
|
|
prePatch = ''
|
|
sed -i 's|semirings.*0.6|semirings|g' hedgehog-classes.cabal
|
|
'';
|
|
});
|
|
|
|
hgeometry-combinatorial = dontCheck hsSuper.hgeometry-combinatorial;
|
|
};
|
|
in {
|
|
haskellPackages = super.haskellPackages.override {
|
|
inherit overrides;
|
|
};
|
|
}
|