b40094d · typeable/servant

git.iko.soy/typeable/servant

convenience scripts and nix updates

commitb40094d01cfabbbe4e1834821719ea72996b9d1d authorBrandon Martin <zmbmartin@gmail.com> dateWed 29 Jul 2015, 08:06 (11 years ago) parent522a7dc

22 files changed+325−58

compare with master

unifiedsplit

.gitignore+1−1

@@ -1,4 +1,4 @@

1−/dist

1+**/*/dist

22/bin

33/lib

44/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> {};

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 @@

66}:

77mkDerivation {

88 pname = "servant-client";

9− version = "0.4.0";

9+ version = "0.5";

1010 src = ./.;

1111 buildDepends = [

1212 aeson attoparsec base bytestring either exceptions http-client

servant-client/shell.nixnew file+18

@@ -0,0 +1,18 @@

1+let

2+ pkgs = import <nixpkgs> {};

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

2−, http-media, lens, servant, stdenv, string-conversions, text

3−, unordered-containers

1+{ mkDerivation, aeson, base, bytestring, bytestring-conversion

2+, case-insensitive, hashable, hspec, http-media, http-types, lens

3+, servant, stdenv, string-conversions, text, unordered-containers

44}:

55mkDerivation {

66 pname = "servant-docs";

7− version = "0.4";

7+ version = "0.5";

88 src = ./.;

99 isLibrary = true;

1010 isExecutable = true;

1111 buildDepends = [

12− aeson base bytestring hashable http-media lens servant

13− string-conversions text unordered-containers

12+ aeson base bytestring bytestring-conversion case-insensitive

13+ hashable http-media http-types lens servant string-conversions text

14+ unordered-containers

1415 ];

15− testDepends = [ aeson base hspec servant string-conversions ];

16+ testDepends = [ aeson base hspec lens servant string-conversions ];

1617 homepage = "http://haskell-servant.github.io/";

1718 description = "generate API docs for your servant webservice";

1819 license = stdenv.lib.licenses.bsd3;

servant-docs/shell.nix+17−8

@@ -1,9 +1,18 @@

1−with (import <nixpkgs> {}).pkgs;

2−let modifiedHaskellPackages = haskellngPackages.override {

3− overrides = self: super: {

4− servant = self.callPackage ../servant {};

5− servant-server = self.callPackage ./servant-server {};

6− servant-docs = self.callPackage ./. {};

7− };