Merge pull request #175670 from yuri-potatoq/chore/ocamlformat

ocamlformat: 0.21.0 -> 0.22.4

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

@@ -7,55 +7,6 @@ let mkOCamlformat = callPackage ./generic.nix; in
 #  https://gist.github.com/Julow/110dc94308d6078225e0665e3eccd433
 
 rec {
-  ocamlformat_0_11_0 = mkOCamlformat {
-    version = "0.11.0";
-  };
-
-  ocamlformat_0_12 = mkOCamlformat {
-    version = "0.12";
-  };
-
-  ocamlformat_0_13_0 = mkOCamlformat rec {
-    version = "0.13.0";
-    tarballName = "ocamlformat-${version}-2.tbz";
-  };
-
-  ocamlformat_0_14_0 = mkOCamlformat {
-    version = "0.14.0";
-  };
-
-  ocamlformat_0_14_1 = mkOCamlformat {
-    version = "0.14.1";
-  };
-
-  ocamlformat_0_14_2 = mkOCamlformat {
-    version = "0.14.2";
-  };
-
-  ocamlformat_0_14_3 = mkOCamlformat {
-    version = "0.14.3";
-  };
-
-  ocamlformat_0_15_0 = mkOCamlformat {
-    version = "0.15.0";
-  };
-
-  ocamlformat_0_15_1 = mkOCamlformat {
-    version = "0.15.1";
-  };
-
-  ocamlformat_0_16_0 = mkOCamlformat {
-    version = "0.16.0";
-  };
-
-  ocamlformat_0_17_0 = mkOCamlformat {
-    version = "0.17.0";
-  };
-
-  ocamlformat_0_18_0 = mkOCamlformat {
-    version = "0.18.0";
-  };
-
   ocamlformat_0_19_0 = mkOCamlformat {
     version = "0.19.0";
   };
@@ -72,5 +23,9 @@ rec {
     version = "0.21.0";
   };
 
-  ocamlformat = ocamlformat_0_21_0;
+  ocamlformat_0_22_4 = mkOCamlformat {
+    version = "0.22.4";
+  };
+
+  ocamlformat = ocamlformat_0_22_4;
 }

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

@@ -4,39 +4,18 @@
 }:
 
 let src =
