ocamlPackages treewide: Add missing inputs

2022-03-04 11:30:58 +01:00 · 2022-03-04 11:30:58 +01:00 · 661ee6b468
parent 6e30c654e1
commit 661ee6b468
18 changed files with 36 additions and 27 deletions
--- a/pkgs/development/ocaml-modules/batteries/default.nix
+++ b/pkgs/development/ocaml-modules/batteries/default.nix
@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, num, ounit
+{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, qcheck, num, ounit
 , doCheck ? lib.versionAtLeast ocaml.version "4.08" && !stdenv.isAarch64
 }:

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
  };

  nativeBuildInputs = [ ocaml findlib ocamlbuild ];
-  checkInputs = [ qtest ounit ];
+  checkInputs = [ qtest ounit qcheck ];
  propagatedBuildInputs = [ num ];

  strictDeps = !doCheck;
--- a/pkgs/development/ocaml-modules/conduit/default.nix
+++ b/pkgs/development/ocaml-modules/conduit/default.nix
@ -15,8 +15,7 @@ buildDunePackage rec {
    sha256 = "2a37ffaa352a1e145ef3d80ac28661213c69a741b238623e59f29e3d5a12c537";
  };

-  buildInputs = [ ppx_sexp_conv ];
-  propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri logs ];
+  propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri logs ppx_sexp_conv ];

  meta = {
    description = "A network connection establishment library";
--- a/pkgs/development/ocaml-modules/elina/default.nix
+++ b/pkgs/development/ocaml-modules/elina/default.nix
@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
    sha256 = "1nymykskq1yx87y4xl6hl9i4q6kv0qaq25rniqgl1bfn883p1ysc";
  };

-  nativeBuildInputs = [ perl ocaml findlib ];
+  nativeBuildInputs = [ perl ocaml findlib camlidl ];

-  propagatedBuildInputs = [ apron camlidl gmp mpfr ];
+  propagatedBuildInputs = [ apron gmp mpfr ];

  strictDeps = true;

--- a/pkgs/development/ocaml-modules/gmetadom/default.nix
+++ b/pkgs/development/ocaml-modules/gmetadom/default.nix
@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
  '';

  nativeBuildInputs = [ pkg-config ocaml findlib ];
-  buildInputs = [ gdome2 libxslt];
-  propagatedBuildInputs = [gdome2];
+  buildInputs = [ libxslt ];
+  propagatedBuildInputs = [ gdome2 ];

  strictDeps = true;

