From 5b25af4f80af591da1e5ec07914302fdb1dfe2d3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 7 Aug 2011 18:21:52 +0000
Subject: [PATCH] haskell-src-exts: updated to version 1.11.1.nix

The older version, 1.9.6.nix, is still around because Agda won't accept
the latest one.

svn path=/nixpkgs/trunk/; revision=28226
---
 .../libraries/haskell/haskell-src-exts/1.11.1.nix | 15 +++++++++++++++
 .../haskell-src-exts/{default.nix => 1.9.6.nix}   |  0
 pkgs/top-level/haskell-packages.nix               | 12 ++++++------
 3 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix
 rename pkgs/development/libraries/haskell/haskell-src-exts/{default.nix => 1.9.6.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix
new file mode 100644
index 00000000000..7678b279104
--- /dev/null
+++ b/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix
@@ -0,0 +1,15 @@
+{cabal, cpphs, happy} :
+
+cabal.mkDerivation (self : {
+  pname = "haskell-src-exts";
+  version = "1.11.1";
+  sha256 = "1jqf8l81zw7x5ryf8h2n0b2636yhxkfp3j4ndbqw6hc7i5q581m6";
+  propagatedBuildInputs = [ cpphs happy ];
+  meta = {
+    homepage = "http://code.haskell.org/haskell-src-exts";
+    description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.stdenv.lib.platforms.haskellPlatforms;
+    maintainers = [ self.stdenv.lib.maintainers.simons ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.9.6.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/haskell-src-exts/default.nix
rename to pkgs/development/libraries/haskell/haskell-src-exts/1.9.6.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 5269b3648fa..9141d256f51 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -352,11 +352,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   # Haskell libraries.
 
   Agda = callPackage ../development/libraries/haskell/Agda {
-    # I've been trying to get the latest Agda to build with ghc-6.12, too,
-    # but failed so far.
-    # mtl        = self.mtl2;
-    # QuickCheck = self.QuickCheck2;
-    syb        = self.syb02;
+    syb = self.syb02;
+    haskellSrcExts = self.haskellSrcExts_1_9_6;
   };
 
   ACVector = callPackage ../development/libraries/haskell/AC-Vector {};
@@ -615,7 +612,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   haskellSrc_1_0_1_4 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.4.nix {};
   haskellSrc = self.haskellSrc_1_0_1_3;
 
-  haskellSrcExts = callPackage ../development/libraries/haskell/haskell-src-exts {};
+  # The old version is required for Agda.
+  haskellSrcExts_1_11_1 = callPackage ../development/libraries/haskell/haskell-src-exts/1.11.1.nix {};
+  haskellSrcExts_1_9_6 = callPackage ../development/libraries/haskell/haskell-src-exts/1.9.6.nix {};
+  haskellSrcExts = self.haskellSrcExts_1_11_1;
 
   haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {};