From cd0b0c3d02589e282072ac9f2f53735ba45abd1f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 13 Aug 2011 13:57:43 +0000
Subject: [PATCH] haskell-multirec: added version 0.6

svn path=/nixpkgs/trunk/; revision=28540
---
 .../multirec/{default.nix => 0.5.1.nix}        |  0
 .../libraries/haskell/multirec/0.6.nix         | 18 ++++++++++++++++++
 pkgs/top-level/haskell-packages.nix            |  8 ++++++--
 3 files changed, 24 insertions(+), 2 deletions(-)
 rename pkgs/development/libraries/haskell/multirec/{default.nix => 0.5.1.nix} (100%)
 create mode 100644 pkgs/development/libraries/haskell/multirec/0.6.nix

diff --git a/pkgs/development/libraries/haskell/multirec/default.nix b/pkgs/development/libraries/haskell/multirec/0.5.1.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/multirec/default.nix
rename to pkgs/development/libraries/haskell/multirec/0.5.1.nix
diff --git a/pkgs/development/libraries/haskell/multirec/0.6.nix b/pkgs/development/libraries/haskell/multirec/0.6.nix
new file mode 100644
index 000000000000..6fb6acd58ed3
--- /dev/null
+++ b/pkgs/development/libraries/haskell/multirec/0.6.nix
@@ -0,0 +1,18 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "multirec";
+  version = "0.6";
+  sha256 = "1k0icyz9i4hc5vfpwrv42l3q4lrnsb1bswhyyv63d9azffn5flys";
+  noHaddock = true;
+  meta = {
+    homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec";
+    description = "Generic programming for families of recursive datatypes";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c9312af93a33..0f885fc17338 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -855,7 +855,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   multiplate = callPackage ../development/libraries/haskell/multiplate {};
 
-  multirec = callPackage ../development/libraries/haskell/multirec {};
+  multirec_0_5_1 = callPackage ../development/libraries/haskell/multirec/0.5.1.nix {};
+  multirec_0_6 = callPackage ../development/libraries/haskell/multirec/0.6.nix {};
+  multirec = self.multirec_0_6;
 
   multiset = callPackage ../development/libraries/haskell/multiset {};
 
@@ -1305,7 +1307,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   zipArchive = callPackage ../development/libraries/haskell/zip-archive {};
 
-  zipper = callPackage ../development/libraries/haskell/zipper {};
+  zipper = callPackage ../development/libraries/haskell/zipper {
+    multirec = self.multirec_0_5_1;
+  };
 
   zlib_0_5_0_0 = callPackage ../development/libraries/haskell/zlib/0.5.0.0.nix {
     inherit (pkgs) zlib;