From d3491557ef2b3c06263430bb1828fb0780d5eb83 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 9 Jan 2023 10:34:22 +0100 Subject: [PATCH] ocamlPackages.cohttp: use dune 3 --- pkgs/development/ocaml-modules/cohttp/async.nix | 2 ++ pkgs/development/ocaml-modules/cohttp/default.nix | 1 + pkgs/development/ocaml-modules/cohttp/lwt-unix.nix | 2 ++ pkgs/development/ocaml-modules/cohttp/lwt.nix | 2 ++ pkgs/development/ocaml-modules/cohttp/mirage.nix | 2 ++ 5 files changed, 9 insertions(+) diff --git a/pkgs/development/ocaml-modules/cohttp/async.nix b/pkgs/development/ocaml-modules/cohttp/async.nix index dc980ce4ab2..3e6ac4ae2d9 100644 --- a/pkgs/development/ocaml-modules/cohttp/async.nix +++ b/pkgs/development/ocaml-modules/cohttp/async.nix @@ -28,6 +28,8 @@ buildDunePackage { src ; + duneVersion = "3"; + buildInputs = [ ppx_sexp_conv ]; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index 597d4107fce..fcbed191ad6 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -9,6 +9,7 @@ buildDunePackage rec { version = "5.0.0"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-${version}.tbz"; diff --git a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix index 2886cac1c7b..3a5d5ff529d 100644 --- a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix @@ -9,6 +9,8 @@ buildDunePackage { pname = "cohttp-lwt-unix"; inherit (cohttp-lwt) version src; + duneVersion = "3"; + buildInputs = [ cmdliner ppx_sexp_conv ]; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/cohttp/lwt.nix b/pkgs/development/ocaml-modules/cohttp/lwt.nix index 74fcfcbd498..42e1d380863 100644 --- a/pkgs/development/ocaml-modules/cohttp/lwt.nix +++ b/pkgs/development/ocaml-modules/cohttp/lwt.nix @@ -7,6 +7,8 @@ buildDunePackage { src ; + duneVersion = "3"; + buildInputs = [ ppx_sexp_conv ]; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/cohttp/mirage.nix b/pkgs/development/ocaml-modules/cohttp/mirage.nix index 048202ccdbc..3b1c8219497 100644 --- a/pkgs/development/ocaml-modules/cohttp/mirage.nix +++ b/pkgs/development/ocaml-modules/cohttp/mirage.nix @@ -10,6 +10,8 @@ buildDunePackage { inherit (cohttp) version src; + duneVersion = "3"; + nativeBuildInputs = [ ppx_sexp_conv ]; propagatedBuildInputs = [