diff options
Diffstat (limited to 'pkgs/development/tools/ocaml')
-rw-r--r-- | pkgs/development/tools/ocaml/dune/2.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix | 18 | ||||
-rw-r--r-- | pkgs/development/tools/ocaml/js_of_ocaml/default.nix | 42 | ||||
-rw-r--r-- | pkgs/development/tools/ocaml/merlin/default.nix | 4 |
4 files changed, 14 insertions, 54 deletions
diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index 37f277686702..ac3b7f2a4299 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.5.1"; + version = "2.6.0"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "0az5ih18wadsp3ljagvws1i7vf0vpg24h75ariy0v3i0gyld6xwg"; + sha256 = "1hvgj78xqqqph8dwn1jjkjp8bpppvwzx33lzkvwh5wn5zd4xij8j"; }; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix b/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix deleted file mode 100644 index 9ca6ca67421f..000000000000 --- a/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler -, ocaml-migrate-parsetree, ppx_tools_versioned, uchar -}: - -stdenv.mkDerivation { - pname = "js_of_ocaml"; - - inherit (js_of_ocaml-compiler) version src installPhase meta; - - buildInputs = [ findlib ocaml-migrate-parsetree ppx_tools_versioned ]; - nativeBuildInputs = [ ocaml findlib dune ]; - - postPatch = "patchShebangs lib/generate_stubs.sh"; - - propagatedBuildInputs = [ js_of_ocaml-compiler uchar ]; - - buildPhase = "dune build -p js_of_ocaml"; -} diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index 7f6426c9610d..9ca6ca67421f 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -1,40 +1,18 @@ -{ stdenv, fetchurl, ocaml, findlib, lwt, menhir, ocsigen_deriving, ppx_deriving, camlp4, ocamlbuild -, cmdliner, tyxml, reactivedata, cppo, which, base64, uchar, yojson +{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler +, ocaml-migrate-parsetree, ppx_tools_versioned, uchar }: -let version = if stdenv.lib.versionAtLeast ocaml.version "4.02" - then "2.8.4" else "2.7"; -in - stdenv.mkDerivation { - pname = "js_of_ocaml"; - inherit version; - src = fetchurl { - url = "https://github.com/ocsigen/js_of_ocaml/archive/${version}.tar.gz"; - sha256 = { - "2.7" = "1dali1akyd4zmkwav0d957ynxq2jj6cc94r4xiaql7ca89ajz4jj"; - "2.8.4" = "098ph50s9kqw6rc3qjn39zv9b5swdf4qr44afwqfkkjgjs5d7vbl"; - }.${version}; - }; + pname = "js_of_ocaml"; + + inherit (js_of_ocaml-compiler) version src installPhase meta; - 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 = [ lwt camlp4 ppx_deriving ] - ++ stdenv.lib.optional (version == "2.8.4") uchar; + buildInputs = [ findlib ocaml-migrate-parsetree ppx_tools_versioned ]; + nativeBuildInputs = [ ocaml findlib dune ]; - patches = [ ./Makefile.conf.diff ]; + postPatch = "patchShebangs lib/generate_stubs.sh"; - createFindlibDestdir = true; + propagatedBuildInputs = [ js_of_ocaml-compiler uchar ]; - meta = with stdenv.lib; { - homepage = "http://ocsigen.org/js_of_ocaml/"; - description = "Compiler of OCaml bytecode to Javascript. It makes it possible to run Ocaml programs in a Web browser"; - license = licenses.lgpl2; - platforms = ocaml.meta.platforms or []; - maintainers = [ - maintainers.gal_bolle - ]; - broken = versionAtLeast ocaml.version "4.05"; - }; + buildPhase = "dune build -p js_of_ocaml"; } diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index fa78e47951f3..4b11dd13983d 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "merlin"; - version = "3.3.4"; + version = "3.3.6"; minimumOCamlVersion = "4.02.1"; src = fetchurl { url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz"; - sha256 = "12wxric6n3rmsn0w16xm8vjd8p5aw24cj76zw2x87qfwwgmy1kdd"; + sha256 = "1360cm0jkn2v2y5p3yzdyw9661a1vpddcibkbfblmk95qafx4civ"; }; buildInputs = [ yojson ]; |