diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-06-12 09:15:11 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-06-12 09:15:11 +0200 |
commit | de12094b0e97e36485a26abce86a014d4bddd0de (patch) | |
tree | dd9db99a798674258d2f46a6068b910505fa6069 /pkgs/top-level/haskell-defaults.nix | |
parent | e4dc3f8ae3665f005b241edee76bfbcde7c1b1c1 (diff) | |
parent | af3d448d335cd22355b6b84857520cfa5cfb380e (diff) | |
download | nixlib-de12094b0e97e36485a26abce86a014d4bddd0de.tar nixlib-de12094b0e97e36485a26abce86a014d4bddd0de.tar.gz nixlib-de12094b0e97e36485a26abce86a014d4bddd0de.tar.bz2 nixlib-de12094b0e97e36485a26abce86a014d4bddd0de.tar.lz nixlib-de12094b0e97e36485a26abce86a014d4bddd0de.tar.xz nixlib-de12094b0e97e36485a26abce86a014d4bddd0de.tar.zst nixlib-de12094b0e97e36485a26abce86a014d4bddd0de.zip |
Merge recent master
Diffstat (limited to 'pkgs/top-level/haskell-defaults.nix')
-rw-r--r-- | pkgs/top-level/haskell-defaults.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index d002503d0c73..beeee5663dc0 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -15,14 +15,15 @@ # Older compilers inherit the overrides from newer ones. ghcHEADPrefs = self : super : super // { - mtl = self.mtl_2_1_2; cabalInstall_1_20_0_2 = super.cabalInstall_1_20_0_2.override { Cabal = null; }; + mtl = self.mtl_2_2_1; transformersCompat = super.transformersCompat_0_3_3; }; ghc782Prefs = self : super : ghcHEADPrefs self super // { cabalInstall_1_20_0_2 = super.cabalInstall_1_20_0_2.override { Cabal = self.Cabal_1_20_0_1; }; codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_1; }; }; + mtl = self.mtl_2_1_2; }; ghc763Prefs = self : super : ghc782Prefs self super // { |