diff options
| author | Jules Aguillon <jules@j3s.fr> | 2022-07-19 11:04:23 +0200 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2022-07-26 13:33:49 +0200 |
| commit | 6ac387a3a327970e5838a9c53efd3baef22e4c88 (patch) | |
| tree | f7eadc0893b2f6a290f1c116f349666210cc4b57 | |
| parent | 6d559df86798cbe99b7de8c94a25a5ac1b240c98 (diff) | |
| download | nixpkgs-6ac387a3a327970e5838a9c53efd3baef22e4c88.tar nixpkgs-6ac387a3a327970e5838a9c53efd3baef22e4c88.tar.gz nixpkgs-6ac387a3a327970e5838a9c53efd3baef22e4c88.tar.bz2 nixpkgs-6ac387a3a327970e5838a9c53efd3baef22e4c88.tar.lz nixpkgs-6ac387a3a327970e5838a9c53efd3baef22e4c88.tar.xz nixpkgs-6ac387a3a327970e5838a9c53efd3baef22e4c88.tar.zst nixpkgs-6ac387a3a327970e5838a9c53efd3baef22e4c88.zip | |
ocamlformat_0_24_0: init
| -rw-r--r-- | pkgs/development/tools/ocaml/ocamlformat/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/tools/ocaml/ocamlformat/generic.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix index a441d974520..1a6a9ba7775 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -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; } diff --git a/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/pkgs/development/tools/ocaml/ocamlformat/generic.nix index 5e58699fa74..0f6433c0e6a 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/generic.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -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 ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df7aaa7ff1f..7820cc6b4d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |