diff options
Diffstat (limited to 'nixpkgs/pkgs/development/ocaml-modules/janestreet')
3 files changed, 6 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix index 23f2cb5cd651..8f7262b47760 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -514,7 +514,8 @@ with self; ppx_js_style = janePackage { pname = "ppx_js_style"; - hash = "1ahk4mv63s9cw8ji62598ggw6b3lqpaljqa2ya7w91lify3lb76q"; + version = "0.14.1"; + hash = "16ax6ww9h36xyn9acbm8zxv0ajs344sm37lgj2zd2bvgsqv24kxj"; minimumOCamlVersion = "4.04.2"; meta.description = "Code style checker for Jane Street Packages"; propagatedBuildInputs = [ octavius ppxlib ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix index fdb0d8034e69..62876e5eaf94 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix @@ -17,6 +17,8 @@ buildOcaml (args // { buildInputs = [ ocaml_oasis js_build_tools opaline ] ++ buildInputs; dontAddPrefix = true; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; configurePhase = "./configure --prefix $out"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix index ff03c209190d..2f68ee8230e7 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix @@ -16,6 +16,8 @@ buildOcaml rec { buildInputs = [ ocaml_oasis opaline ]; dontAddPrefix = true; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; configurePhase = "./configure --prefix $prefix"; installPhase = "opaline -prefix $prefix -libdir $OCAMLFIND_DESTDIR ${name}.install"; |