From 18c2d73cc734ae123e8ff5c9a3e786b0bc46c166 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 15 Jan 2023 08:55:01 +0100 Subject: [PATCH 1/7] beluga: use Dune 3 --- pkgs/applications/science/logic/beluga/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/beluga/default.nix b/pkgs/applications/science/logic/beluga/default.nix index 6a94d3f639e2..6d66269eabec 100644 --- a/pkgs/applications/science/logic/beluga/default.nix +++ b/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 From 911525afcee092bcbf50e30c539d8ab031a7264b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 15 Jan 2023 08:55:16 +0100 Subject: [PATCH 2/7] anders: use Dune 3 --- pkgs/applications/science/logic/anders/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/anders/default.nix b/pkgs/applications/science/logic/anders/default.nix index bb60b2b8321a..ccb81686cb32 100644 --- a/pkgs/applications/science/logic/anders/default.nix +++ b/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"; From f5ed6406521559916eeabe6a96d63207eb01612a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 15 Jan 2023 08:55:21 +0100 Subject: [PATCH 3/7] satysfi: use Dune 3 --- pkgs/tools/typesetting/satysfi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix index d694a3cda0f7..ee73c735d871 100644 --- a/pkgs/tools/typesetting/satysfi/default.nix +++ b/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 From f3f8ae2fa2f553b438d721e73ad2506da2b86cce Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 15 Jan 2023 08:55:25 +0100 Subject: [PATCH 4/7] obelisk: use Dune 3 --- pkgs/development/tools/ocaml/obelisk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/ocaml/obelisk/default.nix b/pkgs/development/tools/ocaml/obelisk/default.nix index a37a8c8b3927..938fa24374af 100644 --- a/pkgs/development/tools/ocaml/obelisk/default.nix +++ b/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; From 93df56918c571d5323468f8cec39986a93933a9c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 15 Jan 2023 08:55:29 +0100 Subject: [PATCH 5/7] orpie: use Dune 3 --- pkgs/applications/misc/orpie/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/orpie/default.nix b/pkgs/applications/misc/orpie/default.nix index a1f119f6834c..ffb62dd6c199 100644 --- a/pkgs/applications/misc/orpie/default.nix +++ b/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"; From 97ea0e7236f3cd189d2b9ed10449cb1b6ce5fd05 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 15 Jan 2023 08:55:33 +0100 Subject: [PATCH 6/7] opam-installer: use Dune 3 --- pkgs/development/tools/ocaml/opam/installer.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/ocaml/opam/installer.nix b/pkgs/development/tools/ocaml/opam/installer.nix index 4501ddd63f04..9b3b7a5617ba 100644 --- a/pkgs/development/tools/ocaml/opam/installer.nix +++ b/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 ]; From 689c7010dea10fedb96d241c6c2208c311c8b6a2 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 15 Jan 2023 10:02:29 +0100 Subject: [PATCH 7/7] ocamlPackages.ocaml-recovery-parser: use Dune 3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And disable for OCaml ≥ 5.0 --- .../tools/ocaml/ocaml-recovery-parser/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix b/pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix index 0aa456ee6cec..11564d4e985c 100644 --- a/pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix +++ b/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";