Skip to content

Commit

Permalink
haskell-stm: update overrides that use version 2.4.5.0 to version 2.4…
Browse files Browse the repository at this point in the history
….5.1
  • Loading branch information
peti committed Sep 12, 2018
1 parent cd41cad commit 53d3430
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
Expand Up @@ -40,7 +40,7 @@ self: super: {
mtl = self.mtl_2_2_2;
parsec = self.parsec_3_1_13_0;
parsec_3_1_13_0 = addBuildDepends super.parsec_3_1_13_0 [self.fail self.semigroups];
stm = self.stm_2_4_5_0;
stm = self.stm_2_4_5_1;
text = self.text_1_2_3_0;

# Build jailbreak-cabal with the latest version of Cabal.
Expand Down
Expand Up @@ -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_0;
stm = self.stm_2_4_5_1;
text = self.text_1_2_3_0;

# https://github.com/bmillwood/applicative-quoters/issues/6
Expand Down
Expand Up @@ -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_0;
stm = self.stm_2_4_5_1;
text = self.text_1_2_3_0;

# Make sure we can still build Cabal 1.x.
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/haskell-modules/configuration-ghcjs.nix
Expand Up @@ -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_0;
stm = self.stm_2_4_5_1;
ghc-compact = self.ghc-compact_0_1_0_0;

network = addBuildTools super.network (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv);
Expand Down

0 comments on commit 53d3430

Please sign in to comment.