From 019d49e782ed02d5b21de0169f7774ccb837f2f3 Mon Sep 17 00:00:00 2001 From: "Julian K. Arni" Date: Mon, 20 Apr 2015 19:13:55 +0200 Subject: [PATCH] default.nix and sources files --- servant-client/default.nix | 24 +++++++++++++++++++++++ servant-docs/default.nix | 2 +- servant-jquery/default.nix | 21 ++++++++++++++++++++ servant-server/default.nix | 39 +++++++++++++++++++++++++------------- servant/default.nix | 30 +++++++++++++++++++---------- sources.txt | 5 +++++ 6 files changed, 97 insertions(+), 24 deletions(-) create mode 100644 servant-client/default.nix create mode 100644 servant-jquery/default.nix create mode 100644 sources.txt diff --git a/servant-client/default.nix b/servant-client/default.nix new file mode 100644 index 00000000..76cf30ff --- /dev/null +++ b/servant-client/default.nix @@ -0,0 +1,24 @@ +{ mkDerivation, aeson, attoparsec, base, bytestring, deepseq +, either, exceptions, hspec, http-client, http-client-tls +, http-media, http-types, HUnit, network, network-uri, QuickCheck +, safe, servant, servant-server, stdenv, string-conversions, text +, transformers, wai, warp +}: +mkDerivation { + pname = "servant-client"; + version = "0.2.2"; + src = ./.; + buildDepends = [ + aeson attoparsec base bytestring either exceptions http-client + http-client-tls http-media http-types network-uri safe servant + string-conversions text transformers + ]; + testDepends = [ + aeson base bytestring deepseq either hspec http-client http-media + http-types HUnit network QuickCheck servant servant-server text wai + warp + ]; + homepage = "http://haskell-servant.github.io/"; + description = "automatical derivation of querying functions for servant webservices"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/servant-docs/default.nix b/servant-docs/default.nix index b310e07c..47c1b247 100644 --- a/servant-docs/default.nix +++ b/servant-docs/default.nix @@ -12,7 +12,7 @@ mkDerivation { aeson base bytestring hashable http-media lens servant string-conversions text unordered-containers ]; - testDepends = [ aeson base hspec lens servant ]; + testDepends = [ aeson base hspec servant string-conversions ]; homepage = "http://haskell-servant.github.io/"; description = "generate API docs for your servant webservice"; license = stdenv.lib.licenses.bsd3; diff --git a/servant-jquery/default.nix b/servant-jquery/default.nix new file mode 100644 index 00000000..3210c098 --- /dev/null +++ b/servant-jquery/default.nix @@ -0,0 +1,21 @@ +{ mkDerivation, aeson, base, charset, filepath, hspec +, hspec-expectations, language-ecmascript, lens, servant +, servant-server, stdenv, stm, text, transformers, warp +}: +mkDerivation { + pname = "servant-jquery"; + version = "0.2.2"; + src = ./.; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson base charset filepath lens servant servant-server stm text + transformers warp + ]; + testDepends = [ + base hspec hspec-expectations language-ecmascript lens servant + ]; + homepage = "http://haskell-servant.github.io/"; + description = "Automatically derive (jquery) javascript functions to query servant webservices"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/servant-server/default.nix b/servant-server/default.nix index e8a420df..4409fc5d 100644 --- a/servant-server/default.nix +++ b/servant-server/default.nix @@ -1,15 +1,28 @@ -{ pkgs ? import { config.allowUnfree = true; } -, src ? builtins.filterSource (path: type: - type != "unknown" && - baseNameOf path != ".git" && - baseNameOf path != "result" && - baseNameOf path != "dist") ./. -, servant ? import ../servant {} +{ mkDerivation, aeson, attoparsec, base, bytestring +, bytestring-conversion, directory, either, exceptions, hspec +, hspec-wai, http-types, network, network-uri, parsec, QuickCheck +, safe, servant, split, stdenv, string-conversions, system-filepath +, temporary, text, transformers, wai, wai-app-static, wai-extra +, warp }: -pkgs.haskellPackages.buildLocalCabalWithArgs { - name = "servant-server"; - inherit src; - args = { - inherit servant; - }; +mkDerivation { + pname = "servant-server"; + version = "0.2.4"; + src = ./.; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson attoparsec base bytestring either http-types network-uri safe + servant split string-conversions system-filepath text transformers + wai wai-app-static warp + ]; + testDepends = [ + aeson base bytestring bytestring-conversion directory either + exceptions hspec hspec-wai http-types network parsec QuickCheck + servant string-conversions temporary text transformers wai + wai-extra warp + ]; + homepage = "http://haskell-servant.github.io/"; + description = "A family of combinators for defining webservices APIs and serving them"; + license = stdenv.lib.licenses.bsd3; } diff --git a/servant/default.nix b/servant/default.nix index a6d6a443..3240a68a 100644 --- a/servant/default.nix +++ b/servant/default.nix @@ -1,12 +1,22 @@ -{ pkgs ? import { config.allowUnfree = true; } -, src ? builtins.filterSource (path: type: - type != "unknown" && - baseNameOf path != ".git" && - baseNameOf path != "result" && - baseNameOf path != "dist") ./. +{ mkDerivation, aeson, attoparsec, base, bytestring +, bytestring-conversion, case-insensitive, doctest, filemanip +, hspec, http-media, http-types, network-uri, parsec, QuickCheck +, quickcheck-instances, stdenv, string-conversions, text, url }: -pkgs.haskellPackages.buildLocalCabalWithArgs { - name = "servant"; - inherit src; - args = {}; +mkDerivation { + pname = "servant"; + version = "0.2.2"; + src = ./.; + buildDepends = [ + aeson attoparsec base bytestring bytestring-conversion + case-insensitive http-media http-types network-uri + string-conversions text + ]; + testDepends = [ + aeson attoparsec base bytestring doctest filemanip hspec parsec + QuickCheck quickcheck-instances string-conversions text url + ]; + homepage = "http://haskell-servant.github.io/"; + description = "A family of combinators for defining webservices APIs"; + license = stdenv.lib.licenses.bsd3; } diff --git a/sources.txt b/sources.txt new file mode 100644 index 00000000..88cd15da --- /dev/null +++ b/sources.txt @@ -0,0 +1,5 @@ +servant +servant-client +servant-docs +servant-jquery +servant-server