diff --git a/pkgs/development/libraries/haskell/Agda/default.nix b/pkgs/development/libraries/haskell/Agda/default.nix
index e1f5b27c0ec..db49277d7fc 100644
--- a/pkgs/development/libraries/haskell/Agda/default.nix
+++ b/pkgs/development/libraries/haskell/Agda/default.nix
@@ -3,13 +3,14 @@
 
 cabal.mkDerivation (self : {
   pname = "Agda";
-  version = "2.2.2";
-  sha256 = "265dbb5bc6d67bfeefa4a2a4ac9e5018d6d8b5c1a75816e05da2661c43a39bba";
+  version = "2.2.6";
+  sha256 = "e9268a61db30fc0f22f7e1fbc78673cd3e0d1bf2dd40ee5cf809635ca40fca78";
   extraBuildInputs = [happy alex];
   propagatedBuildInputs =
     [QuickCheck binary haskeline haskellSrc mtl utf8String xhtml zlib];
   meta = {
     description = "A dependently typed functional language and proof assistant";
+    maintainers = [self.stdenv.lib.maintainers.andres];
   };
 })  
 
diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.1.0.1.nix b/pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix
similarity index 50%
rename from pkgs/development/libraries/haskell/QuickCheck/2.1.0.1.nix
rename to pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix
index e84a7780983..4e9bdefc537 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/2.1.0.1.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix
@@ -2,12 +2,13 @@
 
 cabal.mkDerivation (self : {
   pname = "QuickCheck";
-  version = "2.1.0.1";
-  sha256 = "f99edf1a45315e90c9ec672d5d959d5878dcc1de65678c6aed85829a896b75f1";
+  version = "2.1.0.2";
+  sha256 = "1adeea5aa52cba7b8bcd27f9cdd9fe944e9a4a22d22fdf0570b526f580981e58";
   propagatedBuildInputs = [mtl];
-  configureFlags = ''--constraint=base<4'';
   meta = {
     description = "Automatic testing of Haskell programs";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
   };
 })  
 
diff --git a/pkgs/development/libraries/haskell/cabal/cabal.nix b/pkgs/development/libraries/haskell/cabal/cabal.nix
index 931991a700e..f6220cb0fb3 100644
--- a/pkgs/development/libraries/haskell/cabal/cabal.nix
+++ b/pkgs/development/libraries/haskell/cabal/cabal.nix
@@ -97,6 +97,10 @@ attrs :
 
               eval "$postInstall"
             '';
+
+            # We inherit stdenv and ghc so that they can be used
+            # in Cabal derivations.
+            inherit (attrs) stdenv ghc;
           };
     in  attrs.stdenv.mkDerivation ((rec { f = dtransform f // transform f; }).f);
 }
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 9948236812f..ed5e5706291 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -27,11 +27,10 @@ rec {
 
   # Haskell libraries.
 
-  # Agda depends on a specific version of QuickCheck
   Agda = import ../development/libraries/haskell/Agda {
     inherit cabal binary haskeline haskellSrc mtl utf8String xhtml zlib
       happy alex;
-    QuickCheck = QuickCheck2101;
+    QuickCheck = QuickCheck2;
   };
 
   ansiTerminal = import ../development/libraries/haskell/ansi-terminal {
@@ -403,14 +402,12 @@ rec {
   };
 
   QuickCheck  = QuickCheck1;
-  QuickCheck1 = QuickCheck1200;
-  QuickCheck2 = QuickCheck2101;
 
-  QuickCheck1200 = import ../development/libraries/haskell/QuickCheck {
+  QuickCheck1 = import ../development/libraries/haskell/QuickCheck {
     inherit cabal;
   };
 
-  QuickCheck2101 = import ../development/libraries/haskell/QuickCheck/2.1.0.1.nix {
+  QuickCheck2 = import ../development/libraries/haskell/QuickCheck/QuickCheck-2.nix {
     inherit cabal mtl;
   };