mmm

3 files changed, 16 insertions, 15 deletions

diff --git a/bs5.opam b/bs5.opam
index cd6ac58..7632cd4 100644
--- a/bs5.opam
+++ b/bs5.opam
@@ -13,8 +13,8 @@ depends: [
   "ocaml"
   "dune" {>= "3.19"}
   "ocaml-lsp-server"
-  "ocamlmerlin-mlx"
-  "ocamlformat-mlx"
+  "ocamlmerlin-mlx" {with-dev-setup}
+  "ocamlformat-mlx" {with-dev-setup}
   "odoc" {with-doc}
 ]
 build: [
diff --git a/dune-project b/dune-project
index 0e7879b..3b0ab08 100644
--- a/dune-project
+++ b/dune-project
@@ -19,7 +19,12 @@
  (name bs5)
  (synopsis "A short synopsis")
  (description "A longer description")
- (depends ocaml dune ocaml-lsp-server ocamlmerlin-mlx ocamlformat-mlx)
+ (depends
+  ocaml
+  dune
+  ocaml-lsp-server
+  (ocamlmerlin-mlx :with-dev-setup)
+  (ocamlformat-mlx :with-dev-setup))
  (tags
   (topics "to describe" your project)))
 
diff --git a/flake.nix b/flake.nix
index b750030..ea0d8b1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,8 +15,13 @@
     flake-utils.lib.eachDefaultSystem (system: let
       pkgs = import nixpkgs {
         inherit system;
-
-        overlays = [ocaml.overlays.default];
+        overlays = [
+          ocaml.overlays.default
+          (final: prev: {
+            # This ensures we consistently use one version of ocaml packages
+            ocamlPackages = prev.ocaml-ng.ocamlPackages_5_3;
+          })
+        ];
       };
 
       quickjs = pkgs.ocamlPackages.buildDunePackage {
@@ -82,16 +87,6 @@
           writeShellApplication
           ;
       };
-      # gemini-cli = pkgs.buildNpmPackage {
-      #   name = "gemini-cli";
-      #   src = pkgs.fetchFromGitHub {
-      #     owner = "google-gemini";
-      #     repo = "gemini-cli";
-      #     rev = "bf873a1d85d4400fd22c175db0f3b80a47bc27fb";
-      #     sha256 = "QllEB3FAhp9lVOBkAE09Sw8IqOjRpaIMXAcY8dGbgw0=";
-      #   };
-      #   npmDepsHash = "qimhi2S8fnUbIq2MPU1tlvj5k9ZChY7kzxLrYqy9FXI=";
-      # };
     in {
       devShells.default = pkgs.mkShell rec {
         packages = [gemini-cli];
@@ -104,6 +99,7 @@
           pkgs.sqlite
           pkgs.dune_3
           pkgs.ocaml
+          pkgs.opam
           findlib
           ocaml-lsp
           ocamlformat