fix da nix

elara.cabal

@@ -49,6 +49,7 @@ library
       Elara.Data.Unique
       Elara.Data.Unwrap
       Elara.Desugar
+      Elara.Emit
       Elara.Error
       Elara.Error.Codes
       Elara.Error.Effect
@@ -117,6 +118,7 @@ library
     , generic-lens
     , headed-megaparsec
     , lens
+    , h2jvm
     , megaparsec >=9.0.0
     , mtl
     , parser-combinators

flake.nix

@@ -8,42 +8,41 @@
     treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
     flake-root.url = "github:srid/flake-root";
     mission-control.url = "github:Platonic-Systems/mission-control";
+
+    h2jvm.url = "github:ElaraLang/h2jvm";
+
+    diagnose.url = "github:knightzmc/diagnose";
+    diagnose.flake = false;
   };
+
   outputs = inputs:
     inputs.flake-parts.lib.mkFlake { inherit inputs; } {
 
       systems = import inputs.systems;
+
       imports = [
         inputs.haskell-flake.flakeModule
         inputs.treefmt-nix.flakeModule
         inputs.flake-root.flakeModule
         inputs.mission-control.flakeModule
       ];
 
-      perSystem = { self', config, pkgs, ... }: {
+      perSystem = { self', system, config, pkgs, ... }: {
 
         haskellProjects.default = {
-          # basePackages = pkgs.haskell.packages.ghc94; # Use GHC 9.4.4
 
           autoWire = [ "packages" "apps" "checks" ]; # Wire all but the devShell
 
-          overrides = self: super: with pkgs.haskell.lib; {
-            megaparsec = self.callHackage "megaparsec" "9.3.0" { };
-
-            diagnose = (dontCheck (self.callCabal2nix "diagnose"
-              (
-                pkgs.fetchgit {
-                  url = "https://github.com/knightzmc/diagnose";
-                  sha256 = "sha256-RqwnKus+Xga5nnV1g0lCQfqRg8zbN/IcDBZ+Sb1Bocs=";
-                  rev = "7e8a1fe2bc3a60fdec43e96aab2a27fa1e3eb4d5";
-                })
-              { })).overrideAttrs
-              (old: {
-                buildInputs = old.buildInputs ++ [
-                  self.megaparsec
-                ];
-                configureFlags = [ "-f megaparsec-compat" ]; # the flag configuration in stack.yaml seems to be ignoed
-              });
+          packages = {
+            h2jvm.source = inputs.h2jvm;
+            diagnose.source = inputs.diagnose;
+          };
+
+          settings = {
+            diagnose = {
+              extraBuildDepends = [ pkgs.haskellPackages.megaparsec ];
+              extraConfigureFlags = [ "-f megaparsec-compat" ];
+            };
           };
 
           devShell = {
@@ -64,7 +63,7 @@
           programs.ormolu.enable = true;
           programs.nixpkgs-fmt.enable = true;
           programs.cabal-fmt.enable = false;
-          programs.hlint.enable = true;
+          programs.hlint.enable = false;
 
           programs.ormolu.package = pkgs.haskellPackages.fourmolu;
 
@@ -97,7 +96,7 @@
 
 
         packages.default = self'.packages.elara;
-        apps.default = self'.apps.elara;
+
 
         devShells.default = pkgs.mkShell {
           inputsFrom = [

package.yaml

@@ -33,7 +33,7 @@ dependencies:
   - polysemy
   - polysemy-plugin
   - mtl
-  # - h2jvm
+  - h2jvm
   - binary
 
 ghc-options:

result-bin

@@ -0,0 +1 @@
+/nix/store/yc67lyclcxycdjncsrhchq4w8fcqxnbq-elara-0.0.0.0-bin