lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

ocamlPackages: make lwt-3.0.0 the default

+20 -18
+2 -2
pkgs/development/ocaml-modules/eliom/default.nix
··· 1 1 { stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, 2 - js_of_ocaml, ocaml_react, ocaml_lwt, calendar, cryptokit, tyxml, 2 + js_of_ocaml, ocaml_react, lwt, calendar, cryptokit, tyxml, 3 3 ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp, 4 4 reactivedata, opam, ppx_tools, ppx_deriving, findlib 5 5 , ocamlbuild ··· 22 22 23 23 buildInputs = [ ocaml which findlib ocamlbuild ocaml_optcomp opam ppx_tools ]; 24 24 25 - propagatedBuildInputs = [ ocaml_lwt reactivedata tyxml ipaddr ocsigen_server ppx_deriving 25 + propagatedBuildInputs = [ lwt reactivedata tyxml ipaddr ocsigen_server ppx_deriving 26 26 ocsigen_deriving js_of_ocaml 27 27 calendar cryptokit ocamlnet ocaml_react ocaml_ssl ocaml_pcre ]; 28 28
+2 -2
pkgs/development/ocaml-modules/lambda-term/1.6.nix
··· 1 - { stdenv, fetchurl, libev, ocaml, findlib, ocamlbuild, ocaml_lwt, ocaml_react, zed, camlp4 }: 1 + { stdenv, fetchurl, libev, ocaml, findlib, ocamlbuild, lwt, ocaml_react, zed, camlp4 }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 version = "1.6"; ··· 9 9 sha256 = "1rhfixdgpylxznf6sa9wr31wb4pjzpfn5mxhxqpbchmpl2afwa09"; 10 10 }; 11 11 12 - buildInputs = [ libev ocaml findlib ocamlbuild ocaml_lwt ocaml_react ]; 12 + buildInputs = [ libev ocaml findlib ocamlbuild lwt ocaml_react ]; 13 13 14 14 propagatedBuildInputs = [ camlp4 zed ]; 15 15
+3 -3
pkgs/development/ocaml-modules/ocsigen-server/default.nix
··· 1 1 {stdenv, fetchurl, ocaml, findlib, which, ocaml_react, ocaml_ssl, 2 - ocaml_lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib, 2 + lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib, 3 3 libev, openssl, ocaml_sqlite3, tree, uutf, makeWrapper, camlp4 4 4 , pgocaml 5 5 }: ··· 17 17 sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy"; 18 18 }; 19 19 20 - buildInputs = [ocaml which findlib ocaml_react ocaml_ssl ocaml_lwt 20 + buildInputs = [ocaml which findlib ocaml_react ocaml_ssl lwt 21 21 ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl 22 22 ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml ]; 23 23 ··· 31 31 '' 32 32 rm -rf $out/var/run 33 33 wrapProgram $out/bin/ocsigenserver \ 34 - --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"}" 34 + --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"}" 35 35 ''; 36 36 37 37 dontPatchShebangs = true;
+2 -2
pkgs/development/tools/ocaml/js_of_ocaml/default.nix
··· 1 - { stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, ppx_deriving, camlp4, ocamlbuild 1 + { stdenv, fetchurl, ocaml, findlib, lwt, menhir, ocsigen_deriving, ppx_deriving, camlp4, ocamlbuild 2 2 , cmdliner, tyxml, reactivedata, cppo, which, base64, uchar, yojson 3 3 }: 4 4 ··· 19 19 buildInputs = [ ocaml findlib menhir ocsigen_deriving ocamlbuild 20 20 cmdliner reactivedata cppo which base64 ] 21 21 ++ stdenv.lib.optionals (stdenv.lib.versionAtLeast ocaml.version "4.02") [ yojson tyxml ]; 22 - propagatedBuildInputs = [ ocaml_lwt camlp4 ppx_deriving ] 22 + propagatedBuildInputs = [ lwt camlp4 ppx_deriving ] 23 23 ++ stdenv.lib.optional (version == "2.8.4") uchar; 24 24 25 25 patches = [ ./Makefile.conf.diff ];
+11 -9
pkgs/top-level/ocaml-packages.nix
··· 129 129 cmdliner_1_0 = callPackage ../development/ocaml-modules/cmdliner/1.0.nix { }; 130 130 131 131 cohttp_p4 = callPackage ../development/ocaml-modules/cohttp/0.19.3.nix { 132 - lwt = ocaml_lwt; 132 + lwt = lwt2; 133 133 }; 134 134 135 135 cohttp = ··· 138 138 else cohttp_p4; 139 139 140 140 conduit_p4 = callPackage ../development/ocaml-modules/conduit/0.10.0.nix { 141 - lwt = ocaml_lwt; 141 + lwt = lwt2; 142 142 }; 143 143 144 144 conduit = ··· 182 182 183 183 eff = callPackage ../development/interpreters/eff { }; 184 184 185 - eliom = callPackage ../development/ocaml-modules/eliom { }; 185 + eliom = callPackage ../development/ocaml-modules/eliom { lwt = lwt2; }; 186 186 187 187 enumerate = callPackage ../development/ocaml-modules/enumerate { }; 188 188 ··· 266 266 pcre = ocaml_pcre; 267 267 }; 268 268 269 - js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml { }; 269 + js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml { lwt = lwt2; }; 270 270 271 271 jsonm = callPackage ../development/ocaml-modules/jsonm { }; 272 272 ··· 288 288 gtkmathview = callPackage ../development/libraries/gtkmathview { }; 289 289 }; 290 290 291 - lambdaTerm-1_6 = callPackage ../development/ocaml-modules/lambda-term/1.6.nix { }; 291 + lambdaTerm-1_6 = callPackage ../development/ocaml-modules/lambda-term/1.6.nix { lwt = lwt2; }; 292 292 lambdaTerm = 293 293 if lib.versionOlder "4.02" ocaml.version 294 294 then callPackage ../development/ocaml-modules/lambda-term { } ··· 302 302 lwt = ocaml_lwt; 303 303 }; 304 304 305 + lwt2 = callPackage ../development/ocaml-modules/lwt { }; 306 + 305 307 lwt3 = if lib.versionOlder "4.02" ocaml.version 306 308 then callPackage ../development/ocaml-modules/lwt { 307 309 version = "3.0.0"; 308 310 } 309 311 else throw "lwt3 is not available for OCaml ${ocaml.version}"; 312 + 313 + ocaml_lwt = if lib.versionOlder "4.02" ocaml.version then lwt3 else lwt2; 310 314 311 315 lwt_react = callPackage ../development/ocaml-modules/lwt_react { 312 316 lwt = lwt3; ··· 318 322 319 323 magick = callPackage ../development/ocaml-modules/magick { }; 320 324 321 - markup = callPackage ../development/ocaml-modules/markup { lwt = ocaml_lwt; }; 325 + markup = callPackage ../development/ocaml-modules/markup { lwt = lwt2; }; 322 326 323 327 menhir = callPackage ../development/ocaml-modules/menhir { }; 324 328 ··· 382 386 383 387 ocamlify = callPackage ../development/tools/ocaml/ocamlify { }; 384 388 385 - ocaml_lwt = callPackage ../development/ocaml-modules/lwt { }; 386 - 387 389 ocaml-migrate-parsetree = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree { }; 388 390 389 391 ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { }; ··· 431 433 432 434 ocplib-simplex = callPackage ../development/ocaml-modules/ocplib-simplex { }; 433 435 434 - ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { }; 436 + ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { lwt = lwt2; }; 435 437 436 438 ocsigen-start = callPackage ../development/ocaml-modules/ocsigen-start { }; 437 439