From e3651da23e7bf54ff04d65f32311cc69393ba973 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 2 Feb 2014 22:35:43 +0100
Subject: haskell-lens: add version 4.0

---
 pkgs/development/libraries/haskell/lens/3.10.2.nix | 36 ++++++++++++++++++++++
 pkgs/development/libraries/haskell/lens/4.0.nix    | 35 +++++++++++++++++++++
 .../development/libraries/haskell/lens/default.nix | 36 ----------------------
 pkgs/top-level/haskell-packages.nix                |  4 ++-
 4 files changed, 74 insertions(+), 37 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/lens/3.10.2.nix
 create mode 100644 pkgs/development/libraries/haskell/lens/4.0.nix
 delete mode 100644 pkgs/development/libraries/haskell/lens/default.nix

diff --git a/pkgs/development/libraries/haskell/lens/3.10.2.nix b/pkgs/development/libraries/haskell/lens/3.10.2.nix
new file mode 100644
index 000000000000..819902d61397
--- /dev/null
+++ b/pkgs/development/libraries/haskell/lens/3.10.2.nix
@@ -0,0 +1,36 @@
+{ cabal, bifunctors, comonad, contravariant, deepseq, distributive
+, doctest, filepath, genericDeriving, hashable, HUnit
+, MonadCatchIOTransformers, mtl, nats, parallel, profunctors
+, QuickCheck, reflection, semigroupoids, semigroups, simpleReflect
+, split, tagged, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2, testFrameworkTh, text, transformers
+, transformersCompat, unorderedContainers, vector, void
+}:
+
+cabal.mkDerivation (self: {
+  pname = "lens";
+  version = "3.10.2";
+  sha256 = "0hdj75sg8r1m2jdpfh81zdcwbhp6mb7xipp6q57pv6n90xc6dnxw";
+  buildDepends = [
+    bifunctors comonad contravariant distributive filepath
+    genericDeriving hashable MonadCatchIOTransformers mtl parallel
+    profunctors reflection semigroupoids semigroups split tagged text
+    transformers transformersCompat unorderedContainers vector void
+  ];
+  testDepends = [
+    deepseq doctest filepath genericDeriving HUnit mtl nats parallel
+    QuickCheck semigroups simpleReflect split testFramework
+    testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh text
+    transformers unorderedContainers vector
+  ];
+  patchPhase = ''
+    sed -i lens.cabal -e 's|MonadCatchIO-transformers >=.*,|MonadCatchIO-transformers,|'
+  '';
+  doCheck = false;
+  meta = {
+    homepage = "http://github.com/ekmett/lens/";
+    description = "Lenses, Folds and Traversals";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/lens/4.0.nix b/pkgs/development/libraries/haskell/lens/4.0.nix
new file mode 100644
index 000000000000..9046558c22d7
--- /dev/null
+++ b/pkgs/development/libraries/haskell/lens/4.0.nix
@@ -0,0 +1,35 @@
+{ cabal, aeson, bifunctors, comonad, constraints, contravariant
+, deepseq, distributive, doctest, exceptions, filepath
+, genericDeriving, hashable, hlint, HUnit, mtl, nats, parallel
+, primitive, profunctors, QuickCheck, reflection, scientific
+, semigroupoids, semigroups, simpleReflect, split, tagged
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
+, testFrameworkTh, text, transformers, transformersCompat
+, unorderedContainers, utf8String, vector, void, zlib
+}:
+
+cabal.mkDerivation (self: {
+  pname = "lens";
+  version = "4.0";
+  sha256 = "1mrpbwnj1k2my71lm0ajxsx5r44sz372gfxn78vz4182yv3bmla1";
+  buildDepends = [
+    aeson bifunctors comonad constraints contravariant distributive
+    exceptions filepath hashable mtl parallel primitive profunctors
+    reflection scientific semigroupoids semigroups split tagged text
+    transformers transformersCompat unorderedContainers utf8String
+    vector void zlib
+  ];
+  testDepends = [
+    deepseq doctest filepath genericDeriving hlint HUnit mtl nats
+    parallel QuickCheck semigroups simpleReflect split testFramework
+    testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh text
+    transformers unorderedContainers vector
+  ];
+  doCheck = false;
+  meta = {
+    homepage = "http://github.com/ekmett/lens/";
+    description = "Lenses, Folds and Traversals";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix
deleted file mode 100644
index 819902d61397..000000000000
--- a/pkgs/development/libraries/haskell/lens/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ cabal, bifunctors, comonad, contravariant, deepseq, distributive
-, doctest, filepath, genericDeriving, hashable, HUnit
-, MonadCatchIOTransformers, mtl, nats, parallel, profunctors
-, QuickCheck, reflection, semigroupoids, semigroups, simpleReflect
-, split, tagged, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, testFrameworkTh, text, transformers
-, transformersCompat, unorderedContainers, vector, void
-}:
-
-cabal.mkDerivation (self: {
-  pname = "lens";
-  version = "3.10.2";
-  sha256 = "0hdj75sg8r1m2jdpfh81zdcwbhp6mb7xipp6q57pv6n90xc6dnxw";
-  buildDepends = [
-    bifunctors comonad contravariant distributive filepath
-    genericDeriving hashable MonadCatchIOTransformers mtl parallel
-    profunctors reflection semigroupoids semigroups split tagged text
-    transformers transformersCompat unorderedContainers vector void
-  ];
-  testDepends = [
-    deepseq doctest filepath genericDeriving HUnit mtl nats parallel
-    QuickCheck semigroups simpleReflect split testFramework
-    testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh text
-    transformers unorderedContainers vector
-  ];
-  patchPhase = ''
-    sed -i lens.cabal -e 's|MonadCatchIO-transformers >=.*,|MonadCatchIO-transformers,|'
-  '';
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/ekmett/lens/";
-    description = "Lenses, Folds and Traversals";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 933e7a29c5bd..22ed02954942 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1532,7 +1532,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   leksahServer = callPackage ../development/libraries/haskell/leksah/leksah-server.nix {};
 
-  lens = callPackage ../development/libraries/haskell/lens {};
+  lens_3_10_2 = callPackage ../development/libraries/haskell/lens/3.10.2.nix {};
+  lens_4_0 = callPackage ../development/libraries/haskell/lens/4.0.nix {};
+  lens = self.lens_3_10_2;
 
   lensAeson = callPackage ../development/libraries/haskell/lens-aeson {};
 
-- 
cgit 1.4.1