Skip to content

Commit

Permalink
Update sources (#1922)
Browse files Browse the repository at this point in the history
* Update sources

* jsoo compat for janestreet packages

---------

Co-authored-by: UpdateBot <[email protected]>
  • Loading branch information
anmonteiro and ulrikstrid authored Feb 22, 2025
1 parent 9e2797c commit ce29bc5
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 5 deletions.
8 changes: 4 additions & 4 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
};

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs?rev=d74a2335ac9c133d6bbec9fc98d91a77f1604c1f";
nixpkgs.url = "github:NixOS/nixpkgs?rev=223499992b3dc653197db83a8a39c6c2be30b624";
};

outputs = { self, nixpkgs }:
Expand Down
10 changes: 10 additions & 0 deletions ocaml/janestreet-0.16.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,16 @@

with self;

let
js_of_ocaml-compiler = self.js_of_ocaml-compiler.override { version = "5.9.1"; };
js_of_ocaml = self.js_of_ocaml.override { inherit js_of_ocaml-compiler; };
gen_js_api = self.gen_js_api.override {
inherit js_of_ocaml-compiler;
ojs = self.ojs.override { inherit js_of_ocaml-compiler; };
};
js_of_ocaml-ppx = self.js_of_ocaml-ppx.override { inherit js_of_ocaml; };
in

{

abstract_algebra = janePackage {
Expand Down
7 changes: 7 additions & 0 deletions ocaml/janestreet-0.17.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@ with self;

let
isFlambda2 = lib.hasSuffix "flambda2" ocaml.version;
js_of_ocaml-compiler = self.js_of_ocaml-compiler.override { version = "5.9.1"; };
js_of_ocaml = self.js_of_ocaml.override { inherit js_of_ocaml-compiler; };
gen_js_api = self.gen_js_api.override {
inherit js_of_ocaml-compiler;
ojs = self.ojs.override { inherit js_of_ocaml-compiler; };
};
js_of_ocaml-ppx = self.js_of_ocaml-ppx.override { inherit js_of_ocaml; };
in

{
Expand Down

0 comments on commit ce29bc5

Please sign in to comment.