Merge pull request #108 from NoRedInk/update-nixpkgs-2311

Update main nixpkgs to 23.11, drop GHC 8.10.7 support
NoRedInk · Aug 6, 2024 · 0862fd8 · 0862fd8
2 parents 733ee55 + 69dcde0
commit 0862fd8
Show file tree

Hide file tree

Showing 63 changed files with 177 additions and 1,413 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,7 +20,6 @@ jobs:
           - os: ubuntu-22.04 # linux x86_64; 4 vcpu, 16 GB memory
             base-nixpkgs-channel: nixos-23.11
         ghc:
-          - ghc-8-10
           - ghc-9-2
           - ghc-9-4
     runs-on: ${{ matrix.runner.os }}

diff --git a/nix/mk-shell.nix b/nix/mk-shell.nix
@@ -2,6 +2,8 @@
 
 # Fix from https://github.com/srid/haskell-template
 let
+  sources = import ./sources.nix { };
+  pkgs-unstable = import sources.nixpkgs-unstable { };
   workaround140774 = hpkg:
     with pkgs.haskell.lib;
     overrideCabal hpkg (drv: { enableSeparateBinOutput = false; });
@@ -80,6 +82,6 @@ in pkgs.mkShell {
     pkgs.postgresql # for nri-postgres
     pkgs.redis # for nri-redis
     pkgs.zlib
-    pkgs.zookeeper # for nri-kafka
+    pkgs-unstable.zookeeper # for nri-kafka
   ];
 }
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.05",
+        "branch": "release-23.11",
         "description": "Nix Packages collection",
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421",
-        "sha256": "05cbl1k193c9la9xhlz4y6y8ijpb2mkaqrab30zij6z4kqgclsrd",
+        "rev": "a149706fa833be1b3906eaae60230e0fbfdd067d",
+        "sha256": "1b3nywv7idiyq3j2vz5gr3vbfh3q4v4gw2qf7vpd5sb652f36g8x",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/70bdadeb94ffc8806c0570eb5c2695ad29f0e421.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/a149706fa833be1b3906eaae60230e0fbfdd067d.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,7 @@
+# 0.2.0.0
+
+- Drop support for GHC 8.10.7
+
 # 0.1.0.9
 
 - Support GHC 9.4.7

diff --git a/nri-env-parser/nri-env-parser.cabal b/nri-env-parser/nri-env-parser.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.18
 -- see: https://github.com/sol/hpack
 
 name:           nri-env-parser
-version:        0.1.0.9
+version:        0.2.0.0
 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.12.0.0 && <4.18
+      base >=4.16.4.0 && <4.18
     , 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.12.0.0 && <4.18
+      base >=4.16.4.0 && <4.18
     , 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.1.0.9
+version: 0.2.0.0
 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.12.0.0 && < 4.18
+    - base >= 4.16.4.0 && < 4.18
     - 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,7 @@
+# 0.5.0.0
+
+- Drop support for GHC 8.10.7
+
 # 0.4.0.1
 
 - Regen golden results for GHC 9.2.6 / 8.10.7

diff --git a/nri-http/nri-http.cabal b/nri-http/nri-http.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           nri-http
-version:        0.4.0.1
+version:        0.5.0.0
 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
@@ -20,6 +20,7 @@ build-type:     Simple
 extra-source-files:
     README.md
     LICENSE
+    test/golden-results-9.2/expected-http-span
 
 source-repository head
   type: git
@@ -54,7 +55,7 @@ library
   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.12.0.0 && <4.18
+    , base >=4.16.4.0 && <4.18
     , bytestring >=0.10.8.2 && <0.12
     , case-insensitive >=1.1 && <2.0
     , conduit >=1.3.0 && <1.4
@@ -63,7 +64,7 @@ library
     , http-types ==0.12.*
     , mime-types >=0.1.0.0 && <0.2
     , network-uri >=2.6.0.0 && <2.8
-    , nri-observability >=0.1.0.0 && <0.2
+    , nri-observability >=0.1.0.0 && <0.3
     , nri-prelude >=0.1.0.0 && <0.7
     , safe-exceptions >=0.1.7.0 && <1.3
     , text >=1.2.3.1 && <2.1

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.4.0.1
+version: 0.5.0.0
 maintainer: [email protected]
 copyright: 2023 NoRedInk Corp.
 github: NoRedInk/haskell-libraries/nri-http
