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

ocamlPackages treewide: Add missing inputs

Browse source
This commit is contained in:
Ulrik Strid 2022-03-04 11:30:58 +01:00 committed by Vincent Laporte
parent 6e30c654e1
commit 661ee6b468
18 changed files with 36 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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 , doCheck ? lib.versionAtLeast ocaml.version "4.08" && !stdenv.isAarch64
}: }:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ ocaml findlib ocamlbuild ]; nativeBuildInputs = [ ocaml findlib ocamlbuild ];
checkInputs = [ qtest ounit ]; checkInputs = [ qtest ounit qcheck ];
propagatedBuildInputs = [ num ]; propagatedBuildInputs = [ num ];
strictDeps = !doCheck; strictDeps = !doCheck;

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

@ -15,8 +15,7 @@ buildDunePackage rec {
sha256 = "2a37ffaa352a1e145ef3d80ac28661213c69a741b238623e59f29e3d5a12c537"; sha256 = "2a37ffaa352a1e145ef3d80ac28661213c69a741b238623e59f29e3d5a12c537";
}; };
buildInputs = [ ppx_sexp_conv ]; propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri logs ppx_sexp_conv ];
propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri logs ];
meta = { meta = {
description = "A network connection establishment library"; description = "A network connection establishment library";

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

@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
sha256 = "1nymykskq1yx87y4xl6hl9i4q6kv0qaq25rniqgl1bfn883p1ysc"; sha256 = "1nymykskq1yx87y4xl6hl9i4q6kv0qaq25rniqgl1bfn883p1ysc";
}; };
nativeBuildInputs = [ perl ocaml findlib ]; nativeBuildInputs = [ perl ocaml findlib camlidl ];
propagatedBuildInputs = [ apron camlidl gmp mpfr ]; propagatedBuildInputs = [ apron gmp mpfr ];
strictDeps = true; strictDeps = true;

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

@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ pkg-config ocaml findlib ]; nativeBuildInputs = [ pkg-config ocaml findlib ];
buildInputs = [ gdome2 libxslt]; buildInputs = [ libxslt ];
propagatedBuildInputs = [gdome2]; propagatedBuildInputs = [ gdome2 ];
strictDeps = true; strictDeps = true;

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

