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.

4 files changed, 16 insertions, 24 deletions

diff --git a/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix
index d63d0d9894b..30a0b01e5af 100644
--- a/pkgs/development/tools/ocaml/ocamlformat/generic.nix
+++ b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix
@@ -2,11 +2,7 @@
 
 with ocaml-ng.ocamlPackages;
 
-let
-  inherit (callPackage ../../../ocaml-modules/ocamlformat/generic.nix {
-    inherit version;
-  })
-    src library_deps;
+let inherit (callPackage ./generic.nix { inherit version; }) src library_deps;
 
 in buildDunePackage {
   pname = "ocamlformat";
diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix
deleted file mode 100644
index f0f38777f1c..00000000000
--- a/pkgs/development/tools/ocaml/ocamlformat/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ lib, fetchurl, fetchzip, callPackage }:
-
-# Older versions 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
-
-rec {
-  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 ./generic.nix {};
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e60adcfe1bc..d7dae96a18c 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 60252c1905e..9b6d183f518 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 { };