Merge pull request #113 from NoRedInk/alex-jinnah/update-ghc-9.6

support GHC 9.6.5
NoRedInk · Aug 7, 2024 · 3022329 · 3022329
2 parents 0862fd8 + 1c43e43
commit 3022329
Show file tree

Hide file tree

Showing 55 changed files with 282 additions and 859 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,6 +22,7 @@ jobs:
         ghc:
           - ghc-9-2
           - ghc-9-4
+          - ghc-9-6
     runs-on: ${{ matrix.runner.os }}
     steps:
       - name: Install Nix

diff --git a/nix/common-haskell-overrides.nix b/nix/common-haskell-overrides.nix
@@ -0,0 +1,28 @@
+{ sources, pkgs }:
+self: super:
+  let
+    packageFromSources = name: self.callCabal2nix name sources."${name}" { };
+  in {
+    # todo: resolve breaking changes in brick >= 0.72, also jailbreak
+    # to allow ghc 9.4.x
+    brick =
+      pkgs.haskell.lib.doJailbreak (self.callHackage "brick" "0.71.1" { });
+
+    # >= 5.39 has breaking changes for [email protected]; pin to 5.38 (known-good)
+    vty = self.callHackage "vty" "5.38" { };
+
+    # latest master supports ghc 9.4.x
+    tasty-test-reporter = packageFromSources "tasty-test-reporter";
+
+    # latest master supports ghc 9.4.x
+    string-qq = packageFromSources "string-qq";
+
+    # jailbreak to allow text >= 2
+    pretty-diff = pkgs.haskell.lib.doJailbreak super.pretty-diff;
+
+    # servant-auth-server 0.4.8.0 is marked as broken in nixpkgs but it should be fine
+    servant-auth-server = pkgs.haskell.lib.markUnbroken super.servant-auth-server;
+
+    # for now, pin hw-kafka-client to 4.0.3; [email protected] provides 5.3.0
+    hw-kafka-client = self.callHackage "hw-kafka-client" "4.0.3" { };
+  }
diff --git a/nix/mk-shell.nix b/nix/mk-shell.nix
@@ -7,14 +7,6 @@ let
   workaround140774 = hpkg:
     with pkgs.haskell.lib;
     overrideCabal hpkg (drv: { enableSeparateBinOutput = false; });
