diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 39a1acd9..c44fad7f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -62,7 +62,7 @@ jobs: } - { build: stack, - arg: "--stack-yaml stack-lts-22.33.yaml", + arg: "--stack-yaml stack-lts-22.43.yaml", ismain: false, experimental: false, ghc: "966", @@ -73,7 +73,7 @@ jobs: arg: "", ismain: true, experimental: false, - ghc: "982", + ghc: "983", cachekey: "stack-98", } - { @@ -92,7 +92,7 @@ jobs: arg: "", ismain: true, experimental: false, - ghc: "982", + ghc: "983", cachekey: "stack-98", } diff --git a/flake.lock b/flake.lock index be186de3..7ff99600 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1733392399, + "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 74f421be..3c3f85ee 100644 --- a/flake.nix +++ b/flake.nix @@ -10,11 +10,11 @@ inherit system; }; - stableHPkgs = pkgs.haskell.packages."ghc982"; - hPkgs = pkgs.haskell.packages."ghc982".extend (hself: hsuper: rec { - ihaskell = pkgs.haskell.lib.dontCheck (hself.callHackage "ihaskell" "0.11.0.0" { }); - ghc-syntax-highlighter = - hself.callHackage "ghc-syntax-highlighter" "0.0.11.0" { }; + stableHPkgs = pkgs.haskell.packages."ghc983"; + hPkgs = pkgs.haskell.packages."ghc966".extend (hself: hsuper: rec { + # ihaskell = pkgs.haskell.lib.dontCheck (hself.callHackage "ihaskell" "0.11.0.0" { }); + # ghc-syntax-highlighter = + # hself.callHackage "ghc-syntax-highlighter" "0.0.11.0" { }; }); basicDevTools = [ @@ -46,7 +46,7 @@ }) ]; - devTools = basicDevTools ++ additionalDevTools; + devTools = basicDevTools; # ++ additionalDevTools; # Wrap Stack to work with our Nix integration. We don't want to modify # stack.yaml so non-Nix users don't notice anything. # - no-nix: We don't want Stack's way of integrating Nix. diff --git a/grisette.cabal b/grisette.cabal index 6b74d80d..d10fabf1 100644 --- a/grisette.cabal +++ b/grisette.cabal @@ -38,7 +38,7 @@ tested-with: , GHC == 9.2.8 , GHC == 9.4.8 , GHC == 9.6.6 - , GHC == 9.8.2 + , GHC == 9.8.3 , GHC == 9.10.1 extra-source-files: CHANGELOG.md diff --git a/package.yaml b/package.yaml index d8ccd205..3e6edbcd 100644 --- a/package.yaml +++ b/package.yaml @@ -34,7 +34,7 @@ tested-with: - GHC == 9.2.8 - GHC == 9.4.8 - GHC == 9.6.6 - - GHC == 9.8.2 + - GHC == 9.8.3 - GHC == 9.10.1 dependencies: diff --git a/stack-lts-22.33.yaml b/stack-lts-22.43.yaml similarity index 99% rename from stack-lts-22.33.yaml rename to stack-lts-22.43.yaml index 7cd6084e..39564c78 100644 --- a/stack-lts-22.33.yaml +++ b/stack-lts-22.43.yaml @@ -17,7 +17,7 @@ # # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml -resolver: lts-22.33 +resolver: lts-22.43 # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/stack-lts-22.33.yaml.lock b/stack-lts-22.43.yaml.lock similarity index 65% rename from stack-lts-22.33.yaml.lock rename to stack-lts-22.43.yaml.lock index a9055638..f9829eb0 100644 --- a/stack-lts-22.33.yaml.lock +++ b/stack-lts-22.43.yaml.lock @@ -6,7 +6,7 @@ packages: [] snapshots: - completed: - sha256: 098936027eaa1ef14e2b8eb39d9933a973894bb70a68684a1bbf00730249879b - size: 720001 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/33.yaml - original: lts-22.33 + sha256: 08bd13ce621b41a8f5e51456b38d5b46d7783ce114a50ab604d6bbab0d002146 + size: 720271 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/43.yaml + original: lts-22.43 diff --git a/stack.yaml b/stack.yaml index efa1d9fa..ede0f0e2 100644 --- a/stack.yaml +++ b/stack.yaml @@ -17,7 +17,7 @@ # # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml -resolver: nightly-2024-08-13 +resolver: nightly-2024-12-04 # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/stack.yaml.lock b/stack.yaml.lock index 118a2387..73d9f73e 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -13,7 +13,7 @@ packages: hackage: sbv-11.0 snapshots: - completed: - sha256: 3e2ebb6e538654269973faf683d0068b123a6ee9462a48ac2c3f3281a7bf3f8b - size: 658094 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2024/8/13.yaml - original: nightly-2024-08-13 + sha256: 3096172337b6138d0c4cb5303c4e9c58100230ee8d89aacf7d940a684d22e687 + size: 678646 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2024/12/4.yaml + original: nightly-2024-12-04