ocamlPackages treewide: strictDeps all packages

pkgs/applications/misc/orpie/default.nix

@@ -19,7 +19,8 @@ ocamlPackages.buildDunePackage rec {
     substituteInPlace src/orpie/install.ml.in --replace '@prefix@' $out
   '';
 
-  buildInputs = with ocamlPackages; [ curses camlp5 num gsl ];
+  nativeBuildInputs = [ ocamlPackages.camlp5 ];
+  buildInputs = with ocamlPackages; [ curses num gsl ];
 
   meta = {
     inherit (src.meta) homepage;

pkgs/applications/misc/stog/default.nix

@@ -20,7 +20,8 @@ buildDunePackage rec {
     sha256 = "sha256:0krj5w4y05bcfx7hk9blmap8avl31gp7yi01lpqzs6ync23mvm0x";
   };
 
-  buildInputs = [ fmt lwt_ppx menhir ocf_ppx ppx_blob xtmpl_ppx ];
+  nativeBuildInputs = [ menhir ];
+  buildInputs = [ fmt lwt_ppx ocf_ppx ppx_blob xtmpl_ppx ];
   propagatedBuildInputs = [
     dune-build-info
     dune-site

pkgs/applications/networking/google-drive-ocamlfuse/default.nix

@@ -17,7 +17,7 @@ buildDunePackage rec {
   };
 
   doCheck = true;
-  nativeCheckInputs = [ ounit2 ];
+  checkInputs = [ ounit2 ];
 
   buildInputs = [ extlib ocamlfuse gapi-ocaml ocaml_sqlite3 tiny_httpd ];
 

pkgs/applications/science/logic/acgtk/default.nix

@@ -13,11 +13,19 @@ stdenv.mkDerivation {
     sha256 = "sha256-W/BDhbng5iYuiB7desMKvRtDFdhoaxiJNvNvtbLlA6E=";
   };
 
-  buildInputs = [ dune_2 ] ++ (with ocamlPackages; [
+  strictDeps = true;
-    ocaml findlib ansiterminal cairo2 cmdliner fmt logs menhir menhirLib mtime sedlex yojson
-  ]);
 
-  buildPhase = "dune build --profile=release";
+  nativeBuildInputs = with ocamlPackages; [ menhir ocaml findlib dune_2 ];
+
+  buildInputs = with ocamlPackages; [
+    ansiterminal cairo2 cmdliner fmt logs menhirLib mtime sedlex yojson
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+    dune build --profile=release ''${enableParallelBuilding:+-j $NIX_BUILD_CORES}
+    runHook postBuild
+  '';
 
   installPhase = ''
     dune install --prefix $out --libdir $OCAMLFIND_DESTDIR

pkgs/applications/science/logic/z3/default.nix

@@ -32,9 +32,10 @@ let common = { version, sha256, patches ? [ ] }:
     nativeBuildInputs = optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
     buildInputs = [ python ]
       ++ optional javaBindings jdk
-      ++ optionals ocamlBindings [ ocaml findlib zarith ]
+      ++ optionals ocamlBindings [ ocaml findlib ]
     ;
-    propagatedBuildInputs = [ python.pkgs.setuptools ];
+    propagatedBuildInputs = [ python.pkgs.setuptools ]
+      ++ optionals ocamlBindings [ zarith ];
     enableParallelBuilding = true;
 
     postPatch = optionalString ocamlBindings ''

pkgs/applications/virtualization/virt-top/default.nix

@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
     hash = "sha256-IKIkqzx7YWki0L6D5WbwQiVWJfDFGdI2nsGgg212CcE=";
   };
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     autoreconfHook
     pkg-config

pkgs/build-support/ocaml/dune.nix

@@ -34,7 +34,7 @@ stdenv.mkDerivation ({
     runHook postInstall
   '';
 
-} // (builtins.removeAttrs args [ "minimalOCamlVersion" "duneVersion" ]) // {
+} // (builtins.removeAttrs args [ "minimalOCamlVersion"  "duneVersion" ]) // {
 
   name = "ocaml${ocaml.version}-${pname}-${version}";
 

pkgs/development/compilers/stanc/default.nix

@@ -22,9 +22,11 @@ ocamlPackages.buildDunePackage rec {
       --replace "if Sys.file_exists (to_windows path) then to_windows cmd else cmd" "cmd"
   '';
 
+  nativeBuildInputs = with ocamlPackages; [
+    menhir
+  ];
   buildInputs = with ocamlPackages; [
     core_unix
-    menhir
     menhirLib
     ppx_deriving
     fmt

pkgs/development/ocaml-modules/afl-persistent/default.nix

@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "06yyds2vcwlfr2nd3gvyrazlijjcrd1abnvkfpkaadgwdw3qam1i";
   };
 
+  strictDeps = true;
+
   nativeBuildInputs = [ ocaml findlib ];
 
   # don't run tests in buildPhase

pkgs/development/ocaml-modules/alcotest/lwt.nix

@@ -10,7 +10,7 @@ buildDunePackage {
   propagatedBuildInputs = [ alcotest logs lwt fmt ];
 
   doCheck = true;
-  nativeCheckInputs = [ re cmdliner ];
+  checkInputs = [ re cmdliner ];
 
   meta = alcotest.meta // {
     description = "Lwt-based helpers for Alcotest";

pkgs/development/ocaml-modules/angstrom/default.nix

@@ -14,7 +14,7 @@ buildDunePackage rec {
     sha256 = "1hmrkdcdlkwy7rxhngf3cv3sa61cznnd9p5lmqhx20664gx2ibrh";
   };
 
-  nativeCheckInputs = [ alcotest ppx_let ];
+  checkInputs = [ alcotest ppx_let ];
   buildInputs = [ ocaml-syntax-shims ];
   propagatedBuildInputs = [ bigstringaf result ];
   doCheck = lib.versionAtLeast ocaml.version "4.08";

pkgs/development/ocaml-modules/apron/default.nix

@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ gmp mpfr ppl camlidl ];
   propagatedBuildInputs = [ mlgmpidl ];
 
+  # TODO: Doesn't produce the library correctly if true
   strictDeps = false;
 
   outputs = [ "out" "bin" "dev" ];

pkgs/development/ocaml-modules/arp/default.nix

@@ -36,7 +36,7 @@ buildDunePackage rec {
   ];
 
   doCheck = true;
-  nativeCheckInputs = [
+  checkInputs = [
     alcotest
     mirage-clock-unix
     mirage-profile

pkgs/development/ocaml-modules/asn1-combinators/default.nix

@@ -16,7 +16,7 @@ buildDunePackage rec {
   propagatedBuildInputs = [ cstruct zarith bigarray-compat stdlib-shims ptime ];
 
   doCheck = true;
-  nativeCheckInputs = [ alcotest ];
+  checkInputs = [ alcotest ];
 
   meta = with lib; {
     homepage = "https://github.com/mirleft/ocaml-asn1-combinators";

pkgs/development/ocaml-modules/atdgen/default.nix

@@ -10,10 +10,10 @@ buildDunePackage {
 
   propagatedBuildInputs = [ atdgen-runtime ];
 
+  strictDeps = true;
   doCheck = true;
-  nativeCheckInputs = [ alcotest atdgen-codec-runtime
+  nativeCheckInputs = [ atd (python3.withPackages (ps: [ ps.jsonschema ]))];
-    (python3.withPackages (ps: [ ps.jsonschema ]))
+  checkInputs = [ alcotest atdgen-codec-runtime ];
-  ];
 
   meta = (builtins.removeAttrs atd.meta [ "mainProgram" ]) // {
     description = "Generates efficient JSON serializers, deserializers and validators";

pkgs/development/ocaml-modules/awa/default.nix

@@ -18,8 +18,6 @@ buildDunePackage rec {
     hash = "sha256-ae1gTx3Emmkof/2Gnhq0d5RyfkFx21hHkVEVgyPdXuo=";
   };
 
-  nativeBuildInputs = [ ppx_cstruct ];
-
   propagatedBuildInputs = [
     mirage-crypto mirage-crypto-ec mirage-crypto-rng mirage-crypto-pk x509
     cstruct cstruct-sexp sexplib mtime
@@ -27,8 +25,10 @@ buildDunePackage rec {
     ppx_sexp_conv eqaf
   ];
 
+  buildInputs = [ ppx_cstruct ];
+
   doCheck = true;
-  nativeCheckInputs = [ cstruct-unix cmdliner fmt ];
+  checkInputs = [ cstruct-unix cmdliner fmt ];
 
   meta = with lib; {
     description = "SSH implementation in OCaml";

pkgs/development/ocaml-modules/awa/lwt.nix

@@ -14,7 +14,8 @@ buildDunePackage {
   ];
 
   doCheck = true;
-  nativeCheckInputs = [ cstruct-unix ];
+  nativeCheckInputs = [ awa ];
+  checkInputs = [ cstruct-unix ];
 
   meta = awa.meta // { mainProgram = "awa_lwt_server"; };
 }

pkgs/development/ocaml-modules/bap/default.nix

@@ -38,7 +38,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ which makeWrapper ocaml findlib ocamlbuild ocaml_oasis ];
 
-  buildInputs = [ linenoise
+  buildInputs = [ ocamlbuild
+                  linenoise
                   ounit
                   ppx_bitstring
                   z3

pkgs/development/ocaml-modules/base64/default.nix

@@ -11,11 +11,11 @@ buildDunePackage rec {
     sha256 = "sha256-WJ3pwAV46/54QZismBjTWGxHSyMWts0+HEbMsfYq46Q=";
   };
 
-  propagatedBuildInputs = [ findlib ];
+  nativeBuildInputs = [ findlib ];
 
   # otherwise fmt breaks evaluation
   doCheck = lib.versionAtLeast ocaml.version "4.08";
-  nativeCheckInputs = [ alcotest bos rresult ];
+  checkInputs = [ alcotest bos rresult ];
 
   meta = {
     homepage = "https://github.com/mirage/ocaml-base64";

pkgs/development/ocaml-modules/benchmark/default.nix

@@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "16wi8ld7c3mq77ylpgbnj8qqqqimyzwxs47v06vyrwpma5pab5xa";
   };
 
+  strictDeps = true;
+
   nativeBuildInputs = [ ocaml findlib ocamlbuild ];
   buildInputs = [ ocaml_pcre ];
 
-  strictDeps = true;
-
   createFindlibDestdir = true;
 
   meta = {

pkgs/development/ocaml-modules/bheap/default.nix

@@ -12,7 +12,7 @@ buildDunePackage rec {
   useDune2 = true;
 
   doCheck = true;
-  nativeCheckInputs = [
+  checkInputs = [
     stdlib-shims
   ];
 

pkgs/development/ocaml-modules/bigarray-overlap/default.nix

@@ -14,12 +14,12 @@ buildDunePackage rec {
   minimumOCamlVersion = "4.07";
   useDune2 = true;
 
-  strictDeps = !doCheck;
+  strictDeps = true;
 
   propagatedBuildInputs = [ bigarray-compat ];
 
   nativeBuildInputs = [ findlib pkg-config ];
-  nativeCheckInputs = [ alcotest astring fpath bos ];
+  checkInputs = [ alcotest astring fpath bos ];
   doCheck = lib.versionAtLeast ocaml.version "4.08";
 
   meta = with lib; {

pkgs/development/ocaml-modules/bigstringaf/default.nix

@@ -13,11 +13,8 @@ buildDunePackage rec {
     sha256 = "sha256-HXPjnE56auy2MI6HV2XuBX/VeqsO50HFzTul17lKEqE=";
   };
 
-  # This currently fails with dune
-  strictDeps = false;
-
   nativeBuildInputs = [ pkg-config ];
-  nativeCheckInputs = [ alcotest ];
+  checkInputs = [ alcotest ];
   doCheck = true;
 
   meta = {

pkgs/development/ocaml-modules/bindlib/default.nix

@@ -18,7 +18,7 @@ buildDunePackage rec {
     hash = "sha256-058yMbz9ExvgNG/kY9tPk70XSeVRSSKVg4n4F4fmPu4=";
   };
 
-  nativeCheckInputs = [ earley timed ];
+  checkInputs = [ earley timed ];
   doCheck = true;
 
   meta = with lib; {

pkgs/development/ocaml-modules/biocaml/default.nix

@@ -1,6 +1,7 @@
 { lib, buildDunePackage, fetchFromGitHub, fetchpatch
 , ounit, async, base64, camlzip, cfstream
-, core, ppx_jane, ppx_sexp_conv, rresult, uri, xmlm }:
+, core, ppx_jane, ppx_sexp_conv, rresult, uri, xmlm
+}:
 
 buildDunePackage rec {
   pname = "biocaml";
@@ -10,8 +11,8 @@ buildDunePackage rec {
 
   src = fetchFromGitHub {
     owner = "biocaml";
-    repo   = pname;
+    repo = pname;
-    rev    = "v${version}";
+    rev = "v${version}";
     sha256 = "01yw12yixs45ya1scpb9jy2f7dw1mbj7741xib2xpq3kkc1hc21s";
   };
 
@@ -21,7 +22,7 @@ buildDunePackage rec {
   };
 
   buildInputs = [ ppx_jane ppx_sexp_conv ];
-  nativeCheckInputs = [ ounit ];
+  checkInputs = [ ounit ];
   propagatedBuildInputs = [ async base64 camlzip cfstream core rresult uri xmlm ];
 
   meta = with lib; {

pkgs/development/ocaml-modules/bitstring/ppx.nix

@@ -14,7 +14,7 @@ buildDunePackage rec {
   buildInputs = [ bitstring ppxlib ];
 
   doCheck = lib.versionAtLeast ocaml.version "4.08";
-  nativeCheckInputs = [ ounit ];
+  checkInputs = [ ounit ];
 
   meta = bitstring.meta // {
     description = "Bitstrings and bitstring matching for OCaml - PPX extension";

pkgs/development/ocaml-modules/bls12-381-signature/default.nix

@@ -1,11 +1,11 @@
-{
+{ lib
-  lib,
+, fetchzip
-  fetchzip,
+, buildDunePackage
-  buildDunePackage,
+, bls12-381
-  bls12-381,
+, alcotest
-  alcotest,
+, bisect_ppx
-  bisect_ppx,
+, integers_stubs_js
-  integers_stubs_js,
+,
 }:
 
 buildDunePackage rec {
@@ -20,7 +20,7 @@ buildDunePackage rec {
 
   propagatedBuildInputs = [ bls12-381 ];
 
-  nativeCheckInputs = [alcotest bisect_ppx integers_stubs_js];
+  checkInputs = [ alcotest bisect_ppx integers_stubs_js ];
 
   doCheck = true;
 
@@ -28,6 +28,6 @@ buildDunePackage rec {
     description = "Implementation of BLS signatures for the pairing-friendly curve BLS12-381";
     license = lib.licenses.mit;
     homepage = "https://gitlab.com/nomadic-labs/cryptography/ocaml-bls12-381-signature";
-    maintainers = [lib.maintainers.ulrikstrid];
+    maintainers = [ lib.maintainers.ulrikstrid ];
   };
 }

pkgs/development/ocaml-modules/bls12-381/default.nix

@@ -1,6 +1,7 @@
 { lib, buildDunePackage, fetchFromGitLab
 , ff-sig, zarith, zarith_stubs_js, integers_stubs_js, integers, hex
-, alcotest, ff-pbt }:
+, alcotest, ff-pbt
+}:
 
 buildDunePackage rec {
   pname = "bls12-381";
@@ -23,7 +24,7 @@ buildDunePackage rec {
     hex
   ];
 
-  nativeCheckInputs = [ alcotest ff-pbt ];
+  checkInputs = [ alcotest ff-pbt ];
 
   doCheck = true;
 

pkgs/development/ocaml-modules/bls12-381/legacy.nix

@@ -26,7 +26,7 @@ buildDunePackage rec {
     zarith
   ];
 
-  nativeCheckInputs = [
+  checkInputs = [
     alcotest
   ];
 

pkgs/development/ocaml-modules/bwd/default.nix

@@ -14,7 +14,7 @@ buildDunePackage rec {
   };
 
   doCheck = true;
-  nativeCheckInputs = [ qcheck-core ];
+  checkInputs = [ qcheck-core ];
 
   meta = {
     description = "Backward Lists";

pkgs/development/ocaml-modules/ca-certs-nss/default.nix

@@ -39,7 +39,7 @@ buildDunePackage rec {
   ];
 
   doCheck = true;
-  nativeCheckInputs = [ alcotest ];
+  checkInputs = [ alcotest ];
 
   meta = with lib; {
     description = "X.509 trust anchors extracted from Mozilla's NSS";

pkgs/development/ocaml-modules/ca-certs/default.nix

@@ -19,7 +19,7 @@ buildDunePackage rec {
   propagatedBuildInputs = [ bos fpath ptime mirage-crypto x509 astring logs ];
 
   doCheck = true;
-  nativeCheckInputs = [
+  checkInputs = [
     cacert    # for /etc/ssl/certs/ca-bundle.crt
     alcotest
     fmt

pkgs/development/ocaml-modules/callipyge/default.nix

@@ -25,7 +25,7 @@ buildDunePackage rec {
 
   # alcotest isn't available for OCaml < 4.08 due to fmt
   doCheck = lib.versionAtLeast ocaml.version "4.08";
-  nativeCheckInputs = [ alcotest ];
+  checkInputs = [ alcotest ];
 
   meta = {
     homepage = "https://github.com/oklm-wsh/Callipyge";

pkgs/development/ocaml-modules/camlimages/4.2.4.nix

@@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
     sha256 = "17hvsql5dml7ialjcags8wphs7w6z88b2rgjir1382bg8vn62bkr";
   };
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     omake
     ocaml
@@ -65,6 +67,8 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     # 4.2.5 requires OCaml >= 4.06
     branch = "4.2.4";
+    # incompatible with omake >= 0.10
+    broken = true;
     homepage = "https://gitlab.com/camlspotter/camlimages";
     description = "OCaml image processing library";
     license = licenses.lgpl2Only;

pkgs/development/ocaml-modules/caqti/default.nix

@@ -1,6 +1,7 @@
 { lib, fetchurl, buildDunePackage, ocaml
 , cppo, logs, ptime, uri, bigstringaf
-, re, cmdliner, alcotest }:
+, re, cmdliner, alcotest
+}:
 
 buildDunePackage rec {
   pname = "caqti";
@@ -15,7 +16,7 @@ buildDunePackage rec {
 
   nativeBuildInputs = [ cppo ];
   propagatedBuildInputs = [ logs ptime uri bigstringaf ];
-  nativeCheckInputs = [ re cmdliner alcotest ];
+  checkInputs = [ re cmdliner alcotest ];
 
   doCheck = lib.versionAtLeast ocaml.version "4.08";
 

pkgs/development/ocaml-modules/carton/default.nix

@@ -56,7 +56,7 @@ buildDunePackage rec {
   nativeBuildInputs = [
     findlib
   ];
-  nativeCheckInputs = [
+  checkInputs = [
     base64
     alcotest
     alcotest-lwt

pkgs/development/ocaml-modules/carton/lwt.nix

@@ -24,6 +24,8 @@ buildDunePackage {
   doCheck = true;
   nativeCheckInputs = [
     git-binary
+  ];
+  checkInputs = [
     alcotest
     alcotest-lwt
     cstruct

pkgs/development/ocaml-modules/chacha/default.nix

@@ -32,7 +32,7 @@ buildDunePackage rec {
 
   # alcotest isn't available for OCaml < 4.05 due to fmt
   doCheck = lib.versionAtLeast ocaml.version "4.05";
-  nativeCheckInputs = [ alcotest ];
+  checkInputs = [ alcotest ];
 
   meta = {
     homepage = "https://github.com/abeaumont/ocaml-chacha";

pkgs/development/ocaml-modules/checkseum/default.nix

@@ -24,7 +24,7 @@ buildDunePackage rec {
     ocaml-freestanding
   ];
 
-  nativeCheckInputs = [
+  checkInputs = [
     alcotest
     bos
     astring

pkgs/development/ocaml-modules/class_group_vdf/default.nix

@@ -1,7 +1,8 @@
 { stdenv, lib, fetchFromGitLab, buildDunePackage
 , gmp, pkg-config, dune-configurator
 , zarith, integers
-, alcotest, bisect_ppx }:
+, alcotest, bisect_ppx
+}:
 
 buildDunePackage rec {
   pname = "class_group_vdf";
@@ -23,12 +24,16 @@ buildDunePackage rec {
     dune-configurator
   ];
 
+  buildInputs = [
+    dune-configurator
+  ];
+
   propagatedBuildInputs = [
     zarith
     integers
   ];
 
-  nativeCheckInputs = [
+  checkInputs = [
     alcotest
     bisect_ppx
   ];

pkgs/development/ocaml-modules/cohttp/async.nix

@@ -51,7 +51,7 @@ buildDunePackage {
 
   # Examples don't compile with core 0.15.  See https://github.com/mirage/ocaml-cohttp/pull/864.
   doCheck = false;
-  nativeCheckInputs = [
+  checkInputs = [
     ounit
     mirage-crypto
     core

pkgs/development/ocaml-modules/cohttp/default.nix

@@ -21,7 +21,7 @@ buildDunePackage rec {
   propagatedBuildInputs = [ base64 re stringext uri-sexp ];
 
   doCheck = true;
-  nativeCheckInputs = [ fmt alcotest crowbar ];
+  checkInputs = [ fmt alcotest crowbar ];
 
   meta = {
     description = "HTTP(S) library for Lwt, Async and Mirage";

pkgs/development/ocaml-modules/cohttp/lwt-unix.nix

@@ -14,13 +14,18 @@ buildDunePackage {
   buildInputs = [ cmdliner ppx_sexp_conv ];
 
   propagatedBuildInputs = [
-    cohttp-lwt conduit-lwt conduit-lwt-unix fmt logs magic-mime
+    cohttp-lwt
+    conduit-lwt
+    conduit-lwt-unix
+    fmt
+    logs
+    magic-mime
   ];
 
   # TODO(@sternenseemann): fail for unknown reason
   # https://github.com/mirage/ocaml-cohttp/issues/675#issuecomment-830692742
   doCheck = false;
-  nativeCheckInputs = [ ounit cacert ];
+  checkInputs = [ ounit cacert ];
 
   meta = cohttp-lwt.meta // {
     description = "CoHTTP implementation for Unix and Windows using Lwt";

pkgs/development/ocaml-modules/conduit/lwt-unix.nix

@@ -23,7 +23,7 @@ buildDunePackage {
   ];
 
   doCheck = true;
-  nativeCheckInputs = [
+  checkInputs = [
     lwt_log
     ssl
   ];

pkgs/development/ocaml-modules/containers/data.nix

@@ -9,7 +9,7 @@ buildDunePackage {
   inherit (containers) src version doCheck;
 
   buildInputs = [ dune-configurator ];
-  nativeCheckInputs = [ gen iter qcheck-core ];
+  checkInputs = [ gen iter qcheck-core ];
 
   propagatedBuildInputs = [ containers ];
 

pkgs/development/ocaml-modules/containers/default.nix

@@ -18,7 +18,7 @@ buildDunePackage rec {
   buildInputs = [ dune-configurator ];
   propagatedBuildInputs = [ either seq ];
 
-  nativeCheckInputs = [ gen iter qcheck-core uutf yojson ];
+  checkInputs = [ gen iter qcheck-core uutf yojson ];
 
   doCheck = lib.versionAtLeast ocaml.version "4.08";
 

pkgs/development/ocaml-modules/cooltt/default.nix

@@ -13,6 +13,8 @@
 , uuseg
 , uutf
 , yuujinchou
+, ounit2
+, qcheck
 }:
 
 let
@@ -70,12 +72,13 @@ buildDunePackage {
   };
 
   nativeBuildInputs = [
-    cmdliner
     menhir
-    ppxlib
   ];
 
-  buildInputs = [ containers ];
+  buildInputs = [
+    cmdliner
+    ppxlib
+  ];
 
   propagatedBuildInputs = [
     bantorra
@@ -87,6 +90,12 @@ buildDunePackage {
     uuseg
     uutf
     yuujinchou
+    containers
+  ];
+
+  checkInputs = [
+    ounit2
+    qcheck
   ];
 
   meta = with lib; {

pkgs/development/ocaml-modules/cow/default.nix

@@ -1,5 +1,6 @@
 { lib, fetchurl, buildDunePackage, ocaml, alcotest
-, uri, xmlm, omd, ezjsonm }:
+, uri, xmlm, omd, ezjsonm
+}:
 
 buildDunePackage rec {
   useDune2 = true;
@@ -14,7 +15,7 @@ buildDunePackage rec {
   };
 
   propagatedBuildInputs = [ xmlm uri ezjsonm omd ];
-  nativeCheckInputs = [ alcotest ];
+  checkInputs = [ alcotest ];
   doCheck = lib.versionAtLeast ocaml.version "4.08";
 
   meta = with lib; {

pkgs/development/ocaml-modules/cpu/default.nix

@@ -18,7 +18,7 @@ buildDunePackage rec {
     autoheader
   '';
 
-  buildInputs = [ autoconf ];
+  nativeBuildInputs = [ autoconf ];
 
   hardeningDisable = lib.optional stdenv.isDarwin "strictoverflow";
 

pkgs/development/ocaml-modules/crowbar/default.nix

@@ -18,7 +18,7 @@ buildDunePackage rec {
   postPatch = "rm -rf examples/xmldiff";
 
   propagatedBuildInputs = [ ocplib-endian cmdliner afl-persistent ];
-  nativeCheckInputs = [ calendar fpath pprint uutf uunf uucp ];
+  checkInputs = [ calendar fpath pprint uutf uunf uucp ];
   # uunf is broken on aarch64
   doCheck = !stdenv.isAarch64;
 

pkgs/development/ocaml-modules/cstruct/default.nix

@@ -14,7 +14,7 @@ buildDunePackage rec {
   buildInputs = [ fmt ];
 
   doCheck = true;
-  nativeCheckInputs = [ alcotest crowbar ];
+  checkInputs = [ alcotest crowbar ];
 
   meta = {
     description = "Access C-like structures directly from OCaml";

pkgs/development/ocaml-modules/cstruct/ppx.nix

@@ -6,14 +6,15 @@ if lib.versionOlder (cstruct.version or "1") "3"
 then cstruct
 else
 
-buildDunePackage {
+  buildDunePackage {
-  pname = "ppx_cstruct";
+    pname = "ppx_cstruct";
-  inherit (cstruct) version src meta;
+    inherit (cstruct) version src meta;
 
-  minimalOCamlVersion = "4.08";
+    minimalOCamlVersion = "4.08";
 
-  propagatedBuildInputs = [ cstruct ppxlib sexplib stdlib-shims ];
+    propagatedBuildInputs = [ cstruct ppxlib sexplib stdlib-shims ];
 
-  doCheck = true;
+    doCheck = true;
-  nativeCheckInputs = [ ounit cppo ppx_sexp_conv cstruct-sexp cstruct-unix ];
+    nativeCheckInputs = [ cppo ];
-}
+    checkInputs = [ ounit ppx_sexp_conv cstruct-sexp cstruct-unix ];
+  }

pkgs/development/ocaml-modules/cstruct/sexp.nix

@@ -11,7 +11,7 @@ buildDunePackage rec {
   minimalOCamlVersion = "4.08";
 
   doCheck = true;
-  nativeCheckInputs = [ alcotest ];
+  checkInputs = [ alcotest ];
 
   propagatedBuildInputs = [ cstruct sexplib ];
 }

pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix

@@ -20,10 +20,12 @@ buildDunePackage rec {
 
   propagatedBuildInputs = [ integers_stubs_js ];
   nativeCheckInputs = [
-    ctypes
-    js_of_ocaml-compiler
-    ppx_expect
     nodejs
+    js_of_ocaml-compiler
+  ];
+  checkInputs = [
+    ctypes
+    ppx_expect
   ];
   doCheck = true;
 

pkgs/development/ocaml-modules/cudf/default.nix

@@ -1,6 +1,6 @@
 { lib, fetchurl, stdenv, ocaml, ocamlbuild, findlib, extlib, glib, perl, pkg-config, stdlib-shims, ounit }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "ocaml${ocaml.version}-cudf";
   version = "0.9";
 
@@ -13,15 +13,16 @@ stdenv.mkDerivation {
     "all"
     "opt"
   ];
+
   nativeBuildInputs = [
     findlib
     ocaml
     ocamlbuild
     pkg-config
+    perl
   ];
   buildInputs = [
     glib
-    perl
     stdlib-shims
   ];
   propagatedBuildInputs = [
@@ -32,7 +33,7 @@ stdenv.mkDerivation {
     "all"
     "test"
   ];
-  nativeCheckInputs = [
+  checkInputs = [
     ounit
   ];
   doCheck = true;

pkgs/development/ocaml-modules/curly/default.nix

@@ -16,7 +16,8 @@ buildDunePackage rec {
   };
 
   propagatedBuildInputs = [ result ];
-  nativeCheckInputs = [ alcotest cohttp-lwt-unix cacert ];
+  nativeCheckInputs = [ cacert ];
+  checkInputs = [ alcotest cohttp-lwt-unix ];
   # test dependencies are only available for >= 4.08
   # https://github.com/mirage/ca-certs/issues/16
   doCheck = lib.versionAtLeast ocaml.version "4.08"

pkgs/development/ocaml-modules/curses/default.nix

@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "0yy3wf8i7jgvzdc40bni7mvpkvclq97cgb5fw265mrjj0iqpkqpd";
   };
 
+  strictDeps = true;
+
   propagatedBuildInputs = [ ncurses ];
 
   nativeBuildInputs = [ ocaml findlib ];

pkgs/development/ocaml-modules/data-encoding/default.nix

@@ -36,7 +36,7 @@ buildDunePackage {
     json-data-encoding-bson
   ];
 
-  nativeCheckInputs = [
+  checkInputs = [
     alcotest
     crowbar
     ppx_expect

pkgs/development/ocaml-modules/decompress/default.nix

@@ -18,7 +18,7 @@ buildDunePackage rec {
 
   buildInputs = [ cmdliner ];
   propagatedBuildInputs = [ optint checkseum ];
-  nativeCheckInputs = [ alcotest astring bigstringaf bos ctypes fmt camlzip base64 crowbar rresult ];
+  checkInputs = [ alcotest astring bigstringaf bos ctypes fmt camlzip base64 crowbar rresult ];
   doCheck = true;
 
   meta = {

pkgs/development/ocaml-modules/diet/default.nix

@@ -17,7 +17,7 @@ buildDunePackage rec {
   propagatedBuildInputs = [ stdlib-shims ];
 
   doCheck = true;
-  nativeCheckInputs = [ ounit ];
+  checkInputs = [ ounit ];
 
   meta = with lib; {
     homepage = "https://github.com/mirage/ocaml-diet";

pkgs/development/ocaml-modules/digestif/default.nix

@@ -15,12 +15,13 @@ buildDunePackage rec {
     sha256 = "sha256-edNM5ROxFIV+OAqr328UcyGPGwXdflHQOJB3ntAbRmY=";
   };
 
-  nativeBuildInputs = [ findlib which ];
+  strictDeps = true;
-  buildInputs = [ ocaml ];
+
+  nativeBuildInputs = [ findlib which ocaml pkg-config ];
 
   propagatedBuildInputs = [ eqaf ];
 
-  nativeCheckInputs = [ alcotest astring bos fpath ];
+  checkInputs = [ alcotest astring bos fpath ];
   doCheck = true;
 
   postCheck = ''

pkgs/development/ocaml-modules/dispatch/default.nix

@@ -15,7 +15,7 @@ buildDunePackage rec {
 
   propagatedBuildInputs = [ result ];
 
-  nativeCheckInputs = [ alcotest ];
+  checkInputs = [ alcotest ];
 
   doCheck = lib.versionAtLeast ocaml.version "4.08";
 

pkgs/development/ocaml-modules/dns/cli.nix

@@ -39,7 +39,7 @@ buildDunePackage {
   ];
 
   doCheck = true;
-  nativeCheckInputs = [
+  checkInputs = [
     alcotest
   ];
 

pkgs/development/ocaml-modules/dns/client.nix

@@ -12,11 +12,28 @@ buildDunePackage {
   inherit (dns) src version;
   duneVersion = "3";
 
-  propagatedBuildInputs = [ cstruct fmt logs dns randomconv domain-name ipaddr
+  propagatedBuildInputs = [
-                            lwt mirage-random mirage-time mirage-clock
+    cstruct
-                            ca-certs ca-certs-nss happy-eyeballs tcpip tls tls-mirage
+    fmt
-                            mtime mirage-crypto-rng ];
+    logs
-  nativeCheckInputs = [ alcotest ];
+    dns
+    randomconv
+    domain-name
+    ipaddr
+    lwt
+    mirage-random
+    mirage-time
+    mirage-clock
+    ca-certs
+    ca-certs-nss
+    happy-eyeballs
+    tcpip
+    tls
+    tls-mirage
+    mtime
+    mirage-crypto-rng
+  ];
+  checkInputs = [ alcotest ];
   doCheck = true;
 
   meta = dns.meta // {

pkgs/development/ocaml-modules/dns/default.nix

@@ -1,5 +1,17 @@
-{ lib, buildDunePackage, fetchurl, alcotest
+{ lib
-, cstruct, domain-name, duration, gmap, ipaddr, logs, lru, metrics, ptime, fmt
+, buildDunePackage
+, fetchurl
+, alcotest
+, cstruct
+, domain-name
+, duration
+, gmap
+, ipaddr
+, logs
+, lru
+, metrics
+, ptime
+, fmt
 , base64
 }:
 
@@ -18,7 +30,7 @@ buildDunePackage rec {
   propagatedBuildInputs = [ fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics base64 ];
 
   doCheck = true;
-  nativeCheckInputs = [ alcotest ];
+  checkInputs = [ alcotest ];
 
   meta = {
     description = "An Domain Name System (DNS) library";

pkgs/development/ocaml-modules/dns/dnssec.nix

@@ -1,6 +1,13 @@
-{ buildDunePackage, cstruct, dns, mirage-crypto, mirage-crypto-pk, mirage-crypto-ec
+{ buildDunePackage
-, domain-name, logs
+, cstruct
-, alcotest, base64
+, dns
+, mirage-crypto
+, mirage-crypto-pk
+, mirage-crypto-ec
+, domain-name
+, logs
+, alcotest
+, base64
 }:
 
 buildDunePackage {
@@ -20,7 +27,7 @@ buildDunePackage {
   ];
 
   doCheck = true;
-  nativeCheckInputs = [
+  checkInputs = [
     alcotest
     base64
   ];

pkgs/development/ocaml-modules/dns/resolver.nix

@@ -1,6 +1,18 @@
-{ buildDunePackage, dns, dns-server, dns-mirage, lru, duration
+{ buildDunePackage
-, randomconv, lwt, mirage-time, mirage-clock, mirage-random
+, dns
-, tcpip, tls, tls-mirage, dnssec
+, dns-server
+, dns-mirage
+, lru
+, duration
+, randomconv
+, lwt
+, mirage-time
+, mirage-clock
+, mirage-random
+, tcpip
+, tls
+, tls-mirage
+, dnssec
 , alcotest
 }:
 
@@ -28,7 +40,7 @@ buildDunePackage {
   ];
 
   doCheck = true;
-  nativeCheckInputs = [
+  checkInputs = [
     alcotest
   ];
 

pkgs/development/ocaml-modules/dns/server.nix

@@ -1,6 +1,16 @@
-{ buildDunePackage, dns, dns-mirage, randomconv, duration, lwt
+{ buildDunePackage
-, mirage-time, mirage-clock, metrics
+, dns
-, alcotest, mirage-crypto-rng, dns-tsig, base64
+, dns-mirage
+, randomconv
+, duration
+, lwt
+, mirage-time
+, mirage-clock
+, metrics
+, alcotest
+, mirage-crypto-rng
+, dns-tsig
+, base64
 }:
 
 buildDunePackage {
@@ -21,7 +31,7 @@ buildDunePackage {
   ];
 
   doCheck = true;
-  nativeCheckInputs = [
+  checkInputs = [
     alcotest
     mirage-crypto-rng
     dns-tsig

pkgs/development/ocaml-modules/dns/tsig.nix

@@ -13,7 +13,7 @@ buildDunePackage {
   ];
 
   doCheck = true;
-  nativeCheckInputs = [
+  checkInputs = [
     alcotest
   ];
 

pkgs/development/ocaml-modules/domain-name/default.nix

@@ -13,7 +13,7 @@ buildDunePackage rec {
 
   minimalOCamlVersion = "4.04";
 
-  nativeCheckInputs = [ alcotest ];
+  checkInputs = [ alcotest ];
 
   doCheck = lib.versionAtLeast ocaml.version "4.08";
 

pkgs/development/ocaml-modules/domainslib/default.nix

@@ -1,4 +1,6 @@
-{ lib, fetchurl, buildDunePackage
+{ lib
+, fetchurl
+, buildDunePackage
 , lockfree
 , mirage-clock-unix
 }:
@@ -18,7 +20,7 @@ buildDunePackage rec {
   propagatedBuildInputs = [ lockfree ];
 
   doCheck = true;
-  nativeCheckInputs = [ mirage-clock-unix ];
+  checkInputs = [ mirage-clock-unix ];
 
   meta = {
     homepage = "https://github.com/ocaml-multicore/domainslib";

pkgs/development/ocaml-modules/dose3/default.nix

@@ -34,11 +34,13 @@ buildDunePackage rec {
   ];
 
   nativeCheckInputs = [
-    dpkg                      # Replaces: conf-dpkg
-    git
-    ounit
     python39                  # Replaces: conf-python-3
     python39Packages.pyyaml   # Replaces: conf-python3-yaml
+    git
+  ];
+  checkInputs = [
+    dpkg                      # Replaces: conf-dpkg
+    ounit
   ];
   doCheck = false; # Tests are failing.
                    # To enable tests use: lib.versionAtLeast ocaml.version "4.04";

pkgs/development/ocaml-modules/dtoa/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, buildDunePackage }:
+{ stdenv, lib, fetchurl, buildDunePackage, ounit }:
 
 buildDunePackage rec {
   pname = "dtoa";
@@ -13,6 +13,10 @@ buildDunePackage rec {
     sha256 = "0zkhn0rdq82g6gamsv6nkx6i44s8104nh6jg5xydazl9jl1704xn";
   };
 
+  checkInputs = [ ounit ];
+
+  doCheck = true;
+
   hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";
 
   meta = with lib; {

pkgs/development/ocaml-modules/duff/default.nix

@@ -1,6 +1,12 @@
-{ lib, fetchurl, buildDunePackage, ocaml
+{ lib
+, fetchurl
+, buildDunePackage
+, ocaml
 , fmt
-, alcotest, hxd, crowbar, bigstringaf
+, alcotest
+, hxd
+, crowbar
+, bigstringaf
 }:
 
 buildDunePackage rec {
@@ -15,7 +21,7 @@ buildDunePackage rec {
   propagatedBuildInputs = [ fmt ];
 
   doCheck = lib.versionAtLeast ocaml.version "4.08";
-  nativeCheckInputs = [
+  checkInputs = [
     alcotest
     crowbar
     hxd

pkgs/development/ocaml-modules/dune-build-info/default.nix

@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, dune_2 }:
+{ lib, buildDunePackage, dune_2, dune-action-plugin }:
 
 buildDunePackage rec {
   pname = "dune-build-info";
@@ -8,6 +8,8 @@ buildDunePackage rec {
 
   dontAddPrefix = true;
 
+  buildInputs = [ dune-action-plugin ];
+
   meta = with lib; {
     inherit (dune_2.meta) homepage;
     description = "Embed build information inside executables";

pkgs/development/ocaml-modules/duration/default.nix

@@ -12,7 +12,7 @@ buildDunePackage rec {
   };
 
   doCheck = lib.versionAtLeast ocaml.version "4.08";
-  nativeCheckInputs = [ alcotest ];
+  checkInputs = [ alcotest ];
 
   meta = {
     homepage = "https://github.com/hannesm/duration";

pkgs/development/ocaml-modules/earlybird/default.nix

@@ -22,7 +22,9 @@ buildDunePackage rec {
     hash = "sha256-8JHZWsgpz2pzpDxST3bkMSmPHtj7MDzD5G3ujqMW+MU=";
   };
 
-  buildInputs = [ cmdliner dap fmt iter logs lru lwt_ppx lwt_react menhir menhirLib path_glob ppx_deriving_yojson ];
+  nativeBuildInputs = [ menhir ];
+
+  buildInputs = [ cmdliner dap fmt iter logs lru lwt_ppx lwt_react menhirLib path_glob ppx_deriving_yojson ];
 
   passthru.updateScript = gitUpdater { };
 

pkgs/development/ocaml-modules/elpi/default.nix

@@ -36,9 +36,12 @@ buildDunePackage rec {
 
   minimalOCamlVersion = "4.04";
 
-  buildInputs = [ perl ncurses ]
+  # atdgen is both a library and executable
+  nativeBuildInputs = [ perl camlp5 ]
   ++ lib.optional (lib.versionAtLeast version "1.15" || version == "dev") menhir
   ++ lib.optional (lib.versionAtLeast version "1.16" || version == "dev") atdgen;
+  buildInputs = [ ncurses ]
+  ++ lib.optional (lib.versionAtLeast version "1.16" || version == "dev") atdgen;
 
   propagatedBuildInputs = [ re stdlib-shims ]
   ++ (if lib.versionAtLeast version "1.15" || version == "dev"

pkgs/development/ocaml-modules/emile/default.nix

@@ -1,6 +1,14 @@
-{ lib, buildDunePackage, fetchurl, ocaml
+{ lib
-, angstrom, ipaddr, base64, pecu, uutf
+, buildDunePackage
-, alcotest, cmdliner
+, fetchurl
+, ocaml
+, angstrom
+, ipaddr
+, base64
+, pecu
+, uutf
+, alcotest
+, cmdliner
 }:
 
 buildDunePackage rec {
@@ -28,7 +36,7 @@ buildDunePackage rec {
   # and angstrom (fmt) are only available for >= 4.08. Disabling
   # tests for < 4.08 at least improves the error message
   doCheck = lib.versionAtLeast ocaml.version "4.08";
-  nativeCheckInputs = [ alcotest ];
+  checkInputs = [ alcotest ];
 
   meta = with lib; {
     description = "Parser of email address according RFC822";

pkgs/development/ocaml-modules/encore/default.nix

@@ -1,5 +1,12 @@
-{ lib, buildDunePackage, fetchurl, ocaml
+{ lib
-, fmt, bigstringaf, angstrom, alcotest }:
+, buildDunePackage
+, fetchurl
+, ocaml
+, fmt
+, bigstringaf
+, angstrom
+, alcotest
+}:
 
 buildDunePackage rec {
   pname = "encore";
@@ -15,7 +22,7 @@ buildDunePackage rec {
   useDune2 = true;
 
   propagatedBuildInputs = [ angstrom fmt bigstringaf ];
-  nativeCheckInputs = [ alcotest ];
+  checkInputs = [ alcotest ];
   doCheck = true;
 
   meta = {

pkgs/development/ocaml-modules/ethernet/default.nix

@@ -17,7 +17,7 @@ buildDunePackage rec {
     sha256 = "0a898vp9dw42majsvzzvs8pc6x4ns01wlwhwbacixliv6vv78ng9";
   };
 
-  nativeBuildInputs = [
+  buildInputs = [
     ppx_cstruct
   ];
 

pkgs/development/ocaml-modules/faraday/default.nix

@@ -13,7 +13,7 @@ buildDunePackage rec {
     sha256 = "sha256-wR4kDocR1t3OLRuudXH8IccYde552O6Gvo5BHNxRbAI=";
   };
 
-  nativeCheckInputs = [ alcotest ];
+  checkInputs = [ alcotest ];
   propagatedBuildInputs = [ bigstringaf ];
   doCheck = true;
 

pkgs/development/ocaml-modules/ff/default.nix

@@ -9,7 +9,7 @@ buildDunePackage rec {
     zarith
   ];
 
-  nativeCheckInputs = [
+  checkInputs = [
     alcotest
     ff-pbt
   ];

pkgs/development/ocaml-modules/ff/pbt.nix

@@ -6,7 +6,7 @@ buildDunePackage {
 
   minimalOCamlVersion = "4.08";
 
-  nativeCheckInputs = [
+  checkInputs = [
     alcotest
   ];
 

pkgs/development/ocaml-modules/fileutils/default.nix

@@ -16,7 +16,7 @@ buildDunePackage rec {
     stdlib-shims
   ];
 
-  nativeCheckInputs = [
+  checkInputs = [
     ounit2
   ];
   doCheck = lib.versionAtLeast ocaml.version "4.04";

pkgs/development/ocaml-modules/gapi-ocaml/default.nix

@@ -20,7 +20,7 @@ buildDunePackage rec {
   propagatedBuildInputs = [ cryptokit ocamlnet ocurl yojson ];
 
   doCheck = true;
-  nativeCheckInputs = [ ounit2 ];
+  checkInputs = [ ounit2 ];
 
   meta = {
     description = "OCaml client for google services";

pkgs/development/ocaml-modules/gen/default.nix

@@ -16,9 +16,12 @@ buildDunePackage rec {
     hash = "sha256-YWoVcl2TQoMIgU1LoKL16ia31zJjwAMwuphtSXnhtvw=";
   };
 
+  strictDeps = true;
+
   buildInputs = [ dune-configurator ];
   propagatedBuildInputs = [ seq ];
   nativeCheckInputs = [ qcheck ounit2 ];
+  checkInputs = [ qcheck ounit2 ];
 
   doCheck = lib.versionAtLeast ocaml.version "4.08";
 

pkgs/development/ocaml-modules/gg/default.nix

@@ -18,6 +18,8 @@ stdenv.mkDerivation {
     sha256 = "sha256:0j7bpj8k17csnz6v6frkz9aycywsb7xmznnb31g8rbfk3626f3ci";
   };
 
+  strictDeps = true;
+
   nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
   buildInputs = [ topkg ];
 

pkgs/development/ocaml-modules/git/default.nix

@@ -32,7 +32,10 @@ buildDunePackage rec {
     domain-name emile mimic carton carton-lwt carton-git ipaddr psq hxd
   ];
   nativeCheckInputs = [
-    alcotest alcotest-lwt mirage-crypto-rng git-binary crowbar cmdliner
+    git-binary
+  ];
+  checkInputs = [
+    alcotest alcotest-lwt mirage-crypto-rng crowbar cmdliner
   ];
   doCheck = !stdenv.isAarch64;
 

pkgs/development/ocaml-modules/git/mirage.nix

@@ -1,4 +1,5 @@
-{ lib, buildDunePackage
+{ lib
+, buildDunePackage
 , git
 , mimic
 , mimic-happy-eyeballs
@@ -82,7 +83,7 @@ buildDunePackage {
     result
   ];
 
-  nativeCheckInputs = [
+  checkInputs = [
     alcotest
     alcotest-lwt
     bigstringaf

pkgs/development/ocaml-modules/git/unix.nix

@@ -18,8 +18,11 @@ buildDunePackage {
   duneVersion = "3";
 
   buildInputs = [
-    awa awa-mirage cmdliner
+    awa
-    mirage-clock tcpip
+    awa-mirage
+    cmdliner
+    mirage-clock
+    tcpip
   ];
   propagatedBuildInputs = [
     rresult result bigstringaf
@@ -30,12 +33,13 @@ buildDunePackage {
     tls tls-mirage git happy-eyeballs-lwt
     git-mirage mirage-clock-unix
   ];
-  nativeCheckInputs = [
+  checkInputs = [
     alcotest alcotest-lwt base64 ke
-    mirage-crypto-rng git-binary
+    mirage-crypto-rng
     uri mtime
     cacert # sets up NIX_SSL_CERT_FILE
   ];
+  nativeCheckInputs = [ git-binary ];
   doCheck = true;
 
   meta = {

pkgs/development/ocaml-modules/gmap/default.nix

@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, ocaml, fetchurl, alcotest }:
+{ lib, buildDunePackage, ocaml, fetchurl, alcotest, fmt }:
 
 buildDunePackage rec {
   pname = "gmap";
@@ -13,7 +13,7 @@ buildDunePackage rec {
 
   minimumOCamlVersion = "4.03";
 
-  nativeCheckInputs = [ alcotest ];
+  checkInputs = [ alcotest fmt ];
 
   doCheck = lib.versionAtLeast ocaml.version "4.08";
 

pkgs/development/ocaml-modules/graphql/cohttp.nix

@@ -1,6 +1,14 @@
-{ lib, buildDunePackage, ocaml-crunch
+{ lib
-, astring, cohttp, digestif, graphql, ocplib-endian
+, buildDunePackage
-, alcotest, cohttp-lwt-unix, graphql-lwt
+, ocaml-crunch
+, astring
+, cohttp
+, digestif
+, graphql
+, ocplib-endian
+, alcotest
+, cohttp-lwt-unix
+, graphql-lwt
 }:
 
 buildDunePackage rec {
@@ -13,7 +21,7 @@ buildDunePackage rec {
   nativeBuildInputs = [ ocaml-crunch ];
   propagatedBuildInputs = [ astring cohttp digestif graphql ocplib-endian ];
 
-  nativeCheckInputs = lib.optionals doCheck [ alcotest cohttp-lwt-unix graphql-lwt ];
+  checkInputs = lib.optionals doCheck [ alcotest cohttp-lwt-unix graphql-lwt ];
 
   doCheck = true;
 

pkgs/development/ocaml-modules/graphql/default.nix

@@ -9,7 +9,7 @@ buildDunePackage rec {
 
   propagatedBuildInputs = [ graphql_parser rresult yojson ];
 
-  nativeCheckInputs = [ alcotest ];
+  checkInputs = [ alcotest ];
 
   doCheck = true;
 

pkgs/development/ocaml-modules/graphql/lwt.nix

@@ -9,7 +9,7 @@ buildDunePackage rec {
 
   propagatedBuildInputs = [ graphql ocaml_lwt ];
 
-  nativeCheckInputs = [ alcotest ];
+  checkInputs = [ alcotest ];
 
   doCheck = true;
 

pkgs/development/ocaml-modules/graphql/parser.nix

@@ -15,7 +15,7 @@ buildDunePackage rec {
   nativeBuildInputs = [ menhir ];
   propagatedBuildInputs = [ fmt re ];
 
-  nativeCheckInputs = [ alcotest ];
+  checkInputs = [ alcotest ];
 
   doCheck = true;
 

pkgs/development/ocaml-modules/graphql_ppx/default.nix

@@ -18,7 +18,11 @@ buildDunePackage rec {
     sha256 = "sha256-+WJhA2ixZHiSZBoX14dnQKk7JfVAIME4JooNSnhRp44=";
   };
 
-  buildInputs = [ ppxlib ];
+  strictDeps = true;
+
+  nativeBuildInputs = [ reason ];
+
+  buildInputs = [ ppxlib reason ];
 
   propagatedBuildInputs = [
     reason
@@ -26,7 +30,7 @@ buildDunePackage rec {
     yojson
   ];
 
-  nativeCheckInputs = [ alcotest ];
+  checkInputs = [ alcotest ];
 
   doCheck = true;
 

pkgs/development/ocaml-modules/h2/default.nix

@@ -46,7 +46,7 @@ buildDunePackage rec {
   preCheck = ''
     ln -s "${http2-frame-test-case}" lib_test/http2-frame-test-case
   '';
-  nativeCheckInputs = [
+  checkInputs = [
     alcotest
     yojson
     hex

pkgs/development/ocaml-modules/hkdf/default.nix

@@ -13,7 +13,7 @@ buildDunePackage rec {
   };
 
   propagatedBuildInputs = [ cstruct mirage-crypto ];
-  nativeCheckInputs = [ alcotest ];
+  checkInputs = [ alcotest ];
   doCheck = true;
 
   meta = with lib; {

pkgs/development/ocaml-modules/httpaf/default.nix

@@ -15,7 +15,7 @@ buildDunePackage rec {
     sha256 = "0zk78af3qyvf6w66mg8sxygr6ndayzqw5s3zfxibvn121xwni26z";
   };
 
-  nativeCheckInputs = [ alcotest ];
+  checkInputs = [ alcotest ];
   propagatedBuildInputs = [ angstrom faraday ];
   doCheck = lib.versionAtLeast ocaml.version "4.08";