update jsoo for 5.3, happy-eyeballs, ppx_expect (#1706)

nix-ocaml · Oct 13, 2024 · 99b4da0 · 99b4da0
1 parent e2fae0a
commit 99b4da0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/ocaml/default.nix b/ocaml/default.nix
@@ -1046,6 +1046,13 @@ with oself;
  nativeBuildInputs = [ cppo ];
  };
 
+ happy-eyeballs = osuper.happy-eyeballs.overrideAttrs (_: {
+ src = builtins.fetchurl {
+ url = "https://github.com/robur-coop/happy-eyeballs/releases/download/v1.2.2/happy-eyeballs-1.2.2.tbz";
+ sha256 = "1brfclji1gamana57n8mnvpbj89zgjm7x7d866qbkhhc0ikh4p8a";
+ };
+ });
+
  hdr_histogram = buildDunePackage {
  pname = "hdr_histogram";
  version = "0.0.3";
@@ -1201,6 +1208,15 @@ with oself;
 
  jose = callPackage ./jose { };
 
+ js_of_ocaml-compiler = osuper.js_of_ocaml-compiler.overrideAttrs (_: {
+ src = fetchFromGitHub {
+ owner = "ocsigen";
+ repo = "js_of_ocaml";
+ rev = "95dafb1ad45c6ede3e7ff7ca278b93dd372f466c";
+ hash = "sha256-gB7uE8Kxaoi0n5FH3P5UNM+PrPLc4XQfsuOtFibSPsY=";
+ };
+ });
+
  jsonrpc = osuper.jsonrpc.overrideAttrs (o: {
  src =
  if lib.versionOlder "5.3" ocaml.version then

diff --git a/ocaml/janestreet-0.17.nix b/ocaml/janestreet-0.17.nix
@@ -1540,7 +1540,8 @@ in
 
  ppx_expect = (janePackage {
  pname = "ppx_expect";
- hash = "sha256-m4Nr48ZET632I6vw5RjpNA0elW3lpN3aPmfA3RzsEn8=";
+ version = "0.17.1";
+ hash = "sha256-Fx4COazc8yd/y+3eI6sGTPbJLEDsn3GnWKgqpSjitiY=";
  minimalOCamlVersion = "4.14";
  meta.description = "Cram like framework for OCaml";
  propagatedBuildInputs = [ base ppx_here ppx_inline_test stdio re ppx_compare ];