From 589e4a2bb246f08b083beecb383172f2529b7f42 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 9 Jan 2023 10:34:06 +0100 Subject: [PATCH] ocamlPackages.graphql: use dune 3 --- pkgs/development/ocaml-modules/graphql/cohttp.nix | 2 +- pkgs/development/ocaml-modules/graphql/default.nix | 2 ++ pkgs/development/ocaml-modules/graphql/lwt.nix | 2 ++ pkgs/development/ocaml-modules/graphql/parser.nix | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/graphql/cohttp.nix b/pkgs/development/ocaml-modules/graphql/cohttp.nix index 09f4757041af..c96b762189d6 100644 --- a/pkgs/development/ocaml-modules/graphql/cohttp.nix +++ b/pkgs/development/ocaml-modules/graphql/cohttp.nix @@ -8,7 +8,7 @@ buildDunePackage rec { inherit (graphql) version src; - useDune2 = true; + duneVersion = "3"; nativeBuildInputs = [ ocaml-crunch ]; propagatedBuildInputs = [ astring cohttp digestif graphql ocplib-endian ]; diff --git a/pkgs/development/ocaml-modules/graphql/default.nix b/pkgs/development/ocaml-modules/graphql/default.nix index 5bf61789e83a..679d89f44b10 100644 --- a/pkgs/development/ocaml-modules/graphql/default.nix +++ b/pkgs/development/ocaml-modules/graphql/default.nix @@ -5,6 +5,8 @@ buildDunePackage rec { inherit (graphql_parser) version src; + duneVersion = "3"; + propagatedBuildInputs = [ graphql_parser rresult yojson ]; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/graphql/lwt.nix b/pkgs/development/ocaml-modules/graphql/lwt.nix index 8fd6abfb8fb4..cbdcba64abb4 100644 --- a/pkgs/development/ocaml-modules/graphql/lwt.nix +++ b/pkgs/development/ocaml-modules/graphql/lwt.nix @@ -5,6 +5,8 @@ buildDunePackage rec { inherit (graphql) version src; + duneVersion = "3"; + propagatedBuildInputs = [ graphql ocaml_lwt ]; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/graphql/parser.nix b/pkgs/development/ocaml-modules/graphql/parser.nix index ce953a68b3c2..4042e65772bc 100644 --- a/pkgs/development/ocaml-modules/graphql/parser.nix +++ b/pkgs/development/ocaml-modules/graphql/parser.nix @@ -5,6 +5,7 @@ buildDunePackage rec { version = "0.14.0"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/andreas/ocaml-graphql-server/releases/download/${version}/graphql-${version}.tbz";