Skip to content

Commit

Permalink
GHC 9.12 compat, update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
@tbidne
tbidne committed Jan 16, 2025
1 parent 1aa3937 commit 0cc356d
Show file tree
Hide file tree
Showing 10 changed files with 93 additions and 86 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/ci.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ jobs:
matrix:
ghc:
- "9.10.1"
- "9.12.1"
os:
- "macos-latest"
- "ubuntu-latest"
Expand Down Expand Up @@ -47,7 +48,7 @@ jobs:
id: unit
run: cabal test pacer:unit --test-options '--hedgehog-tests 1000000'

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
name: Unit tests upload
if: ${{ failure() && steps.unit.conclusion == 'failure' }}
with:
Expand All @@ -59,7 +60,7 @@ jobs:
id: functional
run: cabal test pacer:functional

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
name: Functional tests upload
if: ${{ failure() && steps.functional.conclusion == 'failure' }}
with:
Expand Down Expand Up @@ -92,7 +93,7 @@ jobs:
- uses: actions/checkout@v4

- name: Setup nix
uses: cachix/install-nix-action@v25
uses: cachix/install-nix-action@v30
with:
github_access_token: ${{ secrets.GITHUB_TOKEN }}
nix_path: nixpkgs=channel:nixos-unstable
Expand All @@ -106,7 +107,7 @@ jobs:
- uses: actions/checkout@v4

