Skip to content

Commit

Permalink
Update tools for ghc 9.10
Browse files Browse the repository at this point in the history
  • Loading branch information
tbidne committed Nov 7, 2024
1 parent 017fe1d commit 2330a1d
Show file tree
Hide file tree
Showing 5 changed files with 74 additions and 32 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- main
- ghc-9.10

pull_request:
branches:
Expand Down
16 changes: 14 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to the
[Haskell Package Versioning Policy](https://pvp.haskell.org/).

## [Unreleased]
TODO: Check versions w/ final nixpkgs

## [0.11]
### Changed
* Updated tools:
* `cabal-fmt: 0.1.11.0 -> 0.1.12`
* `cabal-plan: 0.7.3.0 -> 0.7.4.0`
* `fourmolu: 0.15.0.0 -> 0.16.2.0`
* `hlint: 3.8 -> ???`
* `nixfmt: 2024-03-01 -> 2024-08-16`
* `ormolu: 0.7.4.0 -> 0.7.7.0`
* `stylish: 0.14.6.0 -> ???`

### Added
* `prettier-3.2.5`
* `yamllint-1.35.1`
Expand Down Expand Up @@ -134,7 +146,7 @@ and this project adheres to the

* First version. Released on an unsuspecting world.

[Unreleased]: https://github.com/tbidne/nix-hs-tools/compare/0.10.1...main
[0.11]: https://github.com/tbidne/nix-hs-tools/compare/0.10.1...0.11
[0.10.1]: https://github.com/tbidne/nix-hs-tools/compare/0.10...0.10.1
[0.10]: https://github.com/tbidne/nix-hs-tools/compare/0.9.1.0...0.10
[0.9.1.0]: https://github.com/tbidne/nix-hs-tools/compare/0.9.0.1...0.9.1.0
Expand Down
14 changes: 8 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# nix-hs-tools

[![GitHub release (latest SemVer)](https://img.shields.io/github/v/tag/tbidne/nix-hs-tools?include_prereleases&sort=semver)](https://github.com/tbidne/nix-hs-tools/releases/)
![haskell](https://img.shields.io/static/v1?label=&message=9.8&logo=haskell&logoColor=655889&labelColor=2f353e&color=655889)
![haskell](https://img.shields.io/static/v1?label=&message=9.10&logo=haskell&logoColor=655889&labelColor=2f353e&color=655889)
[![ci](http://img.shields.io/github/actions/workflow/status/tbidne/nix-hs-tools/ci.yaml?branch=main&logoColor=85c5e7&labelColor=2f353c)](https://github.com/tbidne/nix-hs-tools/actions/workflows/ci.yaml)
[![MIT](https://img.shields.io/github/license/tbidne/nix-hs-tools?color=blue)](https://opensource.org/licenses/MIT)

Expand All @@ -15,21 +15,23 @@

<div align="center">

TODO: Check versions w/ final nixpkgs

###### Haskell Formatters
[![Static Badge](https://img.shields.io/badge/cabal--fmt-0.1.11-orange)](#cabal-fmt)
[![Static Badge](https://img.shields.io/badge/fourmolu-0.15.0.0-orange)](#fourmolu)
[![Static Badge](https://img.shields.io/badge/ormolu-0.7.4.0-orange)](#ormolu)
[![Static Badge](https://img.shields.io/badge/cabal--fmt-0.1.12-orange)](#cabal-fmt)
[![Static Badge](https://img.shields.io/badge/fourmolu-0.16.2.0-orange)](#fourmolu)
[![Static Badge](https://img.shields.io/badge/ormolu-0.7.7.0-orange)](#ormolu)
[![Static Badge](https://img.shields.io/badge/stylish-0.14.6.0-orange)](#stylish)

###### Haskell Linters
[![Static Badge](https://img.shields.io/badge/hlint-3.8-orange)](#hlint)

###### Haskell Miscellaneous
[![Static Badge](https://img.shields.io/badge/cabal--plan-0.7.3.0-orange)](#cabal-plan)
[![Static Badge](https://img.shields.io/badge/cabal--plan-0.7.4.0-orange)](#cabal-plan)
[![Static Badge](https://img.shields.io/badge/hie-0.1.4.0-orange)](#hie)

###### Nix Formatters
[![Static Badge](https://img.shields.io/badge/nixfmt-unstable--2024--03--01-orange)](#nixfmt)
[![Static Badge](https://img.shields.io/badge/nixfmt-unstable--2024--08--16-orange)](#nixfmt)
[![Static Badge](https://img.shields.io/badge/nixpkgs--fmt-1.3.0-orange)](#nixpkgs-fmt)

###### Other
Expand Down
36 changes: 15 additions & 21 deletions flake.lock

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

39 changes: 36 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,42 @@
let
hlib = pkgs.haskell.lib;

ghcVers = "ghc981";
# FIXME: The following issues need to be resolved before we can release:
#
# - New hlint release
# - See https://github.com/ndmitchell/hlint/issues/1613
#
# - cabal-plan is broken
#
# - New stylish release
# - https://github.com/haskell/stylish-haskell/issues/479
#
ghcVers = "ghc9101";
compiler = pkgs.haskell.packages."${ghcVers}".override {
overrides = final: prev: { stylish-haskell = prev.stylish-haskell_0_14_6_0; };
overrides = final: prev: {
# cabal-plan needs ansi-terminal > 1.0.2. Note that all of our
# haskell tools are OK with the default ansi-terminal, so make
# sure overriding this does not destory caching for other
# tools.
ansi-terminal = prev.ansi-terminal_1_1_1;
ansi-terminal-types = prev.ansi-terminal-types_1_1;

# NOTE: Disabling test failures as the suite current fails
# due to different call stack output (i.e. it probably
# doesn't matter to us).
call-stack = hlib.dontCheck prev.call-stack;

cabal-plan = prev.cabal-plan_0_7_4_0;
fourmolu = prev.fourmolu_0_16_2_0;
# FIXME: Need a newer version of hlint for GHC 9.10
# (presumably 3.10). Currently waiting for this to be released
# to hackage, then make it to nixpkgs...
#
# https://github.com/ndmitchell/hlint/issues/1613
hlint = prev.hlint_3_8;
ormolu = prev.ormolu_0_7_7_0;
stylish-haskell = prev.stylish-haskell_0_14_6_0;
};
};

pkgsUtils = {
Expand Down Expand Up @@ -68,7 +101,7 @@
\t - version
See github.com/tbidne/nix-hs-tools#readme.
'';
version = "0.10";
version = "0.11";
in
{
apps = {
Expand Down

0 comments on commit 2330a1d

Please sign in to comment.