From 8e0cb615ad3bbdd8b192ce7fbb49182e1c9e9c11 Mon Sep 17 00:00:00 2001 From: Alp Mestanogullari Date: Wed, 27 Dec 2017 01:33:12 +0100 Subject: [PATCH] cookbook projects: add (lower) bounds for non servant deps --- doc/cookbook/basic-auth/basic-auth.cabal | 14 +++++++------- .../db-postgres-pool/db-postgres-pool.cabal | 18 +++++++++--------- .../db-sqlite-simple/db-sqlite-simple.cabal | 14 +++++++------- doc/cookbook/file-upload/file-upload.cabal | 14 +++++++------- doc/cookbook/https/https.cabal | 6 +++--- .../jwt-and-basic-auth.cabal | 16 ++++++++-------- .../structuring-apis/structuring-apis.cabal | 4 ++-- nix/shell.nix | 2 +- 8 files changed, 44 insertions(+), 44 deletions(-) diff --git a/doc/cookbook/basic-auth/basic-auth.cabal b/doc/cookbook/basic-auth/basic-auth.cabal index 8254bee2..9d788a30 100644 --- a/doc/cookbook/basic-auth/basic-auth.cabal +++ b/doc/cookbook/basic-auth/basic-auth.cabal @@ -14,17 +14,17 @@ executable cookbook-basic-auth buildable: False main-is: BasicAuth.lhs build-depends: base == 4.* - , text - , aeson - , containers + , text >= 1.2 + , aeson >= 1.2 + , containers >= 0.5 , servant , servant-client , servant-server - , warp - , wai - , http-types < 0.11 + , warp >= 3.2 + , wai >= 3.2 + , http-types >= 0.10 , markdown-unlit >= 0.4 - , http-client + , http-client >= 0.5 default-language: Haskell2010 ghc-options: -Wall -pgmL markdown-unlit build-tool-depends: markdown-unlit:markdown-unlit diff --git a/doc/cookbook/db-postgres-pool/db-postgres-pool.cabal b/doc/cookbook/db-postgres-pool/db-postgres-pool.cabal index b2faa09d..fc05a40f 100644 --- a/doc/cookbook/db-postgres-pool/db-postgres-pool.cabal +++ b/doc/cookbook/db-postgres-pool/db-postgres-pool.cabal @@ -14,19 +14,19 @@ executable cookbook-db-postgres-pool buildable: False main-is: PostgresPool.lhs build-depends: base == 4.* - , bytestring - , text - , aeson + , bytestring >= 0.10 + , text >= 1.2 + , aeson >= 1.2 , servant , servant-client , servant-server - , warp - , wai - , http-types < 0.11 + , warp >= 3.2 + , wai >= 3.2 + , http-types >= 0.10 , markdown-unlit >= 0.4 - , http-client - , postgresql-simple - , resource-pool + , http-client >= 0.5 + , postgresql-simple >= 0.5 + , resource-pool >= 0.2 default-language: Haskell2010 ghc-options: -Wall -pgmL markdown-unlit build-tool-depends: markdown-unlit:markdown-unlit diff --git a/doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal b/doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal index 13d37644..47553df0 100644 --- a/doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal +++ b/doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal @@ -14,17 +14,17 @@ executable cookbook-db-sqlite-simple buildable: False main-is: DBConnection.lhs build-depends: base == 4.* - , text - , aeson + , text >= 1.2 + , aeson >= 1.2 , servant , servant-client , servant-server - , warp - , wai - , http-types < 0.11 + , warp >= 3.2 + , wai >= 3.2 + , http-types >= 0.10 , markdown-unlit >= 0.4 - , http-client - , sqlite-simple + , http-client >= 0.5 + , sqlite-simple >= 0.4 default-language: Haskell2010 ghc-options: -Wall -pgmL markdown-unlit build-tool-depends: markdown-unlit:markdown-unlit diff --git a/doc/cookbook/file-upload/file-upload.cabal b/doc/cookbook/file-upload/file-upload.cabal index 538cc019..56ecdf28 100644 --- a/doc/cookbook/file-upload/file-upload.cabal +++ b/doc/cookbook/file-upload/file-upload.cabal @@ -14,17 +14,17 @@ executable cookbook-file-upload buildable: False main-is: FileUpload.lhs build-depends: base == 4.* - , text - , mtl - , network - , bytestring + , text >= 1.2 + , mtl >= 2.2 + , network >= 2.6 + , bytestring >= 0.10 , servant , servant-server , servant-multipart - , warp - , wai + , warp >= 3.2 + , wai >= 3.2 , markdown-unlit >= 0.4 - , http-client + , http-client >= 0.5 default-language: Haskell2010 ghc-options: -Wall -pgmL markdown-unlit build-tool-depends: markdown-unlit:markdown-unlit diff --git a/doc/cookbook/https/https.cabal b/doc/cookbook/https/https.cabal index eb505c12..a13e6def 100644 --- a/doc/cookbook/https/https.cabal +++ b/doc/cookbook/https/https.cabal @@ -16,9 +16,9 @@ executable cookbook-https build-depends: base == 4.* , servant , servant-server - , wai - , warp - , warp-tls + , wai >= 3.2 + , warp >= 3.2 + , warp-tls >= 3.2 , markdown-unlit >= 0.4 default-language: Haskell2010 ghc-options: -Wall -pgmL markdown-unlit diff --git a/doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal b/doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal index 91965d91..18f398a3 100644 --- a/doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal +++ b/doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal @@ -17,20 +17,20 @@ executable cookbook-jwt-and-basic-auth buildable: False main-is: JWTAndBasicAuth.lhs build-depends: base == 4.* - , text - , aeson - , containers + , text >= 1.2 + , aeson >= 1.2 + , containers >= 0.5 , servant , servant-client , servant-server , servant-auth , servant-auth-server - , warp - , wai - , http-types < 0.11 + , warp >= 3.2 + , wai >= 3.2 + , http-types >= 0.10 , markdown-unlit >= 0.4 - , http-client - , bytestring + , http-client >= 0.5 + , bytestring >= 0.10 default-language: Haskell2010 ghc-options: -Wall -pgmL markdown-unlit build-tool-depends: markdown-unlit:markdown-unlit diff --git a/doc/cookbook/structuring-apis/structuring-apis.cabal b/doc/cookbook/structuring-apis/structuring-apis.cabal index 4e35aa98..aa602bd0 100644 --- a/doc/cookbook/structuring-apis/structuring-apis.cabal +++ b/doc/cookbook/structuring-apis/structuring-apis.cabal @@ -14,10 +14,10 @@ executable cookbook-structuring-apis buildable: False main-is: StructuringApis.lhs build-depends: base == 4.* - , aeson + , aeson >= 1.2 , servant , servant-server - , warp + , warp >= 3.2 , markdown-unlit >= 0.4 default-language: Haskell2010 ghc-options: -Wall -pgmL markdown-unlit diff --git a/nix/shell.nix b/nix/shell.nix index 637aaeb2..9c0cef9e 100644 --- a/nix/shell.nix +++ b/nix/shell.nix @@ -12,7 +12,7 @@ in stdenv.mkDerivation { name = "servant-dev"; - buildInputs = [ ghc zlib ] + buildInputs = [ ghc zlib python3 wget ] ++ (if tutorial then [docstuffs postgresql] else []); shellHook = '' eval $(grep export ${ghc}/bin/ghc)