From afd961fa809d8fce6cee21f65ae96d9eebcd95e2 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 21 Mar 2023 13:05:42 +0100 Subject: [PATCH 1/6] ocamlPackages.higlo: use Dune 3 --- pkgs/development/ocaml-modules/higlo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/higlo/default.nix b/pkgs/development/ocaml-modules/higlo/default.nix index 87a4186a68c3..da843fe15112 100644 --- a/pkgs/development/ocaml-modules/higlo/default.nix +++ b/pkgs/development/ocaml-modules/higlo/default.nix @@ -3,7 +3,7 @@ buildDunePackage rec { pname = "higlo"; version = "0.8"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitLab { domain = "framagit.org"; owner = "zoggy"; From 4263071ee06a020e950ad0023f6c5ba74c898835 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 21 Mar 2023 13:05:46 +0100 Subject: [PATCH 2/6] ocamlPackages.xtmpl: use Dune 3 --- pkgs/development/ocaml-modules/xtmpl/default.nix | 2 +- pkgs/development/ocaml-modules/xtmpl/ppx.nix | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/xtmpl/default.nix b/pkgs/development/ocaml-modules/xtmpl/default.nix index 6b4771fe1ff4..47e153e53c2d 100644 --- a/pkgs/development/ocaml-modules/xtmpl/default.nix +++ b/pkgs/development/ocaml-modules/xtmpl/default.nix @@ -3,7 +3,7 @@ buildDunePackage rec { pname = "xtmpl"; version = "0.19.0"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitLab { domain = "framagit.org"; owner = "zoggy"; diff --git a/pkgs/development/ocaml-modules/xtmpl/ppx.nix b/pkgs/development/ocaml-modules/xtmpl/ppx.nix index b6f5bd65000f..0e23cdc48f70 100644 --- a/pkgs/development/ocaml-modules/xtmpl/ppx.nix +++ b/pkgs/development/ocaml-modules/xtmpl/ppx.nix @@ -3,8 +3,9 @@ buildDunePackage { pname = "xtmpl_ppx"; minimalOCamlVersion = "4.11"; + duneVersion = "3"; - inherit (xtmpl) src version useDune2; + inherit (xtmpl) src version; buildInputs = [ ppxlib xtmpl ]; From 48549020fca766a9330c88e70e8627e0efccb599 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 21 Mar 2023 13:05:50 +0100 Subject: [PATCH 3/6] ocamlPackages.iri: use Dune 3 --- pkgs/development/ocaml-modules/iri/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/iri/default.nix b/pkgs/development/ocaml-modules/iri/default.nix index 22f106975868..0ea05cb7b9ba 100644 --- a/pkgs/development/ocaml-modules/iri/default.nix +++ b/pkgs/development/ocaml-modules/iri/default.nix @@ -5,7 +5,7 @@ buildDunePackage rec { pname = "iri"; version = "0.6.0"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitLab { domain = "framagit.org"; From 48774c43cd70ceb5b64b60bb783e8b39cdee5142 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 21 Mar 2023 13:05:53 +0100 Subject: [PATCH 4/6] acgtk: use Dune 3 --- pkgs/applications/science/logic/acgtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix index c627b8a3c8f5..693bc306f21e 100644 --- a/pkgs/applications/science/logic/acgtk/default.nix +++ b/pkgs/applications/science/logic/acgtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, dune_2, ocamlPackages }: +{ lib, stdenv, fetchFromGitLab, dune_3, ocamlPackages }: stdenv.mkDerivation { @@ -15,7 +15,7 @@ stdenv.mkDerivation { strictDeps = true; - nativeBuildInputs = with ocamlPackages; [ menhir ocaml findlib dune_2 ]; + nativeBuildInputs = with ocamlPackages; [ menhir ocaml findlib dune_3 ]; buildInputs = with ocamlPackages; [ ansiterminal cairo2 cmdliner fmt logs menhirLib mtime sedlex yojson From 942e6fd471968470b5ca0fabc95681033e4552b6 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 21 Mar 2023 13:05:56 +0100 Subject: [PATCH 5/6] ocamlPackages.sedlex: use Dune 3 --- pkgs/development/ocaml-modules/sedlex/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix index 27756fdcd26e..0ce962417ed7 100644 --- a/pkgs/development/ocaml-modules/sedlex/default.nix +++ b/pkgs/development/ocaml-modules/sedlex/default.nix @@ -47,6 +47,7 @@ buildDunePackage rec { inherit (param) version; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchFromGitHub { owner = "ocaml-community"; From 5350e7282db35f6ece665906b36bce84277a550f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 21 Mar 2023 13:05:59 +0100 Subject: [PATCH 6/6] =?UTF-8?q?ocamlPackages.gen:=201.0=20=E2=86=92=201.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/gen/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/gen/default.nix b/pkgs/development/ocaml-modules/gen/default.nix index ee932bffd5e6..86dbc61f6faf 100644 --- a/pkgs/development/ocaml-modules/gen/default.nix +++ b/pkgs/development/ocaml-modules/gen/default.nix @@ -1,22 +1,21 @@ { lib, buildDunePackage, fetchFromGitHub, ocaml -, dune-configurator , seq , qcheck, ounit2 }: buildDunePackage rec { - version = "1.0"; + version = "1.1"; pname = "gen"; minimalOCamlVersion = "4.03"; + duneVersion = "3"; src = fetchFromGitHub { owner = "c-cube"; repo = "gen"; rev = "v${version}"; - hash = "sha256-YWoVcl2TQoMIgU1LoKL16ia31zJjwAMwuphtSXnhtvw="; + hash = "sha256-ZytPPGhmt/uANaSgkgsUBOwyQ9ka5H4J+5CnJpEdrNk="; }; - buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ seq ]; checkInputs = [ qcheck ounit2 ];