diff --git a/3/chi.cabal b/3/chi.cabal index 18e7537..e249920 100644 --- a/3/chi.cabal +++ b/3/chi.cabal @@ -12,7 +12,7 @@ library hashable >= 1.4.7.0 && < 1.6, mtl >= 2.2.2 && < 2.4, pretty ^>= 1.1.3.6, - QuickCheck ^>= 2.16.0.0, + QuickCheck >= 2.16.0.0, transformers >= 0.5.6.2 && < 0.7, unordered-containers ^>= 0.2.20 build-tool-depends: @@ -28,8 +28,9 @@ library . executable interpreter - main-is: Assignment.hs + main-is: Main.hs + hs-source-dirs: + interpreter build-depends: base , chi , mtl - , unordered-containers diff --git a/3/flake.nix b/3/flake.nix index b3da1db..8785da6 100644 --- a/3/flake.nix +++ b/3/flake.nix @@ -10,7 +10,7 @@ outputs = { self, nixpkgs, flake-utils }: let - ghcVer = "ghc910"; + ghcVer = "ghc912"; makeHaskellOverlay = overlay: final: prev: { haskell = prev.haskell // { packages = prev.haskell.packages // { @@ -53,9 +53,6 @@ withHoogle = true; buildInputs = (with pkgs; [ - gnumake - jasmin - jre_minimal ]) ++ (with haskellPackages; [ haskell-language-server diff --git a/3/Assignment.hs b/3/interpreter/Main.hs similarity index 98% rename from 3/Assignment.hs rename to 3/interpreter/Main.hs index b15d63f..74e27cb 100644 --- a/3/Assignment.hs +++ b/3/interpreter/Main.hs @@ -1,5 +1,5 @@ {-# Language LambdaCase, Strict #-} -module Assignment where +module Main where import Chi import Data.Functor ( (<&>) )