From 713379c658dd727cd406c472d3e896c3df5d228d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 19 Jul 2014 21:12:04 +0200
Subject: [PATCH] Re-generate Haskell packages with cabal2nix.

---
 pkgs/development/libraries/haskell/aeson-utils/default.nix     | 2 ++
 pkgs/development/libraries/haskell/cgrep/default.nix           | 2 ++
 pkgs/development/libraries/haskell/code-builder/default.nix    | 2 ++
 pkgs/development/libraries/haskell/focus/default.nix           | 2 ++
 pkgs/development/libraries/haskell/generic-aeson/default.nix   | 2 ++
 .../development/libraries/haskell/hxt-pickle-utils/default.nix | 2 ++
 pkgs/development/libraries/haskell/imm/default.nix             | 1 -
 pkgs/development/libraries/haskell/json-schema/default.nix     | 2 ++
 pkgs/development/libraries/haskell/loch-th/default.nix         | 2 ++
 pkgs/development/libraries/haskell/multipart/default.nix       | 2 ++
 pkgs/development/libraries/haskell/placeholders/default.nix    | 2 ++
 .../libraries/haskell/regular-xmlpickler/default.nix           | 2 ++
 pkgs/development/libraries/haskell/rest-client/default.nix     | 2 ++
 pkgs/development/libraries/haskell/rest-core/default.nix       | 2 ++
 pkgs/development/libraries/haskell/rest-gen/default.nix        | 2 ++
 pkgs/development/libraries/haskell/rest-happstack/default.nix  | 2 ++
 pkgs/development/libraries/haskell/rest-snap/default.nix       | 2 ++
 pkgs/development/libraries/haskell/rest-stringmap/default.nix  | 2 ++
 pkgs/development/libraries/haskell/rest-types/default.nix      | 2 ++
 pkgs/development/libraries/haskell/rest-wai/default.nix        | 2 ++
 pkgs/development/libraries/haskell/stm-containers/default.nix  | 2 ++
 pkgs/development/libraries/haskell/thyme/default.nix           | 3 +--
 pkgs/development/libraries/haskell/tostring/default.nix        | 2 ++
 pkgs/development/libraries/haskell/uri-encode/default.nix      | 2 ++
 pkgs/development/tools/haskell/codex/default.nix               | 2 +-
 25 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/aeson-utils/default.nix b/pkgs/development/libraries/haskell/aeson-utils/default.nix
