Skip to content

Commit

Permalink
haskell-binary: update use of 0.8.0.1 to 0.8.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
peti committed Feb 3, 2016
1 parent 9e06f68 commit e389794
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ self: super: {
unix = null;

# These packages are core libraries in GHC 7.10.x, but not here.
binary = self.binary_0_8_0_1;
binary = self.binary_0_8_2_0;
deepseq = self.deepseq_1_3_0_1;
haskeline = self.haskeline_0_7_2_1;
hoopl = self.hoopl_3_10_2_0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ self: super: {
xhtml = self.xhtml_3000_2_1;

# https://github.com/haskell/cabal/issues/2322
Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_0_1; process = self.process_1_2_3_0; };
Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_2_0; process = self.process_1_2_3_0; };

# Newer versions don't compile.
Cabal_1_18_1_7 = dontJailbreak super.Cabal_1_18_1_7;
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ self: super: {
xhtml = self.xhtml_3000_2_1;

# https://github.com/haskell/cabal/issues/2322
Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_0_1; };
Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_2_0; };

# Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_0_1; });
cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_2_0; });

# https://github.com/tibbe/hashable/issues/85
hashable = dontCheck super.hashable;
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ self: super: {
xhtml = self.xhtml_3000_2_1;

# https://github.com/haskell/cabal/issues/2322
Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_0_1; };
Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_2_0; };

# Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_0_1; });
cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_2_0; });

# https://github.com/tibbe/hashable/issues/85
hashable = dontCheck super.hashable;
Expand Down

0 comments on commit e389794

Please sign in to comment.