diff options
| author | Jules Aguillon <jules@j3s.fr> | 2023-07-05 17:21:04 +0200 |
|---|---|---|
| committer | Jules Aguillon <jules@j3s.fr> | 2023-07-05 17:21:04 +0200 |
| commit | fb98ebb9a05fefa25585ef78000b40744e8d4d17 (patch) | |
| tree | 9faabf43a7841383cf9ecab3a90e319bd93462bd /pkgs/top-level | |
| parent | a5ca6a0f2ee8b2c8aa2cca64a06bd5652ad28a4b (diff) | |
ocamlPackages.ocamlformat: Move into 'ocamlPackages'
Move the definitions of OCamlformat packages into ocamlPackages. This moves the package containing the tool closer to the definition of the library. It's now possible to build OCamlformat using a different version of OCaml than the default. `ocamlformat`, `ocamlPackages.ocamlformat` and `ocaml-ng.ocamlPackages_<lastest>.ocamlformat` are all aliases.
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e60adcfe1bc42..d7dae96a18cb1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16348,7 +16348,7 @@ with pkgs; ocaml-crunch = ocamlPackages.crunch.bin; - inherit (callPackage ../development/tools/ocaml/ocamlformat { }) + inherit (ocamlPackages) 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_24_1 ocamlformat_0_25_1; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 60252c1905ef6..9b6d183f51804 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1170,6 +1170,20 @@ let ocamlc-loc = callPackage ../development/ocaml-modules/ocamlc-loc { }; + # Older versions of OCamlformat should be removed when their usage decrease + # This script scraps Github looking for OCamlformat's options and versions usage: + # https://gist.github.com/Julow/110dc94308d6078225e0665e3eccd433 + ocamlformat_0_19_0 = ocamlformat.override { version = "0.19.0"; }; + ocamlformat_0_20_0 = ocamlformat.override { version = "0.20.0"; }; + ocamlformat_0_20_1 = ocamlformat.override { version = "0.20.1"; }; + ocamlformat_0_21_0 = ocamlformat.override { version = "0.21.0"; }; + ocamlformat_0_22_4 = ocamlformat.override { version = "0.22.4"; }; + ocamlformat_0_23_0 = ocamlformat.override { version = "0.23.0"; }; + ocamlformat_0_24_1 = ocamlformat.override { version = "0.24.1"; }; + ocamlformat_0_25_1 = ocamlformat.override { version = "0.25.1"; }; + + ocamlformat = callPackage ../development/ocaml-modules/ocamlformat/ocamlformat.nix {}; + ocamlformat-lib = callPackage ../development/ocaml-modules/ocamlformat/ocamlformat-lib.nix { }; ocamlformat-rpc-lib = callPackage ../development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix { }; |