@@ -11,14 +11,14 @@ category: Web
 extra-source-files:
   - README.md
   - LICENSE
-  - "test/golden-results/*"
+  - "test/golden-results-*/*"
 library:
   dependencies:
   - aeson >= 1.4.6.0 && < 2.2
-  - base >= 4.12.0.0 && < 4.18
+  - base >= 4.16.4.0 && < 4.18
   - bytestring >= 0.10.8.2 && < 0.12
   - nri-prelude >= 0.1.0.0 && < 0.7
-  - nri-observability >= 0.1.0.0 && < 0.2
+  - nri-observability >= 0.1.0.0 && < 0.3
   - conduit >= 1.3.0 && < 1.4
   - case-insensitive >= 1.1 && < 2.0
   - http-client >= 0.6.0 && < 0.8

diff --git a/nri-http/test/GoldenHelpers.hs b/nri-http/test/GoldenHelpers.hs
@@ -1,9 +1,9 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 
 module GoldenHelpers (goldenResultsDir) where
 
--- | Golden results are slightly different between GHC 9.2.x and 8.10.x due
+-- | Historical context:
+-- Golden results are slightly different between GHC 9.2.x and 8.10.x due
 -- to apparent differences in internal handling of stack frame source locations.
 -- In particular, the end of a function call now does not extend to the end of
 -- the line but instead to the end of the function name. E.g. for the following:
@@ -15,10 +15,9 @@ module GoldenHelpers (goldenResultsDir) where
 -- In GHC 8.10.x (and possibly GHC 9.0.x?) `srcLocEndLine` and `srcLocEndCol`
 -- would correspond to the `z` at the end of `baz`.  Unfortunately, in GHC 9.2.x
 -- it corresponds to the second `o` at the end of `foo`.
+--
+-- We keep this helper around so that if this happens again for future GHC versions
+-- we can have different golden results for different GHC versions as necessary.
 
 goldenResultsDir :: Text
-#if __GLASGOW_HASKELL__ >= 902
 goldenResultsDir = "test/golden-results-9.2"
-#else
-goldenResultsDir = "test/golden-results-8.10"
-#endif
diff --git a/nri-http/test/golden-results-8.10/expected-http-span b/nri-http/test/golden-results-8.10/expected-http-span
diff --git a/nri-kafka/CHANGELOG.md b/nri-kafka/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.2.0.0
+
+- Drop support for GHC 8.10.7
+
 # 0.1.0.5
 
 - Support GHC 9.4.7, `aeson-2.1.x`

diff --git a/nri-kafka/nri-kafka.cabal b/nri-kafka/nri-kafka.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           nri-kafka
-version:        0.1.0.5
+version:        0.2.0.0
 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
@@ -69,13 +69,13 @@ library
   build-depends:
       aeson >=1.4.6.0 && <2.2
     , async >=2.2.2 && <2.3
-    , base >=4.12.0.0 && <4.18
+    , base >=4.16.4.0 && <4.18
     , bytestring >=0.10.8.2 && <0.12
     , conduit >=1.3.0 && <1.4
     , containers >=0.6.0.1 && <0.7
     , hw-kafka-client >=4.0.3 && <5.0
-    , nri-env-parser >=0.1.0.0 && <0.2
-    , nri-observability >=0.1.1.1 && <0.2
+    , nri-env-parser >=0.1.0.0 && <0.3
+    , nri-observability >=0.1.1.1 && <0.3
     , nri-prelude >=0.1.0.0 && <0.7
     , safe-exceptions >=0.1.7.0 && <1.3
     , stm >=2.4 && <2.6
@@ -113,14 +113,14 @@ executable pause-resume-bug-consumer
   build-depends:
       aeson >=1.4.6.0 && <2.2
     , async >=2.2.2 && <2.3
-    , base >=4.12.0.0 && <4.18
+    , base >=4.16.4.0 && <4.18
     , bytestring >=0.10.8.2 && <0.12
     , conduit >=1.3.0 && <1.4
     , containers >=0.6.0.1 && <0.7
     , hw-kafka-client >=4.0.3 && <5.0
-    , nri-env-parser >=0.1.0.0 && <0.2
+    , nri-env-parser >=0.1.0.0 && <0.3
     , nri-kafka
