public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocamlPackages.js_of_ocaml: 2.8.3 -> 2.8.4

Browse Source
This commit is contained in:
Vincent Laporte 2017-06-30 16:38:57 +00:00
parent f0c3e5f519
commit ea052b6f6b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/tools/ocaml/js_of_ocaml/default.nix
View File

@ -1,9 +1,9 @@
{ stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, ppx_deriving, camlp4, ocamlbuild { stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, ppx_deriving, camlp4, ocamlbuild
, cmdliner, tyxml, reactivedata, cppo, which, base64, uchar , cmdliner, tyxml, reactivedata, cppo, which, base64, uchar, yojson
}: }:
let version = if stdenv.lib.versionAtLeast ocaml.version "4.02" let version = if stdenv.lib.versionAtLeast ocaml.version "4.02"
then "2.8.3" else "2.7"; then "2.8.4" else "2.7";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -12,15 +12,15 @@ stdenv.mkDerivation {
url = "https://github.com/ocsigen/js_of_ocaml/archive/${version}.tar.gz"; url = "https://github.com/ocsigen/js_of_ocaml/archive/${version}.tar.gz";
sha256 = { sha256 = {
"2.7" = "1dali1akyd4zmkwav0d957ynxq2jj6cc94r4xiaql7ca89ajz4jj"; "2.7" = "1dali1akyd4zmkwav0d957ynxq2jj6cc94r4xiaql7ca89ajz4jj";
"2.8.3" = "0xrw215w5saqdcdd9ipjhvg8f982z63znsds9ih445s3jr49szm7"; "2.8.4" = "098ph50s9kqw6rc3qjn39zv9b5swdf4qr44afwqfkkjgjs5d7vbl";
}."${version}"; }."${version}";
}; };
buildInputs = [ ocaml findlib menhir ocsigen_deriving ocamlbuild buildInputs = [ ocaml findlib menhir ocsigen_deriving ocamlbuild
cmdliner reactivedata cppo which base64 ] cmdliner reactivedata cppo which base64 ]
++ stdenv.lib.optional (stdenv.lib.versionAtLeast ocaml.version "4.02") tyxml; ++ stdenv.lib.optionals (stdenv.lib.versionAtLeast ocaml.version "4.02") [ yojson tyxml ];
propagatedBuildInputs = [ ocaml_lwt camlp4 ppx_deriving ] propagatedBuildInputs = [ ocaml_lwt camlp4 ppx_deriving ]
++ stdenv.lib.optional (version == "2.8.3") uchar; ++ stdenv.lib.optional (version == "2.8.4") uchar;
patches = [ ./Makefile.conf.diff ]; patches = [ ./Makefile.conf.diff ];