b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

ocamlformat: Add versions 0.15.1 and 0.16.0

Browse source
This commit is contained in:
Jules Aguillon 2021-01-13 16:10:59 +01:00 committed by Vincent Laporte
parent be14c2084d
commit bf010dac66
No known key found for this signature in database
GPG key ID: EBD582ADDDB1F81F
3 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/tools/ocaml/ocamlformat/default.nix
View file

@ -40,5 +40,13 @@ rec {
version = "0.15.0";
};
ocamlformat = ocamlformat_0_15_0;
ocamlformat_0_15_1 = mkOCamlformat {
version = "0.15.1";
};
ocamlformat_0_16_0 = mkOCamlformat {
version = "0.16.0";
};
ocamlformat = ocamlformat_0_16_0;
}

20
pkgs/development/tools/ocaml/ocamlformat/generic.nix
View file

@ -18,6 +18,8 @@ let src =
"0.14.2" = "16phz1sg9b070p6fm8d42j0piizg05vghdjmw8aj7xm82b1pm7sz";
"0.14.3" = "13pfakdncddm41cp61p0l98scawbvhx1q4zdsglv7ph87l7zwqfl";
"0.15.0" = "0190vz59n6ma9ca1m3syl3mc8i1smj1m3d8x1jp21f710y4llfr6";
"0.15.1" = "1x6fha495sgk4z05g0p0q3zfqm5l6xzmf6vjm9g9g7c820ym2q9a";
"0.16.0" = "1vwjvvwha0ljc014v8jp8snki5zsqxlwd7x0dl0rg2i9kcmwc4mr";
}."${version}";
}
; in
@ -39,7 +41,23 @@ buildDunePackage rec {
useDune2 = true;
buildInputs =
if lib.versionAtLeast version "0.14"
if lib.versionAtLeast version "0.15.1"
then [
base
cmdliner
fpath
odoc
re
stdio
uuseg
uutf
fix
menhir
(ppxlib.override { version = "0.18.0"; })
dune-build-info # lib.versionAtLeast version "0.16.0"
ocaml-version # lib.versionAtLeast version "0.16.0"
]
else if lib.versionAtLeast version "0.14"
then [
base
cmdliner

3
pkgs/top-level/all-packages.nix
View file

@ -10491,7 +10491,8 @@ in
inherit (callPackage ../development/tools/ocaml/ocamlformat { })
ocamlformat # latest version
ocamlformat_0_11_0 ocamlformat_0_12 ocamlformat_0_13_0 ocamlformat_0_14_0
ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_14_3 ocamlformat_0_15_0;
ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_14_3 ocamlformat_0_15_0
ocamlformat_0_15_1 ocamlformat_0_16_0;
orc = callPackage ../development/compilers/orc { };