ocamlPackages.graphql: use Dune 2

NixOS · Dec 8, 2020 · 4628174 · 4628174
1 parent e56e8d4
commit 4628174
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/pkgs/development/ocaml-modules/graphql/default.nix b/pkgs/development/ocaml-modules/graphql/default.nix
@@ -1,13 +1,13 @@
-{ lib, buildDunePackage, alcotest, graphql_parser, rresult, yojson }:
+{ buildDunePackage, alcotest, graphql_parser, rresult, yojson }:
 
 buildDunePackage rec {
   pname = "graphql";
 
-  inherit (graphql_parser) version src;
+  inherit (graphql_parser) version useDune2 src;
 
   propagatedBuildInputs = [ graphql_parser rresult yojson ];
 
-  checkInputs = lib.optional doCheck alcotest;
+  checkInputs = [ alcotest ];
 
   doCheck = true;
 

diff --git a/pkgs/development/ocaml-modules/graphql/lwt.nix b/pkgs/development/ocaml-modules/graphql/lwt.nix
@@ -1,13 +1,13 @@
-{ lib, buildDunePackage, alcotest, graphql, ocaml_lwt }:
+{ buildDunePackage, alcotest, graphql, ocaml_lwt }:
 
 buildDunePackage rec {
   pname = "graphql-lwt";
 
-  inherit (graphql) version src;
+  inherit (graphql) version useDune2 src;
 
   propagatedBuildInputs = [ graphql ocaml_lwt ];
 
-  checkInputs = lib.optional doCheck alcotest;
+  checkInputs = [ alcotest ];
 
   doCheck = true;
 

diff --git a/pkgs/development/ocaml-modules/graphql/parser.nix b/pkgs/development/ocaml-modules/graphql/parser.nix
@@ -4,6 +4,8 @@ buildDunePackage rec {
   pname = "graphql_parser";
   version = "0.13.0";
 
+  useDune2 = true;
+
   minimumOCamlVersion = "4.03";
 
   src = fetchurl {
@@ -14,7 +16,7 @@ buildDunePackage rec {
   nativeBuildInputs = [ menhir ];
   propagatedBuildInputs = [ fmt re ];
 
-  checkInputs = lib.optional doCheck alcotest;
+  checkInputs = [ alcotest ];
 
   doCheck = true;