-    , nri-observability >=0.1.1.1 && <0.2
+    , nri-observability >=0.1.1.1 && <0.3
     , nri-prelude >=0.1.0.0 && <0.7
     , safe-exceptions >=0.1.7.0 && <1.3
     , stm >=2.4 && <2.6
@@ -162,14 +162,14 @@ executable pause-resume-bug-producer
   build-depends:
       aeson >=1.4.6.0 && <2.2
     , async >=2.2.2 && <2.3
-    , base >=4.12.0.0 && <4.18
+    , base >=4.16.4.0 && <4.18
     , bytestring >=0.10.8.2 && <0.12
     , conduit >=1.3.0 && <1.4
     , containers >=0.6.0.1 && <0.7
     , hw-kafka-client >=4.0.3 && <5.0
-    , nri-env-parser >=0.1.0.0 && <0.2
+    , nri-env-parser >=0.1.0.0 && <0.3
     , nri-kafka
-    , nri-observability >=0.1.1.1 && <0.2
+    , nri-observability >=0.1.1.1 && <0.3
     , nri-prelude >=0.1.0.0 && <0.7
     , safe-exceptions >=0.1.7.0 && <1.3
     , stm >=2.4 && <2.6
@@ -226,13 +226,13 @@ test-suite tests
   build-depends:
       aeson >=1.4.6.0 && <2.2
     , async >=2.2.2 && <2.3
-    , base >=4.12.0.0 && <4.18
+    , base >=4.16.4.0 && <4.18
     , bytestring >=0.10.8.2 && <0.12
     , conduit >=1.3.0 && <1.4
     , containers >=0.6.0.1 && <0.7
     , hw-kafka-client >=4.0.3 && <5.0
-    , nri-env-parser >=0.1.0.0 && <0.2
-    , nri-observability >=0.1.1.1 && <0.2
+    , nri-env-parser >=0.1.0.0 && <0.3
+    , nri-observability >=0.1.1.1 && <0.3
     , nri-prelude >=0.1.0.0 && <0.7
     , safe-exceptions >=0.1.7.0 && <1.3
     , stm >=2.4 && <2.6

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.1.0.5
+version: 0.2.0.0
 maintainer: [email protected]
 copyright: 2023 NoRedInk Corp.
 github: NoRedInk/haskell-libraries/nri-kafka
@@ -16,13 +16,13 @@ extra-source-files:
 dependencies:
   - aeson >= 1.4.6.0 && < 2.2
   - async >=2.2.2 && <2.3
-  - base >= 4.12.0.0 && < 4.18
+  - base >= 4.16.4.0 && < 4.18
   - bytestring >= 0.10.8.2 && < 0.12
   - conduit >= 1.3.0 && < 1.4
   - containers >= 0.6.0.1 && < 0.7
   - hw-kafka-client >=4.0.3 && < 5.0
-  - nri-env-parser >= 0.1.0.0 && < 0.2
-  - nri-observability >= 0.1.1.1 && < 0.2
+  - nri-env-parser >= 0.1.0.0 && < 0.3
+  - nri-observability >= 0.1.1.1 && < 0.3
   - nri-prelude >= 0.1.0.0 && < 0.7
   - safe-exceptions >= 0.1.7.0 && < 1.3
   - stm >= 2.4 && < 2.6

diff --git a/nri-log-explorer/CHANGELOG.md b/nri-log-explorer/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.2.0.0
+
+- Drop support for GHC 8.10.7
+
 # 0.1.1.4
 
 - Support GHC 9.4.7, `aeson-2.1.x`, `text-zipper-0.13.x`, `vector-0.13.x`

diff --git a/nri-log-explorer/nri-log-explorer.cabal b/nri-log-explorer/nri-log-explorer.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.18
 -- see: https://github.com/sol/hpack
 
 name:           nri-log-explorer
-version:        0.1.1.4
+version:        0.2.0.0
 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
@@ -53,7 +53,7 @@ executable log-explorer
       aeson >=1.4.6.0 && <2.2
     , aeson-pretty >=0.8.0 && <0.9
     , async >=2.2.2 && <2.3
-    , base >=4.12.0.0 && <4.18
+    , base >=4.16.4.0 && <4.18
     , brick >=0.51 && <0.72
     , bytestring >=0.10.8.2 && <0.12
     , directory >=1.3.3.0 && <1.4