diff options
| author | Peter Simons <simons@cryp.to> | 2014-12-18 19:56:00 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2014-12-19 07:45:12 +0100 |
| commit | d461256d8b12bafea8c2a5393b289a183a750b9e (patch) | |
| tree | f37f7585bfa358cc72e7093b4870aea28cefeb5d /pkgs/top-level | |
| parent | b441fa9f195cba6d9da3d52c89d8c0da357f4450 (diff) | |
| download | nixlib-d461256d8b12bafea8c2a5393b289a183a750b9e.tar nixlib-d461256d8b12bafea8c2a5393b289a183a750b9e.tar.gz nixlib-d461256d8b12bafea8c2a5393b289a183a750b9e.tar.bz2 nixlib-d461256d8b12bafea8c2a5393b289a183a750b9e.tar.lz nixlib-d461256d8b12bafea8c2a5393b289a183a750b9e.tar.xz nixlib-d461256d8b12bafea8c2a5393b289a183a750b9e.tar.zst nixlib-d461256d8b12bafea8c2a5393b289a183a750b9e.zip | |
haskell-transformers-compat: update to version 0.3.3.4
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/haskell-defaults.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 74e4b19ea62b..4e3746d4de6e 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -17,7 +17,6 @@ ghcHEADPrefs = self : super : super // { cabalInstall_1_20_0_4 = super.cabalInstall_1_20_0_4.override { Cabal = null; }; mtl = self.mtl_2_2_1; - transformersCompat = super.transformersCompat_0_3_3; }; ghc783Prefs = self : super : ghcHEADPrefs self super // { @@ -26,6 +25,9 @@ jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_20_0_2; }; MonadRandom = self.MonadRandom_0_2_0_1; # newer versions require transformers >= 0.4.x mtl = self.mtl_2_1_3_1; + transformersCompat = super.transformersCompat.override { cabal = self.cabal.override { + extension = self: super: { configureFlags = "-fthree " + super.configureFlags or ""; }; + }; }; }; ghc763Prefs = self : super : ghc783Prefs self super // { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8a3d0815e62f..7d3f59486cb7 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2635,9 +2635,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in transformersBase = callPackage ../development/libraries/haskell/transformers-base {}; - transformersCompat_0_3_3 = callPackage ../development/libraries/haskell/transformers-compat/0.3.3.nix {}; - transformersCompat_0_3_3_4 = callPackage ../development/libraries/haskell/transformers-compat/0.3.3.4.nix {}; - transformersCompat = self.transformersCompat_0_3_3_4; + transformersCompat = callPackage ../development/libraries/haskell/transformers-compat {}; transformersFree = callPackage ../development/libraries/haskell/transformers-free {}; |