Skip to content

Commit

Permalink
update network stack and ocaml 5.1.1 (#1118)
Browse files Browse the repository at this point in the history
  • Loading branch information
anmonteiro authored Oct 19, 2023
1 parent 2d3c13d commit 57c3328
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 10 deletions.
4 changes: 2 additions & 2 deletions ocaml/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1280,8 +1280,8 @@ with oself;

mirage-logs = osuper.mirage-logs.overrideAttrs (_: {
src = builtins.fetchurl {
url = https://github.com/mirage/mirage-logs/releases/download/v2.0.0/mirage-logs-2.0.0.tbz;
sha256 = "086x45sijjldg1vcvf7lq23fqxrl8mbbp2ym8hja7gl6m9j759pj";
url = https://github.com/mirage/mirage-logs/releases/download/v2.1.0/mirage-logs-2.1.0.tbz;
sha256 = "1fww8q0an84wiqfwycqlv9chc52a9apf6swbiqk28h1v1jrc52mf";
};
});

Expand Down
4 changes: 2 additions & 2 deletions ocaml/eio-ssl/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ buildDunePackage {
src = fetchFromGitHub {
owner = "anmonteiro";
repo = "eio-ssl";
rev = "c5c9c3562baf771f7a00fa52b52dfe1f956b5489";
hash = "sha256-67Mjh/GmnjLMfubcXHUVXeRe2pyhezT4IPX0E7DSXEg=";
rev = "5e83c3ffb2200affde9d900de02f6994dd6421da";
hash = "sha256-rkk4OA+kq2jFuKwVtR9MRDtMXt7WYc9fBB+CgY+n6Kc=";
};
propagatedBuildInputs = [ ssl eio ];
}
4 changes: 2 additions & 2 deletions ocaml/gluten/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ buildDunePackage {
src = fetchFromGitHub {
owner = "anmonteiro";
repo = "gluten";
rev = "0c672bf386047e5ce88677f3e5dfc67b7e9c04d9";
hash = "sha256-NDB92mTncEWr9wJ6h4Ahi6UwdKpg8BZcPxiH7lbnCH8=";
rev = "e8efb527eb92924793615714c973cd9ee32d490b";
hash = "sha256-7T2VwdNjkqMEAqHlfe0TgroOnj/O/RDdlSy3ySIzXCw=";
};
propagatedBuildInputs = [ bigstringaf faraday ke ];
}
4 changes: 2 additions & 2 deletions ocaml/melange-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ with oself;
src = fetchFromGitHub {
owner = "reasonml";
repo = "reason-react";
rev = "1fdc7b1b38c7aea6d412b28e7902f8cb338f565a";
hash = "sha256-lpYujcmNNrJKCDkrZwdGQBh6wWXLc3CKh/VbL2eYFHA=";
rev = "3ab8747623e43b259bf4db8375fa35a5c5265db4";
hash = "sha256-5GyKXZ1C8fQnY4ekzJQNOhdRrRU4inQxZGkuEkN8Suo=";
};
propagatedBuildInputs = [ ppxlib ];
};
Expand Down
11 changes: 11 additions & 0 deletions ocaml/overlay-ocaml-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,17 @@ let
};
};

ocamlPackages_5_1 = ocaml-ng.ocamlPackages_5_1.overrideScope' (oself: osuper: {
ocaml = osuper.ocaml.overrideAttrs (_: {
src = super.fetchFromGitHub {
owner = "ocaml";
repo = "ocaml";
rev = "a7840563fe9fe972d1f34f72f58d46d9dd67fa16";
hash = "sha256-9uEZm0IZv+TDoLwmpFKzCjkucuYDBBSjquQx9CqfhK0=";
};
});
});

ocamlPackages_jst = ocaml-ng.ocamlPackages_4_14.overrideScope' (oself: osuper: {
ocaml = (callPackage
(import "${nixpkgs}/pkgs/development/compilers/ocaml/generic.nix" {
Expand Down
4 changes: 2 additions & 2 deletions ocaml/piaf/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ buildDunePackage {
src = fetchFromGitHub {
owner = "anmonteiro";
repo = "piaf";
rev = "daf09111b026eaca09e51330be656cc1b49fd4e6";
hash = "sha256-NUpu4LCkqeHJq6io6he+6kupei8Y2G+57D+MKEEtc8w=";
rev = "5c9561ba81ba3d3883cf4959541f5e2675516f88";
hash = "sha256-B1qpQTuv8buCKdrtbFNkKmZY+XTzbXEj98Kpf5Ych6U=";
};

checkInputs = [ alcotest dune-site ];
Expand Down

0 comments on commit 57c3328

Please sign in to comment.