Merge pull request #126 from malob/update-ghc

Update GHC versions with default as 9.4.7

.github/workflows/nix-agda.yml

@@ -16,8 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Linux disabled since it runs out of memory
-        os: [ 'macos-12' ] #, 'ubuntu-22.04']
+        os: [ 'macos-12' , 'ubuntu-22.04']
 
     name: Nix Agda
     runs-on: ${{ matrix.os }}

.github/workflows/nix.yml

@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         # Keep in sync with `ghcVersions` in `../../flake.nix`.
-        ghc: ['8107', '928', '946', '962']
+        ghc: ['8107', '928', '947', '963']
 
     name: Build package (ghc${{ matrix.ghc }})
     runs-on: ${{ inputs.os }}

flake.nix

@@ -7,20 +7,20 @@
     flake-compat = { url = "github:edolstra/flake-compat"; flake = false; };
 
     # See https://github.com/isovector/cornelis#agda-version
-    agda.url = "github:agda/agda/v2.6.3.20230805";
+    agda.url = "github:agda/agda/v2.6.4";
     agda.inputs.flake-utils.follows = "flake-utils";
     agda.inputs.nixpkgs.follows = "nixpkgs";
-    agda-stdlib-source = { url = "github:agda/agda-stdlib"; flake = false; };
+    agda-stdlib-source = { url = "github:agda/agda-stdlib/v1.7.3"; flake = false; };
   };
 
   outputs = { self, nixpkgs, ... }@inputs:
     let
       name = "cornelis";
       # Update `./.github/workflows/nix.yml` if changed.
       # `ghc902` excluded due to build issues.
-      ghcVersions = map (v: "ghc${v}") [ "8107" "928" "946" "962" ];
+      ghcVersions = map (v: "ghc${v}") [ "8107" "928" "947" "963" ];
       # Ensure resolver in `./stack.yaml` is in sync with `defaultGhcVersion`.
-      defaultGhcVersion = "ghc946";
+      defaultGhcVersion = "ghc947";
     in
     {
       overlays = {
@@ -56,7 +56,7 @@
         };
         agda = pkgs.agda.withPackages (p: nixpkgs.lib.singleton (
           p.standard-library.overrideAttrs (_: {
-            version = "HEAD";
+            version = "1.7.3";
             src = inputs.agda-stdlib-source;
           })
         ));

stack.yaml

@@ -1,6 +1,6 @@
-# GHC 9.4.6
+# GHC 9.4.7
 # Update `defaultGHCVersion` in `./flake.nix` when updating to resolver with different GHC version.
-resolver: lts-21.9
+resolver: lts-21.19
 
 packages:
 - .

stack.yaml.lock

@@ -13,7 +13,7 @@ packages:
     hackage: levenshtein-0.2.1.0
 snapshots:
 - completed:
-    sha256: 2fc12a405ab6f7eac73eb11a0ca5ccca0e956bd2848db780c140b7406ff9ebb5
-    size: 640035
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/9.yaml
-  original: lts-21.9
+    sha256: fb482b8e2d5d061cdda4ba1da2957c012740c893a5ee1c1b99001adae7b1fbe7
+    size: 640046
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/19.yaml
+  original: lts-21.19