From 5f73c562d0ac5092fa31e073f7dc2a26bb48587c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 9 Jan 2023 10:34:14 +0100 Subject: [PATCH] ocamlPackages.resto: use dune 3 --- pkgs/development/ocaml-modules/resto/acl.nix | 1 + pkgs/development/ocaml-modules/resto/cohttp-client.nix | 1 + .../ocaml-modules/resto/cohttp-self-serving-client.nix | 1 + pkgs/development/ocaml-modules/resto/cohttp-server.nix | 1 + pkgs/development/ocaml-modules/resto/cohttp.nix | 1 + pkgs/development/ocaml-modules/resto/default.nix | 1 + pkgs/development/ocaml-modules/resto/directory.nix | 1 + pkgs/development/ocaml-modules/resto/json.nix | 1 + 8 files changed, 8 insertions(+) diff --git a/pkgs/development/ocaml-modules/resto/acl.nix b/pkgs/development/ocaml-modules/resto/acl.nix index 0eed996289d..92a1b751ed5 100644 --- a/pkgs/development/ocaml-modules/resto/acl.nix +++ b/pkgs/development/ocaml-modules/resto/acl.nix @@ -5,6 +5,7 @@ buildDunePackage { inherit (resto) src version meta doCheck; minimalOCamlVersion = "4.10"; + duneVersion = "3"; propagatedBuildInputs = [ resto diff --git a/pkgs/development/ocaml-modules/resto/cohttp-client.nix b/pkgs/development/ocaml-modules/resto/cohttp-client.nix index dd0db02cdd5..fe6dd6b506e 100644 --- a/pkgs/development/ocaml-modules/resto/cohttp-client.nix +++ b/pkgs/development/ocaml-modules/resto/cohttp-client.nix @@ -9,6 +9,7 @@ buildDunePackage { pname = "resto-cohttp-client"; inherit (resto) src version meta doCheck; + duneVersion = "3"; propagatedBuildInputs = [ resto diff --git a/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix b/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix index c01fb1db905..fac4ce7422a 100644 --- a/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix +++ b/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix @@ -13,6 +13,7 @@ buildDunePackage { pname = "resto-cohttp-self-serving-client"; inherit (resto) src version meta doCheck; + duneVersion = "3"; propagatedBuildInputs = [ resto diff --git a/pkgs/development/ocaml-modules/resto/cohttp-server.nix b/pkgs/development/ocaml-modules/resto/cohttp-server.nix index 29e18aa88b1..6347b8628b3 100644 --- a/pkgs/development/ocaml-modules/resto/cohttp-server.nix +++ b/pkgs/development/ocaml-modules/resto/cohttp-server.nix @@ -12,6 +12,7 @@ buildDunePackage { pname = "resto-cohttp-server"; inherit (resto) src version meta doCheck; + duneVersion = "3"; propagatedBuildInputs = [ resto diff --git a/pkgs/development/ocaml-modules/resto/cohttp.nix b/pkgs/development/ocaml-modules/resto/cohttp.nix index 4de70b1dfef..f495cadbf48 100644 --- a/pkgs/development/ocaml-modules/resto/cohttp.nix +++ b/pkgs/development/ocaml-modules/resto/cohttp.nix @@ -3,6 +3,7 @@ buildDunePackage { pname = "resto-cohttp"; inherit (resto) src version meta doCheck; + duneVersion = "3"; propagatedBuildInputs = [ resto diff --git a/pkgs/development/ocaml-modules/resto/default.nix b/pkgs/development/ocaml-modules/resto/default.nix index 03795e5e1cf..0d67ca94775 100644 --- a/pkgs/development/ocaml-modules/resto/default.nix +++ b/pkgs/development/ocaml-modules/resto/default.nix @@ -3,6 +3,7 @@ buildDunePackage rec { pname = "resto"; version = "1.0"; + duneVersion = "3"; src = fetchFromGitLab { owner = "nomadic-labs"; repo = "resto"; diff --git a/pkgs/development/ocaml-modules/resto/directory.nix b/pkgs/development/ocaml-modules/resto/directory.nix index 555ec590ffd..efbb7cb608e 100644 --- a/pkgs/development/ocaml-modules/resto/directory.nix +++ b/pkgs/development/ocaml-modules/resto/directory.nix @@ -3,6 +3,7 @@ buildDunePackage { pname = "resto-directory"; inherit (resto) src version meta doCheck; + duneVersion = "3"; propagatedBuildInputs = [ resto diff --git a/pkgs/development/ocaml-modules/resto/json.nix b/pkgs/development/ocaml-modules/resto/json.nix index dbb81fd35a6..c0f9b00d6ad 100644 --- a/pkgs/development/ocaml-modules/resto/json.nix +++ b/pkgs/development/ocaml-modules/resto/json.nix @@ -3,6 +3,7 @@ buildDunePackage { pname = "resto-json"; inherit (resto) src version meta doCheck; + duneVersion = "3"; propagatedBuildInputs = [ resto