Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update GHC versions with default as 9.4.8 #134

Merged
merged 1 commit into from
Dec 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
55 changes: 6 additions & 49 deletions flake.lock

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

19 changes: 4 additions & 15 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,16 @@
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:
let
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 = {
Expand Down Expand Up @@ -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 = {
Expand Down
4 changes: 2 additions & 2 deletions stack.yaml
Original file line number Diff line number Diff line change
@@ -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:
- .
Expand Down
8 changes: 4 additions & 4 deletions stack.yaml.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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