Merge pull request #210884 from vbgl/beluga-dune-3

Use dune 3 for a few OCaml tools

pkgs/applications/misc/orpie/default.nix

@@ -4,7 +4,7 @@ ocamlPackages.buildDunePackage rec {
   pname = "orpie";
   version = "1.6.1";
 
-  useDune2 = true;
+  duneVersion = "3";
 
   src = fetchFromGitHub {
     owner = "pelzlpj";

pkgs/applications/science/logic/anders/default.nix

@@ -4,7 +4,7 @@ ocamlPackages.buildDunePackage rec {
   pname = "anders";
   version = "1.1.1";
 
-  useDune2 = true;
+  duneVersion = "3";
 
   src = fetchFromGitHub {
     owner = "groupoid";

pkgs/applications/science/logic/beluga/default.nix

@@ -11,7 +11,7 @@ ocamlPackages.buildDunePackage rec {
     sha256 = "1ziqjfv8jwidl8lj2mid2shhgqhv31dfh5wad2zxjpvf6038ahsw";
   };
 
-  useDune2 = true;
+  duneVersion = "3";
 
   buildInputs = with ocamlPackages; [
     gen sedlex extlib dune-build-info linenoise

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

@@ -3,7 +3,7 @@
 ocamlPackages.buildDunePackage rec {
   pname = "obelisk";
   version = "0.6.0";
-  useDune2 = true;
+  duneVersion = "3";
   src = fetchFromGitHub {
     owner = "Lelio-Brun";
     repo = pname;

pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix

@@ -1,5 +1,6 @@
 { lib
 , fetchFromGitHub
+, ocaml
 , buildDunePackage
 , fix
 , menhirLib
@@ -7,12 +8,15 @@
 , gitUpdater
 }:
 
+lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
+  "ocaml-recovery-parser is not available for OCaml ${ocaml.version}"
+
 buildDunePackage rec {
   pname = "ocaml-recovery-parser";
   version = "0.2.4";
 
   minimalOCamlVersion = "4.08";
-  useDune2 = true;
+  duneVersion = "3";
 
   src = fetchFromGitHub {
     owner = "serokell";

pkgs/development/tools/ocaml/opam/installer.nix

@@ -3,7 +3,7 @@
 ocamlPackages.buildDunePackage {
   pname = "opam-installer";
 
-  useDune2 = true;
+  duneVersion = "3";
 
   inherit (opam) version src;
   nativeBuildInputs = [ unzip ];

pkgs/tools/typesetting/satysfi/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, ruby, dune_2, ocamlPackages
+{ lib, stdenv, fetchFromGitHub, ruby, dune_3, ocamlPackages
 , ipaexfont, junicode, lmodern, lmmath
 }:
 let
@@ -28,7 +28,7 @@ let
       rev = "v1.4.2+satysfi";
       sha256 = "17s5xrnpim54d1apy972b5l08bph4c0m5kzbndk600fl0vnlirnl";
     };
-    useDune2 = true;
+    duneVersion = "3";
     nativeBuildInputs = [ ocamlPackages.cppo ];
     propagatedBuildInputs = [ ocamlPackages.biniou ];
     inherit (ocamlPackages.yojson) meta;
@@ -53,7 +53,7 @@ in
 
     DUNE_PROFILE = "release";
 
-    nativeBuildInputs = [ ruby dune_2 ];
+    nativeBuildInputs = [ ruby dune_3 ];
 
     buildInputs = [ camlpdf otfm yojson-with-position ] ++ (with ocamlPackages; [
       ocaml findlib menhir menhirLib