git.iko.soy/servant
on master help sign in
convenience scripts and nix updates
b40094dBrandon Martin
.gitignore+1−1
compare with master
unifiedsplit
@@ -1,4 +1,4 @@
1−/dist
1+**/*/dist
2/bin
2/bin
3/lib
3/lib
4/share
4/share
scripts/clear-sandbox.shnew file+26
@@ -0,0 +1,26 @@
1+#!/bin/bash -
2+#===============================================================================
3+#
4+# FILE: clear-sandbox.sh
5+#
6+# USAGE: ./clear-sandbox.sh
7+#
8+# DESCRIPTION: Clear sandbox at top-level and at all packages
9+#
10+# REQUIREMENTS: bash >= 4
11+#===============================================================================
12+
13+set -o nounset
14+set -o errexit
15+
16+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
17+. "$DIR"/lib/common.sh
18+
19+clear_sandbox () {
20+ rm -rf .cabal-sandbox cabal.sandbox.config
21+ for s in ${SOURCES[@]} ; do
22+ (cd "$s" && rm -rf cabal.sandbox.config dist)
23+ done
24+}
25+
26+clear_sandbox
scripts/update-defaults-nix.shdeleted−20
@@ -1,20 +0,0 @@
1−#!/bin/bash -
2−#===============================================================================
3−#
4−# USAGE: ./update-defaults-nix.sh
5−#
6−# DESCRIPTION: Updates the default.nix files in all source dirs
7−#
8−# REQUIREMENTS: cabal2nix, bash >= 4
9−#===============================================================================
10−
11−set -o nounset
12−set -o errexit
13−
14−DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
15−. "$DIR"/lib/common.sh
16−
17−for s in ${SOURCES[@]} ; do
18− echo $s
19− (cd "$BASE_DIR/$s" && cabal2nix . > default.nix )
20−done
scripts/update-nix-files.shnew file+46
@@ -0,0 +1,46 @@
1+#!/bin/bash -
2+#===============================================================================
3+#
4+# FILE: update-nix-files.sh
5+#
6+# USAGE: ./update-nix-files.sh
7+#
8+# DESCRIPTION: Update nix files at top-level and add all packages
9+#
10+# REQUIREMENTS: bash >= 4, cabal2nix(nix tool)
11+#===============================================================================
12+
13+set -o nounset
14+set -o errexit
15+
16+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
17+. "$DIR"/lib/common.sh
18+SHELLNIX="shell.nix"
19+
20+write-package-shell-nix () {
21+ rm -rf $SHELLNIX
22+ echo -e "let" >> $SHELLNIX
23+ echo -e " pkgs = import <nixpkgs> {};" >> $SHELLNIX
24+ echo -e "" >> $SHELLNIX
25+ echo -e " haskellPackages = pkgs.haskellPackages.override {" >> $SHELLNIX
26+ echo -e " overrides = self: super: {" >> $SHELLNIX
27+ for n in ${SOURCES[@]} ; do
28+ if [[ $1 != $n ]]; then
29+ echo -e " $n = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../$n {}) \"--ghc-options=-Werror\");" >> $SHELLNIX
30+ fi
31+ done
32+ echo -e " $1 = pkgs.haskell.lib.appendConfigureFlag (self.callPackage ./. {}) \"--ghc-options=-Werror\";" >> $SHELLNIX
33+ echo -e " };" >> $SHELLNIX
34+ echo -e " };" >> $SHELLNIX
35+ echo -e "" >> $SHELLNIX
36+ echo -e "in haskellPackages.$s.env" >> $SHELLNIX
37+}
38+
39+update-nix-files () {
40+ for s in ${SOURCES[@]} ; do
41+ cd "$s" && cabal2nix . > default.nix
42+ write-package-shell-nix $s
43+ done
44+}
45+
46+update-nix-files
servant-blaze/default.nixnew file+10
@@ -0,0 +1,10 @@
1+{ mkDerivation, base, blaze-html, http-media, servant, stdenv }:
2+mkDerivation {
3+ pname = "servant-blaze";
4+ version = "0.5";
5+ src = ./.;
6+ buildDepends = [ base blaze-html http-media servant ];
7+ homepage = "http://haskell-servant.github.io/";
8+ description = "Blaze-html support for servant";
9+ license = stdenv.lib.licenses.bsd3;
10+}
servant-blaze/shell.nixnew file+18
@@ -0,0 +1,18 @@
1+let
2+ pkgs = import <nixpkgs> {};
3+
4+ haskellPackages = pkgs.haskellPackages.override {
5+ overrides = self: super: {
6+ servant = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant {}) "--ghc-options=-Werror");
7+ servant-client = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-client {}) "--ghc-options=-Werror");
8+ servant-docs = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-docs {}) "--ghc-options=-Werror");
9+ servant-js = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-js {}) "--ghc-options=-Werror");
10+ servant-server = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-server {}) "--ghc-options=-Werror");
11+ servant-examples = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-examples {}) "--ghc-options=-Werror");
12+ servant-lucid = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-lucid {}) "--ghc-options=-Werror");
13+ servant-mock = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-mock {}) "--ghc-options=-Werror");
14+ servant-blaze = pkgs.haskell.lib.appendConfigureFlag (self.callPackage ./. {}) "--ghc-options=-Werror";
15+ };
16+ };
17+
18+in haskellPackages.servant-blaze.env
servant-client/default.nix+1−1
@@ -6,7 +6,7 @@
6}:
6}:
7mkDerivation {
7mkDerivation {
8 pname = "servant-client";
8 pname = "servant-client";
9− version = "0.4.0";
9+ version = "0.5";
10 src = ./.;
10 src = ./.;
11 buildDepends = [
11 buildDepends = [
12 aeson attoparsec base bytestring either exceptions http-client
12 aeson attoparsec base bytestring either exceptions http-client
servant-client/shell.nixnew file+18
@@ -0,0 +1,18 @@
1+let
2+ pkgs = import <nixpkgs> {};
3+
4+ haskellPackages = pkgs.haskellPackages.override {
5+ overrides = self: super: {
6+ servant = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant {}) "--ghc-options=-Werror");
7+ servant-docs = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-docs {}) "--ghc-options=-Werror");
8+ servant-js = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-js {}) "--ghc-options=-Werror");
9+ servant-server = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-server {}) "--ghc-options=-Werror");
10+ servant-examples = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-examples {}) "--ghc-options=-Werror");
11+ servant-blaze = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-blaze {}) "--ghc-options=-Werror");
12+ servant-lucid = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-lucid {}) "--ghc-options=-Werror");
13+ servant-mock = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-mock {}) "--ghc-options=-Werror");
14+ servant-client = pkgs.haskell.lib.appendConfigureFlag (self.callPackage ./. {}) "--ghc-options=-Werror";
15+ };
16+ };
17+
18+in haskellPackages.servant-client.env
servant-docs/default.nix+8−7
@@ -1,18 +1,19 @@
1−{ mkDerivation, aeson, base, bytestring, hashable, hspec
1+{ mkDerivation, aeson, base, bytestring, bytestring-conversion
2+, case-insensitive, hashable, hspec, http-media, http-types, lens
2−, http-media, lens, servant, stdenv, string-conversions, text
3+, servant, stdenv, string-conversions, text, unordered-containers
3−, unordered-containers
4}:
4}:
5mkDerivation {
5mkDerivation {
6 pname = "servant-docs";
6 pname = "servant-docs";
7− version = "0.4";
7+ version = "0.5";
8 src = ./.;
8 src = ./.;
9 isLibrary = true;
9 isLibrary = true;
10 isExecutable = true;
10 isExecutable = true;
11 buildDepends = [
11 buildDepends = [
12+ aeson base bytestring bytestring-conversion case-insensitive
12− aeson base bytestring hashable http-media lens servant
13+ hashable http-media http-types lens servant string-conversions text
13− string-conversions text unordered-containers
14+ unordered-containers
14 ];
15 ];
15− testDepends = [ aeson base hspec servant string-conversions ];
16+ testDepends = [ aeson base hspec lens servant string-conversions ];
16 homepage = "http://haskell-servant.github.io/";
17 homepage = "http://haskell-servant.github.io/";
17 description = "generate API docs for your servant webservice";
18 description = "generate API docs for your servant webservice";
18 license = stdenv.lib.licenses.bsd3;
19 license = stdenv.lib.licenses.bsd3;
servant-docs/shell.nix+17−8
@@ -1,9 +1,18 @@
1+let
1−with (import <nixpkgs> {}).pkgs;
2+ pkgs = import <nixpkgs> {};
2−let modifiedHaskellPackages = haskellngPackages.override {
3+
4+ haskellPackages = pkgs.haskellPackages.override {
3− overrides = self: super: {
5+ overrides = self: super: {
6+ servant = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant {}) "--ghc-options=-Werror");
7+ servant-client = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-client {}) "--ghc-options=-Werror");
4− servant = self.callPackage ../servant {};
8+ servant-js = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-js {}) "--ghc-options=-Werror");
5− servant-server = self.callPackage ./servant-server {};
9+ servant-server = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-server {}) "--ghc-options=-Werror");
10+ servant-examples = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-examples {}) "--ghc-options=-Werror");
11+ servant-blaze = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-blaze {}) "--ghc-options=-Werror");
12+ servant-lucid = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-lucid {}) "--ghc-options=-Werror");
13+ servant-mock = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-mock {}) "--ghc-options=-Werror");
6− servant-docs = self.callPackage ./. {};
14+ servant-docs = pkgs.haskell.lib.appendConfigureFlag (self.callPackage ./. {}) "--ghc-options=-Werror";
7− };
8 };
15 };
16+ };
17+
9−in modifiedHaskellPackages.servant-docs.env
18+in haskellPackages.servant-docs.env
servant-examples/default.nixnew file+22
@@ -0,0 +1,22 @@
1+{ mkDerivation, aeson, base, bytestring, directory, either
2+, engine-io, engine-io-wai, http-types, js-jquery, lucid, mtl
3+, random, servant, servant-client, servant-docs, servant-js
4+, servant-lucid, servant-server, socket-io, stdenv, stm, text, time
5+, transformers, wai, wai-extra, warp
6+}:
7+mkDerivation {
8+ pname = "servant-examples";
9+ version = "0.5";
10+ src = ./.;
11+ isLibrary = false;
12+ isExecutable = true;
13+ buildDepends = [
14+ aeson base bytestring directory either engine-io engine-io-wai
15+ http-types js-jquery lucid mtl random servant servant-client
16+ servant-docs servant-js servant-lucid servant-server socket-io stm
17+ text time transformers wai wai-extra warp
18+ ];
19+ homepage = "http://haskell-servant.github.io/";
20+ description = "Example programs for servant";
21+ license = stdenv.lib.licenses.bsd3;
22+}
servant-examples/shell.nixnew file+18
@@ -0,0 +1,18 @@
1+let
2+ pkgs = import <nixpkgs> {};
3+
4+ haskellPackages = pkgs.haskellPackages.override {
5+ overrides = self: super: {
6+ servant = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant {}) "--ghc-options=-Werror");
7+ servant-client = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-client {}) "--ghc-options=-Werror");
8+ servant-docs = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-docs {}) "--ghc-options=-Werror");
9+ servant-js = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-js {}) "--ghc-options=-Werror");
10+ servant-server = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-server {}) "--ghc-options=-Werror");
11+ servant-blaze = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-blaze {}) "--ghc-options=-Werror");
12+ servant-lucid = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-lucid {}) "--ghc-options=-Werror");
13+ servant-mock = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-mock {}) "--ghc-options=-Werror");
14+ servant-examples = pkgs.haskell.lib.appendConfigureFlag (self.callPackage ./. {}) "--ghc-options=-Werror";
15+ };
16+ };
17+
18+in haskellPackages.servant-examples.env
servant-js/default.nix+1−1
@@ -4,7 +4,7 @@
4}:
4}:
5mkDerivation {
5mkDerivation {
6 pname = "servant-js";
6 pname = "servant-js";
7− version = "0.4.0";
7+ version = "0.5";
8 src = ./.;
8 src = ./.;
9 isLibrary = true;
9 isLibrary = true;
10 isExecutable = true;
10 isExecutable = true;
servant-js/shell.nixnew file+18
@@ -0,0 +1,18 @@
1+let
2+ pkgs = import <nixpkgs> {};
3+
4+ haskellPackages = pkgs.haskellPackages.override {
5+ overrides = self: super: {
6+ servant = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant {}) "--ghc-options=-Werror");
7+ servant-client = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-client {}) "--ghc-options=-Werror");
8+ servant-docs = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-docs {}) "--ghc-options=-Werror");
9+ servant-server = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-server {}) "--ghc-options=-Werror");
10+ servant-examples = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-examples {}) "--ghc-options=-Werror");
11+ servant-blaze = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-blaze {}) "--ghc-options=-Werror");
12+ servant-lucid = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-lucid {}) "--ghc-options=-Werror");
13+ servant-mock = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-mock {}) "--ghc-options=-Werror");
14+ servant-js = pkgs.haskell.lib.appendConfigureFlag (self.callPackage ./. {}) "--ghc-options=-Werror";
15+ };
16+ };
17+
18+in haskellPackages.servant-js.env
servant-lucid/default.nixnew file+10
@@ -0,0 +1,10 @@
1+{ mkDerivation, base, http-media, lucid, servant, stdenv }:
2+mkDerivation {
3+ pname = "servant-lucid";
4+ version = "0.5";
5+ src = ./.;
6+ buildDepends = [ base http-media lucid servant ];
7+ homepage = "http://haskell-servant.github.io/";
8+ description = "Servant support for lucid";
9+ license = stdenv.lib.licenses.bsd3;
10+}
servant-lucid/shell.nixnew file+18
@@ -0,0 +1,18 @@
1+let
2+ pkgs = import <nixpkgs> {};
3+
4+ haskellPackages = pkgs.haskellPackages.override {
5+ overrides = self: super: {
6+ servant = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant {}) "--ghc-options=-Werror");
7+ servant-client = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-client {}) "--ghc-options=-Werror");
8+ servant-docs = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-docs {}) "--ghc-options=-Werror");
9+ servant-js = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-js {}) "--ghc-options=-Werror");
10+ servant-server = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-server {}) "--ghc-options=-Werror");
11+ servant-examples = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-examples {}) "--ghc-options=-Werror");
12+ servant-blaze = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-blaze {}) "--ghc-options=-Werror");
13+ servant-mock = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-mock {}) "--ghc-options=-Werror");
14+ servant-lucid = pkgs.haskell.lib.appendConfigureFlag (self.callPackage ./. {}) "--ghc-options=-Werror";
15+ };
16+ };
17+
18+in haskellPackages.servant-lucid.env
servant-mock/default.nixnew file+17
@@ -0,0 +1,17 @@
1+{ mkDerivation, aeson, base, bytestring, http-types, QuickCheck
2+, servant, servant-server, stdenv, transformers, wai, warp
3+}:
4+mkDerivation {
5+ pname = "servant-mock";
6+ version = "0.5";
7+ src = ./.;
8+ isLibrary = true;
9+ isExecutable = true;
10+ buildDepends = [
11+ aeson base bytestring http-types QuickCheck servant servant-server
12+ transformers wai warp
13+ ];
14+ homepage = "http://github.com/haskell-servant/servant";
15+ description = "Derive a mock server for free from your servant API types";
16+ license = stdenv.lib.licenses.bsd3;
17+}
servant-mock/shell.nixnew file+18
@@ -0,0 +1,18 @@
1+let
2+ pkgs = import <nixpkgs> {};
3+
4+ haskellPackages = pkgs.haskellPackages.override {
5+ overrides = self: super: {
6+ servant = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant {}) "--ghc-options=-Werror");
7+ servant-client = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-client {}) "--ghc-options=-Werror");
8+ servant-docs = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-docs {}) "--ghc-options=-Werror");
9+ servant-js = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-js {}) "--ghc-options=-Werror");
10+ servant-server = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-server {}) "--ghc-options=-Werror");
11+ servant-examples = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-examples {}) "--ghc-options=-Werror");
12+ servant-blaze = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-blaze {}) "--ghc-options=-Werror");
13+ servant-lucid = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-lucid {}) "--ghc-options=-Werror");
14+ servant-mock = pkgs.haskell.lib.appendConfigureFlag (self.callPackage ./. {}) "--ghc-options=-Werror";
15+ };
16+ };
17+
18+in haskellPackages.servant-mock.env
servant-server/default.nix+13−11
@@ -1,25 +1,27 @@
1{ mkDerivation, aeson, attoparsec, base, bytestring
1{ mkDerivation, aeson, attoparsec, base, bytestring
2−, bytestring-conversion, directory, doctest, either, exceptions
2+, bytestring-conversion, containers, directory, doctest, either
3−, filemanip, hspec, hspec-wai, http-types, mmorph, mtl, network
3+, exceptions, filemanip, filepath, hspec, hspec-wai, http-types
4−, network-uri, parsec, QuickCheck, safe, servant, split, stdenv
4+, mmorph, mtl, network, network-uri, parsec, QuickCheck, safe
5−, string-conversions, system-filepath, temporary, text
5+, servant, split, stdenv, string-conversions, system-filepath
6−, transformers, wai, wai-app-static, wai-extra, warp
6+, temporary, text, transformers, wai, wai-app-static, wai-extra
7+, warp
7}:
8}:
8mkDerivation {
9mkDerivation {
9 pname = "servant-server";
10 pname = "servant-server";
10− version = "0.4.0";
11+ version = "0.5";
11 src = ./.;
12 src = ./.;
12 isLibrary = true;
13 isLibrary = true;
13 isExecutable = true;
14 isExecutable = true;
14 buildDepends = [
15 buildDepends = [
15− aeson attoparsec base bytestring either http-types mmorph mtl
16+ aeson attoparsec base bytestring containers either filepath
17+ http-types mmorph mtl network network-uri safe servant split
16− network-uri safe servant split string-conversions system-filepath
18+ string-conversions system-filepath text transformers wai
17− text transformers wai wai-app-static warp
19+ wai-app-static warp
18 ];
20 ];
19 testDepends = [
21 testDepends = [
20 aeson base bytestring bytestring-conversion directory doctest
22 aeson base bytestring bytestring-conversion directory doctest
21− either exceptions filemanip hspec hspec-wai http-types mtl network
23+ either exceptions filemanip filepath hspec hspec-wai http-types mtl
22− parsec QuickCheck servant string-conversions temporary text
24+ network parsec QuickCheck servant string-conversions temporary text
23 transformers wai wai-extra warp
25 transformers wai wai-extra warp
24 ];
26 ];
25 homepage = "http://haskell-servant.github.io/";
27 homepage = "http://haskell-servant.github.io/";
servant-server/shell.nixnew file+18
@@ -0,0 +1,18 @@
1+let
2+ pkgs = import <nixpkgs> {};
3+
4+ haskellPackages = pkgs.haskellPackages.override {
5+ overrides = self: super: {
6+ servant = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant {}) "--ghc-options=-Werror");
7+ servant-client = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-client {}) "--ghc-options=-Werror");
8+ servant-docs = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-docs {}) "--ghc-options=-Werror");
9+ servant-js = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-js {}) "--ghc-options=-Werror");
10+ servant-examples = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-examples {}) "--ghc-options=-Werror");
11+ servant-blaze = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-blaze {}) "--ghc-options=-Werror");
12+ servant-lucid = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-lucid {}) "--ghc-options=-Werror");
13+ servant-mock = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-mock {}) "--ghc-options=-Werror");
14+ servant-server = pkgs.haskell.lib.appendConfigureFlag (self.callPackage ./. {}) "--ghc-options=-Werror";
15+ };
16+ };
17+
18+in haskellPackages.servant-server.env
servant/default.nix+9−7
@@ -1,20 +1,22 @@
1{ mkDerivation, aeson, attoparsec, base, bytestring
1{ mkDerivation, aeson, attoparsec, base, bytestring
2−, bytestring-conversion, case-insensitive, doctest, filemanip
2+, bytestring-conversion, case-insensitive, directory, doctest
3−, hspec, http-media, http-types, network-uri, parsec, QuickCheck
3+, filemanip, filepath, hspec, http-media, http-types, network-uri
4+, parsec, QuickCheck, quickcheck-instances, stdenv
4−, quickcheck-instances, stdenv, string-conversions, text, url
5+, string-conversions, text, url, vault
5}:
6}:
6mkDerivation {
7mkDerivation {
7 pname = "servant";
8 pname = "servant";
8− version = "0.4.0";
9+ version = "0.5";
9 src = ./.;
10 src = ./.;
10 buildDepends = [
11 buildDepends = [
11 aeson attoparsec base bytestring bytestring-conversion
12 aeson attoparsec base bytestring bytestring-conversion
12 case-insensitive http-media http-types network-uri
13 case-insensitive http-media http-types network-uri
13− string-conversions text
14+ string-conversions text vault
14 ];
15 ];
15 testDepends = [
16 testDepends = [
16− aeson attoparsec base bytestring doctest filemanip hspec parsec
17+ aeson attoparsec base bytestring directory doctest filemanip
18+ filepath hspec parsec QuickCheck quickcheck-instances
17− QuickCheck quickcheck-instances string-conversions text url
19+ string-conversions text url
18 ];
20 ];
19 homepage = "http://haskell-servant.github.io/";
21 homepage = "http://haskell-servant.github.io/";
20 description = "A family of combinators for defining webservices APIs";
22 description = "A family of combinators for defining webservices APIs";
servant/shell.nix+18−2
@@ -1,2 +1,18 @@
1+let
1−with (import <nixpkgs> {}).pkgs;
2+ pkgs = import <nixpkgs> {};
2−(haskellngPackages.callPackage ./. {}).env
3+
4+ haskellPackages = pkgs.haskellPackages.override {
5+ overrides = self: super: {
6+ servant-client = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-client {}) "--ghc-options=-Werror");
7+ servant-docs = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-docs {}) "--ghc-options=-Werror");
8+ servant-js = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-js {}) "--ghc-options=-Werror");
9+ servant-server = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-server {}) "--ghc-options=-Werror");
10+ servant-examples = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-examples {}) "--ghc-options=-Werror");
11+ servant-blaze = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-blaze {}) "--ghc-options=-Werror");
12+ servant-lucid = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-lucid {}) "--ghc-options=-Werror");
13+ servant-mock = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-mock {}) "--ghc-options=-Werror");
14+ servant = pkgs.haskell.lib.appendConfigureFlag (self.callPackage ./. {}) "--ghc-options=-Werror";
15+ };
16+ };
17+
18+in haskellPackages.servant.env