cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

ocamlformat_0_24_0: init

Browse source
This commit is contained in:
Jules Aguillon 2022-07-19 11:04:23 +02:00 committed by Vincent Laporte
parent 6d559df867
commit 6ac387a3a3
3 changed files with 11 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

@ -31,5 +31,9 @@ rec {
version = "0.23.0";
};
ocamlformat = ocamlformat_0_23_0;
ocamlformat_0_24_0 = mkOCamlformat {
version = "0.24.0";
};
ocamlformat = ocamlformat_0_24_0;
}

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

@ -13,6 +13,7 @@ let src =
"0.21.0" = "sha256-KhgX9rxYH/DM6fCqloe4l7AnJuKrdXSe6Y1XY3BXMy0=";
"0.22.4" = "sha256-61TeK4GsfMLmjYGn3ICzkagbc3/Po++Wnqkb2tbJwGA=";
"0.23.0" = "sha256-m9Pjz7DaGy917M1GjyfqG5Lm5ne7YSlJF2SVcDHe3+0=";
"0.24.0" = "sha256-Zil0wceeXmq2xy0OVLxa/Ujl4Dtsmc4COyv6Jo7rVaM=";
}."${version}";
};
ocamlPackages = ocaml-ng.ocamlPackages;
@ -48,8 +49,10 @@ buildDunePackage {
uutf
]
++ lib.optionals (lib.versionAtLeast version "0.20.0") [ ocaml-version either ]
++ (if lib.versionAtLeast version "0.20.1"
then [ odoc-parser ]
++ (if lib.versionAtLeast version "0.24.0"
then [ (odoc-parser.override { version = "2.0.0"; }) ]
else if lib.versionAtLeast version "0.20.1"
then [ (odoc-parser.override { version = "1.0.1"; }) ]
else [ (odoc-parser.override { version = "0.9.0"; }) ])
++ (if lib.versionAtLeast version "0.21.0"
then [ cmdliner_1_1 ]

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

@ -13995,7 +13995,7 @@ with pkgs;
inherit (callPackage ../development/tools/ocaml/ocamlformat { })
ocamlformat # latest version
ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0
ocamlformat_0_22_4 ocamlformat_0_23_0;
ocamlformat_0_22_4 ocamlformat_0_23_0 ocamlformat_0_24_0;
orc = callPackage ../development/compilers/orc { };