diff options
10 files changed, 114 insertions, 79 deletions
diff --git a/pkgs/development/libraries/haskell/servant-client/default.nix b/pkgs/development/libraries/haskell/servant-client/default.nix new file mode 100644 index 000000000000..d11e25222ea3 --- /dev/null +++ b/pkgs/development/libraries/haskell/servant-client/default.nix @@ -0,0 +1,27 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, attoparsec, deepseq, either, exceptions, hspec +, httpClient, httpTypes, network, networkUri, QuickCheck, safe +, servant, servantServer, stringConversions, text, transformers +, wai, warp +}: + +cabal.mkDerivation (self: { + pname = "servant-client"; + version = "0.2.1"; + sha256 = "1mwmca96sld3s6n4hxq3zl9pjw24halwa061awjb23kc49cmp4pn"; + buildDepends = [ + aeson attoparsec either exceptions httpClient httpTypes networkUri + safe servant stringConversions text transformers + ]; + testDepends = [ + aeson deepseq either hspec httpTypes network QuickCheck servant + servantServer wai warp + ]; + meta = { + homepage = "http://haskell-servant.github.io/"; + description = "automatical derivation of querying functions for servant webservices"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/servant-docs/default.nix b/pkgs/development/libraries/haskell/servant-docs/default.nix new file mode 100644 index 000000000000..3da6936532c9 --- /dev/null +++ b/pkgs/development/libraries/haskell/servant-docs/default.nix @@ -0,0 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, hashable, lens, servant, stringConversions +, systemFilepath, text, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "servant-docs"; + version = "0.2.1"; + sha256 = "1wchqdpfrc3hxc629ij6rbpr29dzc0flpc7z8phykpmf59106pcv"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson hashable lens servant stringConversions systemFilepath text + unorderedContainers + ]; + meta = { + homepage = "http://haskell-servant.github.io/"; + description = "generate API docs for your servant webservice"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/servant-jquery/default.nix b/pkgs/development/libraries/haskell/servant-jquery/default.nix new file mode 100644 index 000000000000..2a85cb191063 --- /dev/null +++ b/pkgs/development/libraries/haskell/servant-jquery/default.nix @@ -0,0 +1,22 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, filepath, lens, servant, servantServer, stm +, transformers, warp +}: + +cabal.mkDerivation (self: { + pname = "servant-jquery"; + version = "0.2.1"; + sha256 = "1wyfnkzb44m08icfjvdbn1m0b0a1ydsznp1czfdnmq2818rrip8v"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson filepath lens servant servantServer stm transformers warp + ]; + meta = { + homepage = "http://haskell-servant.github.io/"; + description = "Automatically derive jquery-based javascript functions to query servant webservices"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/servant-pool/default.nix b/pkgs/development/libraries/haskell/servant-pool/default.nix deleted file mode 100644 index 692d694ed468..000000000000 --- a/pkgs/development/libraries/haskell/servant-pool/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -# 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/default.nix b/pkgs/development/libraries/haskell/servant-postgresql/default.nix deleted file mode 100644 index 154eefea320e..000000000000 --- a/pkgs/development/libraries/haskell/servant-postgresql/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -# 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/default.nix b/pkgs/development/libraries/haskell/servant-response/default.nix deleted file mode 100644 index 3f7f9c1eee05..000000000000 --- a/pkgs/development/libraries/haskell/servant-response/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -# 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/default.nix b/pkgs/development/libraries/haskell/servant-scotty/default.nix deleted file mode 100644 index 732b2c95cc7e..000000000000 --- a/pkgs/development/libraries/haskell/servant-scotty/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -# 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.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"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/servant-server/default.nix b/pkgs/development/libraries/haskell/servant-server/default.nix new file mode 100644 index 000000000000..7776af8036d1 --- /dev/null +++ b/pkgs/development/libraries/haskell/servant-server/default.nix @@ -0,0 +1,31 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, attoparsec, either, exceptions, hspec, hspecWai +, httpTypes, network, networkUri, parsec, QuickCheck, safe, servant +, split, stringConversions, systemFilepath, temporary, text +, transformers, wai, waiAppStatic, waiExtra, warp +}: + +cabal.mkDerivation (self: { + pname = "servant-server"; + version = "0.2.1"; + sha256 = "1b2aqxnn9nf5qabbl8k9kq9b2mpn591j9jpjy33sis7ni469bayj"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson attoparsec either httpTypes networkUri safe servant split + stringConversions systemFilepath text transformers wai waiAppStatic + warp + ]; + testDepends = [ + aeson either exceptions hspec hspecWai httpTypes network parsec + QuickCheck servant stringConversions temporary text transformers + wai waiExtra warp + ]; + meta = { + homepage = "http://haskell-servant.github.io/"; + description = "A family of combinators for defining webservices APIs and serving them"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/servant/default.nix b/pkgs/development/libraries/haskell/servant/default.nix index 38f89764c4c8..1c206c1ab223 100644 --- a/pkgs/development/libraries/haskell/servant/default.nix +++ b/pkgs/development/libraries/haskell/servant/default.nix @@ -1,14 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal }: +{ cabal, hspec, parsec, QuickCheck, stringConversions, text }: cabal.mkDerivation (self: { pname = "servant"; - version = "0.1"; - sha256 = "1bm5223rjgcm8rb3s2mclmfj2df7j059jjh572a5py0rdqzg3yj0"; + version = "0.2.1"; + sha256 = "1i7yvxvil65lp1gizh99dn4gj1r7vcqslq1w7sqykj88y9h22p3x"; + buildDepends = [ parsec stringConversions text ]; + testDepends = [ hspec parsec QuickCheck stringConversions text ]; 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"; + homepage = "http://haskell-servant.github.io/"; + description = "A family of combinators for defining webservices APIs"; 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 c930746e25df..51b53743e94f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2250,13 +2250,13 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in servant = callPackage ../development/libraries/haskell/servant {}; - servantPool = callPackage ../development/libraries/haskell/servant-pool {}; + servantServer = callPackage ../development/libraries/haskell/servant-server {}; - servantPostgresql = callPackage ../development/libraries/haskell/servant-postgresql {}; + servantClient = callPackage ../development/libraries/haskell/servant-client {}; - servantResponse = callPackage ../development/libraries/haskell/servant-response {}; + servantDocs = callPackage ../development/libraries/haskell/servant-docs {}; - servantScotty = callPackage ../development/libraries/haskell/servant-scotty {}; + servantJquery = callPackage ../development/libraries/haskell/servant-jquery {}; setenv = callPackage ../development/libraries/haskell/setenv {}; |