diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-08-27 14:44:39 +0000 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-08-27 14:55:12 +0000 |
| commit | 935e991b724b096d78571c22d735dcbc8894515b (patch) | |
| tree | 5a4f414cb93d52a596b45e99511dc385be24c19f /pkgs/top-level/ocaml-packages.nix | |
| parent | 4b1a1c1846b1b673f53728a02617a39ea6907006 (diff) | |
| download | nixpkgs-935e991b724b096d78571c22d735dcbc8894515b.tar nixpkgs-935e991b724b096d78571c22d735dcbc8894515b.tar.gz nixpkgs-935e991b724b096d78571c22d735dcbc8894515b.tar.bz2 nixpkgs-935e991b724b096d78571c22d735dcbc8894515b.tar.lz nixpkgs-935e991b724b096d78571c22d735dcbc8894515b.tar.xz nixpkgs-935e991b724b096d78571c22d735dcbc8894515b.tar.zst nixpkgs-935e991b724b096d78571c22d735dcbc8894515b.zip | |
js_of_ocaml: 2.8.4 -> 3.0.0
js_of_ocaml-camlp4: init at 3.0.0 js_of_ocaml-ppx: init at 3.0.0
Diffstat (limited to 'pkgs/top-level/ocaml-packages.nix')
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 509d50ce986..ba75adb77d0 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -182,7 +182,10 @@ let eff = callPackage ../development/interpreters/eff { }; - eliom = callPackage ../development/ocaml-modules/eliom { lwt = lwt2; }; + eliom = callPackage ../development/ocaml-modules/eliom { + lwt = lwt2; + js_of_ocaml = js_of_ocaml_2; + }; enumerate = callPackage ../development/ocaml-modules/enumerate { }; @@ -270,12 +273,21 @@ let pcre = ocaml_pcre; }; - js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml { lwt = lwt2; }; + js_of_ocaml = + if lib.versionOlder "4.02" ocaml.version + then callPackage ../development/tools/ocaml/js_of_ocaml/3.0.nix { } + else js_of_ocaml_2; + + js_of_ocaml_2 = callPackage ../development/tools/ocaml/js_of_ocaml { lwt = lwt2; }; + + js_of_ocaml-camlp4 = callPackage ../development/tools/ocaml/js_of_ocaml/camlp4.nix {}; js_of_ocaml-compiler = callPackage ../development/tools/ocaml/js_of_ocaml/compiler.nix {}; js_of_ocaml-ocamlbuild = callPackage ../development/tools/ocaml/js_of_ocaml/ocamlbuild.nix {}; + js_of_ocaml-ppx = callPackage ../development/tools/ocaml/js_of_ocaml/ppx.nix {}; + jsonm = callPackage ../development/ocaml-modules/jsonm { }; lablgl = callPackage ../development/ocaml-modules/lablgl { }; |