From f40f1e2f2c669d4ad668d804effa5bbeaa070efe Mon Sep 17 00:00:00 2001 From: Nicolas Pouillard Date: Fri, 13 Oct 2023 22:28:08 +0200 Subject: [PATCH 1/4] haskell.packages.ghc96.fgl: 5.8.0.0 -> 5.8.1.1 --- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 157d6f77f609..a44b3e79a23d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -74,6 +74,7 @@ self: super: { bifunctors = doDistribute self.bifunctors_5_6_1; base-compat = doDistribute self.base-compat_0_13_0; base-compat-batteries = doDistribute self.base-compat-batteries_0_13_0; + fgl = doDistribute self.fgl_5_8_1_1; # Because we bumped the version of th-abstraction above.^ aeson = doJailbreak super.aeson; From 91c6034e2bb744c3da9f0628c843cc11385bf7fe Mon Sep 17 00:00:00 2001 From: Nicolas Pouillard Date: Fri, 13 Oct 2023 22:34:46 +0200 Subject: [PATCH 2/4] haskell.packages.ghc96.warp_3_3_29: update exception from warp_3_3_28 --- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index a44b3e79a23d..f6265fefb5db 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -262,7 +262,7 @@ self: super: { }) super.ConfigFile; # The curl executable is required for withApplication tests. - warp_3_3_28 = addTestToolDepend pkgs.curl super.warp_3_3_28; + warp_3_3_29 = addTestToolDepend pkgs.curl super.warp_3_3_29; # The NCG backend for aarch64 generates invalid jumps in some situations, # the workaround on 9.6 is to revert to the LLVM backend (which is used From c49f4c784c21883f1b4370bf4c3dc7bf9a71651d Mon Sep 17 00:00:00 2001 From: Nicolas Pouillard Date: Sat, 14 Oct 2023 00:07:14 +0200 Subject: [PATCH 3/4] haskell.packages.ghc96.servant: 0.20 -> 0.20.1 --- .../development/haskell-modules/configuration-ghc-9.6.x.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index f6265fefb5db..27b955e6efe8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -171,18 +171,18 @@ self: super: { stylish-haskell = super.stylish-haskell_0_14_5_0; # Newer version of servant required for GHC 9.6 - servant = self.servant_0_20; + servant = self.servant_0_20_1; servant-server = self.servant-server_0_20; servant-client = self.servant-client_0_20; servant-client-core = self.servant-client-core_0_20; - # Select versions compatible with servant_0_20 + # Select versions compatible with servant_0_20_1 servant-docs = self.servant-docs_0_13; servant-swagger = self.servant-swagger_1_2; # Jailbreaks for servant <0.20 servant-lucid = doJailbreak super.servant-lucid; # Jailbreak strict upper bounds: http-api-data <0.6 - servant_0_20 = doJailbreak super.servant_0_20; + servant_0_20_1 = doJailbreak super.servant_0_20_1; servant-server_0_20 = doJailbreak super.servant-server_0_20; servant-client_0_20 = doJailbreak super.servant-client_0_20; servant-client-core_0_20 = doJailbreak super.servant-client-core_0_20; From 45dfae0893d5d5bd0c74fb5cf6d9617829dd7597 Mon Sep 17 00:00:00 2001 From: Nicolas Pouillard Date: Sat, 14 Oct 2023 00:27:26 +0200 Subject: [PATCH 4/4] haskell.packages.ghc96.fourmolu: 0.13.1.0 -> 0.14.0.0 --- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 27b955e6efe8..a23364a73149 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -166,7 +166,7 @@ self: super: { hls-floskell-plugin = null; }; - fourmolu = super.fourmolu_0_13_1_0; + fourmolu = super.fourmolu_0_14_0_0; ormolu = self.generateOptparseApplicativeCompletions [ "ormolu" ] (enableSeparateBinOutput super.ormolu_0_7_2_0); stylish-haskell = super.stylish-haskell_0_14_5_0;