From b3b75dc9805de6238b204171bc8549068e00a165 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Mar 2023 08:57:17 +0200 Subject: [PATCH 01/15] ocamlPackages.mirage-random-test: use Dune 3 --- .../development/ocaml-modules/mirage-random-test/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-random-test/default.nix b/pkgs/development/ocaml-modules/mirage-random-test/default.nix index 81d75db77251..24339b49568c 100644 --- a/pkgs/development/ocaml-modules/mirage-random-test/default.nix +++ b/pkgs/development/ocaml-modules/mirage-random-test/default.nix @@ -6,10 +6,9 @@ buildDunePackage rec { pname = "mirage-random-test"; version = "0.1.0"; - minimumOCamlVersion = "4.06"; + minimalOCamlVersion = "4.06"; - # due to cstruct - useDune2 = true; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; From b28fd0e903f05211f76df8ce69011b951f2e18de Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Mar 2023 08:57:22 +0200 Subject: [PATCH 02/15] ocamlPackages.mirage-random: use Dune 3 --- pkgs/development/ocaml-modules/mirage-random/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/ocaml-modules/mirage-random/default.nix b/pkgs/development/ocaml-modules/mirage-random/default.nix index a119395764e5..ba70665c6ede 100644 --- a/pkgs/development/ocaml-modules/mirage-random/default.nix +++ b/pkgs/development/ocaml-modules/mirage-random/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "mirage-random"; version = "3.0.0"; + duneVersion = "3"; + src = fetchurl { url = "https://github.com/mirage/mirage-random/releases/download/v${version}/mirage-random-v${version}.tbz"; sha256 = "sha256-Sf4/KB1kMMwXI+yr5H/JuOmynYPNXwlk9dAA+gFAZs8="; From 5accdae43a011d68bf33d02c821f4d02e6d0ab8a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Mar 2023 08:57:26 +0200 Subject: [PATCH 03/15] ocamlPackages.mirage-channel: use Dune 3 --- pkgs/development/ocaml-modules/mirage-channel/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/mirage-channel/default.nix b/pkgs/development/ocaml-modules/mirage-channel/default.nix index bdafeb430549..74ff38f9a70a 100644 --- a/pkgs/development/ocaml-modules/mirage-channel/default.nix +++ b/pkgs/development/ocaml-modules/mirage-channel/default.nix @@ -8,10 +8,11 @@ buildDunePackage rec { version = "4.1.0"; minimalOCamlVersion = "4.07"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/mirage-channel/releases/download/v${version}/mirage-channel-${version}.tbz"; - sha256 = "sha256-sBdoUdTd9ZeNcHK0IBGBeOYDDqULM7EYX+Pz2f2nIQA="; + hash = "sha256-sBdoUdTd9ZeNcHK0IBGBeOYDDqULM7EYX+Pz2f2nIQA="; }; propagatedBuildInputs = [ cstruct logs lwt mirage-flow ]; From ad6bb1a8169b30c31eeac884b4904c8e66935460 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Mar 2023 08:57:29 +0200 Subject: [PATCH 04/15] ocamlPackages.callipyge: use Dune 3 --- pkgs/development/ocaml-modules/callipyge/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/callipyge/default.nix b/pkgs/development/ocaml-modules/callipyge/default.nix index 2004f8868caf..68ba880a7987 100644 --- a/pkgs/development/ocaml-modules/callipyge/default.nix +++ b/pkgs/development/ocaml-modules/callipyge/default.nix @@ -1,8 +1,6 @@ { lib , buildDunePackage , fetchurl -, ocaml - , alcotest , eqaf , fmt @@ -14,17 +12,16 @@ buildDunePackage rec { src = fetchurl { url = "https://github.com/oklm-wsh/Callipyge/releases/download/v${version}/${pname}-${version}.tbz"; - sha256 = "sha256-T/94a88xvK51TggjXecdKc9kyTE9aIyueIt5T24sZB0="; + hash = "sha256-T/94a88xvK51TggjXecdKc9kyTE9aIyueIt5T24sZB0="; }; - useDune2 = true; + duneVersion = "3"; - minimumOCamlVersion = "4.03"; + minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ fmt eqaf ]; - # alcotest isn't available for OCaml < 4.08 due to fmt - doCheck = lib.versionAtLeast ocaml.version "4.08"; + doCheck = true; checkInputs = [ alcotest ]; meta = { From 7da5c6a3038aa0e2134cfcd9e1a8490115b81201 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Mar 2023 08:57:32 +0200 Subject: [PATCH 05/15] ocamlPackages.eqaf: use Dune 3 --- pkgs/development/ocaml-modules/eqaf/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/eqaf/default.nix b/pkgs/development/ocaml-modules/eqaf/default.nix index d3e29be3c688..d777755253c2 100644 --- a/pkgs/development/ocaml-modules/eqaf/default.nix +++ b/pkgs/development/ocaml-modules/eqaf/default.nix @@ -2,12 +2,13 @@ buildDunePackage rec { minimalOCamlVersion = "4.07"; + duneVersion = "3"; pname = "eqaf"; version = "0.9"; src = fetchurl { url = "https://github.com/mirage/eqaf/releases/download/v${version}/eqaf-${version}.tbz"; - sha256 = "sha256-7A4oqUasaBf5XVhU8FqZYa46hAi7YQ55z60BubJV3+A="; + hash = "sha256-7A4oqUasaBf5XVhU8FqZYa46hAi7YQ55z60BubJV3+A="; }; propagatedBuildInputs = [ cstruct ]; From 8fdf8ee81c9948cf591a16bf1572cfcd21ec9049 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Mar 2023 08:57:35 +0200 Subject: [PATCH 06/15] ocamlPackages.mirage-console: use Dune 3 --- pkgs/development/ocaml-modules/mirage-console/default.nix | 3 ++- pkgs/development/ocaml-modules/mirage-console/unix.nix | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/mirage-console/default.nix b/pkgs/development/ocaml-modules/mirage-console/default.nix index 2fcd58973bcd..b0746c54162a 100644 --- a/pkgs/development/ocaml-modules/mirage-console/default.nix +++ b/pkgs/development/ocaml-modules/mirage-console/default.nix @@ -7,10 +7,11 @@ buildDunePackage rec { version = "5.1.0"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/mirage-console/releases/download/v${version}/mirage-console-${version}.tbz"; - sha256 = "sha256-mjYRisbNOJbYoSuWaGoPueXakmqAwmWh0ATvLLsvpNM="; + hash = "sha256-mjYRisbNOJbYoSuWaGoPueXakmqAwmWh0ATvLLsvpNM="; }; propagatedBuildInputs = [ lwt mirage-flow ]; diff --git a/pkgs/development/ocaml-modules/mirage-console/unix.nix b/pkgs/development/ocaml-modules/mirage-console/unix.nix index 634bcc353ad3..ca8c2aeac5e3 100644 --- a/pkgs/development/ocaml-modules/mirage-console/unix.nix +++ b/pkgs/development/ocaml-modules/mirage-console/unix.nix @@ -5,6 +5,8 @@ buildDunePackage { inherit (mirage-console) version src; + duneVersion = "3"; + propagatedBuildInputs = [ mirage-console cstruct From 33eff1646629b977e373ef4d486c6862974080a6 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Mar 2023 08:57:38 +0200 Subject: [PATCH 07/15] ocamlPackages.vchan: use Dune 3 --- pkgs/development/ocaml-modules/vchan/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/vchan/default.nix b/pkgs/development/ocaml-modules/vchan/default.nix index 872d11606ff6..e727c8667669 100644 --- a/pkgs/development/ocaml-modules/vchan/default.nix +++ b/pkgs/development/ocaml-modules/vchan/default.nix @@ -9,10 +9,11 @@ buildDunePackage rec { version = "6.0.1"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-vchan/releases/download/v${version}/vchan-${version}.tbz"; - sha256 = "sha256-5E7dITMVirYoxUkp8ZamRAolyhA6avXGJNAioxeBuV0="; + hash = "sha256-5E7dITMVirYoxUkp8ZamRAolyhA6avXGJNAioxeBuV0="; }; propagatedBuildInputs = [ From aeb9262087a4312b9cfea0c3cbaaddb4f333b62a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Mar 2023 08:57:41 +0200 Subject: [PATCH 08/15] ocamlPackages.xenstore: use Dune 3 --- pkgs/development/ocaml-modules/xenstore-tool/default.nix | 2 ++ pkgs/development/ocaml-modules/xenstore/default.nix | 1 + pkgs/development/ocaml-modules/xenstore_transport/default.nix | 1 + 3 files changed, 4 insertions(+) diff --git a/pkgs/development/ocaml-modules/xenstore-tool/default.nix b/pkgs/development/ocaml-modules/xenstore-tool/default.nix index 4b6c0d89a82a..b3c8c241ae41 100644 --- a/pkgs/development/ocaml-modules/xenstore-tool/default.nix +++ b/pkgs/development/ocaml-modules/xenstore-tool/default.nix @@ -5,6 +5,8 @@ buildDunePackage { inherit (xenstore_transport) src version; + duneVersion = "3"; + buildInputs = [ xenstore_transport xenstore lwt ]; meta = xenstore_transport.meta // { diff --git a/pkgs/development/ocaml-modules/xenstore/default.nix b/pkgs/development/ocaml-modules/xenstore/default.nix index a3f4e0abcdef..093ca1ffe902 100644 --- a/pkgs/development/ocaml-modules/xenstore/default.nix +++ b/pkgs/development/ocaml-modules/xenstore/default.nix @@ -7,6 +7,7 @@ buildDunePackage rec { version = "2.2.0"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-xenstore/releases/download/v${version}/xenstore-${version}.tbz"; diff --git a/pkgs/development/ocaml-modules/xenstore_transport/default.nix b/pkgs/development/ocaml-modules/xenstore_transport/default.nix index a7fb853f3bec..f0867b4ec314 100644 --- a/pkgs/development/ocaml-modules/xenstore_transport/default.nix +++ b/pkgs/development/ocaml-modules/xenstore_transport/default.nix @@ -5,6 +5,7 @@ buildDunePackage rec { version = "1.3.0"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchFromGitHub { owner = "xapi-project"; From 1bf4036f3c25ba8f8e0112d4944dad8dc7820204 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Mar 2023 08:57:44 +0200 Subject: [PATCH 09/15] ocamlPackages.io-page: use Dune 3 --- pkgs/development/ocaml-modules/io-page/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/io-page/default.nix b/pkgs/development/ocaml-modules/io-page/default.nix index b57628222405..79142f0e8d4d 100644 --- a/pkgs/development/ocaml-modules/io-page/default.nix +++ b/pkgs/development/ocaml-modules/io-page/default.nix @@ -5,10 +5,11 @@ buildDunePackage rec { version = "3.0.0"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; - sha256 = "sha256-DjbKdNkFa6YQgJDLmLsuvyrweb4/TNvqAiggcj/3hu4="; + hash = "sha256-DjbKdNkFa6YQgJDLmLsuvyrweb4/TNvqAiggcj/3hu4="; }; nativeBuildInputs = [ pkg-config ]; From 4f2c5e880d4f76cdbbf3f55cca952a4220d62e06 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Mar 2023 08:57:46 +0200 Subject: [PATCH 10/15] ocamlPackages.mirage-flow: use Dune 3 --- .../ocaml-modules/mirage-flow/combinators.nix | 8 +++++--- pkgs/development/ocaml-modules/mirage-flow/default.nix | 10 +++++----- pkgs/development/ocaml-modules/mirage-flow/unix.nix | 4 +++- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-flow/combinators.nix b/pkgs/development/ocaml-modules/mirage-flow/combinators.nix index d4904e77430a..5500d0551253 100644 --- a/pkgs/development/ocaml-modules/mirage-flow/combinators.nix +++ b/pkgs/development/ocaml-modules/mirage-flow/combinators.nix @@ -1,11 +1,13 @@ -{ buildDunePackage, mirage-flow, fmt, ocaml_lwt, logs, cstruct, mirage-clock }: +{ buildDunePackage, mirage-flow, fmt, lwt, logs, cstruct, mirage-clock }: buildDunePackage { pname = "mirage-flow-combinators"; - inherit (mirage-flow) version useDune2 src; + inherit (mirage-flow) version src; - propagatedBuildInputs = [ ocaml_lwt logs cstruct mirage-clock mirage-flow ]; + duneVersion = "3"; + + propagatedBuildInputs = [ lwt logs cstruct mirage-clock mirage-flow ]; meta = mirage-flow.meta // { description = "Flow implementations and combinators for MirageOS specialized to lwt"; diff --git a/pkgs/development/ocaml-modules/mirage-flow/default.nix b/pkgs/development/ocaml-modules/mirage-flow/default.nix index bc987eff9884..6b454512915b 100644 --- a/pkgs/development/ocaml-modules/mirage-flow/default.nix +++ b/pkgs/development/ocaml-modules/mirage-flow/default.nix @@ -1,18 +1,18 @@ -{ lib, buildDunePackage, fetchurl, cstruct, fmt, ocaml_lwt }: +{ lib, buildDunePackage, fetchurl, cstruct, fmt, lwt }: buildDunePackage rec { pname = "mirage-flow"; version = "3.0.0"; - useDune2 = true; - minimumOCamlVersion = "4.05"; + duneVersion = "3"; + minimalOCamlVersion = "4.05"; src = fetchurl { url = "https://github.com/mirage/mirage-flow/releases/download/v${version}/mirage-flow-v${version}.tbz"; - sha256 = "sha256-1wvabIXsJ0e+2IvE2V8mnSgQUDuSkT8IB75SkWlhOPw="; + hash = "sha256-1wvabIXsJ0e+2IvE2V8mnSgQUDuSkT8IB75SkWlhOPw="; }; - propagatedBuildInputs = [ cstruct fmt ocaml_lwt ]; + propagatedBuildInputs = [ cstruct fmt lwt ]; meta = { description = "Flow implementations and combinators for MirageOS"; diff --git a/pkgs/development/ocaml-modules/mirage-flow/unix.nix b/pkgs/development/ocaml-modules/mirage-flow/unix.nix index 023896447db1..12681911a3de 100644 --- a/pkgs/development/ocaml-modules/mirage-flow/unix.nix +++ b/pkgs/development/ocaml-modules/mirage-flow/unix.nix @@ -5,7 +5,9 @@ buildDunePackage { pname = "mirage-flow-unix"; - inherit (mirage-flow) version useDune2 src; + inherit (mirage-flow) version src; + + duneVersion = "3"; # Make tests compatible with alcotest 1.4.0 postPatch = '' From 78be8391f7db1778e7d2c18070a878e7a78a2f60 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Mar 2023 08:57:49 +0200 Subject: [PATCH 11/15] ocamlPackages.asn1-combinators: use Dune 3 --- pkgs/development/ocaml-modules/asn1-combinators/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix index 8447c25cd707..a8e8a9cc847f 100644 --- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -4,6 +4,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.08"; + duneVersion = "3"; pname = "asn1-combinators"; version = "0.2.6"; From 23e5b45f189af8cd47b143612d0b90d1eea8ba84 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Mar 2023 08:57:52 +0200 Subject: [PATCH 12/15] ocamlPackages.randomconv: use Dune 3 --- pkgs/development/ocaml-modules/randomconv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/randomconv/default.nix b/pkgs/development/ocaml-modules/randomconv/default.nix index 078d50da895b..45f52ba5bded 100644 --- a/pkgs/development/ocaml-modules/randomconv/default.nix +++ b/pkgs/development/ocaml-modules/randomconv/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "randomconv"; version = "0.1.3"; - useDune2 = true; + duneVersion = "3"; src = fetchurl { url = "https://github.com/hannesm/randomconv/releases/download/v${version}/randomconv-v${version}.tbz"; From 0e0155ed964cef8aa20cd9f797fa1981c94c0f81 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Mar 2023 08:57:55 +0200 Subject: [PATCH 13/15] ocamlPackages.dbf: use Dune 3 --- pkgs/development/ocaml-modules/dbf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/dbf/default.nix b/pkgs/development/ocaml-modules/dbf/default.nix index d2dad611bf46..664cb5dead17 100644 --- a/pkgs/development/ocaml-modules/dbf/default.nix +++ b/pkgs/development/ocaml-modules/dbf/default.nix @@ -7,13 +7,13 @@ buildDunePackage rec { minimalOCamlVersion = "4.08"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "pveber"; repo = "dbf"; - rev = "${version}"; - sha256 = "sha256-h1K5YDLbXGEJi/quKXvSR0gZ+WkBzut7AsVFv+Bm8/g="; + rev = version; + hash = "sha256-h1K5YDLbXGEJi/quKXvSR0gZ+WkBzut7AsVFv+Bm8/g="; }; buildInputs = [ ppx_cstruct ]; From 6134a755daac37db021eed103db693e3fe3b701c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Mar 2023 08:57:59 +0200 Subject: [PATCH 14/15] ocamlPackages.wayland: use Dune 3 --- pkgs/development/ocaml-modules/wayland/default.nix | 1 + pkgs/tools/wayland/wayland-proxy-virtwl/default.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/wayland/default.nix b/pkgs/development/ocaml-modules/wayland/default.nix index f7ade2ec8070..9dea4a64a508 100644 --- a/pkgs/development/ocaml-modules/wayland/default.nix +++ b/pkgs/development/ocaml-modules/wayland/default.nix @@ -15,6 +15,7 @@ buildDunePackage rec { version = "1.1"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/talex5/ocaml-wayland/releases/download/v${version}/wayland-${version}.tbz"; diff --git a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix index 47b59353af86..164605b3d8a2 100644 --- a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix +++ b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix @@ -22,8 +22,8 @@ ocamlPackages.buildDunePackage rec { ''; minimalOCamlVersion = "4.12"; + duneVersion = "3"; - strictDeps = true; nativeBuildInputs = [ pkg-config ]; From cb68c76b8e2843d357ee336569d1f178312a2255 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Mar 2023 08:58:02 +0200 Subject: [PATCH 15/15] =?UTF-8?q?ocamlPackages.cstruct:=206.1.1=20?= =?UTF-8?q?=E2=86=92=206.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/cstruct/async.nix | 2 ++ pkgs/development/ocaml-modules/cstruct/default.nix | 5 +++-- pkgs/development/ocaml-modules/cstruct/lwt.nix | 1 + pkgs/development/ocaml-modules/cstruct/ppx.nix | 1 + pkgs/development/ocaml-modules/cstruct/sexp.nix | 1 + pkgs/development/ocaml-modules/cstruct/unix.nix | 1 + 6 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/cstruct/async.nix b/pkgs/development/ocaml-modules/cstruct/async.nix index 57647c97c416..1fe020f6490b 100644 --- a/pkgs/development/ocaml-modules/cstruct/async.nix +++ b/pkgs/development/ocaml-modules/cstruct/async.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "cstruct-async"; inherit (cstruct) src version meta; + duneVersion = "3"; + propagatedBuildInputs = [ async_unix async diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index 9efe75af70c9..9877adbcf81a 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/pkgs/development/ocaml-modules/cstruct/default.nix @@ -2,13 +2,14 @@ buildDunePackage rec { pname = "cstruct"; - version = "6.1.1"; + version = "6.2.0"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-${version}.tbz"; - sha256 = "sha256-G3T5hw9qfuYAiSRZBxbdUzpyijyhC7GNqf6ovkZ/UY0="; + hash = "sha256-mngHM5JYDoNJFI+jq0sbLpidydMNB0AbBMlrfGDwPmI="; }; buildInputs = [ fmt ]; diff --git a/pkgs/development/ocaml-modules/cstruct/lwt.nix b/pkgs/development/ocaml-modules/cstruct/lwt.nix index 7226193565b1..3aa70e5c9986 100644 --- a/pkgs/development/ocaml-modules/cstruct/lwt.nix +++ b/pkgs/development/ocaml-modules/cstruct/lwt.nix @@ -9,6 +9,7 @@ else inherit (cstruct) version src meta; minimalOCamlVersion = "4.08"; + duneVersion = "3"; propagatedBuildInputs = [ cstruct lwt ]; } diff --git a/pkgs/development/ocaml-modules/cstruct/ppx.nix b/pkgs/development/ocaml-modules/cstruct/ppx.nix index b640c9745f3b..f2b19355b099 100644 --- a/pkgs/development/ocaml-modules/cstruct/ppx.nix +++ b/pkgs/development/ocaml-modules/cstruct/ppx.nix @@ -11,6 +11,7 @@ else inherit (cstruct) version src meta; minimalOCamlVersion = "4.08"; + duneVersion = "3"; propagatedBuildInputs = [ cstruct ppxlib sexplib stdlib-shims ]; diff --git a/pkgs/development/ocaml-modules/cstruct/sexp.nix b/pkgs/development/ocaml-modules/cstruct/sexp.nix index a20911cbb299..3b28cda15afc 100644 --- a/pkgs/development/ocaml-modules/cstruct/sexp.nix +++ b/pkgs/development/ocaml-modules/cstruct/sexp.nix @@ -9,6 +9,7 @@ buildDunePackage rec { inherit (cstruct) version src meta; minimalOCamlVersion = "4.08"; + duneVersion = "3"; doCheck = true; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/cstruct/unix.nix b/pkgs/development/ocaml-modules/cstruct/unix.nix index 064bdadb3285..40467a77a57f 100644 --- a/pkgs/development/ocaml-modules/cstruct/unix.nix +++ b/pkgs/development/ocaml-modules/cstruct/unix.nix @@ -9,6 +9,7 @@ else inherit (cstruct) version src meta; minimalOCamlVersion = "4.08"; + duneVersion = "3"; propagatedBuildInputs = [ cstruct ]; }