pyrox.dev / nixpkgs
lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

ocamlPackages.merlin: fix tests on darwin

authored by

Vincent Laporte and committed by
Vincent Laporte 81797521 631e658e

+22
+3
pkgs/development/tools/ocaml/merlin/4.x.nix
··· 47 47 dot_merlin_reader = "${dot-merlin-reader}/bin/dot-merlin-reader"; 48 48 dune = "${dune_2}/bin/dune"; 49 49 }) 50 + # This fixes the test-suite on macOS 51 + # See https://github.com/ocaml/merlin/pull/1399 52 + ./test.patch 50 53 ]; 51 54 52 55 useDune2 = true;
+19
pkgs/development/tools/ocaml/merlin/test.patch
··· 1 + commit 282eed37f39ff216add8d53766fd59f3737eb87f 2 + Author: Vincent Laporte <Vincent.Laporte@gmail.com> 3 + Date: Thu Nov 4 06:24:07 2021 +0100 4 + 5 + Ignore dune stderr in tests 6 + 7 + diff --git a/tests/test-dirs/document/src-documentation.t/run.t b/tests/test-dirs/document/src-documentation.t/run.t 8 + index 2c9e1419..4f4c4327 100644 9 + --- a/tests/test-dirs/document/src-documentation.t/run.t 10 + +++ b/tests/test-dirs/document/src-documentation.t/run.t 11 + @@ -42,7 +42,7 @@ documentation for the non-last defined value (in the same file) is show 12 + > jq '.value' 13 + " List reversal. " 14 + 15 + - $ dune build --root=. ./doc.exe 16 + + $ dune build --root=. ./doc.exe 2> /dev/null 17 + $ cat >.merlin <<EOF 18 + > B _build/default/.doc.eobjs/byte 19 + > S .