diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 3484cae..b5850a3 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: # Keep in sync with `ghcVersions` in `../../flake.nix`. - ghc: ['8107', '928', '947', '963'] + ghc: ['810', '92', '94', '96'] name: Build package (ghc${{ matrix.ghc }}) runs-on: ${{ inputs.os }} diff --git a/flake.lock b/flake.lock index 29929d3..ddcfe46 100644 --- a/flake.lock +++ b/flake.lock @@ -1,46 +1,5 @@ { "nodes": { - "agda": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1696540558, - "narHash": "sha256-fqYyjgOFQrU4ryGcLyz5gMYMdPk1P24ra7kQiUrbilg=", - "owner": "agda", - "repo": "agda", - "rev": "f42acb696e43d382639f04f869e9a99ab36a91c6", - "type": "github" - }, - "original": { - "owner": "agda", - "ref": "v2.6.4", - "repo": "agda", - "type": "github" - } - }, - "agda-stdlib-source": { - "flake": false, - "locked": { - "lastModified": 1697158940, - "narHash": "sha256-vtL6VPvTXhl/mepulUm8SYyTjnGsqno4RHDmTIy22Xg=", - "owner": "agda", - "repo": "agda-stdlib", - "rev": "0817da6877aa045932221134913d8511caa78d97", - "type": "github" - }, - "original": { - "owner": "agda", - "ref": "v1.7.3", - "repo": "agda-stdlib", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -62,11 +21,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -77,11 +36,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1699186365, - "narHash": "sha256-Pxrw5U8mBsL3NlrJ6q1KK1crzvSUcdfwb9083sKDrcU=", + "lastModified": 1702938738, + "narHash": "sha256-O7Vb0xC9s4Dmgxj8APEpuuMj7HsLgPbpy1UKvNVJp7o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a0b3b06b7a82c965ae0bb1d59f6e386fe755001d", + "rev": "dd8e82f3b4017b8faa52c2b1897a38d53c3c26cb", "type": "github" }, "original": { @@ -93,8 +52,6 @@ }, "root": { "inputs": { - "agda": "agda", - "agda-stdlib-source": "agda-stdlib-source", "flake-compat": "flake-compat", "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" diff --git a/flake.nix b/flake.nix index 352fa00..33fba85 100644 --- a/flake.nix +++ b/flake.nix @@ -5,12 +5,6 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; flake-utils.url = "github:numtide/flake-utils"; flake-compat = { url = "github:edolstra/flake-compat"; flake = false; }; - - # See https://github.com/isovector/cornelis#agda-version - 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/v1.7.3"; flake = false; }; }; outputs = { self, nixpkgs, ... }@inputs: @@ -18,9 +12,9 @@ name = "cornelis"; # Update `./.github/workflows/nix.yml` if changed. # `ghc902` excluded due to build issues. - ghcVersions = map (v: "ghc${v}") [ "8107" "928" "947" "963" ]; + ghcVersions = map (v: "ghc${v}") [ "810" "92" "94" "96" ]; # Ensure resolver in `./stack.yaml` is in sync with `defaultGhcVersion`. - defaultGhcVersion = "ghc947"; + defaultGhcVersion = "ghc94"; in { overlays = { @@ -52,14 +46,9 @@ let pkgs = import nixpkgs { inherit system; - overlays = [ self.overlays.${name} inputs.agda.overlay ]; + overlays = [ self.overlays.${name} ]; }; - agda = pkgs.agda.withPackages (p: nixpkgs.lib.singleton ( - p.standard-library.overrideAttrs (_: { - version = "1.7.3"; - src = inputs.agda-stdlib-source; - }) - )); + agda = pkgs.agda.withPackages (p: [ p.standard-library ]); in { packages = { diff --git a/stack.yaml b/stack.yaml index 1d2eeea..0092c41 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,6 +1,6 @@ -# GHC 9.4.7 +# GHC 9.4.8 # Update `defaultGHCVersion` in `./flake.nix` when updating to resolver with different GHC version. -resolver: lts-21.19 +resolver: lts-21.25 packages: - . diff --git a/stack.yaml.lock b/stack.yaml.lock index 938e7b9..072ec43 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -13,7 +13,7 @@ packages: hackage: levenshtein-0.2.1.0 snapshots: - completed: - sha256: fb482b8e2d5d061cdda4ba1da2957c012740c893a5ee1c1b99001adae7b1fbe7 - size: 640046 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/19.yaml - original: lts-21.19 + sha256: a81fb3877c4f9031e1325eb3935122e608d80715dc16b586eb11ddbff8671ecd + size: 640086 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/25.yaml + original: lts-21.25