Skip to content

Commit

Permalink
build: ⬆️ Update to GHC 9.10.1
Browse files Browse the repository at this point in the history
  • Loading branch information
bristermitten committed Oct 16, 2024
1 parent a40d93b commit 10db81c
Show file tree
Hide file tree
Showing 4 changed files with 185 additions and 166 deletions.
124 changes: 59 additions & 65 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -37,22 +37,28 @@

autoWire = [ "packages" "apps" "checks" ]; # Wire all but the devShell

basePackages = pkgs.haskell.packages.ghc965;
basePackages = pkgs.haskell.packages.ghc910;


packages = {
h2jvm.source = inputs.h2jvm;
diagnose.source = inputs.diagnose;
megaparsec.source = inputs.megaparsec;
polysemy-test.source = "0.9.0.0";
polysemy-test.source = "0.10.0.0";
};

settings = {

fourmolu.check = false;
polysemy-test.jailbreak = true;
polysemy-conc.jailbreak = true;
polysemy-conc.check = false;
polysemy-log.jailbreak = true;
polysemy-plugin.jailbreak = true;
incipit-base.jailbreak = true;
incipit-core.jailbreak = true;
polysemy-resume.jailbreak = true;
polysemy-time.jailbreak = true;

diagnose = {
extraBuildDepends = [
Expand Down
6 changes: 3 additions & 3 deletions src/Elara/Emit.hs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ import Elara.Error (DiagnosticWriter, runErrorOrReport)
import Elara.Logging
import Elara.ToCore (stripForAll)
import JVM.Data.Abstract.Builder
import JVM.Data.Abstract.Builder.Code hiding (code)
import JVM.Data.Abstract.Builder.Code
( emit, emit', runCodeBuilder, CodeBuilder )
import JVM.Data.Abstract.ClassFile
import JVM.Data.Abstract.ClassFile.AccessFlags
import JVM.Data.Abstract.ClassFile.Field
Expand Down Expand Up @@ -102,8 +103,7 @@ emitModule m = fmap swap $ runMultiClassBuilder $ do
runReader defaultGenParams $ addClinit clinitState attrs clinit

pure
( m ^. field @"name"
)
(m ^. field @"name")

addDeclarationsAndMain :: (InnerEmit r, Member CodeBuilder r, Member (Reader GenParams) r) => CoreModule -> Sem r ()
addDeclarationsAndMain m = do
Expand Down
Loading

0 comments on commit 10db81c

Please sign in to comment.