mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(gs/xanthous): fix for hgeometry 0.12.0.1

Browse source 
The breaking removal of triangulationEdges was not that big of a deal
after all: It was just renamed to edgesAsPoints apparently, so the fix
is easy enough and we can save one override.

hgeometry-combinatorial's doctests seem to trigger some kind of GHC
dynamic linking bug (https://github.com/noinia/hgeometry/issues/132) so
we disable the tests.

Change-Id: Iba2a64cade4d1a55fa4b81846e1116f282d4590a
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2608
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>
This commit is contained in:
sterni 2021-03-19 18:03:19 +01:00
parent eb110e9d7c
commit 4cf7dced54
2 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
third_party/nixpkgs-exposed/haskell_overlay/default.nix vendored
View file

@ -26,19 +26,5 @@ self: super: with pkgs.haskell.lib; rec {
''; '';
}); });
# pin hgeometry* to 0.11.0.0 since 0.12.0.0 removes triangulationEdges hgeometry-combinatorial = dontCheck super.hgeometry-combinatorial;
# which is used by //users/glittershark/xanthous
hgeometry =
self.callHackageDirect {
pkg = "hgeometry";
ver = "0.11.0.0";
sha256 = "0qidbpgs6jxrirrhmy7iabwd62178sm68fqrmqg3w3gfyx8nm8ls";
} {};
hgeometry-combinatorial =
self.callHackageDirect {
pkg = "hgeometry-combinatorial";
ver = "0.11.0.0";
sha256 = "0c9ccqz1m45kkdkzw00gvzdspjljhg12vish6himqjqpms7g6sag";
} {};
} }

2
users/glittershark/xanthous/src/Xanthous/Util/Graphics.hs
View file

@ -146,7 +146,7 @@ delaunay
-> [((V2 n, p), (V2 n, p))] -> [((V2 n, p), (V2 n, p))]
delaunay delaunay
= map (over both fromPoint) = map (over both fromPoint)
. Geometry.triangulationEdges . Geometry.edgesAsPoints
. Geometry.delaunayTriangulation . Geometry.delaunayTriangulation
. map toPoint . map toPoint
where where