-  # It is still necessary to run `hpack --force` into packages home dirs
-  haskell-language-server =
-    pkgs.haskellPackages.haskell-language-server.override {
-      hls-ormolu-plugin = pkgs.haskellPackages.hls-ormolu-plugin.override {
-        ormolu = (workaround140774 pkgs.haskellPackages.ormolu);
-      };
-    };
-
 in pkgs.mkShell {
   buildInputs = [
     (haskellPackages.ghcWithPackages (haskellPackages:
@@ -76,7 +68,7 @@ in pkgs.mkShell {
     pkgs.cabal-install
     pkgs.cachix
     pkgs.gnumake
-    haskell-language-server
+    pkgs.haskellPackages.haskell-language-server
     pkgs.haskellPackages.hpack
     pkgs.pcre
     pkgs.postgresql # for nri-postgres

diff --git a/nix/sources.json b/nix/sources.json
@@ -12,15 +12,15 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
-        "branch": "release-23.11",
+        "branch": "release-24.05",
         "description": "Nix Packages collection",
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a149706fa833be1b3906eaae60230e0fbfdd067d",
-        "sha256": "1b3nywv7idiyq3j2vz5gr3vbfh3q4v4gw2qf7vpd5sb652f36g8x",
+        "rev": "59be168c1fcab339bab5fd482d93c995f470cbad",
+        "sha256": "0am4h3ck2as4lq7b37zlxah8zqm57scjl06y5xkk9islh3jvklmf",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/a149706fa833be1b3906eaae60230e0fbfdd067d.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/59be168c1fcab339bab5fd482d93c995f470cbad.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-unstable": {

diff --git a/nri-env-parser/CHANGELOG.md b/nri-env-parser/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 0.2.0.1
+
+- Drop support for `aeson-1.x`
+- Support GHC 9.6.5
+
 # 0.2.0.0
 
 - Drop support for GHC 8.10.7

diff --git a/nri-env-parser/nri-env-parser.cabal b/nri-env-parser/nri-env-parser.cabal
@@ -1,11 +1,11 @@
 cabal-version: 1.18
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 
 name:           nri-env-parser
-version:        0.2.0.0
+version:        0.2.0.1
 synopsis:       Read environment variables as settings to build 12-factor apps.
 description:    Please see the README at <https://github.com/NoRedInk/haskell-libraries/tree/trunk/nri-env-parser#readme>.
 category:       Web
@@ -50,7 +50,7 @@ library
       TypeOperators
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wpartial-fields -Wredundant-constraints -Wincomplete-uni-patterns -fplugin=NriPrelude.Plugin
   build-depends:
-      base >=4.16.4.0 && <4.18
+      base >=4.16.4.0 && <4.19
     , modern-uri >=0.3.1.0 && <0.4
     , network-uri >=2.6.2.0 && <2.8
     , nri-prelude >=0.1.0.0 && <0.7
@@ -83,7 +83,7 @@ test-suite tests
       ExtendedDefaultRules
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wpartial-fields -Wredundant-constraints -Wincomplete-uni-patterns -fplugin=NriPrelude.Plugin -threaded -rtsopts "-with-rtsopts=-N -T" -fno-warn-type-defaults
   build-depends:
-      base >=4.16.4.0 && <4.18
+      base >=4.16.4.0 && <4.19
     , modern-uri >=0.3.1.0 && <0.4
     , network-uri >=2.6.2.0 && <2.8
     , nri-prelude >=0.1.0.0 && <0.7

diff --git a/nri-env-parser/package.yaml b/nri-env-parser/package.yaml
@@ -3,7 +3,7 @@ synopsis: Read environment variables as settings to build 12-factor apps.
 description: Please see the README at <https://github.com/NoRedInk/haskell-libraries/tree/trunk/nri-env-parser#readme>.
 homepage: https://github.com/NoRedInk/haskell-libraries/tree/trunk/nri-env-parser#readme
 author: NoRedInk
-version: 0.2.0.0
+version: 0.2.0.1
 maintainer: [email protected]
 copyright: 2023 NoRedInk Corp.
 github: NoRedInk/haskell-libraries/env-parser
@@ -15,7 +15,7 @@ extra-doc-files:
   - CHANGELOG.md
 library:
   dependencies: &dependencies
-    - base >= 4.16.4.0 && < 4.18
+    - base >= 4.16.4.0 && < 4.19
     - nri-prelude >= 0.1.0.0 && < 0.7
     - modern-uri >= 0.3.1.0 && < 0.4
     - network-uri >= 2.6.2.0 && < 2.8

diff --git a/nri-http/CHANGELOG.md b/nri-http/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 0.5.0.1
+
+- Drop support for `aeson-1.x`
+- Support GHC 9.6.5
+
 # 0.5.0.0
 
 - Drop support for GHC 8.10.7

diff --git a/nri-http/nri-http.cabal b/nri-http/nri-http.cabal
@@ -1,11 +1,11 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 
 name:           nri-http
-version:        0.5.0.0
+version:        0.5.0.1
 synopsis:       Make Elm style HTTP requests
 description:    Please see the README at <https://github.com/NoRedInk/haskell-libraries/tree/trunk/nri-http#readme>.
 category:       Web
@@ -54,8 +54,8 @@ library
       NumericUnderscores
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wpartial-fields -Wredundant-constraints -Wincomplete-uni-patterns -fplugin=NriPrelude.Plugin
   build-depends:
-      aeson >=1.4.6.0 && <2.2
-    , base >=4.16.4.0 && <4.18
+      aeson >=2.0 && <2.2
+    , base >=4.16.4.0 && <4.19
     , bytestring >=0.10.8.2 && <0.12
     , case-insensitive >=1.1 && <2.0
     , conduit >=1.3.0 && <1.4
@@ -100,8 +100,8 @@ test-suite spec
       NumericUnderscores
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wpartial-fields -Wredundant-constraints -Wincomplete-uni-patterns -fplugin=NriPrelude.Plugin -fno-warn-type-defaults
   build-depends:
-      aeson >=1.4.6.0 && <2.1
-    , base >=4.12.0.0 && <4.17
+      aeson >=2.0 && <2.2
+    , base >=4.12.0.0 && <4.19
     , bytestring >=0.10.8.2 && <0.12
     , case-insensitive >=1.1 && <2.0
     , conduit >=1.3.0 && <1.4

diff --git a/nri-http/package.yaml b/nri-http/package.yaml
@@ -2,7 +2,7 @@ name: nri-http
 synopsis: Make Elm style HTTP requests
 description: Please see the README at <https://github.com/NoRedInk/haskell-libraries/tree/trunk/nri-http#readme>.
 author: NoRedInk
-version: 0.5.0.0
+version: 0.5.0.1
 maintainer: [email protected]
 copyright: 2023 NoRedInk Corp.
 github: NoRedInk/haskell-libraries/nri-http
@@ -14,8 +14,8 @@ extra-source-files:
   - "test/golden-results-*/*"
 library:
   dependencies:
-  - aeson >= 1.4.6.0 && < 2.2
-  - base >= 4.16.4.0 && < 4.18
+  - aeson >= 2.0 && < 2.2
+  - base >= 4.16.4.0 && < 4.19
   - bytestring >= 0.10.8.2 && < 0.12
   - nri-prelude >= 0.1.0.0 && < 0.7
   - nri-observability >= 0.1.0.0 && < 0.3
@@ -35,8 +35,8 @@ library:
 tests:
   spec:
     dependencies:
-    - aeson >= 1.4.6.0 && < 2.1
-    - base >= 4.12.0.0 && < 4.17
+    - aeson >= 2.0 && < 2.2
+    - base >= 4.12.0.0 && < 4.19
     - bytestring >= 0.10.8.2 && < 0.12
     - nri-prelude >= 0.1.0.0 && < 0.7
     - nri-observability >= 0.1.0.0 && < 0.2

diff --git a/nri-kafka/CHANGELOG.md b/nri-kafka/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 0.2.0.1
+
+- Drop support for `aeson-1.x`
+- Support GHC 9.6.5
+
 # 0.2.0.0
 
 - Drop support for GHC 8.10.7

diff --git a/nri-kafka/nri-kafka.cabal b/nri-kafka/nri-kafka.cabal
@@ -1,11 +1,11 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 
 name:           nri-kafka
-version:        0.2.0.0
+version:        0.2.0.1
 synopsis:       Functions for working with Kafka
 description:    Please see the README at <https://github.com/NoRedInk/haskell-libraries/tree/trunk/nri-kafka#readme>.
 category:       Web
@@ -67,9 +67,9 @@ library
       TypeOperators
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wpartial-fields -Wredundant-constraints -Wincomplete-uni-patterns -fno-warn-type-defaults -fplugin=NriPrelude.Plugin
   build-depends:
-      aeson >=1.4.6.0 && <2.2
+      aeson >=2.0 && <2.2
     , async >=2.2.2 && <2.3
-    , base >=4.16.4.0 && <4.18
+    , base >=4.16.4.0 && <4.19
     , bytestring >=0.10.8.2 && <0.12
     , conduit >=1.3.0 && <1.4
     , containers >=0.6.0.1 && <0.7
@@ -81,7 +81,7 @@ library
     , stm >=2.4 && <2.6
     , text >=1.2.3.1 && <2.1
     , time >=1.8.0.2 && <2
-    , unix >=2.7.2.2 && <2.8.0.0
+    , unix >=2.7.2.2 && <2.9
     , uuid >=1.3.0 && <1.4
   default-language: Haskell2010
 
@@ -111,9 +111,9 @@ executable pause-resume-bug-consumer
       TypeOperators
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wpartial-fields -Wredundant-constraints -Wincomplete-uni-patterns -fno-warn-type-defaults -fplugin=NriPrelude.Plugin -threaded -rtsopts "-with-rtsopts=-N -T" -O2 -main-is Consumer
   build-depends:
-      aeson >=1.4.6.0 && <2.2
+      aeson >=2.0 && <2.2
     , async >=2.2.2 && <2.3
-    , base >=4.16.4.0 && <4.18
+    , base >=4.16.4.0 && <4.19
     , bytestring >=0.10.8.2 && <0.12
     , conduit >=1.3.0 && <1.4
     , containers >=0.6.0.1 && <0.7
@@ -126,7 +126,7 @@ executable pause-resume-bug-consumer
     , stm >=2.4 && <2.6
     , text >=1.2.3.1 && <2.1
     , time >=1.8.0.2 && <2
-    , unix >=2.7.2.2 && <2.8.0.0
+    , unix >=2.7.2.2 && <2.9
     , uuid >=1.3.0 && <1.4
   default-language: Haskell2010
   if flag(pause-resume-bug)
@@ -160,9 +160,9 @@ executable pause-resume-bug-producer
       TypeOperators
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wpartial-fields -Wredundant-constraints -Wincomplete-uni-patterns -fno-warn-type-defaults -fplugin=NriPrelude.Plugin -main-is Producer
   build-depends:
-      aeson >=1.4.6.0 && <2.2
+      aeson >=2.0 && <2.2
     , async >=2.2.2 && <2.3
-    , base >=4.16.4.0 && <4.18
+    , base >=4.16.4.0 && <4.19
     , bytestring >=0.10.8.2 && <0.12
     , conduit >=1.3.0 && <1.4
     , containers >=0.6.0.1 && <0.7
@@ -175,7 +175,7 @@ executable pause-resume-bug-producer
     , stm >=2.4 && <2.6
     , text >=1.2.3.1 && <2.1
     , time >=1.8.0.2 && <2
-    , unix >=2.7.2.2 && <2.8.0.0
+    , unix >=2.7.2.2 && <2.9
     , uuid >=1.3.0 && <1.4
   default-language: Haskell2010
   if flag(pause-resume-bug)
@@ -224,9 +224,9 @@ test-suite tests
       TypeOperators
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wpartial-fields -Wredundant-constraints -Wincomplete-uni-patterns -fno-warn-type-defaults -fplugin=NriPrelude.Plugin -threaded -rtsopts "-with-rtsopts=-N -T" -fno-warn-type-defaults
   build-depends:
-      aeson >=1.4.6.0 && <2.2
+      aeson >=2.0 && <2.2
     , async >=2.2.2 && <2.3
-    , base >=4.16.4.0 && <4.18
+    , base >=4.16.4.0 && <4.19
     , bytestring >=0.10.8.2 && <0.12
     , conduit >=1.3.0 && <1.4
     , containers >=0.6.0.1 && <0.7
@@ -238,6 +238,6 @@ test-suite tests
     , stm >=2.4 && <2.6
     , text >=1.2.3.1 && <2.1
     , time >=1.8.0.2 && <2
-    , unix >=2.7.2.2 && <2.8.0.0
+    , unix >=2.7.2.2 && <2.9
     , uuid >=1.3.0 && <1.4
   default-language: Haskell2010
diff --git a/nri-kafka/package.yaml b/nri-kafka/package.yaml
@@ -3,7 +3,7 @@ synopsis: Functions for working with Kafka
 description: Please see the README at <https://github.com/NoRedInk/haskell-libraries/tree/trunk/nri-kafka#readme>.
 homepage: https://github.com/NoRedInk/haskell-libraries/tree/trunk/nri-kafka#readme
 author: NoRedInk
-version: 0.2.0.0
+version: 0.2.0.1
 maintainer: [email protected]
 copyright: 2023 NoRedInk Corp.
 github: NoRedInk/haskell-libraries/nri-kafka
@@ -14,9 +14,9 @@ extra-source-files:
   - LICENSE
   - CHANGELOG.md
 dependencies:
-  - aeson >= 1.4.6.0 && < 2.2
+  - aeson >= 2.0 && < 2.2
   - async >=2.2.2 && <2.3
-  - base >= 4.16.4.0 && < 4.18
+  - base >= 4.16.4.0 && < 4.19
   - bytestring >= 0.10.8.2 && < 0.12
   - conduit >= 1.3.0 && < 1.4
   - containers >= 0.6.0.1 && < 0.7
@@ -28,7 +28,7 @@ dependencies:
   - stm >= 2.4 && < 2.6
   - text >= 1.2.3.1 && < 2.1
   - time >= 1.8.0.2 && < 2
-  - unix >= 2.7.2.2 && < 2.8.0.0
+  - unix >= 2.7.2.2 && < 2.9
   - uuid >=1.3.0 && < 1.4
 library:
   exposed-modules:

diff --git a/nri-log-explorer/CHANGELOG.md b/nri-log-explorer/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 0.2.0.1
+
+- Drop support for `aeson-1.x`
+- Support GHC 9.6.5
+
 # 0.2.0.0
 
 - Drop support for GHC 8.10.7

diff --git a/nri-log-explorer/nri-log-explorer.cabal b/nri-log-explorer/nri-log-explorer.cabal
@@ -1,11 +1,11 @@
 cabal-version: 1.18
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 
 name:           nri-log-explorer
-version:        0.2.0.0
+version:        0.2.0.1
 synopsis:       Explore logs produced by nri-prelude tests.
 description:    Please see the README at <https://github.com/NoRedInk/haskell-libraries/tree/trunk/nri-log-explorer#readme>.
 category:       Web
@@ -29,7 +29,6 @@ source-repository head
 executable log-explorer
   main-is: Main.hs
   other-modules:
-      AesonHelpers
       Filterable
       Paths_nri_log_explorer
   hs-source-dirs:
@@ -50,10 +49,10 @@ executable log-explorer
       TypeOperators
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wpartial-fields -Wredundant-constraints -Wincomplete-uni-patterns -threaded -rtsopts "-with-rtsopts=-N -T -xq10m" -O2 -fplugin=NriPrelude.Plugin
   build-depends:
-      aeson >=1.4.6.0 && <2.2
+      aeson >=2.0 && <2.2
     , aeson-pretty >=0.8.0 && <0.9
     , async >=2.2.2 && <2.3
-    , base >=4.16.4.0 && <4.18
+    , base >=4.16.4.0 && <4.19
     , brick >=0.51 && <0.72
     , bytestring >=0.10.8.2 && <0.12
     , directory >=1.3.3.0 && <1.4