diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2019-09-06 16:02:00 +0000 |
---|---|---|
committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2019-09-14 06:54:35 +0000 |
commit | 5fed98e8626d937bb9caf6a8f23f967d69d3372a (patch) | |
tree | 2056a5b755b3e2676ae8a931adc424ae8616fd8f /pkgs/development/tools/ocaml | |
parent | 912f03d0d45d5bc9321733496e7d3b9322840938 (diff) | |
download | nixpkgs-5fed98e8626d937bb9caf6a8f23f967d69d3372a.tar nixpkgs-5fed98e8626d937bb9caf6a8f23f967d69d3372a.tar.gz nixpkgs-5fed98e8626d937bb9caf6a8f23f967d69d3372a.tar.bz2 nixpkgs-5fed98e8626d937bb9caf6a8f23f967d69d3372a.tar.lz nixpkgs-5fed98e8626d937bb9caf6a8f23f967d69d3372a.tar.xz nixpkgs-5fed98e8626d937bb9caf6a8f23f967d69d3372a.tar.zst nixpkgs-5fed98e8626d937bb9caf6a8f23f967d69d3372a.zip |
ocamlPackages.js_of_ocaml*: 3.3.0 -> 3.4.0
Ensures compatibility with OCaml 4.08
Diffstat (limited to 'pkgs/development/tools/ocaml')
-rw-r--r-- | pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index c1526892312..c449c0f9002 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -1,35 +1,26 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, dune +{ lib, fetchFromGitHub, buildDunePackage , cmdliner, cppo, yojson }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" -then throw "js_of_ocaml-compiler is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { +buildDunePackage rec { pname = "js_of_ocaml-compiler"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "ocsigen"; repo = "js_of_ocaml"; rev = version; - sha256 = "0bg8x2s3f24c8ia2g293ikd5yg0yjw3hkdgdql59c8k2amqin8f8"; + sha256 = "0c537say0f3197zn8d83nrihabrxyn28xc6d7c9c3l0vvrv6qvfj"; }; - buildInputs = [ ocaml findlib dune cmdliner cppo ]; + buildInputs = [ cmdliner cppo ]; propagatedBuildInputs = [ yojson ]; - buildPhase = "dune build -p js_of_ocaml-compiler"; - - inherit (dune) installPhase; - meta = { description = "Compiler from OCaml bytecode to Javascript"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; - inherit (ocaml.meta) platforms; }; } |