--- a/pkgs/development/ocaml-modules/hack_parallel/default.nix
+++ b/pkgs/development/ocaml-modules/hack_parallel/default.nix
@ -15,7 +15,7 @@ buildDunePackage rec {

  nativeBuildInputs = [ pkg-config ];

-  buildInputs = [ core core_kernel sqlite ];
+  propagatedBuildInputs = [ core core_kernel sqlite ];

  meta = {
    description =
--- a/pkgs/development/ocaml-modules/mccs/default.nix
+++ b/pkgs/development/ocaml-modules/mccs/default.nix
@ -13,7 +13,7 @@ buildDunePackage rec {

  useDune2 = true;

-  buildInputs = [
+  propagatedBuildInputs = [
    cudf
  ];

--- a/pkgs/development/ocaml-modules/mirage-logs/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-logs/default.nix
@ -1,6 +1,6 @@
 { lib, fetchurl, buildDunePackage
 , logs, lwt, mirage-clock, mirage-profile, ptime
-, alcotest
+, alcotest, stdlib-shims
 }:

 buildDunePackage rec {
@ -14,7 +14,7 @@ buildDunePackage rec {
    sha256 = "0h0amzjxy067jljscib7fvw5q8k0adqa8m86affha9hq5jsh07a1";
  };

-  propagatedBuildInputs = [ logs lwt mirage-clock mirage-profile ptime ];
+  propagatedBuildInputs = [ logs lwt mirage-clock mirage-profile ptime stdlib-shims ];

  doCheck = true;
  checkInputs = [ alcotest ];
--- a/pkgs/development/ocaml-modules/mirage-profile/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-profile/default.nix
@ -1,5 +1,5 @@
 { lib, fetchurl, buildDunePackage
-, ppx_cstruct
+, ppx_cstruct, stdlib-shims
 , cstruct, lwt
 }:

@ -15,7 +15,7 @@ buildDunePackage rec {
  };

  buildInputs = [ ppx_cstruct ];
-  propagatedBuildInputs = [ cstruct lwt ];
+  propagatedBuildInputs = [ cstruct lwt stdlib-shims ];

  meta = with lib; {
    description = "Collect runtime profiling information in CTF format";
--- a/pkgs/development/ocaml-modules/mlgmpidl/default.nix
+++ b/pkgs/development/ocaml-modules/mlgmpidl/default.nix
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
    sha256 = "17xqiclaqs4hmnb92p9z6z9a1xfr31vcn8nlnj8ykk57by31vfza";
  };

-  nativeBuildInputs = [ perl ocaml findlib mpfr camlidl ];
+  nativeBuildInputs = [ perl ocaml findlib camlidl ];
  buildInputs = [ gmp mpfr ];

  strictDeps = true;
@ -22,8 +22,7 @@ stdenv.mkDerivation rec {
  ];

  postConfigure = ''
-    sed -i Makefile \
-      -e 's|/bin/rm|rm|'
+    substituteInPlace Makefile --replace "/bin/rm" "rm"
    mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs
  '';

--- a/pkgs/development/ocaml-modules/odoc-parser/default.nix
+++ b/pkgs/development/ocaml-modules/odoc-parser/default.nix
@ -23,7 +23,7 @@ buildDunePackage rec {

  useDune2 = true;

-  buildInputs = [ astring result ];
+  propagatedBuildInputs = [ astring result ];

  meta = {
    description = "Parser for Ocaml documentation comments";
--- a/pkgs/development/ocaml-modules/opium_kernel/default.nix
+++ b/pkgs/development/ocaml-modules/opium_kernel/default.nix
@ -9,6 +9,7 @@
 , ezjsonm
 , hmap
 , sexplib
+, fieldslib
 }:

 buildDunePackage rec {
@ -31,7 +32,7 @@ buildDunePackage rec {
  ];

  propagatedBuildInputs = [
-    hmap cohttp-lwt ezjsonm sexplib
+    hmap cohttp-lwt ezjsonm sexplib fieldslib
  ];

  meta = {
--- a/pkgs/development/ocaml-modules/pcap-format/default.nix
+++ b/pkgs/development/ocaml-modules/pcap-format/default.nix
@ -1,6 +1,6 @@
 { lib, buildDunePackage, fetchurl
 , ppx_cstruct, ppx_tools
-, cstruct, ounit, mmap
+, cstruct, ounit, mmap, stdlib-shims
 }:

 buildDunePackage rec {
@ -24,6 +24,7 @@ buildDunePackage rec {

  propagatedBuildInputs = [
    cstruct
+    stdlib-shims
  ];

  doCheck = true;
--- a/pkgs/development/ocaml-modules/pipebang/default.nix
+++ b/pkgs/development/ocaml-modules/pipebang/default.nix
@ -15,7 +15,7 @@ buildOcaml rec {

  strictDeps = true;

-  buildInputs = [ camlp4 ];
+  propagatedBuildInputs = [ camlp4 ];

  meta = with lib; {
    homepage = "https://github.com/janestreet/pipebang";
--- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
+++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, piqi, stdlib-shims }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, piqi, stdlib-shims, num }:

 stdenv.mkDerivation rec {
  version = "0.7.7";
@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ ocaml findlib ];
  buildInputs = [ piqi stdlib-shims ];

+  checkInputs  = [ num ];
+
  strictDeps = true;

  createFindlibDestdir = true;
--- a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix
@ -27,17 +27,19 @@ buildDunePackage rec {
    sha256 = "15cjb9ygnvp2kv85rrb7ncz7yalifyl7wd2hp2cl8r1qrpgi1d0w";
  };

-  nativeBuildInputs = [ cppo ];
+  nativeBuildInputs = [ cppo findlib ];

  buildInputs = [
    bigarray-compat
    containers
-    ctypes
    integers
    num
    ppxlib
    re
-    findlib
+  ];
+
+  propagatedBuildInputs = [
+    ctypes
  ];

  strictDeps = true;
--- a/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix
@ -1,5 +1,5 @@
 { lib, fetchurl, buildDunePackage, cppo, ppx_deriving
-, ppxlib
+, ppxlib, dune-configurator
 }:

 buildDunePackage rec {
@ -13,7 +13,9 @@ buildDunePackage rec {
    sha256 = "1dc1vxnkd0cnrgac5v3zbaj2lq1d2w8118mp1cmsdxylp06yz1sj";
  };

-  buildInputs = [ cppo ppxlib ppx_deriving ];
+  nativeBuildInputs = [ cppo ];
+  buildInputs = [ ppxlib dune-configurator ];
+  propagatedBuildInputs = [ ppx_deriving ];

  meta = with lib; {
    homepage = "https://github.com/ocaml-ppx/ppx_deriving_protobuf";
--- a/pkgs/development/ocaml-modules/shared-memory-ring/default.nix
+++ b/pkgs/development/ocaml-modules/shared-memory-ring/default.nix
@ -5,6 +5,7 @@
 , mirage-profile
 , cstruct
 , ounit
+, stdlib-shims
 }:

 buildDunePackage rec {
@ -25,6 +26,7 @@ buildDunePackage rec {
  propagatedBuildInputs = [
    mirage-profile
    cstruct
+    stdlib-shims
  ];

  doCheck = true;
--- a/pkgs/development/ocaml-modules/ulex/default.nix
+++ b/pkgs/development/ocaml-modules/ulex/default.nix
@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
  createFindlibDestdir = true;

  nativeBuildInputs = [ ocaml findlib ocamlbuild camlp4 ];
+  propagatedBuildInputs = [ camlp4 ];

  strictDeps = true;