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

janestreet: use Oasis 0.4.6

Browse Source
This commit is contained in:
Matthew Maurer 2016-09-24 13:08:51 -04:00
parent 6f5d3bec32
commit 3e81648645
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix
View File

@ -1,4 +1,4 @@
{ buildOcaml, opam, js_build_tools, ocaml_oasis, fetchurl } : { buildOcaml, opam, js_build_tools, ocaml_oasis_46, fetchurl } :
{ name, version ? "113.33.03", buildInputs ? [], { name, version ? "113.33.03", buildInputs ? [],
hash ? "", hash ? "",
@ -14,7 +14,7 @@ buildOcaml (args // {
hasSharedObjects = true; hasSharedObjects = true;
buildInputs = [ ocaml_oasis js_build_tools opam ] ++ buildInputs; buildInputs = [ ocaml_oasis_46 js_build_tools opam ] ++ buildInputs;
dontAddPrefix = true; dontAddPrefix = true;

4
pkgs/development/ocaml-modules/janestreet/js-build-tools.nix
View File

@ -1,4 +1,4 @@
{stdenv, buildOcaml, fetchurl, ocaml_oasis, opam}: {stdenv, buildOcaml, fetchurl, ocaml_oasis_46, opam}:
buildOcaml rec { buildOcaml rec {
name = "js-build-tools"; name = "js-build-tools";
@ -13,7 +13,7 @@ buildOcaml rec {
hasSharedObjects = true; hasSharedObjects = true;
buildInputs = [ ocaml_oasis opam ]; buildInputs = [ ocaml_oasis_46 opam ];
dontAddPrefix = true; dontAddPrefix = true;
configurePhase = "./configure --prefix $prefix"; configurePhase = "./configure --prefix $prefix";