diff options
author | sterni <sternenseemann@systemli.org> | 2021-03-19T13·13+0000 |
---|---|---|
committer | sterni <sternenseemann@systemli.org> | 2021-03-19T16·49+0000 |
commit | a01fe5c06fc99bd66c681b981f63534e03063aee (patch) | |
tree | 1da3ace68e4eb6d56fecc0d2d5046c9b74045904 /users/glittershark/xanthous/default.nix | |
parent | 531fc2b80bd4ca5aac8abe371255bcd40395e766 (diff) |
fix(gs/xanthous): fix build failures caused by dependency updates r/2286
The following changes in dependencies of xanthous broke the build and have been fixed in this CL. Thus we can reenable CI for xanthous. * random 1.2.0 removed the Read instance for StdGen, so we need use System.Random.Internal to un-newtype StdGen into an SMGen in the appropriate places as that type still has a Show and Read instance. Requires a new direct dependency on splitmix as well. * witherable 4.0 renamed Data.Witherable into Witherable and no longer exports Filter. * random 1.2.0 probably also broke the Function instance for GameState which contains a StdGen. I'm not exactly sure which change exactly triggered this, but the fix is easy enough: We implement a Function instance for SMGen using functionShow allowing us to write a Function instance for StdGen using functionMap. I've put these instances into Xanthous.Orphans. * hgeometry 0.12.0.0 removes the triangulationEdges function (which is also not mentioned in the changelog, so I'm not sure if there's a replacement yet). Fix by pinning to 0.11.0.0 for now. * hedgehog-classes: relax bounds on semirings Change-Id: I3617d8916d753b386c9fa80062be6bcbdfee0131 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2607 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi>
Diffstat (limited to 'users/glittershark/xanthous/default.nix')
-rw-r--r-- | users/glittershark/xanthous/default.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/users/glittershark/xanthous/default.nix b/users/glittershark/xanthous/default.nix index 8dfd0bce4bd0..0b89a50afb9e 100644 --- a/users/glittershark/xanthous/default.nix +++ b/users/glittershark/xanthous/default.nix @@ -2,9 +2,6 @@ , lib ? pkgs.lib , ... }: -(pkgs.haskell.lib.failOnAllWarnings ( +pkgs.haskell.lib.failOnAllWarnings ( pkgs.haskellPackages.callPackage (import ./pkg.nix { inherit pkgs; }) {} -)) // { - # TODO(grfn): Get this passing (see https://buildkite.com/tvl/depot/builds/3055) - meta.ci = false; -} +) |