-  if version == "0.11.0"
+  fetchurl {
-  then fetchzip {
-    url = "https://github.com/ocaml-ppx/ocamlformat/archive/0.11.0.tar.gz";
-    sha256 = "0zvjn71jd4d3znnpgh0yphb2w8ggs457b6bl6cg1fmpdgxnds6yx";
-  } else fetchurl {
     url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/${tarballName}";
     sha256 = {
-      "0.12" = "1zi8x597dhp2822j6j28s84yyiqppl7kykpwqqclx6ybypvlzdpj";
-      "0.13.0" = "0ki2flqi3xkhw9mfridivb6laxm7gml8rj9qz42vqmy9yx76jjxq";
-      "0.14.0" = "070c0x6z5y0lyls56zm34g8lyc093wkr0jfp50dvrkr9fk1sx2wi";
-      "0.14.1" = "03wn46xib63748157xchj7gflkw5000fcjw6n89h9g82q9slazaa";
-      "0.14.2" = "16phz1sg9b070p6fm8d42j0piizg05vghdjmw8aj7xm82b1pm7sz";
-      "0.14.3" = "13pfakdncddm41cp61p0l98scawbvhx1q4zdsglv7ph87l7zwqfl";
-      "0.15.0" = "0190vz59n6ma9ca1m3syl3mc8i1smj1m3d8x1jp21f710y4llfr6";
-      "0.15.1" = "1x6fha495sgk4z05g0p0q3zfqm5l6xzmf6vjm9g9g7c820ym2q9a";
-      "0.16.0" = "1vwjvvwha0ljc014v8jp8snki5zsqxlwd7x0dl0rg2i9kcmwc4mr";
-      "0.17.0" = "0f1lxp697yq61z8gqxjjaqd2ns8fd1vjfggn55x0gh9dx098p138";
-      "0.18.0" = "0571kzmb1h03qj74090n3mg8wfbh29qqrkdjkai6rnl5chll86lq";
       "0.19.0" = "0ihgwl7d489g938m1jvgx8azdgq9f5np5mzqwwya797hx2m4dz32";
       "0.20.0" = "sha256-JtmNCgwjbCyUE4bWqdH5Nc2YSit+rekwS43DcviIfgk=";
       "0.20.1" = "sha256-fTpRZFQW+ngoc0T6A69reEUAZ6GmHkeQvxspd5zRAjU=";
       "0.21.0" = "sha256-KhgX9rxYH/DM6fCqloe4l7AnJuKrdXSe6Y1XY3BXMy0=";
+      "0.22.4" = "sha256-61TeK4GsfMLmjYGn3ICzkagbc3/Po++Wnqkb2tbJwGA=";
     }."${version}";
   };
-  ocamlPackages =
+  ocamlPackages = ocaml-ng.ocamlPackages;
-  if lib.versionAtLeast version "0.19.0"
+in
-  then ocaml-ng.ocamlPackages
-  else if lib.versionAtLeast version "0.17.0"
-  then ocaml-ng.ocamlPackages_4_12
-  else if lib.versionAtLeast version "0.14.3"
-  then ocaml-ng.ocamlPackages_4_10
-  else ocaml-ng.ocamlPackages_4_07
-; in
 
 with ocamlPackages;
 
@@ -44,10 +23,7 @@ buildDunePackage {
   pname = "ocamlformat";
   inherit src version;
 
-  minimumOCamlVersion =
+  minimumOCamlVersion = "4.08";
-    if lib.versionAtLeast version "0.17.0"
-    then "4.08"
-    else "4.06";
 
   useDune2 = true;
 
@@ -57,120 +33,27 @@ buildDunePackage {
     menhir
   ];
 
-  buildInputs =
+  buildInputs = [
-    if lib.versionAtLeast version "0.20.0"
+    base
-    then [
+    dune-build-info
-      base
+    fix
-      (if lib.versionAtLeast version "0.21.0" then cmdliner_1_1 else cmdliner_1_0)
+    fpath
-      dune-build-info
+    menhirLib
-      either
+    menhirSdk
-      fix
+    ocp-indent
-      fpath
+    re
-      menhirLib
+    stdio
-      menhirSdk
+    uuseg
-      ocaml-version
+    uutf
-      ocp-indent
+  ]
-      (if version == "0.20.0" then odoc-parser.override { version = "0.9.0"; } else odoc-parser)
+  ++ lib.optionals (lib.versionAtLeast version "0.20.0") [ ocaml-version either ]
-      re
+  ++ (if lib.versionAtLeast version "0.20.1"
-      stdio
+      then [ odoc-parser ]
-      uuseg
+      else [ (odoc-parser.override { version = "0.9.0"; }) ])
-      uutf
+  ++ (if lib.versionAtLeast version "0.21.0"
-    ]
+      then [ cmdliner_1_1 ]
-    else if lib.versionAtLeast version "0.19.0"
+      else [ cmdliner_1_0 ])
-    then [
+  ++ lib.optionals (lib.versionAtLeast version "0.22.4") [ csexp ];
-      base
-      cmdliner_1_0
-      fpath
-      re
-      stdio
-      uuseg
-      uutf
-      fix
-      menhirLib
-      menhirSdk
-      ocp-indent
-      dune-build-info
-      (odoc-parser.override { version = "0.9.0"; })
-    ]
-    else if lib.versionAtLeast version "0.18.0"
-    then [
-      base
-      cmdliner_1_0
-      fpath
-      odoc
-      re
-      stdio
-      uuseg
-      uutf
-      fix
-      menhirLib
-      menhirSdk
-      dune-build-info
-      ocaml-version
-      # Changed since 0.16.0:
-      (ppxlib.override { version = "0.22.0"; })
-    ]
-    else if lib.versionAtLeast version "0.17.0"
-    then [
-      base
-      cmdliner_1_0
-      fpath
-      odoc
-      re
-      stdio
-      uuseg
-      uutf
-      fix
-      menhirLib
-      menhirSdk
-      dune-build-info
-      ocaml-version
-      # Changed since 0.16.0:
-      (ppxlib.override { version = "0.22.0"; })
-      ocaml-migrate-parsetree-2
-    ]
-    else if lib.versionAtLeast version "0.15.1"
-    then [
-      base
-      cmdliner_1_0
-      fpath
-      odoc
-      re
-      stdio
-      uuseg
-      uutf
-      fix
-      menhirLib
-      menhirSdk
-      (ppxlib.override { version = "0.18.0"; })
-      dune-build-info # lib.versionAtLeast version "0.16.0"
-      ocaml-version # lib.versionAtLeast version "0.16.0"
-    ]
-    else if lib.versionAtLeast version "0.14"
-    then [
-      base
-      cmdliner_1_0
-      fpath
-      ocaml-migrate-parsetree
-      odoc
-      re
-      stdio
-      uuseg
-      uutf
-      fix
-      menhirLib
-      menhirSdk
-    ] else [
-      base
-      cmdliner_1_0
-      fpath
-      ocaml-migrate-parsetree
-      odoc
-      re
-      stdio
-      uuseg
-      uutf
-    ];
 
   meta = {
     homepage = "https://github.com/ocaml-ppx/ocamlformat";

pkgs/top-level/aliases.nix

@@ -1493,6 +1493,19 @@ mapAliases ({
   ocaml_4_02 = throw "'ocamlPackages_4_02.ocaml' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_02.ocaml'"; # Converted to throw 2022-02-22
   ocaml_4_03 = throw "'ocamlPackages_4_03.ocaml' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_03.ocaml'"; # Converted to throw 2022-02-22
 
+  ocamlformat_0_11_0 = throw "ocamlformat_0_11_0 has been removed in favor of newer versions"; # Added 2022-06-01
+  ocamlformat_0_12 = throw "ocamlformat_0_12 has been removed in favor of newer versions"; # Added 2022-06-01
+  ocamlformat_0_13_0 = throw "ocamlformat_0_13_0 has been removed in favor of newer versions"; # Added 2022-06-01
+  ocamlformat_0_14_0 = throw "ocamlformat_0_14_0 has been removed in favor of newer versions"; # Added 2022-06-01
+  ocamlformat_0_14_1 = throw "ocamlformat_0_14_1 has been removed in favor of newer versions"; # Added 2022-06-01
+  ocamlformat_0_14_2 = throw "ocamlformat_0_14_2 has been removed in favor of newer versions"; # Added 2022-06-01
+  ocamlformat_0_14_3 = throw "ocamlformat_0_14_3 has been removed in favor of newer versions"; # Added 2022-06-01
+  ocamlformat_0_15_0 = throw "ocamlformat_0_15_0 has been removed in favor of newer versions"; # Added 2022-06-01
+  ocamlformat_0_15_1 = throw "ocamlformat_0_15_1 has been removed in favor of newer versions"; # Added 2022-06-01
+  ocamlformat_0_16_0 = throw "ocamlformat_0_16_0 has been removed in favor of newer versions"; # Added 2022-06-01
+  ocamlformat_0_17_0 = throw "ocamlformat_0_17_0 has been removed in favor of newer versions"; # Added 2022-06-01
+  ocamlformat_0_18_0 = throw "ocamlformat_0_18_0 has been removed in favor of newer versions"; # Added 2022-06-01
+
   zabbix44 = throw ''
     Zabbix 4.4 is end of life. For details on upgrading to Zabbix 5.0 look at
     https://www.zabbix.com/documentation/current/manual/installation/upgrade_notes_500

pkgs/top-level/all-packages.nix

@@ -13602,10 +13602,8 @@ with pkgs;
 
   inherit (callPackage ../development/tools/ocaml/ocamlformat { })
     ocamlformat # latest version
-    ocamlformat_0_11_0 ocamlformat_0_12 ocamlformat_0_13_0 ocamlformat_0_14_0
+    ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0
-    ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_14_3 ocamlformat_0_15_0
+    ocamlformat_0_22_4;
-    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_21_0;
 
   orc = callPackage ../development/compilers/orc { };