From 50fb4eb7d9e2f8ff20a96d78d0b82bbbf5b58a1d Mon Sep 17 00:00:00 2001 From: UpdateBot Date: Wed, 19 Feb 2025 11:35:46 +0000 Subject: [PATCH 1/2] Update sources --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index ef617761..7dc9b79a 100644 --- a/flake.lock +++ b/flake.lock @@ -2,17 +2,17 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1739736696, - "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", + "lastModified": 1739887616, + "narHash": "sha256-osQYpKIVuEPtnCZZ93k6kWVky+0QB8aQaZWSU0ueav0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", + "rev": "223499992b3dc653197db83a8a39c6c2be30b624", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", + "rev": "223499992b3dc653197db83a8a39c6c2be30b624", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 298c472b..c2ecb8ed 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ }; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs?rev=d74a2335ac9c133d6bbec9fc98d91a77f1604c1f"; + nixpkgs.url = "github:NixOS/nixpkgs?rev=223499992b3dc653197db83a8a39c6c2be30b624"; }; outputs = { self, nixpkgs }: From 3e08509f1cf5d98cb788d6f60c9760386b891f22 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Sat, 22 Feb 2025 15:11:50 -0800 Subject: [PATCH 2/2] jsoo compat for janestreet packages --- ocaml/janestreet-0.16.nix | 10 ++++++++++ ocaml/janestreet-0.17.nix | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/ocaml/janestreet-0.16.nix b/ocaml/janestreet-0.16.nix index a8e9ce7b..214986ab 100644 --- a/ocaml/janestreet-0.16.nix +++ b/ocaml/janestreet-0.16.nix @@ -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 { diff --git a/ocaml/janestreet-0.17.nix b/ocaml/janestreet-0.17.nix index b39a8021..61dad4f8 100644 --- a/ocaml/janestreet-0.17.nix +++ b/ocaml/janestreet-0.17.nix @@ -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 {