git.iko.soy/servant
on master help sign in
Remove servant-blaze and servant-lucid
commit73bc0e3c1d95e24b08ac1352b39b14f2d977b7a3 authorOleg Grenrus <oleg.grenrus@iki.fi> dateFri 13 May 2016, 14:38 (10 years ago) parent461d436
16 files changed−235
compare with master
unifiedsplit
servant-blaze/LICENSE−30 servant-blaze/Setup.hs−2 servant-blaze/include/overlapping-compat.h−8 servant-blaze/servant-blaze.cabal−34 servant-blaze/src/Servant/HTML/Blaze.hs−35 servant-blaze/tinc.yaml−3 servant-lucid/LICENSE−30 servant-lucid/Setup.hs−2 servant-lucid/include/overlapping-compat.h−8 servant-lucid/servant-lucid.cabal−34 servant-lucid/src/Servant/HTML/Lucid.hs−36 servant-lucid/tinc.yaml−3 sources.txt−2 stack-ghc-7.8.4.yaml−2 stack-ghc-8.0.1.yaml−4 stack.yaml−2
servant-blaze/LICENSEdeleted−30
@@ -1,30 +0,0 @@
1−Copyright (c) 2015-2016, Servant Contributors
2−
3−All rights reserved.
4−
5−Redistribution and use in source and binary forms, with or without
6−modification, are permitted provided that the following conditions are met:
7−
8− * Redistributions of source code must retain the above copyright
9− notice, this list of conditions and the following disclaimer.
10−
11− * Redistributions in binary form must reproduce the above
12− copyright notice, this list of conditions and the following
13− disclaimer in the documentation and/or other materials provided
14− with the distribution.
15−
16− * Neither the name of Julian K. Arni nor the names of other
17− contributors may be used to endorse or promote products derived
18− from this software without specific prior written permission.
19−
20−THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
21−"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
22−LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
23−A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
24−OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
25−SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
26−LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27−DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28−THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29−(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
30−OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
servant-blaze/Setup.hsdeleted−2
@@ -1,2 +0,0 @@
1−import Distribution.Simple
2−main = defaultMain
servant-blaze/include/overlapping-compat.hdeleted−8
@@ -1,8 +0,0 @@
1−#if __GLASGOW_HASKELL__ >= 710
2−#define OVERLAPPABLE_ {-# OVERLAPPABLE #-}
3−#define OVERLAPPING_ {-# OVERLAPPING #-}
4−#else
5−{-# LANGUAGE OverlappingInstances #-}
6−#define OVERLAPPABLE_
7−#define OVERLAPPING_
8−#endif
servant-blaze/servant-blaze.cabaldeleted−34
@@ -1,34 +0,0 @@
1−-- Initial servant-blaze.cabal generated by cabal init. For further
2−-- documentation, see http://haskell.org/cabal/users-guide/
3−
4−name: servant-blaze
5−version: 0.7.1
6−synopsis: Blaze-html support for servant
7−-- description:
8−homepage: http://haskell-servant.readthedocs.org/
9−license: BSD3
10−license-file: LICENSE
11−author: Servant Contributors
12−maintainer: haskell-servant-maintainers@googlegroups.com
13−copyright: 2015-2016 Servant Contributors
14−category: Web
15−build-type: Simple
16−extra-source-files: include/*.h
17−cabal-version: >=1.10
18−bug-reports: http://github.com/haskell-servant/servant/issues
19−source-repository head
20− type: git
21− location: http://github.com/haskell-servant/servant.git
22−
23−library
24− exposed-modules: Servant.HTML.Blaze
25− -- other-modules:
26− -- other-extensions:
27− build-depends: base >=4.7 && <5
28− , servant == 0.7.*
29− , http-media
30− , blaze-html
31− hs-source-dirs: src
32− default-language: Haskell2010
33− include-dirs: include
34− ghc-options: -Wall
servant-blaze/src/Servant/HTML/Blaze.hsdeleted−35
@@ -1,35 +0,0 @@
1−{-# LANGUAGE CPP #-}
2−{-# LANGUAGE DeriveDataTypeable #-}
3−{-# LANGUAGE FlexibleInstances #-}
4−{-# LANGUAGE MultiParamTypeClasses #-}
5−{-# LANGUAGE OverloadedStrings #-}
6−
7−#include "overlapping-compat.h"
8−-- | An @HTML@ empty data type with `MimeRender` instances for @blaze-html@'s
9−-- `ToMarkup` class and `Html` datatype.
10−-- You should only need to import this module for it's instances and the
11−-- `HTML` datatype.:
12−--
13−-- >>> type Eg = Get '[HTML] a
14−--
15−-- Will then check that @a@ has a `ToMarkup` instance, or is `Html`.
16−module Servant.HTML.Blaze where
17−
18−import Data.Typeable (Typeable)
19−import qualified Network.HTTP.Media as M
20−import Servant.API (Accept (..), MimeRender (..))
21−import Text.Blaze.Html (Html, ToMarkup, toHtml)
22−import Text.Blaze.Html.Renderer.Utf8 (renderHtml)
23−
24−data HTML deriving Typeable
25−
26−-- | @text/html;charset=utf-8@
27−instance Accept HTML where
28− contentType _ = "text" M.// "html" M./: ("charset", "utf-8")
29−
30−instance OVERLAPPABLE_ ToMarkup a => MimeRender HTML a where
31− mimeRender _ = renderHtml . toHtml
32−
33−instance OVERLAPPING_ MimeRender HTML Html where
34− mimeRender _ = renderHtml
35−
servant-blaze/tinc.yamldeleted−3
@@ -1,3 +0,0 @@
1−dependencies:
2− - name: servant
3− path: ../servant
servant-lucid/LICENSEdeleted−30
@@ -1,30 +0,0 @@
1−Copyright (c) 2015-2016, Servant Contributors
2−
3−All rights reserved.
4−
5−Redistribution and use in source and binary forms, with or without
6−modification, are permitted provided that the following conditions are met:
7−
8− * Redistributions of source code must retain the above copyright
9− notice, this list of conditions and the following disclaimer.
10−
11− * Redistributions in binary form must reproduce the above
12− copyright notice, this list of conditions and the following
13− disclaimer in the documentation and/or other materials provided
14− with the distribution.
15−
16− * Neither the name of Julian K. Arni nor the names of other
17− contributors may be used to endorse or promote products derived
18− from this software without specific prior written permission.
19−
20−THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
21−"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
22−LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
23−A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
24−OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
25−SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
26−LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27−DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28−THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29−(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
30−OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
servant-lucid/Setup.hsdeleted−2
@@ -1,2 +0,0 @@
1−import Distribution.Simple
2−main = defaultMain
servant-lucid/include/overlapping-compat.hdeleted−8
@@ -1,8 +0,0 @@
1−#if __GLASGOW_HASKELL__ >= 710
2−#define OVERLAPPABLE_ {-# OVERLAPPABLE #-}
3−#define OVERLAPPING_ {-# OVERLAPPING #-}
4−#else
5−{-# LANGUAGE OverlappingInstances #-}
6−#define OVERLAPPABLE_
7−#define OVERLAPPING_
8−#endif
servant-lucid/servant-lucid.cabaldeleted−34
@@ -1,34 +0,0 @@
1−-- Initial servant-lucid.cabal generated by cabal init. For further
2−-- documentation, see http://haskell.org/cabal/users-guide/
3−
4−name: servant-lucid
5−version: 0.7.1
6−synopsis: Servant support for lucid
7−-- description:
8−homepage: http://haskell-servant.readthedocs.org/
9−license: BSD3
10−license-file: LICENSE
11−author: Servant Contributors
12−maintainer: haskell-servant-maintainers@googlegroups.com
13−copyright: 2015-2016 Servant Contributors
14−category: Web
15−build-type: Simple
16−extra-source-files: include/*.h
17−cabal-version: >=1.10
18−bug-reports: http://github.com/haskell-servant/servant/issues
19−source-repository head
20− type: git
21− location: http://github.com/haskell-servant/servant.git
22−
23−library
24− exposed-modules: Servant.HTML.Lucid
25− -- other-modules:
26− -- other-extensions:
27− build-depends: base >=4.7 && <5
28− , http-media
29− , lucid
30− , servant == 0.7.*
31− hs-source-dirs: src
32− default-language: Haskell2010
33− include-dirs: include
34− ghc-options: -Wall
servant-lucid/src/Servant/HTML/Lucid.hsdeleted−36
@@ -1,36 +0,0 @@
1−{-# LANGUAGE CPP #-}
2−{-# LANGUAGE DeriveDataTypeable #-}
3−{-# LANGUAGE FlexibleInstances #-}
4−{-# LANGUAGE MultiParamTypeClasses #-}
5−{-# LANGUAGE OverloadedStrings #-}
6−
7−#include "overlapping-compat.h"
8−
9−-- | An @HTML@ empty data type with `MimeRender` instances for @lucid@'s
10−-- `ToHtml` class and `Html` datatype.
11−-- You should only need to import this module for it's instances and the
12−-- `HTML` datatype.:
13−--
14−-- >>> type Eg = Get '[HTML] a
15−--
16−-- Will then check that @a@ has a `ToHtml` instance, or is `Html`.
17−module Servant.HTML.Lucid where
18−
19−import Data.Typeable (Typeable)
20−import Lucid (Html, ToHtml (..), renderBS)
21−import qualified Network.HTTP.Media as M
22−import Servant.API (Accept (..), MimeRender (..))
23−
24−data HTML deriving Typeable
25−
26−-- | @text/html;charset=utf-8@
27−instance Accept HTML where
28− contentType _ = "text" M.// "html" M./: ("charset", "utf-8")
29−
30−instance OVERLAPPABLE_
31− ToHtml a => MimeRender HTML a where
32− mimeRender _ = renderBS . toHtml
33−
34−instance OVERLAPPING_
35− MimeRender HTML (Html a) where
36− mimeRender _ = renderBS
servant-lucid/tinc.yamldeleted−3
@@ -1,3 +0,0 @@
1−dependencies:
2− - name: servant
3− path: ../servant
sources.txt−2
@@ -4,6 +4,4 @@ servant-client
44servant-docs
55servant-foreign
66servant-js
7−servant-blaze
8−servant-lucid
97servant-mock
stack-ghc-7.8.4.yaml−2
@@ -1,12 +1,10 @@
11flags: {}
22packages:
33- servant/
4−- servant-blaze/
54- servant-client/
65- servant-docs/
76- servant-foreign/
87- servant-js/
9−- servant-lucid/
108- servant-mock/
119- servant-server/
1210extra-deps:
stack-ghc-8.0.1.yaml−4
@@ -3,12 +3,10 @@ flags:
33 old-locale: false
44packages:
55- servant/
6−- servant-blaze/
76- servant-client/
87- servant-docs/
98- servant-foreign/
109- servant-js/
11−- servant-lucid/
1210- servant-mock/
1311- servant-server/
1412setup-info:
@@ -48,7 +46,6 @@ extra-deps:
4846- bytestring-builder-0.10.6.0.0
4947- bytestring-conversion-0.3.1
5048- case-insensitive-1.2.0.6
51−- cassava-0.4.5.0
5249- cereal-0.5.1.0
5350- charset-0.3.7.1
5451- cmdargs-0.10.14
@@ -91,7 +88,6 @@ extra-deps:
9188- language-ecmascript-0.17.1.0
9289- lens-4.14
9390- lifted-base-0.2.3.6
94−- lucid-2.9.5
9591- memory-0.12
9692- mime-types-0.1.0.7
9793- mmorph-1.0.6
stack.yaml−2
@@ -3,12 +3,10 @@ flags:
33 example: false
44packages:
55- servant/
6−- servant-blaze/
76- servant-client/
87- servant-docs/
98- servant-foreign/
109- servant-js/
11−- servant-lucid/
1210- servant-mock/
1311- servant-server/
1412- doc/tutorial