Merge branch 'graph-ir' into tidy-ir

# Conflicts:
#	compiler/shared/test/diff-ir/IR.mls

Author: waterlens

compiler/shared/test/diff-ir/cpp/Makefile

@@ -1,6 +1,6 @@
 CXX := clang++
-CFLAGS := $(CFLAGS) -O3 -Wall -Wextra -std=c++20 -I. -I/opt/homebrew/include -Wno-inconsistent-missing-override
-LDFLAGS := $(LDFLAGS) -L/opt/homebrew/lib -lmimalloc -lgmp
+CFLAGS := $(CFLAGS) -O3 -Wall -Wextra -std=c++20 -I. -Wno-inconsistent-missing-override
+LDFLAGS := $(LDFLAGS) -lmimalloc -lgmp
 SRC :=
 INCLUDES = mlsprelude.h
 DST :=

flake.lock

@@ -0,0 +1,33 @@
+{
+  description = "mlscript";
+
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs";
+  inputs.flake-utils.url = "github:numtide/flake-utils";
+  inputs.sbt-deriv.url = "github:zaninime/sbt-derivation";
+  inputs.sbt-deriv.inputs.nixpkgs.follows = "nixpkgs";
+
+  outputs = { self, nixpkgs, flake-utils, sbt-deriv }:
+    flake-utils.lib.eachDefaultSystem
+      (system:
+      let 
+        sbtOverlay = self: super: {
+          sbt = super.sbt.override { jre = super.jdk17; };
+        };
+        pkgs = import nixpkgs { 
+          inherit system;
+          overlays = [ sbtOverlay ];
+        };
+      in with pkgs; {
+          devShells.default = mkShell {
+            buildInputs = [
+              clang
+              gnumake
+              boost
+              gmp
+              mimalloc
+              sbt
+              nodejs
+            ];
+          };
+      });
+}