index 18440e804793..b0329a4126f1 100644
--- a/pkgs/development/libraries/haskell/aeson-utils/default.nix
+++ b/pkgs/development/libraries/haskell/aeson-utils/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, aeson, attoparsec, scientific, text }:
 
 cabal.mkDerivation (self: {
diff --git a/pkgs/development/libraries/haskell/cgrep/default.nix b/pkgs/development/libraries/haskell/cgrep/default.nix
index ef89ab6b5cb7..5fae8ab3dfdd 100644
--- a/pkgs/development/libraries/haskell/cgrep/default.nix
+++ b/pkgs/development/libraries/haskell/cgrep/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, ansiTerminal, cmdargs, dlist, filepath, regexPosix, safe
 , split, stm, stringsearch, unorderedContainers
 }:
diff --git a/pkgs/development/libraries/haskell/code-builder/default.nix b/pkgs/development/libraries/haskell/code-builder/default.nix
index 30f2429191dd..77883f5a07ad 100644
--- a/pkgs/development/libraries/haskell/code-builder/default.nix
+++ b/pkgs/development/libraries/haskell/code-builder/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal }:
 
 cabal.mkDerivation (self: {
diff --git a/pkgs/development/libraries/haskell/focus/default.nix b/pkgs/development/libraries/haskell/focus/default.nix
index 2e6635ca8ee7..a2575734b4da 100644
--- a/pkgs/development/libraries/haskell/focus/default.nix
+++ b/pkgs/development/libraries/haskell/focus/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, lochTh, placeholders }:
 
 cabal.mkDerivation (self: {
diff --git a/pkgs/development/libraries/haskell/generic-aeson/default.nix b/pkgs/development/libraries/haskell/generic-aeson/default.nix
index 61bf200ec3b6..209cbb7a52e3 100644
--- a/pkgs/development/libraries/haskell/generic-aeson/default.nix
+++ b/pkgs/development/libraries/haskell/generic-aeson/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, aeson, attoparsec, genericDeriving, HUnit, mtl, tagged
 , text, vector
 }:
diff --git a/pkgs/development/libraries/haskell/hxt-pickle-utils/default.nix b/pkgs/development/libraries/haskell/hxt-pickle-utils/default.nix
index e601bcbbff6a..60b43b0bad4b 100644
--- a/pkgs/development/libraries/haskell/hxt-pickle-utils/default.nix
+++ b/pkgs/development/libraries/haskell/hxt-pickle-utils/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, hxt, mtl }:
 
 cabal.mkDerivation (self: {
diff --git a/pkgs/development/libraries/haskell/imm/default.nix b/pkgs/development/libraries/haskell/imm/default.nix
index 0588e633d906..24a96ba028a9 100644
--- a/pkgs/development/libraries/haskell/imm/default.nix
+++ b/pkgs/development/libraries/haskell/imm/default.nix
@@ -23,6 +23,5 @@ cabal.mkDerivation (self: {
     description = "Retrieve RSS/Atom feeds and write one mail per new item in a maildir";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ "Daniel Bergey <bergey@teallabs.org>" ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/json-schema/default.nix b/pkgs/development/libraries/haskell/json-schema/default.nix
index 133fc7f4a931..52789acf41ca 100644
--- a/pkgs/development/libraries/haskell/json-schema/default.nix
+++ b/pkgs/development/libraries/haskell/json-schema/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, aeson, attoparsec, genericAeson, genericDeriving, HUnit
 , tagged, tasty, tastyHunit, tastyTh, text, time
 , unorderedContainers, vector
diff --git a/pkgs/development/libraries/haskell/loch-th/default.nix b/pkgs/development/libraries/haskell/loch-th/default.nix
index ffb846c4d5cd..5061524708bf 100644
--- a/pkgs/development/libraries/haskell/loch-th/default.nix
+++ b/pkgs/development/libraries/haskell/loch-th/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal }:
 
 cabal.mkDerivation (self: {
diff --git a/pkgs/development/libraries/haskell/multipart/default.nix b/pkgs/development/libraries/haskell/multipart/default.nix
index 7b24e05eba37..242005392c21 100644
--- a/pkgs/development/libraries/haskell/multipart/default.nix
+++ b/pkgs/development/libraries/haskell/multipart/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, parsec }:
 
 cabal.mkDerivation (self: {
diff --git a/pkgs/development/libraries/haskell/placeholders/default.nix b/pkgs/development/libraries/haskell/placeholders/default.nix
index 2998686da016..bb4a2c5ca150 100644
--- a/pkgs/development/libraries/haskell/placeholders/default.nix
+++ b/pkgs/development/libraries/haskell/placeholders/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal }:
 
 cabal.mkDerivation (self: {
diff --git a/pkgs/development/libraries/haskell/regular-xmlpickler/default.nix b/pkgs/development/libraries/haskell/regular-xmlpickler/default.nix
index f6664c6c5085..35a3f32847e1 100644
--- a/pkgs/development/libraries/haskell/regular-xmlpickler/default.nix
+++ b/pkgs/development/libraries/haskell/regular-xmlpickler/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, hxt, regular, text }:
 
 cabal.mkDerivation (self: {
diff --git a/pkgs/development/libraries/haskell/rest-client/default.nix b/pkgs/development/libraries/haskell/rest-client/default.nix
index bc5e07304e13..0712742717b7 100644
--- a/pkgs/development/libraries/haskell/rest-client/default.nix
+++ b/pkgs/development/libraries/haskell/rest-client/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, aesonUtils, caseInsensitive, dataDefault
 , exceptionTransformers, httpConduit, httpTypes, hxt
 , hxtPickleUtils, monadControl, mtl, primitive, resourcet
diff --git a/pkgs/development/libraries/haskell/rest-core/default.nix b/pkgs/development/libraries/haskell/rest-core/default.nix
index 6c37dda87b93..743717305697 100644
--- a/pkgs/development/libraries/haskell/rest-core/default.nix
+++ b/pkgs/development/libraries/haskell/rest-core/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, aeson, aesonUtils, either, errors, fclabels, HUnit, hxt
 , hxtPickleUtils, jsonSchema, mtl, multipart, random, restStringmap
 , restTypes, safe, split, testFramework, testFrameworkHunit, text
diff --git a/pkgs/development/libraries/haskell/rest-gen/default.nix b/pkgs/development/libraries/haskell/rest-gen/default.nix
index 298be78bb202..fb27f40cc2b2 100644
--- a/pkgs/development/libraries/haskell/rest-gen/default.nix
+++ b/pkgs/development/libraries/haskell/rest-gen/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, aeson, blazeHtml, Cabal, codeBuilder, fclabels, filepath
 , hashable, haskellSrcExts, hslogger, HStringTemplate, HUnit, hxt
 , jsonSchema, restCore, safe, scientific, split, tagged
diff --git a/pkgs/development/libraries/haskell/rest-happstack/default.nix b/pkgs/development/libraries/haskell/rest-happstack/default.nix
index 3ce2186b423c..74c5f2a06cbd 100644
--- a/pkgs/development/libraries/haskell/rest-happstack/default.nix
+++ b/pkgs/development/libraries/haskell/rest-happstack/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, happstackServer, mtl, restCore, restGen, utf8String }:
 
 cabal.mkDerivation (self: {
diff --git a/pkgs/development/libraries/haskell/rest-snap/default.nix b/pkgs/development/libraries/haskell/rest-snap/default.nix
index b3f052c160f6..5305c2d113f8 100644
--- a/pkgs/development/libraries/haskell/rest-snap/default.nix
+++ b/pkgs/development/libraries/haskell/rest-snap/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, caseInsensitive, restCore, safe, snapCore
 , unorderedContainers, uriEncode, utf8String
 }:
diff --git a/pkgs/development/libraries/haskell/rest-stringmap/default.nix b/pkgs/development/libraries/haskell/rest-stringmap/default.nix
index a21b0439f288..833b79f0df57 100644
--- a/pkgs/development/libraries/haskell/rest-stringmap/default.nix
+++ b/pkgs/development/libraries/haskell/rest-stringmap/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, aeson, hashable, hxt, jsonSchema, tagged, text, tostring
 , unorderedContainers
 }:
diff --git a/pkgs/development/libraries/haskell/rest-types/default.nix b/pkgs/development/libraries/haskell/rest-types/default.nix
index 37d38029b8ff..e7b5ab779626 100644
--- a/pkgs/development/libraries/haskell/rest-types/default.nix
+++ b/pkgs/development/libraries/haskell/rest-types/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, aeson, genericAeson, hxt, jsonSchema, mtl, regular
 , regularXmlpickler, restStringmap, text, uuid
 }:
diff --git a/pkgs/development/libraries/haskell/rest-wai/default.nix b/pkgs/development/libraries/haskell/rest-wai/default.nix
index 25860327f2d0..7ddb500265b1 100644
--- a/pkgs/development/libraries/haskell/rest-wai/default.nix
+++ b/pkgs/development/libraries/haskell/rest-wai/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, caseInsensitive, httpTypes, mimeTypes, mtl, restCore
 , restTypes, text, unorderedContainers, utf8String, wai
 }:
diff --git a/pkgs/development/libraries/haskell/stm-containers/default.nix b/pkgs/development/libraries/haskell/stm-containers/default.nix
index fcc925834bd0..d93bd1a03a8a 100644
--- a/pkgs/development/libraries/haskell/stm-containers/default.nix
+++ b/pkgs/development/libraries/haskell/stm-containers/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, focus, free, hashable, HTF, lochTh, mtl, placeholders
 , primitive, QuickCheck, unorderedContainers
 }:
diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix
index dbf78bac9030..b646fe4d1559 100644
--- a/pkgs/development/libraries/haskell/thyme/default.nix
+++ b/pkgs/development/libraries/haskell/thyme/default.nix
@@ -2,14 +2,13 @@
 
 { cabal, aeson, attoparsec, Cabal, deepseq, filepath, mtl
 , profunctors, QuickCheck, random, systemPosixRedirect, text, time
-, vector, vectorSpace, vectorThUnbox, cpphs
+, vector, vectorSpace, vectorThUnbox
 }:
 
 cabal.mkDerivation (self: {
   pname = "thyme";
   version = "0.3.5.2";
   sha256 = "1vb5qn9m88y9738d9znim5lprb8z10am5yjaksdjl151li8apd6x";
-  buildTools = [ cpphs ];
   buildDepends = [
     aeson attoparsec deepseq mtl profunctors QuickCheck random text
     time vector vectorSpace vectorThUnbox
diff --git a/pkgs/development/libraries/haskell/tostring/default.nix b/pkgs/development/libraries/haskell/tostring/default.nix
index 078c4be92ee3..eee617ffd2bb 100644
--- a/pkgs/development/libraries/haskell/tostring/default.nix
+++ b/pkgs/development/libraries/haskell/tostring/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, text, utf8String }:
 
 cabal.mkDerivation (self: {
diff --git a/pkgs/development/libraries/haskell/uri-encode/default.nix b/pkgs/development/libraries/haskell/uri-encode/default.nix
index 0ee3c303a8f3..3a2d786cd8f0 100644
--- a/pkgs/development/libraries/haskell/uri-encode/default.nix
+++ b/pkgs/development/libraries/haskell/uri-encode/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, network, text, utf8String }:
 
 cabal.mkDerivation (self: {
diff --git a/pkgs/development/tools/haskell/codex/default.nix b/pkgs/development/tools/haskell/codex/default.nix
index 0a6cb2ca1a45..475c6018697b 100644
--- a/pkgs/development/tools/haskell/codex/default.nix
+++ b/pkgs/development/tools/haskell/codex/default.nix
@@ -10,11 +10,11 @@ cabal.mkDerivation (self: {
   sha256 = "0dsc5dx5zcxf5wd2qf6gqzr8d613z1gkllmzzkbny3lxa512crsw";
   isLibrary = true;
   isExecutable = true;
-  jailbreak = true;
   buildDepends = [
     Cabal downloadCurl either filepath hackageDb MissingH monadLoops
     tar text transformers yaml zlib
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/aloiscochard/codex";
     description = "A ctags file generator for cabal project dependencies";