From 6e2e58ea2eaefb22556ed246850542877bcf72d9 Mon Sep 17 00:00:00 2001
From: Alp Mestanogullari <alpmestan@gmail.com>
Date: Wed, 27 Aug 2014 18:05:06 +0200
Subject: [PATCH 1/5] add the servant (haskell) packages to nixpkgs

---
 .../haskell/servant-pool/servant-pool.nix     | 16 +++++++++++++++
 .../servant-postgresql/servant-postgresql.nix | 18 +++++++++++++++++
 .../servant-response/servant-response.nix     | 16 +++++++++++++++
 .../haskell/servant-scotty/servant-scotty.nix | 20 +++++++++++++++++++
 .../libraries/haskell/servant/servant.nix     | 15 ++++++++++++++
 pkgs/top-level/haskell-packages.nix           | 10 ++++++++++
 6 files changed, 95 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/servant-pool/servant-pool.nix
 create mode 100644 pkgs/development/libraries/haskell/servant-postgresql/servant-postgresql.nix
 create mode 100644 pkgs/development/libraries/haskell/servant-response/servant-response.nix
 create mode 100644 pkgs/development/libraries/haskell/servant-scotty/servant-scotty.nix
 create mode 100644 pkgs/development/libraries/haskell/servant/servant.nix

