From 571af5b98878a0a213f4bf2ef2e93db035d5a4d7 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Sat, 27 Dec 2014 14:27:37 -0500
Subject: [PATCH] ghcjs: clean up

---
 .../libraries/haskell/derive/default.nix      |  5 +--
 .../libraries/haskell/lens/4.4.nix            | 32 -------------------
 .../tools/haskell/Cabal-ghcjs/default.nix     |  1 -
 .../tools/haskell/ghcjs/default.nix           |  1 +
 pkgs/development/tools/misc/cpphs/default.nix |  1 -
 pkgs/top-level/haskell-packages.nix           |  1 -
 6 files changed, 4 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/lens/4.4.nix

diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix
index f6bbd6a4a88..d8537024052 100644
--- a/pkgs/development/libraries/haskell/derive/default.nix
+++ b/pkgs/development/libraries/haskell/derive/default.nix
@@ -1,4 +1,6 @@
-{ cabal, process, filepath, haskellSrcExts, syb, transformers, uniplate }:
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, filepath, haskellSrcExts, syb, transformers, uniplate }:
 
 cabal.mkDerivation (self: {
   pname = "derive";
@@ -14,6 +16,5 @@ cabal.mkDerivation (self: {
     description = "A program and library to derive instances for data types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/lens/4.4.nix b/pkgs/development/libraries/haskell/lens/4.4.nix
deleted file mode 100644
index 3c05c94129e..00000000000
--- a/pkgs/development/libraries/haskell/lens/4.4.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ cabal, bifunctors, comonad, contravariant, deepseq, distributive
-, doctest, exceptions, filepath, free, genericDeriving, hashable
-, hlint, HUnit, mtl, nats, parallel, primitive, profunctors
-, QuickCheck, reflection, semigroupoids, semigroups, simpleReflect
-, split, tagged, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2, testFrameworkTh, text, transformers
-, transformersCompat, unorderedContainers, vector, void, zlib
-}:
-
-cabal.mkDerivation (self: {
-  pname = "lens";
-  version = "4.4";
-  sha256 = "06ha4px4ywfbi0n3imy2qqjq3656snsz1b0ggkwzvdzmi550sh8w";
-  buildDepends = [
-    bifunctors comonad contravariant distributive exceptions filepath
-    free hashable mtl parallel primitive profunctors reflection
-    semigroupoids semigroups split tagged text transformers
-    transformersCompat unorderedContainers 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
-  ];
-  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/tools/haskell/Cabal-ghcjs/default.nix b/pkgs/development/tools/haskell/Cabal-ghcjs/default.nix
index 9185c75e1aa..c228740a4fc 100644
--- a/pkgs/development/tools/haskell/Cabal-ghcjs/default.nix
+++ b/pkgs/development/tools/haskell/Cabal-ghcjs/default.nix
@@ -38,6 +38,5 @@ cabal.mkDerivation (self: {
     description = "The command-line interface for Cabal and Hackage";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/tools/haskell/ghcjs/default.nix b/pkgs/development/tools/haskell/ghcjs/default.nix
index 4e2cc4220b4..9cd2080f0c9 100644
--- a/pkgs/development/tools/haskell/ghcjs/default.nix
+++ b/pkgs/development/tools/haskell/ghcjs/default.nix
@@ -24,6 +24,7 @@ let
     rev = "5e11d33cb74f8522efca0ace8365c0dc994b10f6";
     sha256 = "13i78wd064v0nvvx6js5wqw6s01hhf1s7z03c4465xp64a817gk4";
   };
+  # TOD: move this into haskell-packages proper
   ghcjsPrim = cabal.mkDerivation (self: {
     pname = "ghcjs-prim";
     version = "0.1.0.0";
diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix
index 4e996c3288f..da43b134031 100644
--- a/pkgs/development/tools/misc/cpphs/default.nix
+++ b/pkgs/development/tools/misc/cpphs/default.nix
@@ -12,6 +12,5 @@ cabal.mkDerivation (self: {
     description = "A liberalised re-implementation of cpp, the C pre-processor";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index f9c8b332feb..6f6c30aaaf3 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1534,7 +1534,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   lazysmallcheck = callPackage ../development/libraries/haskell/lazysmallcheck {};
 
   lens_4_2 = callPackage ../development/libraries/haskell/lens/4.2.nix {};
-  lens_4_4 = callPackage ../development/libraries/haskell/lens/4.4.nix {};
   lens_4_6_0_1 = callPackage ../development/libraries/haskell/lens/4.6.0.1.nix {};
   lens = self.lens_4_6_0_1;