b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

ocamlPackages treewide: strictDeps all packages

Browse source
This commit is contained in:
Ulrik Strid 2022-03-01 16:42:22 +01:00
parent d6ccd76581
commit c53a63adf1
250 changed files with 660 additions and 407 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/applications/misc/orpie/default.nix
View file

@ -19,7 +19,8 @@ ocamlPackages.buildDunePackage rec {
substituteInPlace src/orpie/install.ml.in --replace '@prefix@' $out 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 = { meta = {
inherit (src.meta) homepage; inherit (src.meta) homepage;

3
pkgs/applications/misc/stog/default.nix
View file

@ -20,7 +20,8 @@ buildDunePackage rec {
sha256 = "sha256:0krj5w4y05bcfx7hk9blmap8avl31gp7yi01lpqzs6ync23mvm0x"; 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 = [ propagatedBuildInputs = [
dune-build-info dune-build-info
dune-site dune-site

2
pkgs/applications/networking/google-drive-ocamlfuse/default.nix
View file

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

16
pkgs/applications/science/logic/acgtk/default.nix
View file

@ -13,11 +13,19 @@ stdenv.mkDerivation {
sha256 = "sha256-W/BDhbng5iYuiB7desMKvRtDFdhoaxiJNvNvtbLlA6E="; 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 = '' installPhase = ''
dune install --prefix $out --libdir $OCAMLFIND_DESTDIR dune install --prefix $out --libdir $OCAMLFIND_DESTDIR

5
pkgs/applications/science/logic/z3/default.nix
View file

@ -32,9 +32,10 @@ let common = { version, sha256, patches ? [ ] }:
nativeBuildInputs = optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; nativeBuildInputs = optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [ python ] buildInputs = [ python ]
++ optional javaBindings jdk ++ 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; enableParallelBuilding = true;
postPatch = optionalString ocamlBindings '' postPatch = optionalString ocamlBindings ''

2
pkgs/applications/virtualization/virt-top/default.nix
View file

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

2
pkgs/build-support/ocaml/dune.nix
View file

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

4
pkgs/development/compilers/stanc/default.nix
View file

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

2
pkgs/development/ocaml-modules/afl-persistent/default.nix
View file

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

2
pkgs/development/ocaml-modules/alcotest/lwt.nix
View file

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

2
pkgs/development/ocaml-modules/angstrom/default.nix
View file

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

1
pkgs/development/ocaml-modules/apron/default.nix
View file

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

2
pkgs/development/ocaml-modules/arp/default.nix
View file

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

2
pkgs/development/ocaml-modules/asn1-combinators/default.nix
View file

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

6
pkgs/development/ocaml-modules/atdgen/default.nix
View file

@ -10,10 +10,10 @@ buildDunePackage {
propagatedBuildInputs = [ atdgen-runtime ]; propagatedBuildInputs = [ atdgen-runtime ];
strictDeps = true;
doCheck = 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" ]) // { meta = (builtins.removeAttrs atd.meta [ "mainProgram" ]) // {
description = "Generates efficient JSON serializers, deserializers and validators"; description = "Generates efficient JSON serializers, deserializers and validators";

6
pkgs/development/ocaml-modules/awa/default.nix
View file

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

3
pkgs/development/ocaml-modules/awa/lwt.nix
View file

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

3
pkgs/development/ocaml-modules/bap/default.nix
View file

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

4
pkgs/development/ocaml-modules/base64/default.nix
View file

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

4
pkgs/development/ocaml-modules/benchmark/default.nix
View file

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

2
pkgs/development/ocaml-modules/bheap/default.nix
View file

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

4
pkgs/development/ocaml-modules/bigarray-overlap/default.nix
View file

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

5
pkgs/development/ocaml-modules/bigstringaf/default.nix
View file

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

2
pkgs/development/ocaml-modules/bindlib/default.nix
View file

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

9
pkgs/development/ocaml-modules/biocaml/default.nix
View file

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

2
pkgs/development/ocaml-modules/bitstring/ppx.nix
View file

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

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

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

5
pkgs/development/ocaml-modules/bls12-381/default.nix
View file

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

2
pkgs/development/ocaml-modules/bls12-381/legacy.nix
View file

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

2
pkgs/development/ocaml-modules/bwd/default.nix
View file

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

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

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

2
pkgs/development/ocaml-modules/ca-certs/default.nix
View file

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

2
pkgs/development/ocaml-modules/callipyge/default.nix
View file

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

4
pkgs/development/ocaml-modules/camlimages/4.2.4.nix
View file

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

5
pkgs/development/ocaml-modules/caqti/default.nix
View file

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

2
pkgs/development/ocaml-modules/carton/default.nix
View file

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

2
pkgs/development/ocaml-modules/carton/lwt.nix
View file

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

2
pkgs/development/ocaml-modules/chacha/default.nix
View file

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

2
pkgs/development/ocaml-modules/checkseum/default.nix
View file

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

9
pkgs/development/ocaml-modules/class_group_vdf/default.nix
View file

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

2
pkgs/development/ocaml-modules/cohttp/async.nix
View file

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

2
pkgs/development/ocaml-modules/cohttp/default.nix
View file

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

9
pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
View file

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

2
pkgs/development/ocaml-modules/conduit/lwt-unix.nix
View file

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

2
pkgs/development/ocaml-modules/containers/data.nix
View file

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

2
pkgs/development/ocaml-modules/containers/default.nix
View file

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

15
pkgs/development/ocaml-modules/cooltt/default.nix
View file

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

5
pkgs/development/ocaml-modules/cow/default.nix
View file

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

2
pkgs/development/ocaml-modules/cpu/default.nix
View file

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

2
pkgs/development/ocaml-modules/crowbar/default.nix
View file

@ -18,7 +18,7 @@ buildDunePackage rec {
postPatch = "rm -rf examples/xmldiff"; postPatch = "rm -rf examples/xmldiff";
propagatedBuildInputs = [ ocplib-endian cmdliner afl-persistent ]; 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 # uunf is broken on aarch64
doCheck = !stdenv.isAarch64; doCheck = !stdenv.isAarch64;

2
pkgs/development/ocaml-modules/cstruct/default.nix
View file

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

17
pkgs/development/ocaml-modules/cstruct/ppx.nix
View file

@ -6,14 +6,15 @@ if lib.versionOlder (cstruct.version or "1") "3"
then cstruct then cstruct
else 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 ];
}

2
pkgs/development/ocaml-modules/cstruct/sexp.nix
View file

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

8
pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix
View file

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

7
pkgs/development/ocaml-modules/cudf/default.nix
View file

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

3
pkgs/development/ocaml-modules/curly/default.nix
View file

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

2
pkgs/development/ocaml-modules/curses/default.nix
View file

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

2
pkgs/development/ocaml-modules/data-encoding/default.nix
View file

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

2
pkgs/development/ocaml-modules/decompress/default.nix
View file

@ -18,7 +18,7 @@ buildDunePackage rec {
buildInputs = [ cmdliner ]; buildInputs = [ cmdliner ];
propagatedBuildInputs = [ optint checkseum ]; 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; doCheck = true;
meta = { meta = {

2
pkgs/development/ocaml-modules/diet/default.nix
View file

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

7
pkgs/development/ocaml-modules/digestif/default.nix
View file

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

2
pkgs/development/ocaml-modules/dispatch/default.nix
View file

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

2
pkgs/development/ocaml-modules/dns/cli.nix
View file

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

27
pkgs/development/ocaml-modules/dns/client.nix
View file

@ -12,11 +12,28 @@ buildDunePackage {
inherit (dns) src version; inherit (dns) src version;
duneVersion = "3"; 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; doCheck = true;
meta = dns.meta // { meta = dns.meta // {

18
pkgs/development/ocaml-modules/dns/default.nix
View file

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

15
pkgs/development/ocaml-modules/dns/dnssec.nix
View file

@ -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 { buildDunePackage {
@ -20,7 +27,7 @@ buildDunePackage {
]; ];
doCheck = true; doCheck = true;
nativeCheckInputs = [ checkInputs = [
alcotest alcotest
base64 base64
]; ];

20
pkgs/development/ocaml-modules/dns/resolver.nix
View file

@ -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 , alcotest
}: }:
@ -28,7 +40,7 @@ buildDunePackage {
]; ];
doCheck = true; doCheck = true;
nativeCheckInputs = [ checkInputs = [
alcotest alcotest
]; ];

18
pkgs/development/ocaml-modules/dns/server.nix
View file

@ -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 { buildDunePackage {
@ -21,7 +31,7 @@ buildDunePackage {
]; ];
doCheck = true; doCheck = true;
nativeCheckInputs = [ checkInputs = [
alcotest alcotest
mirage-crypto-rng mirage-crypto-rng
dns-tsig dns-tsig

2
pkgs/development/ocaml-modules/dns/tsig.nix
View file

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

2
pkgs/development/ocaml-modules/domain-name/default.nix
View file

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

6
pkgs/development/ocaml-modules/domainslib/default.nix
View file

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

8
pkgs/development/ocaml-modules/dose3/default.nix
View file

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

6
pkgs/development/ocaml-modules/dtoa/default.nix
View file

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

12
pkgs/development/ocaml-modules/duff/default.nix
View file

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

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

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

2
pkgs/development/ocaml-modules/duration/default.nix
View file

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

4
pkgs/development/ocaml-modules/earlybird/default.nix
View file

@ -22,7 +22,9 @@ buildDunePackage rec {
hash = "sha256-8JHZWsgpz2pzpDxST3bkMSmPHtj7MDzD5G3ujqMW+MU="; 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 { }; passthru.updateScript = gitUpdater { };

5
pkgs/development/ocaml-modules/elpi/default.nix
View file

@ -36,9 +36,12 @@ buildDunePackage rec {
minimalOCamlVersion = "4.04"; 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.15" || version == "dev") menhir
++ lib.optional (lib.versionAtLeast version "1.16" || version == "dev") atdgen; ++ 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 ] propagatedBuildInputs = [ re stdlib-shims ]
++ (if lib.versionAtLeast version "1.15" || version == "dev" ++ (if lib.versionAtLeast version "1.15" || version == "dev"

16
pkgs/development/ocaml-modules/emile/default.nix
View file

@ -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 { buildDunePackage rec {
@ -28,7 +36,7 @@ buildDunePackage rec {
# and angstrom (fmt) are only available for >= 4.08. Disabling # and angstrom (fmt) are only available for >= 4.08. Disabling
# tests for < 4.08 at least improves the error message # tests for < 4.08 at least improves the error message
doCheck = lib.versionAtLeast ocaml.version "4.08"; doCheck = lib.versionAtLeast ocaml.version "4.08";
nativeCheckInputs = [ alcotest ]; checkInputs = [ alcotest ];
meta = with lib; { meta = with lib; {
description = "Parser of email address according RFC822"; description = "Parser of email address according RFC822";

13
pkgs/development/ocaml-modules/encore/default.nix
View file

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

2
pkgs/development/ocaml-modules/ethernet/default.nix
View file

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

2
pkgs/development/ocaml-modules/faraday/default.nix
View file

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

2
pkgs/development/ocaml-modules/ff/default.nix
View file

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

2
pkgs/development/ocaml-modules/ff/pbt.nix
View file

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

2
pkgs/development/ocaml-modules/fileutils/default.nix
View file

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

2
pkgs/development/ocaml-modules/gapi-ocaml/default.nix
View file

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

3
pkgs/development/ocaml-modules/gen/default.nix
View file

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

2
pkgs/development/ocaml-modules/gg/default.nix
View file

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

5
pkgs/development/ocaml-modules/git/default.nix
View file

@ -32,7 +32,10 @@ buildDunePackage rec {
domain-name emile mimic carton carton-lwt carton-git ipaddr psq hxd domain-name emile mimic carton carton-lwt carton-git ipaddr psq hxd
]; ];
nativeCheckInputs = [ 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; doCheck = !stdenv.isAarch64;

5
pkgs/development/ocaml-modules/git/mirage.nix
View file

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

12
pkgs/development/ocaml-modules/git/unix.nix
View file

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

4
pkgs/development/ocaml-modules/gmap/default.nix
View file

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

16
pkgs/development/ocaml-modules/graphql/cohttp.nix
View file

@ -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 { buildDunePackage rec {
@ -13,7 +21,7 @@ buildDunePackage rec {
nativeBuildInputs = [ ocaml-crunch ]; nativeBuildInputs = [ ocaml-crunch ];
propagatedBuildInputs = [ astring cohttp digestif graphql ocplib-endian ]; 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; doCheck = true;

2
pkgs/development/ocaml-modules/graphql/default.nix
View file

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

2
pkgs/development/ocaml-modules/graphql/lwt.nix
View file

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

2
pkgs/development/ocaml-modules/graphql/parser.nix
View file

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

8
pkgs/development/ocaml-modules/graphql_ppx/default.nix
View file

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

2
pkgs/development/ocaml-modules/h2/default.nix
View file

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

2
pkgs/development/ocaml-modules/hkdf/default.nix
View file

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

2
pkgs/development/ocaml-modules/httpaf/default.nix
View file

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

Some files were not shown because too many files have changed in this diff Show more