nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 23:43:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

ocamlformat: 0.17.0 -> 0.18.0

Browse Source 
https://github.com/ocaml-ppx/ocamlformat/releases/tag/0.18.0
This commit is contained in:
Mario Rodas 2021-04-01 04:20:00 +00:00
parent 7919518f02
commit 212adc0c99
2 changed files with 27 additions and 7 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

@ -52,5 +52,9 @@ rec {
version = "0.17.0";
};
ocamlformat = ocamlformat_0_17_0;
ocamlformat_0_18_0 = mkOCamlformat {
version = "0.18.0";
};
ocamlformat = ocamlformat_0_18_0;
}

28
pkgs/development/tools/ocaml/ocamlformat/generic.nix
View File

@ -21,11 +21,10 @@ let src =
"0.15.1" = "1x6fha495sgk4z05g0p0q3zfqm5l6xzmf6vjm9g9g7c820ym2q9a";
"0.16.0" = "1vwjvvwha0ljc014v8jp8snki5zsqxlwd7x0dl0rg2i9kcmwc4mr";
"0.17.0" = "0f1lxp697yq61z8gqxjjaqd2ns8fd1vjfggn55x0gh9dx098p138";
"0.18.0" = "0571kzmb1h03qj74090n3mg8wfbh29qqrkdjkai6rnl5chll86lq";
}."${version}";
}
; in
let ocamlPackages =
};
ocamlPackages =
if lib.versionAtLeast version "0.14.3"
then ocaml-ng.ocamlPackages
else ocaml-ng.ocamlPackages_4_07
@ -33,7 +32,7 @@ let ocamlPackages =
with ocamlPackages;
buildDunePackage rec {
buildDunePackage {
pname = "ocamlformat";
inherit src version;
@ -45,7 +44,24 @@ buildDunePackage rec {
useDune2 = true;
buildInputs =
if lib.versionAtLeast version "0.17.0"
if lib.versionAtLeast version "0.18.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"; })
]
else if lib.versionAtLeast version "0.17.0"
then [
base
cmdliner