ghostfox/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Details
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Details
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Details
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Details
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Details
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
Details

Browse Source
This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/tools/ocaml/merlin/fix-paths2.patch Normal file
View File

@@ -0,0 +1,17 @@
diff --git a/src/kernel/mconfig_dot.ml b/src/kernel/mconfig_dot.ml
index 0a42a1d3..91997190 100644
--- a/src/kernel/mconfig_dot.ml
+++ b/src/kernel/mconfig_dot.ml
@@ -146,10 +146,10 @@ end = struct
let prog, args =
match cfg with
| Dot_merlin ->
- let prog = "dot-merlin-reader" in
+ let prog = "@dot-merlin-reader@" in
(prog, [| prog |])
| Dune ->
- let prog = "dune" in
+ let prog = "@dune@" in
(prog, [| prog; "ocaml-merlin"; "--no-print-directory" |])
in
let cwd = Sys.getcwd () in