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

ocamlPackages.js_of_ocaml_2: remove at 2.7 & 2.8.4

Browse Source
This commit is contained in:
Vincent Laporte 2020-06-11 10:22:31 +02:00 committed by Vincent Laporte
parent ff5f776886
commit d6a4ee1193
2 changed files with 1 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,40 +0,0 @@
{ stdenv, fetchurl, ocaml, findlib, lwt, menhir, ocsigen_deriving, ppx_deriving, camlp4, ocamlbuild
, cmdliner, tyxml, reactivedata, cppo, which, base64, uchar, yojson
}:
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};
};
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;
patches = [ ./Makefile.conf.diff ];
createFindlibDestdir = true;
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";
};
}

10
pkgs/top-level/ocaml-packages.nix
View File

@ -401,15 +401,7 @@ let
jingoo = callPackage ../development/ocaml-modules/jingoo { };
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 {
base64 = base64_2;
lwt = lwt2;
};
js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml/3.0.nix { };
js_of_ocaml-camlp4 = callPackage ../development/tools/ocaml/js_of_ocaml/camlp4.nix {};