diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-07-21 15:41:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 15:41:22 +0100 |
| commit | 218298b30fe79be30716438a1906d1abd61b9377 (patch) | |
| tree | 65e0041ee5468689142d669c4c4fc4f73f3618ba /pkgs/development/tools/ocaml | |
| parent | cd6e2c9642b8e608c905f350cece21141435deef (diff) | |
| parent | e85db6863a546cfdde0150f03ed0d2db28992575 (diff) | |
| download | nixlib-218298b30fe79be30716438a1906d1abd61b9377.tar nixlib-218298b30fe79be30716438a1906d1abd61b9377.tar.gz nixlib-218298b30fe79be30716438a1906d1abd61b9377.tar.bz2 nixlib-218298b30fe79be30716438a1906d1abd61b9377.tar.lz nixlib-218298b30fe79be30716438a1906d1abd61b9377.tar.xz nixlib-218298b30fe79be30716438a1906d1abd61b9377.tar.zst nixlib-218298b30fe79be30716438a1906d1abd61b9377.zip | |
Merge branch 'master' into unused5
Diffstat (limited to 'pkgs/development/tools/ocaml')
| -rw-r--r-- | pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index 6d269552f628..798013045955 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -8,13 +8,13 @@ else stdenv.mkDerivation rec { name = "js_of_ocaml-compiler-${version}"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "ocsigen"; repo = "js_of_ocaml"; rev = version; - sha256 = "17a0kb39bcx2qq41cq7kjrxghm67l1yahrs47yakgb1avna0pqd9"; + sha256 = "0dxxdxgrbg9xvvi3i627krnk6rb1ja0ypp2diwdkpnmy45wak9lv"; }; buildInputs = [ ocaml findlib jbuilder cmdliner cppo ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix index 31a5c3ea17bb..5ec8cca344d4 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix @@ -1,6 +1,6 @@ { stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler, js_of_ocaml-ppx , ocaml-migrate-parsetree, ppx_tools_versioned -, js_of_ocaml, ocaml_lwt +, js_of_ocaml, ocaml_lwt, lwt_log }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib jbuilder js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ]; - propagatedBuildInputs = [ js_of_ocaml ocaml_lwt ]; + propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ]; buildPhase = "jbuilder build -p js_of_ocaml-lwt"; } |