summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorAndres Löh <mail@andres-loeh.de>2012-05-10 10:38:52 +0000
committerAndres Löh <mail@andres-loeh.de>2012-05-10 10:38:52 +0000
commit2720636b7bae3db310ee4b21df471eda8c25c3ec (patch)
treeed1f6d59bd4df84db3b35db49127518ce3e15707 /pkgs
parentc07854ace45c0693a7dee5de8d30e68452a61968 (diff)
downloadnixlib-2720636b7bae3db310ee4b21df471eda8c25c3ec.tar
nixlib-2720636b7bae3db310ee4b21df471eda8c25c3ec.tar.gz
nixlib-2720636b7bae3db310ee4b21df471eda8c25c3ec.tar.bz2
nixlib-2720636b7bae3db310ee4b21df471eda8c25c3ec.tar.lz
nixlib-2720636b7bae3db310ee4b21df471eda8c25c3ec.tar.xz
nixlib-2720636b7bae3db310ee4b21df471eda8c25c3ec.tar.zst
nixlib-2720636b7bae3db310ee4b21df471eda8c25c3ec.zip
Reverted changes to the Haskell package defaults.
The current versions are the ones being proposed for the
new Haskell Platform. If they cause problems with other
packages, those packages should be fixed, not the defaults.

svn path=/nixpkgs/trunk/; revision=34043
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/top-level/haskell-packages.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4ef2ca30983e..807d671df7af 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -153,15 +153,15 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     regexPosix   = self.regexPosix_0_95_1;      # 7.4.1 ok
     stm          = self.stm_2_3;                # 7.4.1 ok
     syb          = self.syb_0_3_6_1;            # 7.4.1 ok
-    xhtml        = self.xhtml_3000_2_1;         # 7.4.1 ok
+    xhtml        = self.xhtml_3000_2_0_5;       # 7.4.1 ok
     zlib         = self.zlib_0_5_3_3;           # 7.4.1 ok
     HTTP         = self.HTTP_4000_2_3;          # 7.4.1 ok
     text         = self.text_0_11_2_0;          # 7.4.1 ok
-    transformers = self.transformers_0_2_2_0;   # 7.4.1 ok
-    mtl          = self.mtl_2_0_1_0;            # 7.4.1 ok
+    transformers = self.transformers_0_3_0_0;   # 7.4.1 ok
+    mtl          = self.mtl_2_1_1;              # 7.4.1 ok
     random       = self.random_1_0_1_1;         # 7.4.1 ok
     cabalInstall = self.cabalInstall_0_14_0;    # 7.4.1 ok
-    alex         = self.alex_3_0_2;             # 7.4.1 ok
+    alex         = self.alex_3_0_1;             # 7.4.1 ok
     happy        = self.happy_1_18_9;           # 7.4.1 ok
     haddock      = self.haddock_2_10_0;         # 7.4.1 ok
   };