diff --git a/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix b/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix deleted file mode 100644 index 4ff5df9d1c54..000000000000 --- a/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, transformers }: - -cabal.mkDerivation (self: { - pname = "transformers-compat"; - version = "0.3.3"; - sha256 = "14lmwqr6q79k1f7byvb0jcm4r7lprhxkl85z72pr6ghn7bsvqwps"; - buildDepends = [ transformers ]; - meta = { - homepage = "http://github.com/ekmett/transformers-compat/"; - description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms."; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/transformers-compat/0.3.3.4.nix b/pkgs/development/libraries/haskell/transformers-compat/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/transformers-compat/0.3.3.4.nix rename to pkgs/development/libraries/haskell/transformers-compat/default.nix 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 {};