Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
ocamlPackages: use dune 2 if pkg (indirectly) depends on cohttp-lwt-unix
dune refuses to build a package if one of its dependencies uses dune 2.
  • Loading branch information
sternenseemann committed Jun 25, 2020
1 parent 8e368f7 commit 999f5a4
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 0 deletions.
2 changes: 2 additions & 0 deletions pkgs/development/ocaml-modules/curly/default.nix
Expand Up @@ -7,6 +7,8 @@ buildDunePackage rec {

minimumOCamlVersion = "4.02";

useDune2 = true;

src = fetchFromGitHub {
owner = "rgrinberg";
repo = pname;
Expand Down
2 changes: 2 additions & 0 deletions pkgs/development/ocaml-modules/git-unix/default.nix
Expand Up @@ -4,6 +4,8 @@ buildDunePackage {
pname = "git-unix";
inherit (git-http) version src;

useDune2 = true;

buildInputs = [ cmdliner mtime ];
propagatedBuildInputs = [ cohttp-lwt-unix git-http tls ];

Expand Down
2 changes: 2 additions & 0 deletions pkgs/development/ocaml-modules/graphql/cohttp.nix
Expand Up @@ -8,6 +8,8 @@ buildDunePackage rec {

inherit (graphql) version src;

useDune2 = true;

nativeBuildInputs = [ ocaml-crunch ];
propagatedBuildInputs = [ astring cohttp digestif graphql ocplib-endian ];

Expand Down
2 changes: 2 additions & 0 deletions pkgs/development/ocaml-modules/irmin/git.nix
Expand Up @@ -6,6 +6,8 @@ buildDunePackage rec {

inherit (irmin) version src;

useDune2 = true;

propagatedBuildInputs = [ git irmin ];

checkInputs = lib.optionals doCheck [ git-unix irmin-mem irmin-test ];
Expand Down
2 changes: 2 additions & 0 deletions pkgs/development/ocaml-modules/irmin/graphql.nix
Expand Up @@ -6,6 +6,8 @@ buildDunePackage rec {

inherit (irmin) version src;

useDune2 = true;

propagatedBuildInputs = [ cohttp-lwt graphql-cohttp graphql-lwt irmin ];

doCheck = true;
Expand Down
2 changes: 2 additions & 0 deletions pkgs/development/ocaml-modules/irmin/http.nix
Expand Up @@ -8,6 +8,8 @@ buildDunePackage rec {

inherit (irmin) version src;

useDune2 = true;

propagatedBuildInputs = [ cohttp-lwt irmin webmachine ];

checkInputs = lib.optionals doCheck [ checkseum git-unix irmin-git irmin-mem irmin-test ];
Expand Down
2 changes: 2 additions & 0 deletions pkgs/development/ocaml-modules/irmin/ppx.nix
Expand Up @@ -5,6 +5,8 @@ buildDunePackage {

inherit (irmin) version src minimumOCamlVersion;

useDune2 = true;

buildInputs = [ ocaml-syntax-shims ];
propagatedBuildInputs = [ ppxlib ];

Expand Down
2 changes: 2 additions & 0 deletions pkgs/development/ocaml-modules/irmin/unix.nix
Expand Up @@ -10,6 +10,8 @@ buildDunePackage rec {

inherit (irmin) version src;

useDune2 = true;

propagatedBuildInputs = [ checkseum cmdliner git-unix yaml
irmin irmin-fs irmin-git irmin-graphql irmin-http irmin-mem irmin-pack irmin-watcher
];
Expand Down
2 changes: 2 additions & 0 deletions pkgs/development/ocaml-modules/opium/default.nix
Expand Up @@ -17,6 +17,8 @@ buildDunePackage {
pname = "opium";
inherit (opium_kernel) version src meta minimumOCamlVersion;

useDune2 = true;

doCheck = true;

buildInputs = [
Expand Down

0 comments on commit 999f5a4

Please sign in to comment.