diff options
| author | sterni <sternenseemann@systemli.org> | 2021-03-19T17·03+0100 |
|---|---|---|
| committer | sterni <sternenseemann@systemli.org> | 2021-03-19T23·16+0000 |
| commit | 4cf7dced54af817cf79c5e161568156add98d819 (patch) | |
| tree | 0730113beb8c8c7523c009b33a1379abe298dc66 | |
| parent | eb110e9d7c1e95e92fea6d72f26d77c831973a18 (diff) | |
chore(gs/xanthous): fix for hgeometry 0.12.0.1 r/2288
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>
| -rw-r--r-- | third_party/nixpkgs-exposed/haskell_overlay/default.nix | 16 | ||||
| -rw-r--r-- | users/glittershark/xanthous/src/Xanthous/Util/Graphics.hs | 2 |
2 files changed, 2 insertions, 16 deletions
diff --git a/third_party/nixpkgs-exposed/haskell_overlay/default.nix b/third_party/nixpkgs-exposed/haskell_overlay/default.nix index 4cf3cfb4cb73..9b025d7d2828 100644 --- a/third_party/nixpkgs-exposed/haskell_overlay/default.nix +++ b/third_party/nixpkgs-exposed/haskell_overlay/default.nix @@ -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 - # 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"; - } {}; + hgeometry-combinatorial = dontCheck super.hgeometry-combinatorial; } diff --git a/users/glittershark/xanthous/src/Xanthous/Util/Graphics.hs b/users/glittershark/xanthous/src/Xanthous/Util/Graphics.hs index 353fcfc59b14..6ba63a2d8a3f 100644 --- a/users/glittershark/xanthous/src/Xanthous/Util/Graphics.hs +++ b/users/glittershark/xanthous/src/Xanthous/Util/Graphics.hs @@ -146,7 +146,7 @@ delaunay -> [((V2 n, p), (V2 n, p))] delaunay = map (over both fromPoint) - . Geometry.triangulationEdges + . Geometry.edgesAsPoints . Geometry.delaunayTriangulation . map toPoint where |