Skip to content

Commit

Permalink
Merge pull request #972 from endgame/ghc-98
Browse files Browse the repository at this point in the history
GHC 9.8
  • Loading branch information
endgame committed May 13, 2024
2 parents abfca77 + d836f68 commit a37326e
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 24 deletions.
8 changes: 4 additions & 4 deletions configs/templates/types.ede
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{-# LANGUAGE DisambiguateRecordFields #-}
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE StrictData #-}
{-# LANGUAGE DuplicateRecordFields #-}
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE StrictData #-}

{-# OPTIONS_GHC -fno-warn-unused-matches #-}

Expand Down
18 changes: 9 additions & 9 deletions flake.lock

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

14 changes: 3 additions & 11 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
ghc92 = pkgs.haskell.packages."ghc92";
ghc94 = pkgs.haskell.packages."ghc94";
ghc96 = pkgs.haskell.packages."ghc96";
ghc98 = pkgs.haskell.packages."ghc98";

# The default ghc to use when entering `nix develop`.
ghcDefault = ghc94;
Expand All @@ -75,21 +76,11 @@
pkgs.haskell-language-server
pkgs.hlint
pkgs.nixpkgs-fmt
pkgs.ormolu

# Releases
pkgs.gh

# This is regrettable (long build times), but ormolu
# 0.5.0.1 generates really ugly pyramids of `Prelude.seq`
# or `Prelude.hashWithSalt` applications when generating code.
#
# When this assertion fails, check if pkgs.ormolu is newer
# than 0.7.0.0 and see if we can switch back to it.
(
assert (pkgs.ormolu.version == "0.5.0.1");
pkgs.haskell.packages.ghc96.ormolu_0_7_0_0
)

pkgs.parallel
];

Expand Down Expand Up @@ -147,6 +138,7 @@
ghc92 = mkDevShell ghc92;
ghc94 = mkDevShell ghc94;
ghc96 = mkDevShell ghc96;
ghc98 = mkDevShell ghc98;
default = mkDevShell ghcDefault;
};
});
Expand Down
2 changes: 2 additions & 0 deletions lib/amazonka/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

### Fixed

- `amazonka-*`: GHC 9.8 support
[\#9xx](https://github.com/brendanhay/amazonka/pull/9xx)
- `amazonka`: Allow reading the AWS config file when the credentials file is missing [\#951](https://github.com/brendanhay/amazonka/pull/951).
This is useful when you are using a role-based authentication method or AWS IAM Identity Center (formerly AWS SSO) which does not require a credentials file.
Before this fix you had to create an empty credentials file for these methods to work correctly.
Expand Down

0 comments on commit a37326e

Please sign in to comment.