diff options
| author | Peter Simons <simons@cryp.to> | 2016-06-05 18:06:01 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2016-06-06 09:33:31 +0200 |
| commit | a01fab64e2683531c0fb28e2582a2129b251ffd3 (patch) | |
| tree | d151d7922944078c0c124e2b829e80e79580a286 | |
| parent | 1845843cdd355a846dfa9e0eb1c3cb47c5578ef0 (diff) | |
| download | nixpkgs-a01fab64e2683531c0fb28e2582a2129b251ffd3.tar nixpkgs-a01fab64e2683531c0fb28e2582a2129b251ffd3.tar.gz nixpkgs-a01fab64e2683531c0fb28e2582a2129b251ffd3.tar.bz2 nixpkgs-a01fab64e2683531c0fb28e2582a2129b251ffd3.tar.lz nixpkgs-a01fab64e2683531c0fb28e2582a2129b251ffd3.tar.xz nixpkgs-a01fab64e2683531c0fb28e2582a2129b251ffd3.tar.zst nixpkgs-a01fab64e2683531c0fb28e2582a2129b251ffd3.zip | |
haskell-binary: update overrides for latest version
4 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix index 89755799af8..b4ea8fd95b9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix @@ -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_3_0; + binary = self.binary_0_8_4_0; deepseq = self.deepseq_1_3_0_1; haskeline = self.haskeline_0_7_2_1; hoopl = self.hoopl_3_10_2_0; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index d4c3ae73114..2507f9d6aed 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -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_3_0; process = self.process_1_2_3_0; }; + Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_4_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; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix index 977fffbd558..980f4159bc1 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -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_3_0; }; + Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_4_0; }; # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. - cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_3_0; }); + cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_4_0; }); # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index 4ce544534fc..1eebbf2ced9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -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_3_0; }; + Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_4_0; }; # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. - cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_3_0; }); + cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_4_0; }); # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; |