git.iko.soy/typeable/nixpkgs
on master help sign in
ocamlformat: 0.17.0 -> 0.18.0

https://github.com/ocaml-ppx/ocamlformat/releases/tag/0.18.0

commit212adc0c99ba152053b61d8479b47a672ef0c6c8 authorMario Rodas <marsam@users.noreply.github.com> dateThu 1 Apr 2021, 04:20 (6 years ago) parent7919518
2 files changed+27−7
compare with master
unifiedsplit
pkgs/development/tools/ocaml/ocamlformat/default.nix+5−1 pkgs/development/tools/ocaml/ocamlformat/generic.nix+22−6
pkgs/development/tools/ocaml/ocamlformat/default.nix+5−1
@@ -52,5 +52,9 @@ rec {
5252 version = "0.17.0";
5353 };
5454
55− ocamlformat = ocamlformat_0_17_0;
55+ ocamlformat_0_18_0 = mkOCamlformat {
56+ version = "0.18.0";
57+ };
58+
59+ ocamlformat = ocamlformat_0_18_0;
5660}
pkgs/development/tools/ocaml/ocamlformat/generic.nix+22−6
@@ -21,11 +21,10 @@ let src =
2121 "0.15.1" = "1x6fha495sgk4z05g0p0q3zfqm5l6xzmf6vjm9g9g7c820ym2q9a";
2222 "0.16.0" = "1vwjvvwha0ljc014v8jp8snki5zsqxlwd7x0dl0rg2i9kcmwc4mr";
2323 "0.17.0" = "0f1lxp697yq61z8gqxjjaqd2ns8fd1vjfggn55x0gh9dx098p138";
24+ "0.18.0" = "0571kzmb1h03qj74090n3mg8wfbh29qqrkdjkai6rnl5chll86lq";
2425 }."${version}";
25− }
26−; in
27−
28−let ocamlPackages =
26+ };
27+ ocamlPackages =
2928 if lib.versionAtLeast version "0.14.3"
3029 then ocaml-ng.ocamlPackages
3130 else ocaml-ng.ocamlPackages_4_07
@@ -33,7 +32,7 @@ let ocamlPackages =
3332
3433with ocamlPackages;
3534
36−buildDunePackage rec {
35+buildDunePackage {
3736 pname = "ocamlformat";
3837 inherit src version;
3938
@@ -45,7 +44,24 @@ buildDunePackage rec {
4544 useDune2 = true;
4645
4746 buildInputs =
48− if lib.versionAtLeast version "0.17.0"
47+ if lib.versionAtLeast version "0.18.0"
48+ then [
49+ base
50+ cmdliner
51+ fpath
52+ odoc
53+ re
54+ stdio
55+ uuseg
56+ uutf
57+ fix
58+ menhir
59+ dune-build-info
60+ ocaml-version
61+ # Changed since 0.16.0:
62+ (ppxlib.override { version = "0.22.0"; })
63+ ]
64+ else if lib.versionAtLeast version "0.17.0"
4965 then [
5066 base
5167 cmdliner