From 9de1461f45af72e4e5e68033d8486b6f0e9d7d52 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Sep 2018 12:49:46 +0200 Subject: [PATCH] haskell-stm: update overrides for the new 2.5.x version --- pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghcjs.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index ad1f78c7c3f..7a5b78ba74c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -39,7 +39,7 @@ self: super: { # These are now core libraries in GHC 8.4.x. mtl = self.mtl_2_2_2; parsec = self.parsec_3_1_13_0; - stm = self.stm_2_4_5_1; + stm = self.stm_2_5_0_0; text = self.text_1_2_3_1; # Make sure we can still build Cabal 1.x. diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 7e8bc1a1e8e..489f363db6a 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -25,7 +25,7 @@ self: super: # GHCJS does not ship with the same core packages as GHC. # https://github.com/ghcjs/ghcjs/issues/676 - stm = self.stm_2_4_5_1; + stm = self.stm_2_5_0_0; ghc-compact = self.ghc-compact_0_1_0_0; network = addBuildTools super.network (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv);