mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 07:31:20 +00:00
Code Issues Wiki Activity

Merge pull request #116066 from Julow/ocamlformat-0-17-0

Browse source 
ocamlformat: 0.16.0 -> 0.17.0
This commit is contained in:
Mario Rodas 2021-03-13 19:52:34 -05:00 committed by GitHub
parent 86c7e9297d 3bece16153
commit bf0ae59408
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,5 +48,9 @@ rec {
version = "0.16.0";
};
ocamlformat = ocamlformat_0_16_0;
ocamlformat_0_17_0 = mkOCamlformat {
version = "0.17.0";
};
ocamlformat = ocamlformat_0_17_0;
}

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

@ -20,6 +20,7 @@ let src =
"0.15.0" = "0190vz59n6ma9ca1m3syl3mc8i1smj1m3d8x1jp21f710y4llfr6";
"0.15.1" = "1x6fha495sgk4z05g0p0q3zfqm5l6xzmf6vjm9g9g7c820ym2q9a";
"0.16.0" = "1vwjvvwha0ljc014v8jp8snki5zsqxlwd7x0dl0rg2i9kcmwc4mr";
"0.17.0" = "0f1lxp697yq61z8gqxjjaqd2ns8fd1vjfggn55x0gh9dx098p138";
}."${version}";
}
; in
@ -36,12 +37,33 @@ buildDunePackage rec {
pname = "ocamlformat";
inherit src version;
minimumOCamlVersion = "4.06";
minimumOCamlVersion =
if lib.versionAtLeast version "0.17.0"
then "4.08"
else "4.06";
useDune2 = true;
buildInputs =
if lib.versionAtLeast version "0.15.1"
if lib.versionAtLeast version "0.17.0"
then [
base
cmdliner
fpath
odoc
re
stdio
uuseg
uutf
fix
menhir
dune-build-info
ocaml-version
# Changed since 0.16.0:
(ppxlib.override { version = "0.22.0"; })
ocaml-migrate-parsetree-2-1
]
else if lib.versionAtLeast version "0.15.1"
then [
base
cmdliner

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

@ -10816,7 +10816,7 @@ in
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_15_1 ocamlformat_0_16_0;
ocamlformat_0_15_1 ocamlformat_0_16_0 ocamlformat_0_17_0;
orc = callPackage ../development/compilers/orc { };