Update deps

tbidne · Aug 19, 2023 · c96594b · c96594b
1 parent a35d974
commit c96594b
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 70 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -19,9 +19,9 @@ jobs:
         ghc:
           - "8.10.7"
           - "9.0.2"
-          - "9.2.7"
-          - "9.4.5"
-          - "9.6.1"
+          - "9.2.8"
+          - "9.4.6"
+          - "9.6.2"
         os:
         - "macos-latest"
         - "ubuntu-latest"
@@ -54,7 +54,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Setup nix
-        uses: cachix/install-nix-action@v20
+        uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/897876e4c484f1e8f92009fd11b7d988a121a4e7.tar.gz
           extra_nix_config: |

diff --git a/algebra-simple.cabal b/algebra-simple.cabal
@@ -4,7 +4,7 @@ version:            0.1
 license:            MIT
 license-file:       LICENSE
 tested-with:
-  GHC ==8.10.7 || ==9.0.2 || ==9.2.7 || ==9.4.4 || ==9.6.1
+  GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.6 || ==9.6.2
 
 copyright:          2021-2023 Thomas Bidne
 author:             Thomas Bidne
@@ -117,7 +117,7 @@ test-suite props
   build-depends:
     , algebra-simple
     , base
-    , hedgehog        >=1.0.2   && <1.3
+    , hedgehog        >=1.0.2   && <1.5
     , tasty           >=1.1.0.3 && <1.5
     , tasty-hedgehog  >=1.0.0.2 && <1.5
 

diff --git a/default.nix b/default.nix
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,33 +1,23 @@
 {
   description = "algebra-simple flake";
-  inputs.flake-compat = {
-    url = "github:edolstra/flake-compat";
-    flake = false;
-  };
   inputs.flake-parts.url = "github:hercules-ci/flake-parts";
   inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-  inputs.nix-hs-utils = {
-    url = "github:tbidne/nix-hs-utils";
-    inputs.flake-compat.follows = "flake-compat";
-  };
+  inputs.nix-hs-utils.url = "github:tbidne/nix-hs-utils";
   outputs =
-    inputs@{ flake-compat
-    , flake-parts
+    inputs@{ flake-parts
     , nix-hs-utils
     , nixpkgs
     , self
     }:
     flake-parts.lib.mkFlake { inherit inputs; } {
       perSystem = { pkgs, ... }:
         let
-          ghc-version = "ghc944";
+          ghc-version = "ghc962";
           compiler = pkgs.haskell.packages."${ghc-version}".override {
             overrides = final: prev: {
-              apply-refact = prev.apply-refact_0_11_0_0;
-              hedgehog = prev.hedgehog_1_2;
-              # https://github.com/ddssff/listlike/issues/23
-              ListLike = hlib.dontCheck prev.ListLike;
-              tasty-hedgehog = prev.tasty-hedgehog_1_4_0_0;
+              hedgehog = prev.hedgehog_1_3;
+              hlint = prev.hlint_3_6_1;
+              ormolu = prev.ormolu_0_7_1_0;
             };
           };
           hlib = pkgs.haskell.lib;
@@ -37,21 +27,21 @@
               name = "algebra-simple";
               root = ./.;
             };
-          hs-dirs = "src test";
+          hsDirs = "src test";
         in
         {
           packages.default = mkPkg false;
           devShells.default = mkPkg true;
 
           apps = {
             format = nix-hs-utils.format {
-              inherit compiler hs-dirs pkgs;
+              inherit compiler hsDirs pkgs;
             };
             lint = nix-hs-utils.lint {
-              inherit compiler hs-dirs pkgs;
+              inherit compiler hsDirs pkgs;
             };
             lint-refactor = nix-hs-utils.lint-refactor {
-              inherit compiler hs-dirs pkgs;
+              inherit compiler hsDirs pkgs;
             };
           };
         };