ocamlPackages.elpi: 3.0.1 → 3.3.0

Author: vbgl

pkgs/development/ocaml-modules/elpi/default.nix

@@ -13,10 +13,12 @@
   ncurses,
   ppx_deriving,
   ppx_deriving_0_15,
+  ppx_deriving_0_33,
+  ppx_optcomp,
   coqPackages,
   version ?
     if lib.versionAtLeast ocaml.version "4.13" then
-      "3.0.1"
+      "3.3.0"
     else if lib.versionAtLeast ocaml.version "4.08" then
       "1.20.0"
     else
@@ -32,6 +34,7 @@ in
 
 let
   fetched = coqPackages.metaFetch ({
+    release."3.3.0".sha256 = "sha256:963f95eea48b8f853cca9cbe4db49f22343c58e88dc961bc1da303356ef50dcd";
     release."3.0.1".sha256 = "sha256-r4B0xn6UCVslVW4dHiqq8NBMGfNz44kZy48KDWeGquc=";
     release."2.0.7".sha256 = "sha256-gCM+vZK6vWlhSO1VMjiWHse23mvxVwRarhxwkIQK7e0=";
     release."2.0.6".sha256 = "sha256-tRUYXQZ0VXrjIZBZ1skdzieUsww4rSNEe5ik+iKpk3U=";
@@ -76,6 +79,7 @@ buildDunePackage {
   buildInputs = [
     ncurses
   ]
+  ++ lib.optional (lib.versionAtLeast version "3.3.0" || version == "dev") ppx_optcomp
   ++ lib.optional (lib.versionAtLeast version "1.16" || version == "dev") atdgen-runtime;
 
   propagatedBuildInputs = [
@@ -84,10 +88,14 @@ buildDunePackage {
   ]
   ++ (if lib.versionAtLeast version "1.15" || version == "dev" then [ menhirLib ] else [ camlp5 ])
   ++ (
-    if lib.versionAtLeast version "1.13" || version == "dev" then
+    if lib.versionAtLeast version "3.3.0" || version == "dev" then
       [
         ppx_deriving
       ]
+    else if lib.versionAtLeast version "1.13" then
+      [
+        ppx_deriving_0_33
+      ]
     else
       [
         ppx_deriving_0_15

pkgs/development/rocq-modules/rocq-elpi/default.nix

@@ -40,6 +40,7 @@ let
         (case (range "9.0" "9.1") "2.6.0")
         (case ("9.0") "2.5.2")
       ] null;
+    release."3.1.0".sha256 = "sha256-ytGPGwJv+jmRT6uN0sg6q+xh8ND0PMIZ9ULB0Uwca1w=";
     release."3.0.0".sha256 = "sha256-YMe2is7duGcvAHjM4joUE90EloibjSxqfZThsJhstdU=";
     release."2.6.0".sha256 = "sha256-23BHq1NFUkI3ayXnGUwiGFySLyY3EuH4RyMgAhQqI4g=";
     release."2.5.2".sha256 = "sha256-lLzjPrbVB3rrqox528YiheUb0u89R84Xmrgkn0oplOs=";

pkgs/top-level/ocaml-packages.nix

@@ -548,7 +548,7 @@ let
           in
           {
             ppx_deriving_0_15 = ppx_deriving_ "0.15";
-            ppx_deriving = ppx_deriving_ "0.33.0";
+            ppx_deriving_0_33 = ppx_deriving_ "0.33.0";
           }
         );