Commit 3e816486 authored by Matthew Maurer's avatar Matthew Maurer
Browse files

janestreet: use Oasis 0.4.6

parent 6f5d3bec

pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix

+2 −2
Original line number Diff line number Diff line 
{ buildOcaml, opam, js_build_tools, ocaml_oasis, fetchurl } :

{ buildOcaml, opam, js_build_tools, ocaml_oasis_46, fetchurl } :



{ name, version ? "113.33.03", buildInputs ? [],

  hash ? "",
@@ -14,7 +14,7 @@ buildOcaml (args // { 


  hasSharedObjects = true;



  buildInputs = [ ocaml_oasis js_build_tools opam ] ++ buildInputs;

  buildInputs = [ ocaml_oasis_46 js_build_tools opam ] ++ buildInputs;



  dontAddPrefix = true;

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

+2 −2
Original line number Diff line number Diff line 
{stdenv, buildOcaml, fetchurl, ocaml_oasis, opam}:

{stdenv, buildOcaml, fetchurl, ocaml_oasis_46, opam}:



buildOcaml rec {

  name = "js-build-tools";
@@ -13,7 +13,7 @@ buildOcaml rec { 


  hasSharedObjects = true;



  buildInputs = [ ocaml_oasis opam ];

  buildInputs = [ ocaml_oasis_46 opam ];



  dontAddPrefix = true;

  configurePhase = "./configure --prefix $prefix";