From 7fe96798f3f552e9db634e8e47c5d64ca034f7b6 Mon Sep 17 00:00:00 2001 From: Lev <3114081+ldub@users.noreply.github.com> Date: Tue, 25 Nov 2025 15:11:20 -0500 Subject: [PATCH 1/4] data default migration --- cabal.project | 1 + slack-web.cabal | 4 ++-- src/Web/Slack/Prelude.hs | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cabal.project b/cabal.project index e6fdbad..a1b6cbb 100644 --- a/cabal.project +++ b/cabal.project @@ -1 +1,2 @@ packages: . +constraints: data-default-class >= 0.2 diff --git a/slack-web.cabal b/slack-web.cabal index e32e344..db7b757 100644 --- a/slack-web.cabal +++ b/slack-web.cabal @@ -153,14 +153,14 @@ library , classy-prelude , containers , crypton - , data-default-class + , data-default , deepseq , either , errors , hashable , http-api-data >= 0.3 && < 0.7 , http-client >= 0.5 && < 0.8 - , http-client-tls >= 0.3 && < 0.4 + , http-client-tls >= 0.3 , megaparsec >= 5.0 && < 10 , mono-traversable , mtl diff --git a/src/Web/Slack/Prelude.hs b/src/Web/Slack/Prelude.hs index d1d4c47..ceef7e1 100644 --- a/src/Web/Slack/Prelude.hs +++ b/src/Web/Slack/Prelude.hs @@ -12,7 +12,7 @@ module Web.Slack.Prelude ( import ClassyPrelude hiding (link) import Data.Aeson (FromJSON (..), ToJSON (..), object, withObject, (.:), (.:?), (.=)) import Data.Aeson.TH (deriveFromJSON, deriveJSON, deriveToJSON) -import Data.Default.Class (Default (..)) +import Data.Default (Default (..)) import Data.List.NonEmpty (NonEmpty (..)) import Data.Proxy (Proxy (..)) import Data.String.Conversions (cs) From 189104e523ae827761b0dd6d77e21af7ae662570 Mon Sep 17 00:00:00 2001 From: Lev <3114081+ldub@users.noreply.github.com> Date: Tue, 25 Nov 2025 15:17:16 -0500 Subject: [PATCH 2/4] data default migration --- cabal.project | 1 - slack-web.cabal | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cabal.project b/cabal.project index a1b6cbb..e6fdbad 100644 --- a/cabal.project +++ b/cabal.project @@ -1,2 +1 @@ packages: . -constraints: data-default-class >= 0.2 diff --git a/slack-web.cabal b/slack-web.cabal index db7b757..c8e4bfe 100644 --- a/slack-web.cabal +++ b/slack-web.cabal @@ -152,7 +152,7 @@ library , bytestring , classy-prelude , containers - , crypton + , crypton >= 1.0.4 , data-default , deepseq , either From 1cfc5c28020cb703ca2b6d3b39a9f416af390afd Mon Sep 17 00:00:00 2001 From: Lev <3114081+ldub@users.noreply.github.com> Date: Tue, 25 Nov 2025 15:18:11 -0500 Subject: [PATCH 3/4] data default migration --- slack-web.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slack-web.cabal b/slack-web.cabal index c8e4bfe..c9976b6 100644 --- a/slack-web.cabal +++ b/slack-web.cabal @@ -160,7 +160,7 @@ library , hashable , http-api-data >= 0.3 && < 0.7 , http-client >= 0.5 && < 0.8 - , http-client-tls >= 0.3 + , http-client-tls >= 0.3 && < 0.4 , megaparsec >= 5.0 && < 10 , mono-traversable , mtl From 0dcc30899537ca1ef772e21c35d9b1662f214734 Mon Sep 17 00:00:00 2001 From: Lev <3114081+ldub@users.noreply.github.com> Date: Tue, 25 Nov 2025 17:31:26 -0500 Subject: [PATCH 4/4] ghc upgrade --- flake.lock | 18 +++++++++--------- flake.nix | 2 +- slack-web.cabal | 2 +- src/Web/Slack/Internal.hs | 2 ++ 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index ffd911d..ef07f80 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -57,11 +57,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1763966396, + "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", "type": "github" }, "original": { @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1735882644, - "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", + "lastModified": 1763988335, + "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", + "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 907df4b..e93636b 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,7 @@ outputs = { self, nixpkgs, flake-utils, pre-commit-hooks }: let - ghcVer = "ghc96"; + ghcVer = "ghc910"; makeHaskellOverlay = overlay: final: prev: { haskell = prev.haskell // { packages = prev.haskell.packages // { diff --git a/slack-web.cabal b/slack-web.cabal index c9976b6..290092b 100644 --- a/slack-web.cabal +++ b/slack-web.cabal @@ -152,7 +152,7 @@ library , bytestring , classy-prelude , containers - , crypton >= 1.0.4 + , crypton , data-default , deepseq , either diff --git a/src/Web/Slack/Internal.hs b/src/Web/Slack/Internal.hs index 579f50f..33ea3b8 100644 --- a/src/Web/Slack/Internal.hs +++ b/src/Web/Slack/Internal.hs @@ -1,3 +1,5 @@ +{-# OPTIONS_GHC -Wno-orphans #-} + -- | Internal things in slack-web. May be changed arbitrarily! module Web.Slack.Internal where