alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

haskell-stm: update overrides for the new 2.5.x version

Browse source
This commit is contained in:
Peter Simons 2018-09-23 12:49:46 +02:00
parent 21dc7a6aa5
commit 9de1461f45
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
View file

@ -39,7 +39,7 @@ self: super: {
# These are now core libraries in GHC 8.4.x. # These are now core libraries in GHC 8.4.x.
mtl = self.mtl_2_2_2; mtl = self.mtl_2_2_2;
parsec = self.parsec_3_1_13_0; 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; text = self.text_1_2_3_1;
# Make sure we can still build Cabal 1.x. # Make sure we can still build Cabal 1.x.

2
pkgs/development/haskell-modules/configuration-ghcjs.nix
View file

@ -25,7 +25,7 @@ self: super:
# GHCJS does not ship with the same core packages as GHC. # GHCJS does not ship with the same core packages as GHC.
# https://github.com/ghcjs/ghcjs/issues/676 # 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; ghc-compact = self.ghc-compact_0_1_0_0;
network = addBuildTools super.network (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv); network = addBuildTools super.network (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv);