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

ocamlformat: do not depend on janeStreet_0_15

Browse Source
This commit is contained in:
Vincent Laporte
2025-06-11 20:20:47 +02:00
committed by Vincent Laporte
parent 3fa008da69
commit 77215bbae4
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/ocaml-modules/ocamlformat/generic.nix
+2 -7
View File
@@ -21,7 +21,6 @@
stdio,
uuseg,
uutf,
janeStreet_0_15,
...
}:
@@ -67,13 +66,9 @@ rec {
cmdliner_v = if lib.versionAtLeast version "0.21.0" then cmdliner_1_1 else cmdliner_1_0;
base_v = if lib.versionAtLeast version "0.25.1" then base else janeStreet_0_15.base;
stdio_v = if lib.versionAtLeast version "0.25.1" then stdio else janeStreet_0_15.stdio;
library_deps =
[
base_v
base
cmdliner_v
dune-build-info
fix
@@ -81,7 +76,7 @@ rec {
menhirLib
menhirSdk
ocp-indent
stdio_v
stdio
uuseg
uutf
]
pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix
+1
View File
@@ -17,6 +17,7 @@ in
lib.throwIf
(
lib.versionAtLeast ocaml.version "5.0" && !lib.versionAtLeast version "0.23"
|| lib.versionAtLeast ocaml.version "5.1" && !lib.versionAtLeast version "0.25"
|| lib.versionAtLeast ocaml.version "5.2" && !lib.versionAtLeast version "0.26.2"
|| lib.versionAtLeast ocaml.version "5.3" && !lib.versionAtLeast version "0.27"
)