- name: Setup nix
uses: cachix/install-nix-action@v25
uses: cachix/install-nix-action@v30
with:
github_access_token: ${{ secrets.GITHUB_TOKEN }}
nix_path: nixpkgs=channel:nixos-unstable
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ If you have never built a haskell program before, [Cabal](#cabal) is probably th
* [`cabal 2.4+`](https://www.haskell.org/cabal/download.html)
* One of:
* [`ghc 9.10`](https://www.haskell.org/ghc/download.html)
* [`ghc 9.12`](https://www.haskell.org/ghc/download.html)

The easiest way to install these is generally [`ghcup`](https://www.haskell.org/ghcup/).

Expand Down
8 changes: 3 additions & 5 deletions app/Main.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,19 @@
module Main (main) where

import Control.Exception.Annotation.Utils
( setUncaughtExceptionDisplayInnerMatch,
( setIgnoreKnownCallStackHandler,
)
import Pacer.Driver (runApp)
import Pacer.Exception qualified as PEx
import Pacer.Prelude hiding (IO, putStrLn)
import System.IO (IO, putStrLn)
import System.IO (IO)

-- | Executable entry-point.
--
-- @since 0.1
main :: IO ()
main = do
setUncaughtExceptionDisplayInnerMatch
PEx.knownExceptions
putStrLn
setIgnoreKnownCallStackHandler PEx.knownExceptions

runner runApp
where
Expand Down
2 changes: 1 addition & 1 deletion cabal.ghc9101.project.freeze
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,4 +143,4 @@ constraints: any.OneTuple ==0.4.2,
any.vector-stream ==0.1.0.1,
any.witherable ==0.4.2,
any.wl-pprint-annotated ==0.1.0.1
index-state: hackage.haskell.org 2025-01-01T08:19:45Z
index-state: hackage.haskell.org 2025-01-16T06:55:53Z
36 changes: 20 additions & 16 deletions cabal.project
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
index-state: 2025-01-16T06:55:53Z

packages: pacer.cabal

package pacer
Expand All @@ -22,27 +24,17 @@ package pacer
source-repository-package
type: git
location: https://github.com/tbidne/algebra-simple.git
tag: 074ec817e7be495e36b94c071f010204bc547351
tag: 973852fc69a3bb7c0477dafcc933c14ec4cb0f75

source-repository-package
type: git
location: https://github.com/tbidne/bounds.git
tag: fb05a7288020d2bca0dbe45cd43d2c030f5a238c

source-repository-package
type: git
location: https://github.com/tbidne/exception-utils.git
tag: 9ecb81e4a16f62736dbe7f90cb1983e7212b0c0f

source-repository-package
type: git
location: https://github.com/tbidne/fs-utils.git
tag: b9b28c24983e2e8cfd559fe00c7d8d1c9b69caa9
tag: b7ca541cfdd8564bcebe5d38456fe7abf77885b8

source-repository-package
type: git
location: https://github.com/tbidne/effectful-libs.git
tag: 0ffc603026f6632a39deb84530612192c1247a1f
tag: 63713ede9a37754dff857900cc3fb38884c6afde
subdir:
lib/concurrent-effectful
lib/fs-effectful
Expand All @@ -56,13 +48,25 @@ source-repository-package

source-repository-package
type: git
location: https://github.com/tbidne/smart-math.git
tag: 641b6b5cf5708c7a27af3b2d94a5947bc24449ef
location: https://github.com/tbidne/exception-utils.git
tag: d9d3d6061d9ad16d9840a4e5e9cdc36a498a2a82

source-repository-package
type: git
location: https://github.com/tbidne/fs-utils.git
tag: e2273c91c411e1fe12347524065855ba8e34a481

source-repository-package
type: git
location: https://github.com/tbidne/relative-time.git
tag: 923df56587a58f390512e204754140c7741acd8b
tag: 6bd6c1208bcda9f5d5ecb7ff45fafb91929cdea8

source-repository-package
type: git
location: https://github.com/tbidne/smart-math.git
tag: d1b9dceac83d677f55798cee2c98b0fc1f54e6f9

optimization: 2
test-show-details: direct

allow-newer: path:hashable
55 changes: 27 additions & 28 deletions flake.lock
View file

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

28 changes: 14 additions & 14 deletions flake.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,18 @@
inputs.nixpkgs.follows = "nixpkgs";
};

effectful-libs = {
url = "github:tbidne/effectful-libs";
inputs.flake-parts.follows = "flake-parts";
inputs.nix-hs-utils.follows = "nix-hs-utils";
inputs.nixpkgs.follows = "nixpkgs";

inputs.algebra-simple.follows = "algebra-simple";
inputs.bounds.follows = "bounds";
inputs.exception-utils.follows = "exception-utils";
inputs.fs-utils.follows = "fs-utils";
};

exception-utils = {
url = "github:tbidne/exception-utils";
inputs.flake-parts.follows = "flake-parts";
Expand All @@ -35,16 +47,14 @@
inputs.nixpkgs.follows = "nixpkgs";
};

effectful-libs = {
url = "github:tbidne/effectful-libs";
relative-time = {
url = "github:tbidne/relative-time";
inputs.flake-parts.follows = "flake-parts";
inputs.nix-hs-utils.follows = "nix-hs-utils";
inputs.nixpkgs.follows = "nixpkgs";

inputs.algebra-simple.follows = "algebra-simple";
inputs.bounds.follows = "bounds";
inputs.exception-utils.follows = "exception-utils";
inputs.fs-utils.follows = "fs-utils";
};

smart-math = {
Expand All @@ -56,16 +66,6 @@
inputs.algebra-simple.follows = "algebra-simple";
inputs.bounds.follows = "bounds";
};

relative-time = {
url = "github:tbidne/relative-time/convert";
inputs.flake-parts.follows = "flake-parts";
inputs.nix-hs-utils.follows = "nix-hs-utils";
inputs.nixpkgs.follows = "nixpkgs";

inputs.algebra-simple.follows = "algebra-simple";
inputs.bounds.follows = "bounds";
};
};
outputs =
inputs@{
Expand Down
13 changes: 6 additions & 7 deletions pacer.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: pacer
version: 0.1
license: MIT
license-file: LICENSE
tested-with: GHC ==9.10.1
tested-with: GHC ==9.10.1 || ==9.12.1
copyright: 2024-2025 Thomas Bidne
author: Thomas Bidne
maintainer: tbidne@protonmail.com
Expand Down Expand Up @@ -114,22 +114,22 @@ library
, filepath >=1.5 && <1.6
, fs-effectful ^>=0.1
, fs-utils ^>=0.1
, ghc-experimental ^>=0.1.0.0
, ghc-experimental >=0.1.0.0 && <9.1202
, ioref-effectful ^>=0.1
, logger-effectful ^>=0.1
, logger-ns-effectful ^>=0.1
, megaparsec >=7.0.5 && <9.7
, megaparsec >=7.0.5 && <9.8
, nonempty-containers >=0.3.4.2 && <0.4
, optparse-applicative >=0.15 && <0.19
, optparse-effectful ^>=0.1
, path ^>=0.9.6
, relative-time ^>=0.1
, singletons ^>=3.0.3
, smart-math ^>=0.1
, template-haskell >=2.21 && <2.23
, template-haskell >=2.21 && <2.24
, terminal-effectful ^>=0.1
, text >=1.2.3.2 && <2.2
, text-display >=0.0.3.0 && <0.6
, text-display >=0.0.3.0 && <1.1
, time >=1.9.3 && <1.15
, time-effectful ^>=0.1
, toml-reader >=0.2.0.0 && <0.3.0.0
Expand Down Expand Up @@ -168,11 +168,10 @@ test-suite unit
build-depends:
, base
, containers
, exception-utils
, filepath
, fs-effectful
, fs-utils
, hedgehog >=1.0.2 && <1.5
, hedgehog >=1.0.2 && <1.6
, logger-effectful
, pacer
, pretty-simple ^>=4.1.2.0
Expand Down
Loading

0 comments on commit 0cc356d

Please sign in to comment.