Updates GHC and flake lock.

Author: solomon-b

flake.lock

@@ -2,23 +2,14 @@
   description = "Single file Lambda Calculus implementations and presentation slides.";
 
   inputs = {
-    # Nix Inputs
-    nixpkgs.url = github:nixos/nixpkgs/23.05;
+    nixpkgs.url = github:nixos/nixpkgs/24.05;
     flake-utils.url = github:numtide/flake-utils;
   };
 
-  outputs =
-    { self
-    , nixpkgs
-    , flake-utils
-    ,
-    }:
+  outputs = { self , nixpkgs , flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
     let
-      utils = flake-utils.lib;
-    in
-    utils.eachDefaultSystem (system:
-    let
-      compilerVersion = "ghc927";
+      compilerVersion = "ghc982";
       pkgs = nixpkgs.legacyPackages.${system};
       hsPkgs = pkgs.haskell.packages.${compilerVersion}.override {
         overrides = hfinal: hprev: {
@@ -28,30 +19,30 @@
     in
     rec {
       packages =
-        utils.flattenTree
-          { lambda-calculus-hs = hsPkgs.lambda-calculus-hs; };
+        flake-utils.lib.flattenTree
+          { lambda-calculus-hs = hsPkgs.lambda-calculus-hs;
+            default = hsPkgs.lambda-calculus-hs;
+          };
 
-      # nix develop
-      devShell = hsPkgs.shellFor {
-        withHoogle = true;
-        packages = p: [
-          p.lambda-calculus-hs
-        ];
-        buildInputs = with pkgs;
-          [
-            hsPkgs.haskell-language-server
-            haskellPackages.cabal-install
-            cabal2nix
-            haskellPackages.ghcid
-            haskellPackages.fourmolu
-            haskellPackages.cabal-fmt
-            nodePackages.serve
-            nixpkgs-fmt
-          ]
-          ++ (builtins.attrValues (import ./scripts.nix { s = pkgs.writeShellScriptBin; }));
+      devShells = {
+        default = hsPkgs.shellFor {
+          withHoogle = true;
+          packages = p: [
+            p.lambda-calculus-hs
+          ];
+          buildInputs = with pkgs;
+            [
+              cabal-install
+              cabal2nix
+              haskell-language-server
+              haskellPackages.ghcid
+              haskellPackages.fourmolu
+              haskellPackages.cabal-fmt
+            ]
+            ++ (builtins.attrValues (import ./scripts.nix { s = pkgs.writeShellScriptBin; }));
+          };
       };
 
-      # nix build
-      defaultPackage = packages.lambda-calculus-hs;
+      formatter = pkgs.nixfmt-rfc-style;
     });
 }

flake.nix

@@ -5,6 +5,7 @@ module Main where
 
 --------------------------------------------------------------------------------
 
+import Control.Monad ((>=>), foldM)
 import Control.Monad.Except (MonadError (..))
 import Control.Monad.Identity
 import Control.Monad.Reader (MonadReader (..))

main/02-NormalizationByEvaluation.hs

@@ -5,6 +5,7 @@ module Main where
 
 --------------------------------------------------------------------------------
 
+import Control.Monad (foldM)
 import Control.Monad.Except (MonadError (..))
 import Control.Monad.Identity
 import Control.Monad.Reader (MonadReader (..))

main/03-Elaboration.hs

@@ -1,11 +1,11 @@
 {-# LANGUAGE DerivingVia #-}
-{-# LANGUAGE TupleSections #-}
 {-# OPTIONS_GHC -Wno-name-shadowing #-}
 
 module Main where
 
 --------------------------------------------------------------------------------
 
+import Control.Monad (foldM)
 import Control.Monad.Except (MonadError (..))
 import Control.Monad.Identity
 import Control.Monad.Reader (MonadReader (..))

main/04-TypedHoles.hs

@@ -1,12 +1,11 @@
 {-# LANGUAGE DerivingVia #-}
-{-# LANGUAGE TupleSections #-}
 {-# OPTIONS_GHC -Wno-name-shadowing #-}
 
 module Main where
 
 --------------------------------------------------------------------------------
 
-import Control.Applicative (liftA2)
+import Control.Monad (foldM)
 import Control.Monad.Except (MonadError (..))
 import Control.Monad.Identity
 import Control.Monad.Reader (MonadReader (..))

main/05-SystemT.hs

@@ -5,7 +5,7 @@ module Main where
 
 --------------------------------------------------------------------------------
 
-import Control.Applicative (liftA2)
+import Control.Monad (foldM)
 import Control.Arrow ((&&&))
 import Control.Monad.Except (MonadError (..))
 import Control.Monad.Identity

main/06-Records.hs

@@ -6,7 +6,7 @@ module Main where
 
 --------------------------------------------------------------------------------
 
-import Control.Applicative (liftA2)
+import Control.Monad (foldM)
 import Control.Arrow ((&&&))
 import Control.Monad.Except (MonadError (..))
 import Control.Monad.Identity

main/07-Subtyping.hs

@@ -9,7 +9,7 @@ module Main where
 
 --------------------------------------------------------------------------------
 
-import Control.Applicative (liftA2)
+import Control.Monad (foldM, when, zipWithM)
 import Control.Arrow ((&&&))
 import Control.Monad.Except (MonadError (..))
 import Control.Monad.Identity

main/08-NominalInductiveTypes.hs

@@ -4,7 +4,7 @@ module Main where
 
 --------------------------------------------------------------------------------
 
-import Control.Monad.State
+import Control.Monad (foldM)
 import Data.Bool (bool)
 import Data.Foldable (find, sequenceA_)
 import Data.Maybe (fromMaybe)