about summary refs log tree commit diff
path: root/third_party/nixpkgs-exposed/haskell_overlay/patches/hgeometry-fix-haddock.patch
diff options
context:
space:
mode:
authorProfpatsch <mail@profpatsch.de>2021-01-11T08·55+0100
committerProfpatsch <mail@profpatsch.de>2021-01-11T19·44+0000
commit6843016aae40859ddb00a9721aa78c301c353f8d (patch)
treeefb41eba6f453f5fd996c90985bd97c2912127d5 /third_party/nixpkgs-exposed/haskell_overlay/patches/hgeometry-fix-haddock.patch
parent923d90990ee829df71f45a26287be6c9c14bb47b (diff)
chore(third_party): move nixkpgs-exposed to subdir to fix OWNERS r/2075
The owners plugin should in theory be able to match on subdirs (at
least according to its documentation, but it doesn’t and nobody has
any idea how to debug it.

We already know that subdirectories work just fine, so let’s go the
path of least resistance because frankly, I couldn’t care any less.

The haskell overlay also moves to the subdir, this way both can be
changed in the same go by the same people.

Change-Id: I7d98f48afa649ad2c58e38e674e1c4df09039c1c
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2347
Tested-by: BuildkiteCI
Reviewed-by: kanepyork <rikingcoding@gmail.com>
Reviewed-by: lukegb <lukegb@tvl.fyi>
Diffstat (limited to 'third_party/nixpkgs-exposed/haskell_overlay/patches/hgeometry-fix-haddock.patch')
-rw-r--r--third_party/nixpkgs-exposed/haskell_overlay/patches/hgeometry-fix-haddock.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/third_party/nixpkgs-exposed/haskell_overlay/patches/hgeometry-fix-haddock.patch b/third_party/nixpkgs-exposed/haskell_overlay/patches/hgeometry-fix-haddock.patch
new file mode 100644
index 000000000000..748c65b3e0db
--- /dev/null
+++ b/third_party/nixpkgs-exposed/haskell_overlay/patches/hgeometry-fix-haddock.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Data/Geometry/PlanarSubdivision/Merge.hs b/src/Data/Geometry/PlanarSubdivision/Merge.hs
+index 1136114..3f4e7bb 100644
+--- a/src/Data/Geometry/PlanarSubdivision/Merge.hs
++++ b/src/Data/Geometry/PlanarSubdivision/Merge.hs
+@@ -153,7 +153,7 @@ mergeWith' mergeFaces p1 p2 = PlanarSubdivision cs vd rd rf
+         -- we have to shift the number of the *Arcs*. Since every dart
+         -- consists of two arcs, we have to shift by numDarts / 2
+         -- Furthermore, we take numFaces - 1 since we want the first
+-        -- *internal* face of p2 (the one with FaceId 1) to correspond with the first free
++        -- /internal/ face of p2 (the one with FaceId 1) to correspond with the first free
+         -- position (at index numFaces)
+
+     cs = p1^.components <> p2'^.components