@ -15,7 +15,7 @@ buildDunePackage rec {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ core core_kernel sqlite ]; propagatedBuildInputs = [ core core_kernel sqlite ];
meta = { meta = {
description = description =

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

@ -13,7 +13,7 @@ buildDunePackage rec {
useDune2 = true; useDune2 = true;
buildInputs = [ propagatedBuildInputs = [
cudf cudf
]; ];

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

@ -1,6 +1,6 @@
{ lib, fetchurl, buildDunePackage { lib, fetchurl, buildDunePackage
, logs, lwt, mirage-clock, mirage-profile, ptime , logs, lwt, mirage-clock, mirage-profile, ptime
, alcotest , alcotest, stdlib-shims
}: }:
buildDunePackage rec { buildDunePackage rec {
@ -14,7 +14,7 @@ buildDunePackage rec {
sha256 = "0h0amzjxy067jljscib7fvw5q8k0adqa8m86affha9hq5jsh07a1"; sha256 = "0h0amzjxy067jljscib7fvw5q8k0adqa8m86affha9hq5jsh07a1";
}; };
propagatedBuildInputs = [ logs lwt mirage-clock mirage-profile ptime ]; propagatedBuildInputs = [ logs lwt mirage-clock mirage-profile ptime stdlib-shims ];
doCheck = true; doCheck = true;
checkInputs = [ alcotest ]; checkInputs = [ alcotest ];

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

@ -1,5 +1,5 @@
{ lib, fetchurl, buildDunePackage { lib, fetchurl, buildDunePackage
, ppx_cstruct , ppx_cstruct, stdlib-shims
, cstruct, lwt , cstruct, lwt
}: }:
@ -15,7 +15,7 @@ buildDunePackage rec {
}; };
buildInputs = [ ppx_cstruct ]; buildInputs = [ ppx_cstruct ];
propagatedBuildInputs = [ cstruct lwt ]; propagatedBuildInputs = [ cstruct lwt stdlib-shims ];
meta = with lib; { meta = with lib; {
description = "Collect runtime profiling information in CTF format"; description = "Collect runtime profiling information in CTF format";

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

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "17xqiclaqs4hmnb92p9z6z9a1xfr31vcn8nlnj8ykk57by31vfza"; sha256 = "17xqiclaqs4hmnb92p9z6z9a1xfr31vcn8nlnj8ykk57by31vfza";
}; };
nativeBuildInputs = [ perl ocaml findlib mpfr camlidl ]; nativeBuildInputs = [ perl ocaml findlib camlidl ];
buildInputs = [ gmp mpfr ]; buildInputs = [ gmp mpfr ];
strictDeps = true; strictDeps = true;
@ -22,8 +22,7 @@ stdenv.mkDerivation rec {
]; ];
postConfigure = '' postConfigure = ''
sed -i Makefile \ substituteInPlace Makefile --replace "/bin/rm" "rm"
-e 's|/bin/rm|rm|'
mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs
''; '';

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

@ -23,7 +23,7 @@ buildDunePackage rec {
useDune2 = true; useDune2 = true;
buildInputs = [ astring result ]; propagatedBuildInputs = [ astring result ];
meta = { meta = {
description = "Parser for Ocaml documentation comments"; description = "Parser for Ocaml documentation comments";

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

@ -9,6 +9,7 @@
, ezjsonm , ezjsonm
, hmap , hmap
, sexplib , sexplib
, fieldslib
}: }:
buildDunePackage rec { buildDunePackage rec {
@ -31,7 +32,7 @@ buildDunePackage rec {
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
hmap cohttp-lwt ezjsonm sexplib hmap cohttp-lwt ezjsonm sexplib fieldslib
]; ];
meta = { meta = {

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

@ -1,6 +1,6 @@
{ lib, buildDunePackage, fetchurl { lib, buildDunePackage, fetchurl
, ppx_cstruct, ppx_tools , ppx_cstruct, ppx_tools
, cstruct, ounit, mmap , cstruct, ounit, mmap, stdlib-shims
}: }:
buildDunePackage rec { buildDunePackage rec {
@ -24,6 +24,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
cstruct cstruct
stdlib-shims
]; ];
doCheck = true; doCheck = true;

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

@ -15,7 +15,7 @@ buildOcaml rec {
strictDeps = true; strictDeps = true;
buildInputs = [ camlp4 ]; propagatedBuildInputs = [ camlp4 ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/janestreet/pipebang"; homepage = "https://github.com/janestreet/pipebang";

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

@ -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 { stdenv.mkDerivation rec {
version = "0.7.7"; version = "0.7.7";
@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ ocaml findlib ]; nativeBuildInputs = [ ocaml findlib ];
buildInputs = [ piqi stdlib-shims ]; buildInputs = [ piqi stdlib-shims ];
checkInputs = [ num ];
strictDeps = true; strictDeps = true;
createFindlibDestdir = true; createFindlibDestdir = true;

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

@ -27,17 +27,19 @@ buildDunePackage rec {
sha256 = "15cjb9ygnvp2kv85rrb7ncz7yalifyl7wd2hp2cl8r1qrpgi1d0w"; sha256 = "15cjb9ygnvp2kv85rrb7ncz7yalifyl7wd2hp2cl8r1qrpgi1d0w";
}; };
nativeBuildInputs = [ cppo ]; nativeBuildInputs = [ cppo findlib ];
buildInputs = [ buildInputs = [
bigarray-compat bigarray-compat
containers containers
ctypes
integers integers
num num
ppxlib ppxlib
re re
findlib ];
propagatedBuildInputs = [
ctypes
]; ];
strictDeps = true; strictDeps = true;

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

@ -1,5 +1,5 @@
{ lib, fetchurl, buildDunePackage, cppo, ppx_deriving { lib, fetchurl, buildDunePackage, cppo, ppx_deriving
, ppxlib , ppxlib, dune-configurator
}: }:
buildDunePackage rec { buildDunePackage rec {
@ -13,7 +13,9 @@ buildDunePackage rec {
sha256 = "1dc1vxnkd0cnrgac5v3zbaj2lq1d2w8118mp1cmsdxylp06yz1sj"; sha256 = "1dc1vxnkd0cnrgac5v3zbaj2lq1d2w8118mp1cmsdxylp06yz1sj";
}; };
buildInputs = [ cppo ppxlib ppx_deriving ]; nativeBuildInputs = [ cppo ];
buildInputs = [ ppxlib dune-configurator ];
propagatedBuildInputs = [ ppx_deriving ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/ocaml-ppx/ppx_deriving_protobuf"; homepage = "https://github.com/ocaml-ppx/ppx_deriving_protobuf";

2
pkgs/development/ocaml-modules/shared-memory-ring/default.nix
View file

@ -5,6 +5,7 @@
, mirage-profile , mirage-profile
, cstruct , cstruct
, ounit , ounit
, stdlib-shims
}: }:
buildDunePackage rec { buildDunePackage rec {
@ -25,6 +26,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
mirage-profile mirage-profile
cstruct cstruct
stdlib-shims
]; ];
doCheck = true; doCheck = true;

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

@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
createFindlibDestdir = true; createFindlibDestdir = true;
nativeBuildInputs = [ ocaml findlib ocamlbuild camlp4 ]; nativeBuildInputs = [ ocaml findlib ocamlbuild camlp4 ];
propagatedBuildInputs = [ camlp4 ];
strictDeps = true; strictDeps = true;