Skip to content

Commit

Permalink
⬆️ update GHC to 9.6.3 and 9.4.8, update the default to GHC 9.6.3.
Browse files Browse the repository at this point in the history
  • Loading branch information
lsrcz committed Jan 5, 2024
1 parent 034c3e8 commit 623b574
Show file tree
Hide file tree
Showing 11 changed files with 117 additions and 31 deletions.
26 changes: 17 additions & 9 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,28 @@ jobs:
ghc: "928",
cachekey: "stack-20.26",
}
- {
build: stack,
arg: "--stack-yaml stack-lts-21.25.yaml",
ismain: false,
experimental: false,
ghc: "948",
cachekey: "stack-21.25",
}
- {
build: stack,
arg: "",
ismain: true,
experimental: false,
ghc: "946",
cachekey: "stack-21.11",
ghc: "963",
cachekey: "stack-22.4",
}
- {
build: stack,
arg: "--stack-yaml stack-nightly.yaml",
ismain: false,
experimental: false,
ghc: "962",
ghc: "963",
cachekey: "stack-nightly",
}
- {
Expand Down Expand Up @@ -89,19 +97,19 @@ jobs:
}
- {
build: cabal,
arg: "--allow-newer=text",
arg: "",
ismain: false,
experimental: false,
ghc: "946",
cachekey: "cabal-946",
ghc: "948",
cachekey: "cabal-948",
}
- {
build: cabal,
arg: "--allow-newer=text,mtl",
arg: "",
ismain: false,
experimental: false,
ghc: "962",
cachekey: "cabal-962",
ghc: "963",
cachekey: "cabal-963",
}

runs-on: ${{ matrix.os }}
Expand Down
12 changes: 6 additions & 6 deletions flake.lock

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

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
let
pkgs = nixpkgs.legacyPackages.${system};

hPkgs = pkgs.haskell.packages."ghc946";
hPkgs = pkgs.haskell.packages."ghc963";

myDevTools = [
hPkgs.ghc # GHC compiler in the desired version (will be available on PATH)
Expand Down
6 changes: 3 additions & 3 deletions grisette.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 1.12

-- This file has been generated from package.yaml by hpack version 0.35.2.
-- This file has been generated from package.yaml by hpack version 0.36.0.
--
-- see: https://github.com/sol/hpack

Expand Down Expand Up @@ -28,8 +28,8 @@ tested-with:
GHC == 8.10.7
, GHC == 9.0.2
, GHC == 9.2.8
, GHC == 9.4.6
, GHC == 9.6.2
, GHC == 9.4.8
, GHC == 9.6.3
extra-source-files:
CHANGELOG.md
README.md
Expand Down
4 changes: 2 additions & 2 deletions package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ tested-with:
- GHC == 8.10.7
- GHC == 9.0.2
- GHC == 9.2.8
- GHC == 9.4.6
- GHC == 9.6.2
- GHC == 9.4.8
- GHC == 9.6.3

dependencies:
- base >= 4.14 && < 5
Expand Down
66 changes: 66 additions & 0 deletions stack-lts-21.25.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
# This file was automatically generated by 'stack init'
#
# Some commonly used options have been documented as comments in this file.
# For advanced use and comprehensive documentation of the format, please see:
# https://docs.haskellstack.org/en/stable/yaml_configuration/

# Resolver to choose a 'specific' stackage snapshot or a compiler version.
# A snapshot resolver dictates the compiler version and the set of packages
# to be used for project dependencies. For example:
#
# resolver: lts-3.5
# resolver: nightly-2015-09-21
# resolver: ghc-7.10.2
#
# The location of a snapshot can be provided as a file or url. Stack assumes
# a snapshot provided as a file might change, whereas a url resource does not.
#
# resolver: ./custom-snapshot.yaml
# resolver: https://example.com/snapshots/2018-01-01.yaml
resolver: lts-21.25

# User packages to be built.
# Various formats can be used as shown in the example below.
#
# packages:
# - some-directory
# - https://example.com/foo/bar/baz-0.0.2.tar.gz
# subdirs:
# - auto-update
# - wai
packages:
- .
# Dependency packages to be pulled from upstream that are not in the resolver.
# These entries can reference officially published versions as well as
# forks / in-progress versions pinned to a git hash. For example:
#
# extra-deps:
# - acme-missiles-0.3
# - git: https://github.com/commercialhaskell/stack.git
# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a
#
# extra-deps: []

# Override default flag values for local packages and extra-deps
# flags: {}

# Extra package databases containing global packages
# extra-package-dbs: []

# Control whether we use the GHC we find on the path
# system-ghc: true
#
# Require a specific version of stack, using version ranges
# require-stack-version: -any # Default
# require-stack-version: ">=2.7"
#
# Override the architecture used by stack, especially useful on Windows
# arch: i386
# arch: x86_64
#
# Extra directories used by stack for building
# extra-include-dirs: [/path/to/dir]
# extra-lib-dirs: [/path/to/dir]
#
# Allow a newer minor version of GHC than the snapshot specifies
# compiler-check: newer-minor
12 changes: 12 additions & 0 deletions stack-lts-21.25.yaml.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# This file was autogenerated by Stack.
# You should not edit this file by hand.
# For more information, please see the documentation at:
# https://docs.haskellstack.org/en/stable/lock_files

packages: []
snapshots:
- completed:
sha256: a81fb3877c4f9031e1325eb3935122e608d80715dc16b586eb11ddbff8671ecd
size: 640086
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/25.yaml
original: lts-21.25
2 changes: 1 addition & 1 deletion stack-nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#
# resolver: ./custom-snapshot.yaml
# resolver: https://example.com/snapshots/2018-01-01.yaml
resolver: nightly-2023-09-26
resolver: nightly-2023-12-26

# User packages to be built.
# Various formats can be used as shown in the example below.
Expand Down
8 changes: 4 additions & 4 deletions stack-nightly.yaml.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
packages: []
snapshots:
- completed:
sha256: 2759c0a43a745a0aee7d085a37c43422373848a5913e21225113b0039577ed53
size: 669536
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/9/26.yaml
original: nightly-2023-09-26
sha256: b69a06c70e1092e2aa60ce69a4877c6181fbe53dfb7ea041cb98d97617d6007f
size: 716491
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/12/26.yaml
original: nightly-2023-12-26
2 changes: 1 addition & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#
# resolver: ./custom-snapshot.yaml
# resolver: https://example.com/snapshots/2018-01-01.yaml
resolver: lts-21.11
resolver: lts-22.4

# User packages to be built.
# Various formats can be used as shown in the example below.
Expand Down
8 changes: 4 additions & 4 deletions stack.yaml.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
packages: []
snapshots:
- completed:
sha256: 64d66303f927e87ffe6b8ccf736229bf608731e80d7afdf62bdd63c59f857740
size: 640037
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/11.yaml
original: lts-21.11
sha256: 8b211c5a6aad3787e023dfddaf7de7868968e4f240ecedf14ad1c5b2199046ca
size: 714097
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/4.yaml
original: lts-22.4

0 comments on commit 623b574

Please sign in to comment.