diff --git a/pkgs/development/ocaml-modules/hxd/default.nix b/pkgs/development/ocaml-modules/hxd/default.nix index d3a8ce7a85bd2..de60667327b41 100644 --- a/pkgs/development/ocaml-modules/hxd/default.nix +++ b/pkgs/development/ocaml-modules/hxd/default.nix @@ -23,6 +23,10 @@ buildDunePackage rec { doCheck = true; + preCheck = '' + export DUNE_CACHE=disabled + ''; + meta = with lib; { description = "Hexdump in OCaml"; homepage = "https://github.com/dinosaure/hxd"; diff --git a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix index 74ca96b18661f..7d1c2d49d7781 100644 --- a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage, logs, zarith }: +{ lib, fetchFromGitHub, fetchpatch, buildDunePackage, logs, zarith }: buildDunePackage rec { pname = "ocplib-simplex"; @@ -11,6 +11,13 @@ buildDunePackage rec { hash = "sha256-fLTht+TlyJIsIAsRLmmkFKsnbSeW3BgyAyURFdnGfko="; }; + # Fix tests with dune 3.17.0 + # See https://github.com/OCamlPro/ocplib-simplex/issues/35 + patches = (fetchpatch { + url = "https://github.com/OCamlPro/ocplib-simplex/commit/456a744bddd397daade7959d4a49cfadafdadd33.patch"; + hash = "sha256-tQUXOoRGe1AIzHcm6j2MopROxn75OE9YUP+CwcKUbVg="; + }); + propagatedBuildInputs = [ logs zarith ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/reason-react/default.nix b/pkgs/development/ocaml-modules/reason-react/default.nix index 340b0c1c27b13..a447c3172d60b 100644 --- a/pkgs/development/ocaml-modules/reason-react/default.nix +++ b/pkgs/development/ocaml-modules/reason-react/default.nix @@ -17,6 +17,11 @@ buildDunePackage { melange ]; doCheck = true; + # Fix tests with dune 3.17.0 + # See https://github.com/reasonml/reason-react/issues/870 + preCheck = '' + export DUNE_CACHE=disabled + ''; meta = reason-react-ppx.meta // { description = "Reason bindings for React.js"; }; diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix index 289f81af57023..0cadd4fb20e06 100644 --- a/pkgs/development/tools/ocaml/dune/3.nix +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "3.16.1"; + version = "3.17.0"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - hash = "sha256-t4GuIPh2E8KhG9BxeAngBHDILWFeFSZPmmTgMwUaw94="; + hash = "sha256-LDqmxB7Tnj1sGiktdfSAa9gDEIQa/FFnOqWc6cgWUHw="; }; nativeBuildInputs = [ ocaml findlib ];