ocamlformat: 0.20.1 -> 0.21.0

The cmdliner dependency changed.
Update older version to use cmdliner_1_0 explicitly to be ready when it
changes.

pkgs/development/tools/ocaml/ocamlformat/default.nix

···
     version = "0.20.1";
   };
 
-  ocamlformat = ocamlformat_0_20_1;
+  ocamlformat_0_21_0 = mkOCamlformat {
+    version = "0.21.0";
+  };
+
+  ocamlformat = ocamlformat_0_21_0;
 }

pkgs/development/tools/ocaml/ocamlformat/generic.nix

···
       "0.19.0" = "0ihgwl7d489g938m1jvgx8azdgq9f5np5mzqwwya797hx2m4dz32";
       "0.20.0" = "sha256-JtmNCgwjbCyUE4bWqdH5Nc2YSit+rekwS43DcviIfgk=";
       "0.20.1" = "sha256-fTpRZFQW+ngoc0T6A69reEUAZ6GmHkeQvxspd5zRAjU=";
+      "0.21.0" = "sha256-KhgX9rxYH/DM6fCqloe4l7AnJuKrdXSe6Y1XY3BXMy0=";
     }."${version}";
   };
   ocamlPackages =
···
     if lib.versionAtLeast version "0.20.0"
     then [
       base
-      cmdliner
+      (if lib.versionAtLeast version "0.21.0" then cmdliner_1_1 else cmdliner_1_0)
       dune-build-info
       either
       fix
···
     else if lib.versionAtLeast version "0.19.0"
     then [
       base
-      cmdliner
+      cmdliner_1_0
       fpath
       re
       stdio
···
     else if lib.versionAtLeast version "0.18.0"
     then [
       base
-      cmdliner
+      cmdliner_1_0
       fpath
       odoc
       re
···
     else if lib.versionAtLeast version "0.17.0"
     then [
       base
-      cmdliner
+      cmdliner_1_0
       fpath
       odoc
       re
···
     else if lib.versionAtLeast version "0.15.1"
     then [
       base
-      cmdliner
+      cmdliner_1_0
       fpath
       odoc
       re
···
     else if lib.versionAtLeast version "0.14"
     then [
       base
-      cmdliner
+      cmdliner_1_0
       fpath
       ocaml-migrate-parsetree
       odoc
···
       menhirSdk
     ] else [
       base
-      cmdliner
+      cmdliner_1_0
       fpath
       ocaml-migrate-parsetree
       odoc
···
     license = lib.licenses.mit;
   };
 }
-

pkgs/top-level/all-packages.nix

···
     ocamlformat_0_11_0 ocamlformat_0_12 ocamlformat_0_13_0 ocamlformat_0_14_0
     ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_14_3 ocamlformat_0_15_0
     ocamlformat_0_15_1 ocamlformat_0_16_0 ocamlformat_0_17_0 ocamlformat_0_18_0
-    ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1;
+    ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0;
 
   orc = callPackage ../development/compilers/orc { };