haskell-ng: switch default configuration to mtl 2.2.x

pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix

@@ -49,8 +49,6 @@ self: super: {
 
   # transformers is not a core library for this compiler.
   transformers = self.transformers_0_4_3_0;
-  mtl = self.mtl_2_2_1;
-  transformers-compat = disableCabalFlag super.transformers-compat "three";
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;

pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix

@@ -42,8 +42,6 @@ self: super: {
 
   # transformers is not a core library for this compiler.
   transformers = self.transformers_0_4_3_0;
-  mtl = self.mtl_2_2_1;
-  transformers-compat = disableCabalFlag super.transformers-compat "three";
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;

pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix

@@ -88,10 +88,6 @@ self: super: {
   nats = dontHaddock super.nats;
   bytestring-builder = dontHaddock super.bytestring-builder;
 
-  # We have transformers 4.x
-  mtl = self.mtl_2_2_1;
-  transformers-compat = disableCabalFlag super.transformers-compat "three";
-
   # We have time 1.5
   aeson = disableCabalFlag super.aeson "old-locale";
 

pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix

@@ -39,8 +39,6 @@ self: super: {
 
   # transformers is not a core library for this compiler.
   transformers = self.transformers_0_4_3_0;
-  mtl = self.mtl_2_2_1;
-  transformers-compat = disableCabalFlag super.transformers-compat "three";
 
   # https://github.com/haskell/cabal/issues/2322
   Cabal_1_22_2_0 = super.Cabal_1_22_2_0.override { binary = self.binary_0_7_4_0; process = self.process_1_2_3_0; };

pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix

@@ -36,8 +36,6 @@ self: super: {
 
   # transformers is not a core library for this compiler.
   transformers = self.transformers_0_4_3_0;
-  mtl = self.mtl_2_2_1;
-  transformers-compat = disableCabalFlag super.transformers-compat "three";
 
   # https://github.com/haskell/cabal/issues/2322
   Cabal_1_22_2_0 = super.Cabal_1_22_2_0.override { binary = self.binary_0_7_4_0; };

pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix

@@ -35,8 +35,6 @@ self: super: {
 
   # transformers is not a core library for this compiler.
   transformers = self.transformers_0_4_3_0;
-  mtl = self.mtl_2_2_1;
-  transformers-compat = disableCabalFlag super.transformers-compat "three";
 
   # haskeline and terminfo are not core libraries for this compiler.
   haskeline = self.haskeline_0_7_2_1;

pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix

@@ -38,9 +38,11 @@ self: super: {
   xhtml = null;
 
   # mtl 2.2.x needs the latest transformers.
-  mtl_2_2_1 = super.mtl_2_2_1.override { transformers = self.transformers_0_4_3_0; };
+  mtl_2_2_1 = super.mtl.override { transformers = self.transformers_0_4_3_0; };
 
-  # Configure build for mtl 2.1.x.
+  # Configure mtl 2.1.x.
+  mtl = self.mtl_2_1_3_1;
+  transformers-compat = enableCabalFlag super.transformers-compat "three";
   mtl-compat = addBuildDepend (enableCabalFlag super.mtl-compat "two-point-one") self.transformers-compat;
 
   # haddock-api 2.16 requires ghc>=7.10
@@ -53,7 +55,7 @@ self: super: {
     blaze-html = self.blaze-html_0_7_0_3;
     haskeline = self.haskeline_0_7_2_1;
     lens = self.lens_4_7_0_1;
-    mtl = super.mtl_2_2_1;
+    mtl = self.mtl_2_2_1;
     transformers = super.transformers_0_4_3_0;
     transformers-compat = disableCabalFlag super.transformers-compat "three";
   })) (drv: {

pkgs/development/haskell-modules/configuration-ghc-head.nix

@@ -43,14 +43,6 @@ self: super: {
   # haddock: No input file(s).
   nats = dontHaddock super.nats;
 
-  # These used to be core packages in GHC 7.8.x.
-  old-locale = self.old-locale_1_0_0_7;
-  old-time = self.old-time_1_1_0_3;
-
-  # We have transformers 4.x
-  mtl = self.mtl_2_2_1;
-  transformers-compat = disableCabalFlag super.transformers-compat "three";
-
   # We have time 1.5
   aeson = disableCabalFlag super.aeson "old-locale";
 

pkgs/development/haskell-modules/hackage-packages.nix

@@ -517,6 +517,7 @@ self: {
        version = "1.0";
        sha256 = "17rp4v5ibna9fplm526x31k8df8zwkm1imv71yqzpgcqcn48pps2";
        buildDepends = [ AbortT-transformers base mtl ];
+       jailbreak = true;
        homepage = "http://github.com/gcross/AbortT-mtl";
        description = "mtl instances for the AbortT monad transformer";
        license = stdenv.lib.licenses.bsd3;
@@ -1863,7 +1864,7 @@ self: {
 
   "CSPM-FiringRules" = callPackage
     ({ mkDerivation, base, containers, CSPM-CoreLanguage, mtl
-     , parallel-tree-search, tree-monad
+     , parallel-tree-search, QuickCheck, random, tree-monad
      }:
      mkDerivation {
        pname = "CSPM-FiringRules";
@@ -1871,8 +1872,9 @@ self: {
        sha256 = "0rdggf00zq51j4af6rhk4ix8rbpd82piy2al4m6ymziwflv3b70m";
        buildDepends = [
          base containers CSPM-CoreLanguage mtl parallel-tree-search
-         tree-monad
+         QuickCheck random tree-monad
        ];
+       jailbreak = true;
        description = "Firing rules semantic of CSPM";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2856,6 +2858,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base HUnit mtl old-locale QuickCheck time ];
+       jailbreak = true;
        homepage = "http://www.haskellcraft.com/";
        description = "Code for Haskell: the Craft of Functional Programming, 3rd ed";
        license = stdenv.lib.licenses.mit;
@@ -6937,7 +6940,6 @@ self: {
          unordered-containers vector
        ];
        testDepends = [ aeson attoparsec base HTF text ];
-       jailbreak = true;
        homepage = "https://github.com/agrafix/HSmarty";
        description = "Small template engine";
        license = stdenv.lib.licenses.bsd3;
@@ -8243,6 +8245,7 @@ self: {
        version = "0.4.3.3";
        sha256 = "1yx4dzcjmykk4nzrh888jhikb8x635dpx7g27rgnlaiy5nid3pc7";
        buildDepends = [ base bytestring mtl stm ];
+       jailbreak = true;
        homepage = "https://github.com/phonohawk/HsSVN";
        description = "Partial Subversion (SVN) binding for Haskell";
        license = stdenv.lib.licenses.publicDomain;
@@ -13237,6 +13240,7 @@ self: {
        version = "0.2.0.2";
        sha256 = "0q70d5arw1yg0f8b6p3k0g3i4jbh2d8rp1cchswd3ynhinzhrnqg";
        buildDepends = [ base haskeline mtl Shellac ];
+       jailbreak = true;
        description = "Haskeline backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -13910,7 +13914,6 @@ self: {
          base containers deepseq fgl free hmatrix integration list-extras
          mtl numeric-tools parallel
        ];
-       jailbreak = true;
        description = "Utilities for condensed matter physics tight binding calculations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -19666,7 +19669,6 @@ self: {
        testDepends = [
          base mtl QuickCheck test-framework test-framework-quickcheck2
        ];
-       jailbreak = true;
        homepage = "https://www.github.com/ktvoelker/AParsec";
        description = "An applicative parser combinator library";
        license = stdenv.lib.licenses.gpl3;
@@ -23652,6 +23654,7 @@ self: {
        version = "0.4.8.2";
        sha256 = "0cyrr45wpq5h4gg6qms54nmvhqpyj59d5bhlk316g4yjsf3484b7";
        buildDepends = [ array base bytestring containers mtl ];
+       jailbreak = true;
        homepage = "https://github.com/idontgetoutmuch/binary-low-level";
        description = "Binary deserialisation using strict ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -25588,6 +25591,7 @@ self: {
        buildDepends = [
          base binary bytestring containers mtl pretty utf8-string
        ];
+       jailbreak = true;
        homepage = "https://github.com/bjpop/blip";
        description = "Support code for Blip";
        license = stdenv.lib.licenses.bsd3;
@@ -26443,7 +26447,6 @@ self: {
          base bytestring containers directory mtl old-locale pretty process
          random stm time
        ];
-       jailbreak = true;
        homepage = "http://code.ouroborus.net/buildbox";
        description = "Rehackable components for writing buildbots and test harnesses";
        license = stdenv.lib.licenses.bsd3;
@@ -28877,7 +28880,6 @@ self: {
          containers mtl
        ];
        testDepends = [ base QuickCheck ];
-       jailbreak = true;
        homepage = "https://github.com/domdere/cassava-conduit";
        description = "Conduit interface for cassava package";
        license = stdenv.lib.licenses.bsd3;
@@ -29459,16 +29461,16 @@ self: {
 
   "cgi" = callPackage
     ({ mkDerivation, base, bytestring, containers, exceptions, mtl
-     , mtl-compat, multipart, network, network-uri, old-locale, old-time
+     , multipart, network, network-uri, old-locale, old-time, parsec
-     , parsec, xhtml
+     , xhtml
      }:
      mkDerivation {
        pname = "cgi";
        version = "3001.2.2.2";
        sha256 = "0q1pxpa8gi42c0hsidcdkhk5xr5anfrvhqsn3iksr9c0rllhz193";
        buildDepends = [
-         base bytestring containers exceptions mtl mtl-compat multipart
+         base bytestring containers exceptions mtl multipart network
-         network network-uri old-locale old-time parsec xhtml
+         network-uri old-locale old-time parsec xhtml
        ];
        homepage = "https://github.com/cheecheeo/haskell-cgi";
        description = "A library for writing CGI programs";
@@ -30469,7 +30471,6 @@ self: {
          base containers data-stringmap directory filepath ghc HaXml HUnit
          lens lens-aeson mtl QuickCheck tasty tasty-hunit tasty-th
        ];
-       jailbreak = true;
        homepage = "http://clafer.org";
        description = "clafer compiles Clafer models to other formats, such as Alloy, XML, HTML, Dot";
        license = stdenv.lib.licenses.mit;
@@ -33339,7 +33340,6 @@ self: {
          errors http-types monad-control mtl text unordered-containers wai
          warp warp-tls yaml
        ];
-       jailbreak = true;
        homepage = "https://github.com/alephcloud/hs-configuration-tools";
        description = "Tools for specifying and parsing configurations";
        license = stdenv.lib.licenses.mit;
@@ -33960,18 +33960,6 @@ self: {
      }) {};
 
   "control-monad-free" = callPackage
-    ({ mkDerivation, base, deepseq, transformers }:
-     mkDerivation {
-       pname = "control-monad-free";
-       version = "0.5.3";
-       sha256 = "1igwawcdpg8irayjax1xdrlpa9587k1v4y28ib3xfb7yk0xv7vk1";
-       buildDepends = [ base deepseq transformers ];
-       homepage = "http://github.com/pepeiborra/control-monad-free";
-       description = "Free monads and monad transformers";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "control-monad-free_0_6_1" = callPackage
     ({ mkDerivation, base, prelude-extras, transformers }:
      mkDerivation {
        pname = "control-monad-free";
@@ -35056,7 +35044,6 @@ self: {
          QuickCheck temporary test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       jailbreak = true;
        homepage = "https://github.com/mhwombat/creatur";
        description = "Framework for artificial life experiments";
        license = stdenv.lib.licenses.bsd3;
@@ -35280,7 +35267,6 @@ self: {
          attoparsec base derive hspec hspec-expectations QuickCheck text
          time transformers
        ];
-       jailbreak = true;
        homepage = "http://github.com/michaelxavier/cron";
        description = "Cron datatypes and Attoparsec parser";
        license = stdenv.lib.licenses.mit;
@@ -38705,6 +38691,7 @@ self: {
          base cpphs deepseq deepseq-generics generics-sop ghc-prim HUnit
          parallel random syb template-haskell
        ];
+       jailbreak = true;
        homepage = "http://fremissant.net/deepseq-bounded";
        description = "Bounded deepseq, including support for generic deriving";
        license = stdenv.lib.licenses.bsd3;
@@ -39234,7 +39221,6 @@ self: {
        buildDepends = [
          base derive mtl template-haskell template-haskell-util
        ];
-       jailbreak = true;
        homepage = "https://github.com/HaskellZhangSong/derive-topdown";
        description = "This library will help you generate Haskell empty Generic instances and deriving type instances from the top automatically to the bottom for composited data types";
        license = stdenv.lib.licenses.mit;
@@ -42614,7 +42600,6 @@ self: {
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 vector
        ];
-       jailbreak = true;
        description = "your dynamic optimization buddy";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -46646,7 +46631,6 @@ self: {
        isExecutable = true;
        buildDepends = [ base JuicyPixels mtl transformers vector ];
        pkgconfigDepends = [ ffmpeg libavcodec libavformat libswscale ];
-       jailbreak = true;
        description = "Minimal bindings to the FFmpeg library";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) ffmpeg;  libavcodec = null;
@@ -60192,7 +60176,6 @@ self: {
          stm-chans system-fileio text time transformers transformers-base
          unix webkitgtk3 zeromq4-haskell
        ];
-       jailbreak = true;
        homepage = "https://github.com/k0ral/hbro";
        description = "Minimal extensible web-browser";
        license = "unknown";
@@ -62268,6 +62251,7 @@ self: {
          base bytestring cereal hspec leveldb-haskell lifted-base
          monad-control mtl process resourcet transformers transformers-base
        ];
+       jailbreak = true;
        homepage = "https://github.com/jeremyjh/higher-leveldb";
        description = "A rich monadic API for working with leveldb databases";
        license = stdenv.lib.licenses.bsd3;
@@ -62332,7 +62316,6 @@ self: {
          base blaze-html blaze-markup bytestring containers filepath mtl
          pcre-light text
        ];
-       jailbreak = true;
        description = "source code highlighting";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -67237,6 +67220,7 @@ self: {
        version = "2.0.2";
        sha256 = "0qkyclj9fajvzbfcs0ik8ncy66x916r40jd85r4wi5nh482i7sp3";
        buildDepends = [ base hslogger mtl template-haskell ];
+       jailbreak = true;
        description = "Automatic generation of hslogger functions";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -76681,7 +76665,6 @@ self: {
        buildDepends = [
          base bytestring bytestring-trie containers mtl vector
        ];
-       jailbreak = true;
        homepage = "http://lambdacube3d.wordpress.com/";
        description = "LambdaCube 3D IR";
        license = stdenv.lib.licenses.bsd3;
@@ -76699,7 +76682,6 @@ self: {
          base bytestring bytestring-trie containers ghc-prim lambdacube-core
          mtl vector
        ];
-       jailbreak = true;
        homepage = "http://lambdacube3d.wordpress.com/";
        description = "LambdaCube 3D EDSL definition";
        license = stdenv.lib.licenses.bsd3;
@@ -78043,7 +78025,6 @@ self: {
          aeson base blaze-builder bytestring HsOpenSSL http-streams
          io-streams mtl scientific text vector
        ];
-       jailbreak = true;
        homepage = "https://www.lendingclub.com/developers/lc-api.action";
        description = "Bindings for the LendingClub marketplace API";
        license = stdenv.lib.licenses.bsd3;
@@ -86271,7 +86252,6 @@ self: {
          exceptions monad-control msgpack mtl network random text
        ];
        testDepends = [ async base mtl network tasty tasty-hunit ];
-       jailbreak = true;
        homepage = "http://msgpack.org/";
        description = "A MessagePack-RPC Implementation";
        license = stdenv.lib.licenses.bsd3;
@@ -86335,7 +86315,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "mtl" = callPackage
+  "mtl_2_1_3_1" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "mtl";
@@ -86348,7 +86328,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "mtl_2_2_1" = callPackage
+  "mtl" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "mtl";
@@ -86383,7 +86363,6 @@ self: {
        sha256 = "15388p9ybdn6digk6cpdsw6havd0yva8vvwl3p7fnc9sb59wln34";
        editedCabalFile = "b4d1feef302a6fe59e77e822e61261eeaec449a6b56560ea8429bb1bc7dbccc6";
        buildDepends = [ base mtl ];
-       jailbreak = true;
        homepage = "https://github.com/haskell-compat/mtl-compat";
        description = "Backported Control.Monad.Except module from mtl";
        license = stdenv.lib.licenses.bsd3;
@@ -86424,7 +86403,6 @@ self: {
        version = "2.0.2";
        sha256 = "1j42pdkiiqjkdmidgmgpfbwh2i8dwsc40labw4pm86qzsi0r8m2v";
        buildDepends = [ base mtl transformers ];
-       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/mtl-prelude";
        description = "Reexports of most definitions from \"mtl\" and \"transformers\"";
        license = stdenv.lib.licenses.mit;
@@ -97933,7 +97911,6 @@ self: {
          aeson base bytestring cereal containers HsOpenSSL http-streams
          io-streams mtl text transformers vector
        ];
-       jailbreak = true;
        homepage = "https://api.prosper.com";
        description = "Bindings to the Prosper marketplace API";
        license = stdenv.lib.licenses.bsd3;
@@ -100994,7 +100971,6 @@ self: {
          base containers dependent-map dependent-sum mtl primitive
          semigroups template-haskell these
        ];
-       jailbreak = true;
        homepage = "https://github.com/ryantrinkle/reflex";
        description = "Higher-order Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
@@ -101642,6 +101618,7 @@ self: {
        version = "0.2.2";
        sha256 = "0vg05idyiy3havw8rlsky7x4y34mpk6by9500r7rb921xgpdq70a";
        buildDepends = [ base containers mtl ];
+       jailbreak = true;
        homepage = "http://bitbucket.org/jozefg/reified-records";
        description = "Reify records to Maps and back again";
        license = stdenv.lib.licenses.mit;
@@ -102237,7 +102214,6 @@ self: {
          functor-monadic ListLike listsafe monad-loops mtl numericpeano
          parsec semigroupoids system-filepath text transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/ombocomp/repl-toolkit";
        description = "Toolkit for quickly whipping up config files and command-line interfaces";
        license = stdenv.lib.licenses.asl20;
@@ -103193,7 +103169,6 @@ self: {
        version = "0.1.1";
        sha256 = "03v2xxj1gd35738qrhxcl0d3bx6pps4l1singb0yg1smrx5nkpp7";
        buildDepends = [ base mtl primitive vector ];
-       jailbreak = true;
        homepage = "http://github.com/bgamari/ring-buffer";
        description = "A concurrent, mutable ring-buffer";
        license = stdenv.lib.licenses.bsd3;
@@ -103640,7 +103615,6 @@ self: {
          attoparsec base bytestring containers data-default-generics
          filepath mtl pureMD5 tasty tasty-hunit testpack transformers
        ];
-       jailbreak = true;
        homepage = "http://github.com/acowley/roshask";
        description = "Haskell support for the ROS robotics framework";
        license = stdenv.lib.licenses.bsd3;
@@ -108245,7 +108219,6 @@ self: {
          base containers deepseq directory filepath
          MonadCatchIO-transformers mtl SafeSemaphore text time transformers
        ];
-       jailbreak = true;
        homepage = "http://github.com/mvoidex/simple-log";
        description = "Simple log for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -111730,7 +111703,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1syv2l0z7c2s6bbi5103i4var40j8pavahiic813v8m9s6waa4fk";
        buildDepends = [ base lens mtl vector ];
-       jailbreak = true;
        homepage = "https://github.com/relrod/spritz";
        description = "An implementation of the Spritz RC4-like stream cipher in Haskell";
        license = stdenv.lib.licenses.bsd2;
@@ -113183,7 +113155,6 @@ self: {
          attoparsec base bytestring conduit conduit-extra mime mtl
          network-conduit-tls split stompl time utf8-string
        ];
-       jailbreak = true;
        homepage = "http://github.com/toschoo/mom";
        description = "Stompl Client Library";
        license = "LGPL";
@@ -118181,6 +118152,7 @@ self: {
          aeson base bytestring network old-locale tasty tasty-hunit text
          time transformers unix
        ];
+       jailbreak = true;
        homepage = "http://github.com/pjones/themoviedb";
        description = "Haskell API bindings for http://themoviedb.org";
        license = stdenv.lib.licenses.mit;
@@ -120018,14 +119990,12 @@ self: {
      }) {};
 
   "transformers-compat" = callPackage
-    ({ mkDerivation, base, mtl, transformers }:
+    ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "transformers-compat";
        version = "0.4.0.4";
        sha256 = "0lmg8ry6bgigb0v2lg0n74lxi8z5m85qq0qi4h1k9llyjb4in8ym";
-       buildDepends = [ base mtl transformers ];
+       buildDepends = [ base transformers ];
-       configureFlags = [ "-fthree" ];
-       jailbreak = true;
        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 = stdenv.lib.licenses.bsd3;
@@ -131798,7 +131768,6 @@ self: {
          enclosed-exceptions lens lifted-base tagged tasty tasty-hunit text
          transformers transformers-base void
        ];
-       jailbreak = true;
        homepage = "https://github.com/alephcloud/hs-yet-another-logger";
        description = "Yet Another Logger";
        license = stdenv.lib.licenses.asl20;