diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec7e339..9022e53 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
# Changelog
+## Unreleased
+
+Allow build with GHC 9.2.1.
+
+### Changed
+
+- Allow base 4.16
+
## 1.0.2.0
Improve `utf8-troubleshoot` to make it useful for identifying tricky cases.
diff --git a/flake.lock b/flake.lock
index c5c4c05..d677e58 100644
--- a/flake.lock
+++ b/flake.lock
@@ -199,11 +199,11 @@
]
},
"locked": {
- "lastModified": 1630978517,
- "narHash": "sha256-4NOhGRVH9eu/cpADkSHxMqaAbHVsV7vrDDjjCul0jJA=",
+ "lastModified": 1636798039,
+ "narHash": "sha256-zUqHTquXysBMYsa7Ne7u9Wo1oLRl8ByQI6eJel7ZV5o=",
"owner": "input-output-hk",
"repo": "haskell.nix",
- "rev": "a4e105dcdb6d2b9d0627b8f0b893cec80485c14e",
+ "rev": "91ec10c0321b75a79a4b6af69fdb30fa748ec0f7",
"type": "github"
},
"original": {
@@ -264,11 +264,11 @@
"nix-tools": {
"flake": false,
"locked": {
- "lastModified": 1626997434,
- "narHash": "sha256-1judQmP298ao6cGUNxcGhcAXHOnA9qSLvWk/ZtoUL7w=",
+ "lastModified": 1636018067,
+ "narHash": "sha256-ng306fkuwr6V/malWtt3979iAC4yMVDDH2ViwYB6sQE=",
"owner": "input-output-hk",
"repo": "nix-tools",
- "rev": "c8c5e6a6fbb12a73598d1a434984a36e880ce3cf",
+ "rev": "ed5bd7215292deba55d6ab7a4e8c21f8b1564dda",
"type": "github"
},
"original": {
@@ -342,11 +342,11 @@
},
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1628785280,
- "narHash": "sha256-2B5eMrEr6O8ff2aQNeVxTB+9WrGE80OB4+oM6T7fOcc=",
+ "lastModified": 1635295995,
+ "narHash": "sha256-sGYiXjFlxTTMNb4NSkgvX+knOOTipE6gqwPUQpxNF+c=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "6525bbc06a39f26750ad8ee0d40000ddfdc24acb",
+ "rev": "22a500a3f87bbce73bd8d777ef920b43a636f018",
"type": "github"
},
"original": {
@@ -388,16 +388,16 @@
"old-ghc-nix": {
"flake": false,
"locked": {
- "lastModified": 1621819714,
- "narHash": "sha256-EJCnYQSWk7FRLwS0lZgTWIiQ6pcvDX1VuD6LGD4Uwzs=",
+ "lastModified": 1631092763,
+ "narHash": "sha256-sIKgO+z7tj4lw3u6oBZxqIhDrzSkvpHtv0Kki+lh9Fg=",
"owner": "angerman",
"repo": "old-ghc-nix",
- "rev": "f089a6f090cdb35fcf95f865fc6a31ba6b3ac4eb",
+ "rev": "af48a7a7353e418119b6dfe3cd1463a657f342b8",
"type": "github"
},
"original": {
"owner": "angerman",
- "ref": "master2",
+ "ref": "master",
"repo": "old-ghc-nix",
"type": "github"
}
@@ -421,11 +421,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
- "lastModified": 1636031496,
- "narHash": "sha256-wsZPJ94qOvZrCMMxm1eFwXH5DFtPaiwsgnkpKPm9vXk=",
+ "lastModified": 1636829084,
+ "narHash": "sha256-ZlfUAsiJt0uq5TBrtBWYwuoFaxJu3LiHKTHrLePI+Do=",
"owner": "serokell",
"repo": "serokell.nix",
- "rev": "8a424210a184a6e0870448ad24c00079188d64b9",
+ "rev": "3feedad5710f94ae18483249b7e7d12d4549f4b4",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 7fbe975..17301db 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,7 +27,7 @@
flake =
serokell-nix.lib.haskell.makeFlake pkgs.haskell-nix pkgs.haskell-nix.stackProject {
src = ./.;
- ghcVersions = [ "884" "8107" "901" ];
+ ghcVersions = [ "884" "8107" "901" "921" ];
modules = [ serokell-nix.lib.haskell.ciBuildOptions ];
};
in flake // {
diff --git a/package.yaml b/package.yaml
index 821ac8c..84967e2 100644
--- a/package.yaml
+++ b/package.yaml
@@ -37,7 +37,7 @@ ghc-options:
- -Wredundant-constraints
dependencies:
- - base >= 4.10 && < 4.16
+ - base >= 4.10 && < 4.17
- text >= 0.7 && < 1.3
library:
diff --git a/stack.yaml b/stack.yaml
index 5ffbe60..a2c8667 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2020 Serokell
+# SPDX-FileCopyrightText: 2021 Serokell
#
# SPDX-License-Identifier: MPL-2.0
@@ -6,4 +6,10 @@ resolver: lts-18.14
packages: [.]
extra-deps:
- - th-env-0.1.0.3 # Required for GHC >= 9
+ # Required for GHC >= 9
+ - th-env-0.1.0.3
+
+ # Required for GHC >= 9.2
+ - constraints-0.13.1
+ - hashable-1.3.5.0
+ - random-1.2.1