diff --git a/pkgs/development/libraries/haskell/servant-pool/servant-pool.nix b/pkgs/development/libraries/haskell/servant-pool/servant-pool.nix
new file mode 100644
index 00000000000..692d694ed46
--- /dev/null
+++ b/pkgs/development/libraries/haskell/servant-pool/servant-pool.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, resourcePool, servant, time }:
+
+cabal.mkDerivation (self: {
+  pname = "servant-pool";
+  version = "0.1";
+  sha256 = "0if4lxb0fpdd4lnkz9j7z6vhjbrcc80pvz9jb6sdb9p6sbbgqf69";
+  buildDepends = [ resourcePool servant time ];
+  meta = {
+    homepage = "http://github.com/zalora/servant-pool";
+    description = "Utility functions for creating servant 'Context's with \"context/connection pooling\" support";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/servant-postgresql/servant-postgresql.nix b/pkgs/development/libraries/haskell/servant-postgresql/servant-postgresql.nix
new file mode 100644
index 00000000000..154eefea320
--- /dev/null
+++ b/pkgs/development/libraries/haskell/servant-postgresql/servant-postgresql.nix
@@ -0,0 +1,18 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, postgresqlSimple, servant, servantPool, servantResponse }:
+
+cabal.mkDerivation (self: {
+  pname = "servant-postgresql";
+  version = "0.1";
+  sha256 = "1svy1v6sl5pq0zs8ms4qf7wn6zar63bqmfiyfqgz84ryli0wxrhj";
+  buildDepends = [
+    postgresqlSimple servant servantPool servantResponse
+  ];
+  meta = {
+    homepage = "http://github.com/zalora/servant-postgresql";
+    description = "Useful functions and instances for using servant with a PostgreSQL context";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/servant-response/servant-response.nix b/pkgs/development/libraries/haskell/servant-response/servant-response.nix
new file mode 100644
index 00000000000..3f7f9c1eee0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/servant-response/servant-response.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, httpTypes, text }:
+
+cabal.mkDerivation (self: {
+  pname = "servant-response";
+  version = "0.1";
+  sha256 = "0vgzi6nm3f1vjbnvhzcr6v2fh75fsl18wsps54ya0mbmfn2v6chy";
+  buildDepends = [ aeson httpTypes text ];
+  meta = {
+    homepage = "http://github.com/zalora/servant";
+    description = "Machinery to express how servant should turn results of database operations into proper JSON-encodable response types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/servant-scotty/servant-scotty.nix b/pkgs/development/libraries/haskell/servant-scotty/servant-scotty.nix
new file mode 100644
index 00000000000..2d053d3409d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/servant-scotty/servant-scotty.nix
@@ -0,0 +1,20 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, aeson, httpTypes, scotty, servant, servantResponse, text
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "servant-scotty";
+  version = "0.1";
+  sha256 = "0nl4ghx4hp1329sgnphirnnikxyn5hgw0iz5dga5ib16bmkzbsvi";
+  buildDepends = [
+    aeson httpTypes scotty servant servantResponse text transformers
+  ];
+  meta = {
+    homepage = "http://github.com/zalora/servant";
+    description = "Generate a web service for servant 'Resource's using scotty and JSON";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/servant/servant.nix b/pkgs/development/libraries/haskell/servant/servant.nix
new file mode 100644
index 00000000000..38f89764c4c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/servant/servant.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "servant";
+  version = "0.1";
+  sha256 = "1bm5223rjgcm8rb3s2mclmfj2df7j059jjh572a5py0rdqzg3yj0";
+  meta = {
+    homepage = "http://github.com/zalora/servant";
+    description = "A library to generate REST-style webservices on top of scotty, handling all the boilerplate for you";
+    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 88176c01c1b..6ecaf116db2 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2152,6 +2152,16 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   semigroupoidExtras = callPackage ../development/libraries/haskell/semigroupoid-extras {};
 
+  servant = callPackage ../development/libraries/haskell/servant {};
+
+  servant-pool = callPackage ../development/libraries/haskell/servant-pool {};
+
+  servant-postgresql = callPackage ../development/libraries/haskell/servant-postgresql {};
+
+  servant-response = callPackage ../development/libraries/haskell/servant-response {};
+
+  servant-scotty = callPackage ../development/libraries/haskell/servant-scotty {};
+
   setenv = callPackage ../development/libraries/haskell/setenv {};
 
   setlocale = callPackage ../development/libraries/haskell/setlocale {};

From 47519e732b2d304ea38d226fc45bee5fdb711ba3 Mon Sep 17 00:00:00 2001
From: Alp Mestanogullari <alpmestan@gmail.com>
Date: Wed, 27 Aug 2014 18:27:18 +0200
Subject: [PATCH 2/5] use camelCase instead of dashes for servant package names
 in haskell-packages.nix

---
 pkgs/top-level/haskell-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 6ecaf116db2..7a4d4c4f10b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2154,13 +2154,13 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   servant = callPackage ../development/libraries/haskell/servant {};
 
-  servant-pool = callPackage ../development/libraries/haskell/servant-pool {};
+  servantPool = callPackage ../development/libraries/haskell/servant-pool {};
 
-  servant-postgresql = callPackage ../development/libraries/haskell/servant-postgresql {};
+  servantPostgresql = callPackage ../development/libraries/haskell/servant-postgresql {};
 
-  servant-response = callPackage ../development/libraries/haskell/servant-response {};
+  servantResponse = callPackage ../development/libraries/haskell/servant-response {};
 
-  servant-scotty = callPackage ../development/libraries/haskell/servant-scotty {};
+  servantScotty = callPackage ../development/libraries/haskell/servant-scotty {};
 
   setenv = callPackage ../development/libraries/haskell/setenv {};
 

From 9dd3963b4dbd5ead3626d34c5cb9a2c43bc02c38 Mon Sep 17 00:00:00 2001
From: Alp Mestanogullari <alpmestan@gmail.com>
Date: Wed, 27 Aug 2014 18:34:56 +0200
Subject: [PATCH 3/5] rename nix files to default.nix for all servant pkgs

---
 .../haskell/servant-pool/{servant-pool.nix => default.nix}        | 0
 .../servant-postgresql/{servant-postgresql.nix => default.nix}    | 0
 .../servant-response/{servant-response.nix => default.nix}        | 0
 .../haskell/servant-scotty/{servant-scotty.nix => default.nix}    | 0
 .../libraries/haskell/servant/{servant.nix => default.nix}        | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename pkgs/development/libraries/haskell/servant-pool/{servant-pool.nix => default.nix} (100%)
 rename pkgs/development/libraries/haskell/servant-postgresql/{servant-postgresql.nix => default.nix} (100%)
 rename pkgs/development/libraries/haskell/servant-response/{servant-response.nix => default.nix} (100%)
 rename pkgs/development/libraries/haskell/servant-scotty/{servant-scotty.nix => default.nix} (100%)
 rename pkgs/development/libraries/haskell/servant/{servant.nix => default.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/servant-pool/servant-pool.nix b/pkgs/development/libraries/haskell/servant-pool/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/servant-pool/servant-pool.nix
rename to pkgs/development/libraries/haskell/servant-pool/default.nix
diff --git a/pkgs/development/libraries/haskell/servant-postgresql/servant-postgresql.nix b/pkgs/development/libraries/haskell/servant-postgresql/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/servant-postgresql/servant-postgresql.nix
rename to pkgs/development/libraries/haskell/servant-postgresql/default.nix
diff --git a/pkgs/development/libraries/haskell/servant-response/servant-response.nix b/pkgs/development/libraries/haskell/servant-response/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/servant-response/servant-response.nix
rename to pkgs/development/libraries/haskell/servant-response/default.nix
diff --git a/pkgs/development/libraries/haskell/servant-scotty/servant-scotty.nix b/pkgs/development/libraries/haskell/servant-scotty/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/servant-scotty/servant-scotty.nix
rename to pkgs/development/libraries/haskell/servant-scotty/default.nix
diff --git a/pkgs/development/libraries/haskell/servant/servant.nix b/pkgs/development/libraries/haskell/servant/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/servant/servant.nix
rename to pkgs/development/libraries/haskell/servant/default.nix

From a501db1b7ec829d57af91c25d46bed9ec5764b01 Mon Sep 17 00:00:00 2001
From: Alp Mestanogullari <alpmestan@gmail.com>
Date: Wed, 27 Aug 2014 22:03:15 +0200
Subject: [PATCH 4/5] servant-scotty/default.nix: switch to version 0.1.1 which
 relaxes the bounds on the transformers package

---
 .../libraries/haskell/servant-scotty/default.nix       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/servant-scotty/default.nix b/pkgs/development/libraries/haskell/servant-scotty/default.nix
index 2d053d3409d..1c1f358cf15 100644
--- a/pkgs/development/libraries/haskell/servant-scotty/default.nix
+++ b/pkgs/development/libraries/haskell/servant-scotty/default.nix
@@ -1,4 +1,5 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+# This file was auto-generated by cabal2nix. Please do NOT edit
+  manually!
 
 { cabal, aeson, httpTypes, scotty, servant, servantResponse, text
 , transformers
@@ -6,14 +7,15 @@
 
 cabal.mkDerivation (self: {
   pname = "servant-scotty";
-  version = "0.1";
-  sha256 = "0nl4ghx4hp1329sgnphirnnikxyn5hgw0iz5dga5ib16bmkzbsvi";
+  version = "0.1.1";
+  sha256 = "0d3yc7aa2p1izizqnj81iscj9hbgbkpyav1ncmxzkr48svr6h783";
   buildDepends = [
     aeson httpTypes scotty servant servantResponse text transformers
   ];
   meta = {
     homepage = "http://github.com/zalora/servant";
-    description = "Generate a web service for servant 'Resource's using scotty and JSON";
+    description = "Generate a web service for servant 'Resource's
+  using scotty and JSON";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };

From 940a918825bc4c79230c7ec5aa8079cf7e902258 Mon Sep 17 00:00:00 2001
From: Alp Mestanogullari <alpmestan@gmail.com>
Date: Wed, 27 Aug 2014 22:04:27 +0200
Subject: [PATCH 5/5] fix a small typo

---
 pkgs/development/libraries/haskell/servant-scotty/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/servant-scotty/default.nix b/pkgs/development/libraries/haskell/servant-scotty/default.nix
index 1c1f358cf15..562c966bcc7 100644
--- a/pkgs/development/libraries/haskell/servant-scotty/default.nix
+++ b/pkgs/development/libraries/haskell/servant-scotty/default.nix
@@ -1,5 +1,4 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit
-  manually!
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, aeson, httpTypes, scotty, servant, servantResponse, text
 , transformers