From dbe61c96ae778f21cb9111198d68eab3088cd27c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 2 Jul 2017 15:22:04 +0000 Subject: [PATCH] ocamlPackages: make lwt-3.0.0 the default --- .../ocaml-modules/eliom/default.nix | 4 ++-- .../ocaml-modules/lambda-term/1.6.nix | 4 ++-- .../ocaml-modules/ocsigen-server/default.nix | 6 +++--- .../tools/ocaml/js_of_ocaml/default.nix | 4 ++-- pkgs/top-level/ocaml-packages.nix | 20 ++++++++++--------- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index d21bd5977ee..63e256b6095 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, - js_of_ocaml, ocaml_react, ocaml_lwt, calendar, cryptokit, tyxml, + js_of_ocaml, ocaml_react, lwt, calendar, cryptokit, tyxml, ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp, reactivedata, opam, ppx_tools, ppx_deriving, findlib , ocamlbuild @@ -22,7 +22,7 @@ stdenv.mkDerivation rec buildInputs = [ ocaml which findlib ocamlbuild ocaml_optcomp opam ppx_tools ]; - propagatedBuildInputs = [ ocaml_lwt reactivedata tyxml ipaddr ocsigen_server ppx_deriving + propagatedBuildInputs = [ lwt reactivedata tyxml ipaddr ocsigen_server ppx_deriving ocsigen_deriving js_of_ocaml calendar cryptokit ocamlnet ocaml_react ocaml_ssl ocaml_pcre ]; diff --git a/pkgs/development/ocaml-modules/lambda-term/1.6.nix b/pkgs/development/ocaml-modules/lambda-term/1.6.nix index 4638748160a..f8e79d566d4 100644 --- a/pkgs/development/ocaml-modules/lambda-term/1.6.nix +++ b/pkgs/development/ocaml-modules/lambda-term/1.6.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libev, ocaml, findlib, ocamlbuild, ocaml_lwt, ocaml_react, zed, camlp4 }: +{ stdenv, fetchurl, libev, ocaml, findlib, ocamlbuild, lwt, ocaml_react, zed, camlp4 }: stdenv.mkDerivation rec { version = "1.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1rhfixdgpylxznf6sa9wr31wb4pjzpfn5mxhxqpbchmpl2afwa09"; }; - buildInputs = [ libev ocaml findlib ocamlbuild ocaml_lwt ocaml_react ]; + buildInputs = [ libev ocaml findlib ocamlbuild lwt ocaml_react ]; propagatedBuildInputs = [ camlp4 zed ]; diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 8685097750b..1d283e5e55e 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, ocaml, findlib, which, ocaml_react, ocaml_ssl, -ocaml_lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib, +lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib, libev, openssl, ocaml_sqlite3, tree, uutf, makeWrapper, camlp4 , pgocaml }: @@ -17,7 +17,7 @@ stdenv.mkDerivation { sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy"; }; - buildInputs = [ocaml which findlib ocaml_react ocaml_ssl ocaml_lwt + buildInputs = [ocaml which findlib ocaml_react ocaml_ssl lwt ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation { '' rm -rf $out/var/run wrapProgram $out/bin/ocsigenserver \ - --prefix CAML_LD_LIBRARY_PATH : "${mkpath ocaml_ssl "ssl"}:${mkpath ocaml_lwt "lwt"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}" + --prefix CAML_LD_LIBRARY_PATH : "${mkpath ocaml_ssl "ssl"}:${mkpath lwt "lwt"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}" ''; dontPatchShebangs = true; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index ab2ef4d9c5e..23556a0edbd 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, ppx_deriving, camlp4, ocamlbuild +{ stdenv, fetchurl, ocaml, findlib, lwt, menhir, ocsigen_deriving, ppx_deriving, camlp4, ocamlbuild , cmdliner, tyxml, reactivedata, cppo, which, base64, uchar, yojson }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib menhir ocsigen_deriving ocamlbuild cmdliner reactivedata cppo which base64 ] ++ stdenv.lib.optionals (stdenv.lib.versionAtLeast ocaml.version "4.02") [ yojson tyxml ]; - propagatedBuildInputs = [ ocaml_lwt camlp4 ppx_deriving ] + propagatedBuildInputs = [ lwt camlp4 ppx_deriving ] ++ stdenv.lib.optional (version == "2.8.4") uchar; patches = [ ./Makefile.conf.diff ]; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 2a111bca291..e6a025556c2 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -129,7 +129,7 @@ let cmdliner_1_0 = callPackage ../development/ocaml-modules/cmdliner/1.0.nix { }; cohttp_p4 = callPackage ../development/ocaml-modules/cohttp/0.19.3.nix { - lwt = ocaml_lwt; + lwt = lwt2; }; cohttp = @@ -138,7 +138,7 @@ let else cohttp_p4; conduit_p4 = callPackage ../development/ocaml-modules/conduit/0.10.0.nix { - lwt = ocaml_lwt; + lwt = lwt2; }; conduit = @@ -182,7 +182,7 @@ let eff = callPackage ../development/interpreters/eff { }; - eliom = callPackage ../development/ocaml-modules/eliom { }; + eliom = callPackage ../development/ocaml-modules/eliom { lwt = lwt2; }; enumerate = callPackage ../development/ocaml-modules/enumerate { }; @@ -266,7 +266,7 @@ let pcre = ocaml_pcre; }; - js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml { }; + js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml { lwt = lwt2; }; jsonm = callPackage ../development/ocaml-modules/jsonm { }; @@ -288,7 +288,7 @@ let gtkmathview = callPackage ../development/libraries/gtkmathview { }; }; - lambdaTerm-1_6 = callPackage ../development/ocaml-modules/lambda-term/1.6.nix { }; + lambdaTerm-1_6 = callPackage ../development/ocaml-modules/lambda-term/1.6.nix { lwt = lwt2; }; lambdaTerm = if lib.versionOlder "4.02" ocaml.version then callPackage ../development/ocaml-modules/lambda-term { } @@ -302,12 +302,16 @@ let lwt = ocaml_lwt; }; + lwt2 = callPackage ../development/ocaml-modules/lwt { }; + lwt3 = if lib.versionOlder "4.02" ocaml.version then callPackage ../development/ocaml-modules/lwt { version = "3.0.0"; } else throw "lwt3 is not available for OCaml ${ocaml.version}"; + ocaml_lwt = if lib.versionOlder "4.02" ocaml.version then lwt3 else lwt2; + lwt_react = callPackage ../development/ocaml-modules/lwt_react { lwt = lwt3; }; @@ -318,7 +322,7 @@ let magick = callPackage ../development/ocaml-modules/magick { }; - markup = callPackage ../development/ocaml-modules/markup { lwt = ocaml_lwt; }; + markup = callPackage ../development/ocaml-modules/markup { lwt = lwt2; }; menhir = callPackage ../development/ocaml-modules/menhir { }; @@ -382,8 +386,6 @@ let ocamlify = callPackage ../development/tools/ocaml/ocamlify { }; - ocaml_lwt = callPackage ../development/ocaml-modules/lwt { }; - ocaml-migrate-parsetree = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree { }; ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { }; @@ -431,7 +433,7 @@ let ocplib-simplex = callPackage ../development/ocaml-modules/ocplib-simplex { }; - ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { }; + ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { lwt = lwt2; }; ocsigen-start = callPackage ../development/ocaml-modules/ocsigen-start { };