Build on GHC 9.2 (#145)

circuithub · Dec 8, 2021 · 7b9676b · 7b9676b
1 parent 77d1eb3
commit 7b9676b
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 14 deletions.
diff --git a/cabal.project b/cabal.project
@@ -1,6 +1 @@
 packages: .
-
-allow-newer: generic-monoid:base
-allow-newer: cryptohash-sha1:base
-allow-newer: cryptohash-md5:base
-allow-newer: entropy:Cabal
diff --git a/cabal.project.haskell-nix b/cabal.project.haskell-nix
@@ -5,6 +5,7 @@
 
 source-repository-package
   type: git
-  location: git://github.com/jcpetruzza/barbies
-  tag: f99b05454874192e3511bd133555dfb6cc6a6ecb
-  --sha256: 0yy2i2jbllwavv5d2176rf8lmm4l1ws90lxkmdlfgvfzqxidx0gi
+  location: https://github.com/patrickt/haskell-hedgehog
+  tag: 94dd5b81e46d4a636521acf08039c8e3d848ef37
+  subdir: hedgehog
+  --sha256: 1iaza4hjq1897bchb6i6adk7hggbald18ahbn1fn9pkw5imsy2a7
diff --git a/default.nix b/default.nix
@@ -1,11 +1,11 @@
 let
   haskellNix = import (import ./nix/sources.nix)."haskell.nix" {};
 
-  nixpkgsSrc = haskellNix.sources.nixpkgs-2009;
+  nixpkgsSrc = haskellNix.sources.nixpkgs-unstable;
 
   nixpkgsArgs = haskellNix.nixpkgsArgs;
 
-  compiler-nix-name = "ghc901";
+  compiler-nix-name = "ghc921";
 
   pkgs = import nixpkgsSrc nixpkgsArgs;
 

diff --git a/nix/sources.json b/nix/sources.json
@@ -5,10 +5,10 @@
         "homepage": "https://input-output-hk.github.io/haskell.nix",
         "owner": "input-output-hk",
         "repo": "haskell.nix",
-        "rev": "b8c96c25346fa2cce20d857ebefaffd947cb059d",
-        "sha256": "1k6fys034zz1pkqgllm100gpwvcf68cmpk22jlvldbc02ifpj24q",
+        "rev": "390926776d35a889852c6de9312661511fade9ed",
+        "sha256": "1dbvpkk0bgg3cirihzwj1s0m6xvjz66rw954ah8661bq96qlfqbr",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/haskell.nix/archive/b8c96c25346fa2cce20d857ebefaffd947cb059d.tar.gz",
+        "url": "https://github.com/input-output-hk/haskell.nix/archive/390926776d35a889852c6de9312661511fade9ed.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "niv": {

diff --git a/rel8.cabal b/rel8.cabal
@@ -20,7 +20,7 @@ source-repository head
 library
   build-depends:
       aeson
-    , base ^>= 4.14 || ^>=4.15
+    , base ^>= 4.14 || ^>=4.15 || ^>=4.16
     , bifunctors
     , bytestring
     , case-insensitive

diff --git a/src/Rel8/Expr.hs b/src/Rel8/Expr.hs
@@ -1,5 +1,6 @@
 {-# language DataKinds #-}
 {-# language DerivingStrategies #-}
+{-# language FlexibleContexts #-}
 {-# language FlexibleInstances #-}
 {-# language MultiParamTypeClasses #-}
 {-# language ScopedTypeVariables #-}

diff --git a/src/Rel8/Generic/Construction/ADT.hs b/src/Rel8/Generic/Construction/ADT.hs
@@ -1,6 +1,7 @@
 {-# language AllowAmbiguousTypes #-}
 {-# language BlockArguments #-}
 {-# language DataKinds #-}
+{-# language FlexibleContexts #-}
 {-# language FlexibleInstances #-}
 {-# language MultiParamTypeClasses #-}
 {-# language RankNTypes #-}

diff --git a/src/Rel8/Generic/Record.hs b/src/Rel8/Generic/Record.hs
@@ -1,5 +1,6 @@
 {-# language AllowAmbiguousTypes #-}
 {-# language DataKinds #-}
+{-# language FlexibleContexts #-}
 {-# language FlexibleInstances #-}
 {-# language MultiParamTypeClasses #-}
 {-# language PolyKinds #-}

diff --git a/src/Rel8/Generic/Table/ADT.hs b/src/Rel8/Generic/Table/ADT.hs
@@ -1,5 +1,6 @@
 {-# language AllowAmbiguousTypes #-}
 {-# language DataKinds #-}
+{-# language FlexibleContexts #-}
 {-# language FlexibleInstances #-}
 {-# language LambdaCase #-}
 {-# language MultiParamTypeClasses #-}

diff --git a/src/Rel8/Type.hs b/src/Rel8/Type.hs
@@ -1,3 +1,4 @@
+{-# language FlexibleContexts #-}
 {-# language FlexibleInstances #-}
 {-# language MonoLocalBinds #-}
 {-# language MultiWayIf #-}