chore(nix): clean up nix files, avoid ocaml conflicts (#573)

melange-re · May 12, 2023 · f37a015 · f37a015
1 parent 9d6ff19
commit f37a015
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 47 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -24,7 +24,13 @@
     } // (flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = nixpkgs.legacyPackages."${system}".appendOverlays [
-          (self: super: { ocamlPackages = super.ocaml-ng.ocamlPackages_4_14; })
+          (self: super: {
+            ocamlPackages = super.ocaml-ng.ocamlPackages_4_14.overrideScope' (oself: osuper: {
+              menhirLib = osuper.menhirLib_20230415;
+              menhirSdk = osuper.menhirSdk_20230415;
+              menhir = osuper.menhir_20230415;
+            });
+          })
           melange-compiler-libs.overlays.default
         ];
       in
@@ -36,7 +42,6 @@
 
         devShells = {
           default = pkgs.callPackage ./nix/shell.nix {
-            # dream2nix = dream2nix.lib2;
             inherit packages;
           };
           release = pkgs.callPackage ./nix/shell.nix {

diff --git a/nix/ci/test.nix b/nix/ci/test.nix
@@ -23,19 +23,23 @@ let
             src = super.fetchFromGitHub {
               owner = "ocaml";
               repo = "dune";
-              rev = "a08e0f7f8a857b348267b30b10b9297ef881bb4d";
-              hash = "sha256-MK6hCjbNFIbE/sTR2xuVzrMqtdOIp52QKVuqfmjmwoY=";
+              rev = "239e6aca68aaa27bc429425b4aab32f4a9ee9bcd";
+              hash = "sha256-aQbk1YqC62BocL6SNopfJsf8LpxMTvw4KlobPrJJECk=";
             };
           });
 
           melange-compiler-libs = osuper.melange-compiler-libs.overrideAttrs (_: {
             src = super.fetchFromGitHub {
               owner = "melange-re";
               repo = "melange-compiler-libs";
-              rev = "575ac4c24b296ea897821f9aaee1146ff258c704";
-              hash = "sha256-icjQmfRUpo2nexX4XseQLPMhyffIxCftd0LHFW+LOwM=";
+              rev = "17a06ec6c8a5da27adeb76496ff7fab6c58091f5";
+              hash = "sha256-EZ8JAeJQMfZQJr9CPwdWVnaa8bHdnr+FiiVbC1hG7oM=";
             };
           });
+
+          menhirLib = osuper.menhirLib_20230415;
+          menhirSdk = osuper.menhirSdk_20230415;
+          menhir = osuper.menhir_20230415;
         });
       })
     ];
@@ -48,6 +52,8 @@ let
       (builtins.unsafeDiscardStringContext packages.melange.outPath);
 in
 
