Improve nix flake (ocaml#1632)

* Fix nix tests * Fix scopes * Fix merlin tests --------- Co-authored-by: Antonio Nuno Monteiro <[email protected]>
pitag-ha · Jun 27, 2023 · 4ba69de · 4ba69de
1 parent 95f2005
commit 4ba69de
Showing 1 changed file with 47 additions and 8 deletions.
diff --git a/flake.nix b/flake.nix
@@ -24,21 +24,60 @@
       rec {
         packages = rec {
           default = merlin;
-          merlin = buildDunePackage {
-            pname = "merlin";
-            version = "n/a";
+          merlin-lib = buildDunePackage {
+            pname = "merlin-lib";
+            version = "dev";
             src = ./.;
             duneVersion = "3";
-            buildInputs = with pkgs.ocamlPackages; [ menhirSdk menhir ];
             propagatedBuildInputs = with pkgs.ocamlPackages; [
-              findlib
               csexp
-              yojson
-              menhirLib
             ];
-            checkInputs = with pkgs.ocamlPackages; [ ppxlib pkgs.jq ];
             doCheck = true;
           };
+          dot-merlin-reader = buildDunePackage {
+            pname = "dot-merlin-reader";
+            version = "dev";
+            src = ./.;
+            duneVersion = "3";
+            propagatedBuildInputs = [
+              pkgs.ocamlPackages.findlib
+            ];
+            buildInputs = [
+              merlin-lib
+            ];
+            doCheck = true;
+          };
+          merlin = buildDunePackage {
+            pname = "merlin";
+            version = "dev";
+            src = ./.;
+            duneVersion = "3";
+            buildInputs = [
+              merlin-lib
+              dot-merlin-reader
+              pkgs.ocamlPackages.menhirLib
+              pkgs.ocamlPackages.menhirSdk
+              pkgs.ocamlPackages.yojson
+            ];
+            nativeBuildInputs = [
+              pkgs.ocamlPackages.menhir
+              pkgs.jq
+            ];
+            nativeCheckInputs = [ dot-merlin-reader ];
+            checkInputs = with pkgs.ocamlPackages; [
+              ppxlib
+            ];
+            doCheck = true;
+            checkPhase = ''
+              runHook preCheck
+              patchShebangs tests/merlin-wrapper
+              dune build @check @runtest
+              runHook postCheck
+           '';
+            meta = with pkgs; {
+              mainProgram = "ocamlmerlin";
+            };
+          };
         };
         devShells.default = pkgs.mkShell {
           inputsFrom = pkgs.lib.attrValues packages;