From a265fd31a03799e0ce6ff78237505aacba106435 Mon Sep 17 00:00:00 2001 From: Jonathan Lange Date: Tue, 8 Sep 2015 20:28:47 +0100 Subject: [PATCH] Run of update-nix-files.sh --- servant-blaze/shell.nix | 1 + servant-cassava/default.nix | 11 +++++++++++ servant-cassava/shell.nix | 19 +++++++++++++++++++ servant-client/shell.nix | 1 + servant-docs/shell.nix | 1 + servant-examples/shell.nix | 1 + servant-js/shell.nix | 1 + servant-lucid/shell.nix | 1 + servant-mock/shell.nix | 1 + servant-server/shell.nix | 1 + servant/default.nix | 24 ++++++++++++++++++++++++ servant/shell.nix | 1 + 12 files changed, 63 insertions(+) create mode 100644 servant-cassava/default.nix create mode 100644 servant-cassava/shell.nix diff --git a/servant-blaze/shell.nix b/servant-blaze/shell.nix index 44a0f570..b07a478d 100644 --- a/servant-blaze/shell.nix +++ b/servant-blaze/shell.nix @@ -4,6 +4,7 @@ let haskellPackages = pkgs.haskellPackages.override { overrides = self: super: { servant = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant {}) "--ghc-options=-Werror"); + servant-cassava = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-cassava {}) "--ghc-options=-Werror"); servant-client = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-client {}) "--ghc-options=-Werror"); servant-docs = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-docs {}) "--ghc-options=-Werror"); servant-js = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-js {}) "--ghc-options=-Werror"); diff --git a/servant-cassava/default.nix b/servant-cassava/default.nix new file mode 100644 index 00000000..ddf1aa36 --- /dev/null +++ b/servant-cassava/default.nix @@ -0,0 +1,11 @@ +{ mkDerivation, base, cassava, http-media, servant, stdenv, vector +}: +mkDerivation { + pname = "servant-cassava"; + version = "0.4.4.2"; + src = ./.; + buildDepends = [ base cassava http-media servant vector ]; + homepage = "http://haskell-servant.github.io/"; + description = "Servant CSV content-type for cassava"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/servant-cassava/shell.nix b/servant-cassava/shell.nix new file mode 100644 index 00000000..af092b8a --- /dev/null +++ b/servant-cassava/shell.nix @@ -0,0 +1,19 @@ +let + pkgs = import {}; + + haskellPackages = pkgs.haskellPackages.override { + overrides = self: super: { + servant = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant {}) "--ghc-options=-Werror"); + servant-client = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-client {}) "--ghc-options=-Werror"); + servant-docs = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-docs {}) "--ghc-options=-Werror"); + servant-js = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-js {}) "--ghc-options=-Werror"); + servant-server = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-server {}) "--ghc-options=-Werror"); + servant-examples = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-examples {}) "--ghc-options=-Werror"); + servant-blaze = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-blaze {}) "--ghc-options=-Werror"); + servant-lucid = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-lucid {}) "--ghc-options=-Werror"); + servant-mock = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-mock {}) "--ghc-options=-Werror"); + servant-cassava = pkgs.haskell.lib.appendConfigureFlag (self.callPackage ./. {}) "--ghc-options=-Werror"; + }; + }; + +in haskellPackages.servant-cassava.env diff --git a/servant-client/shell.nix b/servant-client/shell.nix index 6862ab21..c3eb41fc 100644 --- a/servant-client/shell.nix +++ b/servant-client/shell.nix @@ -4,6 +4,7 @@ let haskellPackages = pkgs.haskellPackages.override { overrides = self: super: { servant = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant {}) "--ghc-options=-Werror"); + servant-cassava = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-cassava {}) "--ghc-options=-Werror"); servant-docs = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-docs {}) "--ghc-options=-Werror"); servant-js = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-js {}) "--ghc-options=-Werror"); servant-server = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-server {}) "--ghc-options=-Werror"); diff --git a/servant-docs/shell.nix b/servant-docs/shell.nix index 0bf6f8ca..cca19263 100644 --- a/servant-docs/shell.nix +++ b/servant-docs/shell.nix @@ -4,6 +4,7 @@ let haskellPackages = pkgs.haskellPackages.override { overrides = self: super: { servant = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant {}) "--ghc-options=-Werror"); + servant-cassava = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-cassava {}) "--ghc-options=-Werror"); servant-client = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-client {}) "--ghc-options=-Werror"); servant-js = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-js {}) "--ghc-options=-Werror"); servant-server = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-server {}) "--ghc-options=-Werror"); diff --git a/servant-examples/shell.nix b/servant-examples/shell.nix index 0fae2886..0012a0f2 100644 --- a/servant-examples/shell.nix +++ b/servant-examples/shell.nix @@ -4,6 +4,7 @@ let haskellPackages = pkgs.haskellPackages.override { overrides = self: super: { servant = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant {}) "--ghc-options=-Werror"); + servant-cassava = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-cassava {}) "--ghc-options=-Werror"); servant-client = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-client {}) "--ghc-options=-Werror"); servant-docs = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-docs {}) "--ghc-options=-Werror"); servant-js = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-js {}) "--ghc-options=-Werror"); diff --git a/servant-js/shell.nix b/servant-js/shell.nix index 9f4c888a..81d7210c 100644 --- a/servant-js/shell.nix +++ b/servant-js/shell.nix @@ -4,6 +4,7 @@ let haskellPackages = pkgs.haskellPackages.override { overrides = self: super: { servant = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant {}) "--ghc-options=-Werror"); + servant-cassava = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-cassava {}) "--ghc-options=-Werror"); servant-client = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-client {}) "--ghc-options=-Werror"); servant-docs = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-docs {}) "--ghc-options=-Werror"); servant-server = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-server {}) "--ghc-options=-Werror"); diff --git a/servant-lucid/shell.nix b/servant-lucid/shell.nix index 656531cd..d45c3940 100644 --- a/servant-lucid/shell.nix +++ b/servant-lucid/shell.nix @@ -4,6 +4,7 @@ let haskellPackages = pkgs.haskellPackages.override { overrides = self: super: { servant = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant {}) "--ghc-options=-Werror"); + servant-cassava = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-cassava {}) "--ghc-options=-Werror"); servant-client = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-client {}) "--ghc-options=-Werror"); servant-docs = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-docs {}) "--ghc-options=-Werror"); servant-js = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-js {}) "--ghc-options=-Werror"); diff --git a/servant-mock/shell.nix b/servant-mock/shell.nix index cd9721d7..be4dc49b 100644 --- a/servant-mock/shell.nix +++ b/servant-mock/shell.nix @@ -4,6 +4,7 @@ let haskellPackages = pkgs.haskellPackages.override { overrides = self: super: { servant = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant {}) "--ghc-options=-Werror"); + servant-cassava = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-cassava {}) "--ghc-options=-Werror"); servant-client = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-client {}) "--ghc-options=-Werror"); servant-docs = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-docs {}) "--ghc-options=-Werror"); servant-js = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-js {}) "--ghc-options=-Werror"); diff --git a/servant-server/shell.nix b/servant-server/shell.nix index 8fb19d5a..3769a18f 100644 --- a/servant-server/shell.nix +++ b/servant-server/shell.nix @@ -4,6 +4,7 @@ let haskellPackages = pkgs.haskellPackages.override { overrides = self: super: { servant = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant {}) "--ghc-options=-Werror"); + servant-cassava = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-cassava {}) "--ghc-options=-Werror"); servant-client = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-client {}) "--ghc-options=-Werror"); servant-docs = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-docs {}) "--ghc-options=-Werror"); servant-js = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-js {}) "--ghc-options=-Werror"); diff --git a/servant/default.nix b/servant/default.nix index e69de29b..0bf96999 100644 --- a/servant/default.nix +++ b/servant/default.nix @@ -0,0 +1,24 @@ +{ mkDerivation, aeson, attoparsec, base, bytestring +, bytestring-conversion, case-insensitive, directory, doctest +, filemanip, filepath, hspec, http-media, http-types, network-uri +, parsec, QuickCheck, quickcheck-instances, stdenv +, string-conversions, text, url, vault +}: +mkDerivation { + pname = "servant"; + version = "0.5"; + src = ./.; + buildDepends = [ + aeson attoparsec base bytestring bytestring-conversion + case-insensitive http-media http-types network-uri + string-conversions text vault + ]; + testDepends = [ + aeson attoparsec base bytestring directory doctest filemanip + filepath 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/servant/shell.nix b/servant/shell.nix index 82d3938f..cb809131 100644 --- a/servant/shell.nix +++ b/servant/shell.nix @@ -3,6 +3,7 @@ let haskellPackages = pkgs.haskellPackages.override { overrides = self: super: { + servant-cassava = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-cassava {}) "--ghc-options=-Werror"); servant-client = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-client {}) "--ghc-options=-Werror"); servant-docs = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-docs {}) "--ghc-options=-Werror"); servant-js = pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.appendConfigureFlag (self.callPackage ../servant-js {}) "--ghc-options=-Werror");