ocamlPackages treewide: Add missing inputs
commit661ee6b46824286320843905569061c4a5a2594b
authorUlrik Strid <ulrik.strid@outlook.com>
dateFri 4 Mar 2022, 11:30 (5 years ago)
parent6e30c65
pkgs/development/ocaml-modules/batteries/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, num, ounit
1+{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, qcheck, num, ounit
22, doCheck ? lib.versionAtLeast ocaml.version "4.08" && !stdenv.isAarch64
33}:
44
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 };
1919
2020 nativeBuildInputs = [ ocaml findlib ocamlbuild ];
21− checkInputs = [ qtest ounit ];
21+ checkInputs = [ qtest ounit qcheck ];
2222 propagatedBuildInputs = [ num ];
2323
2424 strictDeps = !doCheck;
pkgs/development/ocaml-modules/conduit/default.nix+1−2
@@ -15,8 +15,7 @@ buildDunePackage rec {
1515 sha256 = "2a37ffaa352a1e145ef3d80ac28661213c69a741b238623e59f29e3d5a12c537";
1616 };
1717
18− buildInputs = [ ppx_sexp_conv ];
19− propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri logs ];
18+ propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri logs ppx_sexp_conv ];
2019
2120 meta = {
2221 description = "A network connection establishment library";
pkgs/development/ocaml-modules/elina/default.nix+2−2
@@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
88 sha256 = "1nymykskq1yx87y4xl6hl9i4q6kv0qaq25rniqgl1bfn883p1ysc";
99 };
1010
11− nativeBuildInputs = [ perl ocaml findlib ];
11+ nativeBuildInputs = [ perl ocaml findlib camlidl ];
1212
13− propagatedBuildInputs = [ apron camlidl gmp mpfr ];
13+ propagatedBuildInputs = [ apron gmp mpfr ];
1414
1515 strictDeps = true;
1616
pkgs/development/ocaml-modules/gmetadom/default.nix+2−2
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
2222 '';
2323
2424 nativeBuildInputs = [ pkg-config ocaml findlib ];
25− buildInputs = [ gdome2 libxslt];
26− propagatedBuildInputs = [gdome2];
25+ buildInputs = [ libxslt ];
26+ propagatedBuildInputs = [ gdome2 ];
2727
2828 strictDeps = true;
2929
pkgs/development/ocaml-modules/hack_parallel/default.nix+1−1
@@ -15,7 +15,7 @@ buildDunePackage rec {
1515
1616 nativeBuildInputs = [ pkg-config ];
1717
18− buildInputs = [ core core_kernel sqlite ];
18+ propagatedBuildInputs = [ core core_kernel sqlite ];
1919
2020 meta = {
2121 description =
pkgs/development/ocaml-modules/mccs/default.nix+1−1
@@ -13,7 +13,7 @@ buildDunePackage rec {
1313
1414 useDune2 = true;
1515
16− buildInputs = [
16+ propagatedBuildInputs = [
1717 cudf
1818 ];
1919
pkgs/development/ocaml-modules/mirage-logs/default.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, fetchurl, buildDunePackage
22, logs, lwt, mirage-clock, mirage-profile, ptime
3−, alcotest
3+, alcotest, stdlib-shims
44}:
55
66buildDunePackage rec {
@@ -14,7 +14,7 @@ buildDunePackage rec {
1414 sha256 = "0h0amzjxy067jljscib7fvw5q8k0adqa8m86affha9hq5jsh07a1";
1515 };
1616
17− propagatedBuildInputs = [ logs lwt mirage-clock mirage-profile ptime ];
17+ propagatedBuildInputs = [ logs lwt mirage-clock mirage-profile ptime stdlib-shims ];
1818
1919 doCheck = true;
2020 checkInputs = [ alcotest ];
pkgs/development/ocaml-modules/mirage-profile/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, fetchurl, buildDunePackage
2−, ppx_cstruct
2+, ppx_cstruct, stdlib-shims
33, cstruct, lwt
44}:
55
@@ -15,7 +15,7 @@ buildDunePackage rec {
1515 };
1616
1717 buildInputs = [ ppx_cstruct ];
18− propagatedBuildInputs = [ cstruct lwt ];
18+ propagatedBuildInputs = [ cstruct lwt stdlib-shims ];
1919
2020 meta = with lib; {
2121 description = "Collect runtime profiling information in CTF format";
pkgs/development/ocaml-modules/mlgmpidl/default.nix+2−3
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 sha256 = "17xqiclaqs4hmnb92p9z6z9a1xfr31vcn8nlnj8ykk57by31vfza";
1111 };
1212
13− nativeBuildInputs = [ perl ocaml findlib mpfr camlidl ];
13+ nativeBuildInputs = [ perl ocaml findlib camlidl ];
1414 buildInputs = [ gmp mpfr ];
1515
1616 strictDeps = true;
@@ -22,8 +22,7 @@ stdenv.mkDerivation rec {
2222 ];
2323
2424 postConfigure = ''
25− sed -i Makefile \
26− -e 's|/bin/rm|rm|'
25+ substituteInPlace Makefile --replace "/bin/rm" "rm"
2726 mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs
2827 '';
2928
pkgs/development/ocaml-modules/odoc-parser/default.nix+1−1
@@ -23,7 +23,7 @@ buildDunePackage rec {
2323
2424 useDune2 = true;
2525
26− buildInputs = [ astring result ];
26+ propagatedBuildInputs = [ astring result ];
2727
2828 meta = {
2929 description = "Parser for Ocaml documentation comments";
pkgs/development/ocaml-modules/opium_kernel/default.nix+2−1
@@ -9,6 +9,7 @@
99, ezjsonm
1010, hmap
1111, sexplib
12+, fieldslib
1213}:
1314
1415buildDunePackage rec {
@@ -31,7 +32,7 @@ buildDunePackage rec {
3132 ];
3233
3334 propagatedBuildInputs = [
34− hmap cohttp-lwt ezjsonm sexplib
35+ hmap cohttp-lwt ezjsonm sexplib fieldslib
3536 ];
3637
3738 meta = {
pkgs/development/ocaml-modules/pcap-format/default.nix+2−1
@@ -1,6 +1,6 @@
11{ lib, buildDunePackage, fetchurl
22, ppx_cstruct, ppx_tools
3−, cstruct, ounit, mmap
3+, cstruct, ounit, mmap, stdlib-shims
44}:
55
66buildDunePackage rec {
@@ -24,6 +24,7 @@ buildDunePackage rec {
2424
2525 propagatedBuildInputs = [
2626 cstruct
27+ stdlib-shims
2728 ];
2829
2930 doCheck = true;
pkgs/development/ocaml-modules/pipebang/default.nix+1−1
@@ -15,7 +15,7 @@ buildOcaml rec {
1515
1616 strictDeps = true;
1717
18− buildInputs = [ camlp4 ];
18+ propagatedBuildInputs = [ camlp4 ];
1919
2020 meta = with lib; {
2121 homepage = "https://github.com/janestreet/pipebang";
pkgs/development/ocaml-modules/piqi-ocaml/default.nix+3−1
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, piqi, stdlib-shims }:
1+{ lib, stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, piqi, stdlib-shims, num }:
22
33stdenv.mkDerivation rec {
44 version = "0.7.7";
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
1515 nativeBuildInputs = [ ocaml findlib ];
1616 buildInputs = [ piqi stdlib-shims ];
1717
18+ checkInputs = [ num ];
19+
1820 strictDeps = true;
1921
2022 createFindlibDestdir = true;
pkgs/development/ocaml-modules/ppx_cstubs/default.nix+5−3
@@ -27,17 +27,19 @@ buildDunePackage rec {
2727 sha256 = "15cjb9ygnvp2kv85rrb7ncz7yalifyl7wd2hp2cl8r1qrpgi1d0w";
2828 };
2929
30− nativeBuildInputs = [ cppo ];
30+ nativeBuildInputs = [ cppo findlib ];
3131
3232 buildInputs = [
3333 bigarray-compat
3434 containers
35− ctypes
3635 integers
3736 num
3837 ppxlib
3938 re
40− findlib
39+ ];
40+
41+ propagatedBuildInputs = [
42+ ctypes
4143 ];
4244
4345 strictDeps = true;
pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix+4−2
@@ -1,5 +1,5 @@
11{ lib, fetchurl, buildDunePackage, cppo, ppx_deriving
2−, ppxlib
2+, ppxlib, dune-configurator
33}:
44
55buildDunePackage rec {
@@ -13,7 +13,9 @@ buildDunePackage rec {
1313 sha256 = "1dc1vxnkd0cnrgac5v3zbaj2lq1d2w8118mp1cmsdxylp06yz1sj";
1414 };
1515
16− buildInputs = [ cppo ppxlib ppx_deriving ];
16+ nativeBuildInputs = [ cppo ];
17+ buildInputs = [ ppxlib dune-configurator ];
18+ propagatedBuildInputs = [ ppx_deriving ];
1719
1820 meta = with lib; {
1921 homepage = "https://github.com/ocaml-ppx/ppx_deriving_protobuf";
pkgs/development/ocaml-modules/shared-memory-ring/default.nix+2
@@ -5,6 +5,7 @@
55, mirage-profile
66, cstruct
77, ounit
8+, stdlib-shims
89}:
910
1011buildDunePackage rec {
@@ -25,6 +26,7 @@ buildDunePackage rec {
2526 propagatedBuildInputs = [
2627 mirage-profile
2728 cstruct
29+ stdlib-shims
2830 ];
2931
3032 doCheck = true;
pkgs/development/ocaml-modules/ulex/default.nix+1
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
2626 createFindlibDestdir = true;
2727
2828 nativeBuildInputs = [ ocaml findlib ocamlbuild camlp4 ];
29+ propagatedBuildInputs = [ camlp4 ];
2930
3031 strictDeps = true;
3132