+with ocamlPackages;
+
 stdenv.mkDerivation {
   name = "melange-tests-${inputString}";
 
@@ -57,7 +63,6 @@ stdenv.mkDerivation {
   # the dream of running fixed-output-derivations is dead -- somehow after
   # Nix 2.4 it results in `error: unexpected end-of-file`.
   # Example: https://github.com/melange-re/melange/runs/4132970590
-
   outputHashMode = "flat";
   outputHashAlgo = "sha256";
   outputHash = builtins.hashString "sha256" "melange";
@@ -68,19 +73,21 @@ stdenv.mkDerivation {
   phases = [ "unpackPhase" "checkPhase" "installPhase" ];
 
   doCheck = true;
-  dontDetectOcamlConflicts = true;
-
-  nativeBuildInputs = with ocamlPackages; [ ocaml findlib dune ];
-  buildInputs = [
+  nativeBuildInputs = [
+    ocaml
+    findlib
+    dune
     nodePackages.mocha
-    packages.melange
-    packages.reactjs-jsx-ppx
-    packages.rescript-syntax
     ocamlPackages.reason
     tree
     nodejs
     yarn
   ];
+  buildInputs = [
+    packages.melange
+    packages.reactjs-jsx-ppx
+    packages.rescript-syntax
+  ];
 
   checkPhase = ''
     cat > dune-project <<EOF

diff --git a/nix/default.nix b/nix/default.nix
@@ -7,8 +7,10 @@
 , nodejs
 }:
 
+with ocamlPackages;
+
 rec {
-  melange = ocamlPackages.buildDunePackage {
+  melange = buildDunePackage {
     pname = "melange";
     version = "dev";
     duneVersion = "3";
@@ -38,13 +40,13 @@ rec {
     nativeCheckInputs = [
       tree
       nodejs
-      ocamlPackages.reason
+      reason
     ];
-    checkInputs = with ocamlPackages; [ ounit2 reactjs-jsx-ppx ];
+    checkInputs = [ ounit2 reactjs-jsx-ppx ];
 
-    nativeBuildInputs = with ocamlPackages; [ cppo ];
+    nativeBuildInputs = [ cppo ];
     buildInputs = [ makeWrapper ];
-    propagatedBuildInputs = with ocamlPackages; [
+    propagatedBuildInputs = [
       dune-build-info
       base64
       melange-compiler-libs
@@ -54,7 +56,7 @@ rec {
     meta.mainProgram = "melc";
   };
 
-  rescript-syntax = ocamlPackages.buildDunePackage {
+  rescript-syntax = buildDunePackage {
     pname = "rescript-syntax";
     version = "dev";
     duneVersion = "3";
@@ -68,15 +70,12 @@ rec {
       ];
     };
 
-    propagatedBuildInputs = with ocamlPackages; [
-      ppxlib
-      melange
-    ];
+    propagatedBuildInputs = [ ppxlib melange ];
 
     meta.mainProgram = "rescript-syntax";
   };
 
-  reactjs-jsx-ppx = ocamlPackages.buildDunePackage {
+  reactjs-jsx-ppx = buildDunePackage {
     pname = "reactjs-jsx-ppx";
     version = "dev";
     duneVersion = "3";
@@ -89,6 +88,6 @@ rec {
         "reactjs-jsx-ppx"
       ];
     };
-    propagatedBuildInputs = with ocamlPackages; [ ppxlib ];
+    propagatedBuildInputs = [ ppxlib ];
   };
 }
diff --git a/nix/overlay.nix b/nix/overlay.nix
@@ -9,8 +9,8 @@ final: prev:
         src = prev.fetchFromGitHub {
           owner = "ocaml";
           repo = "dune";
-          rev = "a08e0f7f8a857b348267b30b10b9297ef881bb4d";
-          hash = "sha256-MK6hCjbNFIbE/sTR2xuVzrMqtdOIp52QKVuqfmjmwoY=";
+          rev = "239e6aca68aaa27bc429425b4aab32f4a9ee9bcd";
+          hash = "sha256-aQbk1YqC62BocL6SNopfJsf8LpxMTvw4KlobPrJJECk=";
         };
       });
     })).overrideScope' (oself: osuper:

diff --git a/nix/shell.nix b/nix/shell.nix
@@ -24,24 +24,20 @@ let
 
 in
 
+with ocamlPackages;
+
 mkShell {
-  dontDetectOcamlConflicts = true;
-  inputsFrom = lib.attrValues derivations;
-  nativeBuildInputs = [ ocamlPackages.reason ];
-  buildInputs = [
+  inputsFrom = lib.attrValues derivations ++ [ melange-compiler-libs ];
+  nativeBuildInputs = [
+    ocamlformat
+    utop
+    ocaml-lsp
+    merlin
     python3
     nodejs_latest
     yarn
     nodePackages.mocha
-  ]
-  ++ (with ocamlPackages; [
-    merlin
-    ppxlib
-    utop
-    ocamlformat
-    ocaml-lsp
-  ])
-  ++ lib.optionals release-mode [ cacert curl ocamlPackages.dune-release git ];
+  ] ++ lib.optionals release-mode [ cacert curl dune-release git ];
   shellHook = ''
     PATH=$PWD/_build/install/default/bin:$PATH
   '';