From a8d77f4b7957959a43eaba3eaec2880f8ad4b0f4 Mon Sep 17 00:00:00 2001
From: Mesabloo <22964017+Mesabloo@users.noreply.github.com>
Date: Tue, 26 Apr 2022 15:09:41 +0200
Subject: [PATCH] switch to latest GHC 8.10.7 LTS

---
 diagnose.cabal         | 48 +++++++++++++++++++++---------------------
 nix/nixpkgs-pinned.nix | 15 +++++++------
 package.yaml           | 15 +++++++------
 stack.yaml             |  3 ++-
 4 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/diagnose.cabal b/diagnose.cabal
index cbf6eed..bfd3bd5 100644
--- a/diagnose.cabal
+++ b/diagnose.cabal
@@ -65,13 +65,13 @@ library
   ghc-options: -Wall -Wextra
   build-depends:
       base >=4.7 && <5
-    , bytestring ==0.10.*
-    , data-default ==0.7.*
-    , hashable ==1.3.*
-    , prettyprinter ==1.7.*
-    , prettyprinter-ansi-terminal ==1.1.*
-    , text ==1.2.*
+    , data-default >=0.7 && <1
+    , hashable >=1.3 && <2
+    , prettyprinter >=1.7.0 && <2
+    , prettyprinter-ansi-terminal >=1.1.0 && <2
+    , text >=1.2 && <2
     , unordered-containers ==0.2.*
+    , wcwidth >=0.0.1
   if flag(json)
     cpp-options: -DUSE_AESON
     build-depends:
@@ -105,14 +105,14 @@ test-suite diagnose-megaparsec-tests
   ghc-options: -Wall -Wextra -threaded -rtsopts -with-rtsopts=-N
   build-depends:
       base >=4.7 && <5
-    , bytestring ==0.10.*
-    , data-default ==0.7.*
+    , data-default >=0.7 && <1
     , diagnose
-    , hashable ==1.3.*
-    , prettyprinter ==1.7.*
-    , prettyprinter-ansi-terminal ==1.1.*
-    , text ==1.2.*
+    , hashable >=1.3 && <2
+    , prettyprinter >=1.7.0 && <2
+    , prettyprinter-ansi-terminal >=1.1.0 && <2
+    , text >=1.2 && <2
     , unordered-containers ==0.2.*
+    , wcwidth >=0.0.1
   if flag(json)
     cpp-options: -DUSE_AESON
     build-depends:
@@ -143,14 +143,14 @@ test-suite diagnose-parsec-tests
   ghc-options: -Wall -Wextra -threaded -rtsopts -with-rtsopts=-N
   build-depends:
       base >=4.7 && <5
-    , bytestring ==0.10.*
-    , data-default ==0.7.*
+    , data-default >=0.7 && <1
     , diagnose
-    , hashable ==1.3.*
-    , prettyprinter ==1.7.*
-    , prettyprinter-ansi-terminal ==1.1.*
-    , text ==1.2.*
+    , hashable >=1.3 && <2
+    , prettyprinter >=1.7.0 && <2
+    , prettyprinter-ansi-terminal >=1.1.0 && <2
+    , text >=1.2 && <2
     , unordered-containers ==0.2.*
+    , wcwidth >=0.0.1
   if flag(json)
     cpp-options: -DUSE_AESON
     build-depends:
@@ -180,14 +180,14 @@ test-suite diagnose-rendering-tests
   ghc-options: -Wall -Wextra -threaded -rtsopts -with-rtsopts=-N
   build-depends:
       base >=4.7 && <5
-    , bytestring ==0.10.*
-    , data-default ==0.7.*
+    , data-default >=0.7 && <1
     , diagnose
-    , hashable ==1.3.*
-    , prettyprinter ==1.7.*
-    , prettyprinter-ansi-terminal ==1.1.*
-    , text ==1.2.*
+    , hashable >=1.3 && <2
+    , prettyprinter >=1.7.0 && <2
+    , prettyprinter-ansi-terminal >=1.1.0 && <2
+    , text >=1.2 && <2
     , unordered-containers ==0.2.*
+    , wcwidth >=0.0.1
   if flag(json)
     cpp-options: -DUSE_AESON
     build-depends:
diff --git a/nix/nixpkgs-pinned.nix b/nix/nixpkgs-pinned.nix
index cc6bdd0..576e712 100644
--- a/nix/nixpkgs-pinned.nix
+++ b/nix/nixpkgs-pinned.nix
@@ -1,6 +1,9 @@
-import (builtins.fetchTarball {
-  name = "nixpkgs-pinned";
-  url = "https://github.com/nixos/nixpkgs/archive/43cdc5b364511eabdcad9fde639777ffd9e5bab1.tar.gz";
-  # Use `nix-prefetch-url --unpack <url>`
-  sha256 = "1wrd5rrpa2fcy6q9193vgihiqmqc686vmwqyn24cb0fk1a37m2g4";
-}) {}
+import
+  (builtins.fetchTarball {
+    name = "nixpkgs-pinned";
+    url = "https://github.com/nixos/nixpkgs/archive/a7ecde854aee5c4c7cd6177f54a99d2c1ff28a31.tar.gz";
+    # Use `nix-prefetch-url --unpack <url>`
+    sha256 = "162dywda2dvfj1248afxc45kcrg83appjd0nmdb541hl7rnncf02";
+  })
+{ }
+
diff --git a/package.yaml b/package.yaml
index b69691f..4c61f75 100644
--- a/package.yaml
+++ b/package.yaml
@@ -8,13 +8,14 @@ category: "Error Reporting"
 
 dependencies:
 - base >= 4.7 && < 5
-- prettyprinter == 1.7.*
-- prettyprinter-ansi-terminal == 1.1.*
-- unordered-containers == 0.2.*
-- hashable == 1.3.*
-- data-default == 0.7.*
-- bytestring == 0.10.*
-- text == 1.2.*
+- prettyprinter >= 1.7.0 && < 2
+- prettyprinter-ansi-terminal >= 1.1.0 && < 2
+- unordered-containers >= 0.2 && < 0.3
+- hashable >= 1.3 && < 2
+- data-default >= 0.7 && < 1
+# - bytestring >= 0.9 && < 1
+- text >= 1.2 && < 2
+- wcwidth >= 0.0.1
 
 default-extensions:
 - OverloadedStrings
diff --git a/stack.yaml b/stack.yaml
index 0cb21ad..2c57105 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -17,7 +17,7 @@
 #
 # resolver: ./custom-snapshot.yaml
 # resolver: https://example.com/snapshots/2018-01-01.yaml
-resolver: lts-18.5
+resolver: lts-18.28
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.
@@ -40,6 +40,7 @@ packages:
 #   commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a
 #
 # extra-deps: []
+extra-deps:
 
 # Override default flag values for local packages and extra-deps
 # flags: {}