mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

finally got a clean build all the way through of all haskell libs

Browse source
This commit is contained in:
Joey Hess 2013-05-08 02:20:52 -04:00
parent 2456b52d4d
commit d5cd86b977
5 changed files with 97 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
standalone/android/haskell-patches/hamlet_1.1.6.1_0001-remove-TH.patch
View file

@ -1,13 +1,12 @@
From aa18210b7cc124e11fb71640d993de77492b63b1 Mon Sep 17 00:00:00 2001
From b2c677ed39f1aca3a1111691ba51b26f7fd414a4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 15 Apr 2013 15:08:31 -0400
Date: Wed, 8 May 2013 01:50:58 -0400
Subject: [PATCH] remove TH
Export functions referred to by TH splices, as these will be needed when
using the Evil Splicer
---
Text/Hamlet.hs | 219 ++-------------------------------------------------------
1 file changed, 6 insertions(+), 213 deletions(-)
Text/Hamlet.hs | 219 ++------------------------------------------------------
hamlet.cabal | 2 +-
2 files changed, 7 insertions(+), 214 deletions(-)
diff --git a/Text/Hamlet.hs b/Text/Hamlet.hs
index 4ac870a..63b8555 100644
@ -277,6 +276,19 @@ index 4ac870a..63b8555 100644
varName :: Scope -> String -> Exp
varName _ "" = error "Illegal empty varName"
varName scope v@(_:_) = fromMaybe (strToExp v) $ lookup (Ident v) scope
--
1.8.2.rc3
diff --git a/hamlet.cabal b/hamlet.cabal
index 73fa6a8..4348508 100644
--- a/hamlet.cabal
+++ b/hamlet.cabal
@@ -50,7 +50,7 @@ library
, text >= 0.7 && < 0.12
, containers >= 0.2
, blaze-builder >= 0.2 && < 0.4
- , process >= 1.0 && < 1.2
+ , process >= 1.0 && < 1.3
, blaze-html >= 0.5 && < 0.6
, blaze-markup >= 0.5.1 && < 0.6
--
1.7.10.4

25
standalone/android/haskell-patches/process_1.1.0.2-0001-avoid-configure-script.patch
View file

@ -1,25 +0,0 @@
From ff72a2c501358b3cd71e15c6275ee03670748f3d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 7 May 2013 17:52:50 -0400
Subject: [PATCH] avoid configure script
---
process.cabal | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/process.cabal b/process.cabal
index 8c76b08..2930fdc 100644
--- a/process.cabal
+++ b/process.cabal
@@ -14,7 +14,7 @@ extra-source-files:
extra-tmp-files:
config.log config.status autom4te.cache
include/HsProcessConfig.h
-build-type: Configure
+build-type: Simple
cabal-version: >=1.6
source-repository head
--
1.7.10.4

26
standalone/android/haskell-patches/shakespeare-css_1.0.2_0001-remove-TH.patch
View file

@ -1,14 +1,15 @@
From cb77113314702175f066cd801dee5c38d3e26576 Mon Sep 17 00:00:00 2001
From 8f058e84892a8c4202275f524f74bd6a7097ad40 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 28 Feb 2013 23:35:51 -0400
Date: Wed, 8 May 2013 02:07:15 -0400
Subject: [PATCH] remove TH
---
Text/Cassius.hs | 23 ---------------
Text/Css.hs | 84 -----------------------------------------------------
Text/Cassius.hs | 23 --------------
Text/Css.hs | 84 -------------------------------------------------
Text/CssCommon.hs | 4 ---
Text/Lucius.hs | 30 +------------------
4 files changed, 1 insertion(+), 140 deletions(-)
Text/Lucius.hs | 30 +-----------------
shakespeare-css.cabal | 2 +-
5 files changed, 2 insertions(+), 141 deletions(-)
diff --git a/Text/Cassius.hs b/Text/Cassius.hs
index ce05374..ae56b0a 100644
@ -255,6 +256,19 @@ index b71614e..a902e1c 100644
parseTopLevels :: Parser [TopLevel]
parseTopLevels =
go id
diff --git a/shakespeare-css.cabal b/shakespeare-css.cabal
index de2497b..874a3b5 100644
--- a/shakespeare-css.cabal
+++ b/shakespeare-css.cabal
@@ -33,7 +33,7 @@ library
, shakespeare >= 1.0 && < 1.1
, template-haskell
, text >= 0.11.1.1 && < 0.12
- , process >= 1.0 && < 1.2
+ , process >= 1.0 && < 1.3
, parsec >= 2 && < 4
, transformers
--
1.7.10.4

28
standalone/android/haskell-patches/shakespeare_1.0.3_0001-remove-TH.patch
View file

@ -1,15 +1,16 @@
From 2e6721d571148cb77fb8c906042f6fa61e660999 Mon Sep 17 00:00:00 2001
From 10484c5f68431349b249f07517c392c4a90bdb05 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 28 Feb 2013 23:35:41 -0400
Date: Wed, 8 May 2013 01:47:19 -0400
Subject: [PATCH] remove TH
---
Text/Shakespeare.hs | 109 ----------------------------------------------
Text/Shakespeare/Base.hs | 28 ------------
2 files changed, 137 deletions(-)
shakespeare.cabal | 2 +-
3 files changed, 1 insertion(+), 138 deletions(-)
diff --git a/Text/Shakespeare.hs b/Text/Shakespeare.hs
index e774e65..d300951 100644
index 7750135..fabbf66 100644
--- a/Text/Shakespeare.hs
+++ b/Text/Shakespeare.hs
@@ -12,11 +12,7 @@ module Text.Shakespeare
@ -24,7 +25,7 @@ index e774e65..d300951 100644
, shakespeareUsedIdentifiers
, RenderUrl
, VarType
@@ -133,39 +129,6 @@ defaultShakespeareSettings = ShakespeareSettings {
@@ -135,39 +131,6 @@ defaultShakespeareSettings = ShakespeareSettings {
, modifyFinalValue = Nothing
}
@ -64,7 +65,7 @@ index e774e65..d300951 100644
type QueryParameters = [(TS.Text, TS.Text)]
type RenderUrl url = (url -> QueryParameters -> TS.Text)
type Shakespeare url = RenderUrl url -> Builder
@@ -300,54 +263,6 @@ pack' = TS.pack
@@ -302,54 +265,6 @@ pack' = TS.pack
{-# NOINLINE pack' #-}
#endif
@ -119,7 +120,7 @@ index e774e65..d300951 100644
data VarType = VTPlain | VTUrl | VTUrlParam | VTMixin
getVars :: Content -> [(Deref, VarType)]
@@ -367,30 +282,6 @@ data VarExp url = EPlain Builder
@@ -369,30 +284,6 @@ data VarExp url = EPlain Builder
shakespeareUsedIdentifiers :: ShakespeareSettings -> String -> [(Deref, VarType)]
shakespeareUsedIdentifiers settings = concatMap getVars . contentFromString settings
@ -189,6 +190,19 @@ index 7c96898..ef769b1 100644
derefParens, derefCurlyBrackets :: UserParser a Deref
derefParens = between (char '(') (char ')') parseDeref
derefCurlyBrackets = between (char '{') (char '}') parseDeref
diff --git a/shakespeare.cabal b/shakespeare.cabal
index 01c8d5d..0fff966 100644
--- a/shakespeare.cabal
+++ b/shakespeare.cabal
@@ -27,7 +27,7 @@ library
, template-haskell
, parsec >= 2 && < 4
, text >= 0.7 && < 0.12
- , process >= 1.0 && < 1.2
+ , process >= 1.0 && < 1.3
exposed-modules:
Text.Shakespeare
--
1.7.10.4

65
standalone/android/install-haskell-packages
View file

@ -36,57 +36,64 @@ patched () {
cd ..
}
cabal install bytestring-0.10.3.0 text-0.11.2.3 parsec-3.1.3
unpatched () {
echo "cabal install $@"
cabal install "$@"
}
unpatched bytestring-0.10.3.0 text-0.11.2.3 parsec-3.1.3
patched network 2.4.1.0
cabal install cereal-0.3.5.2
unpatched cereal-0.3.5.2
patched socks 0.4.2
cabal install hslogger-1.2.1
unpatched hslogger-1.2.1
patched MissingH 1.2.0.0
patched unix-time 0.1.4
patched async 2.0.1.4
patched zlib 0.5.4.00
patched zlib 0.5.4.0
patched primitive 0.5.0.1
patched vector 0.10.0.1
patched distributive 0.3
cabal install hashable-1.1.2.5
unpatched hashable-1.1.2.5
patched case-insensitive 0.4.0.1
cabal install nats-0.1 semigroups-0.9 tagged-0.4.4 comonad-3.0.1.1 comonad-transformers-3.0.1
unpatched nats-0.1 semigroups-0.9 tagged-0.4.4 comonad-3.0.1.1 comonad-transformers-3.0.1
patched profunctors 3.3
patched split 0.2.1.2patched split 0.2.1.2
cabal install monads-tf-0.1.0.1
patched split 0.2.1.2
unpatched monads-tf-0.1.0.1
patched gnutls 0.1.4
cabal install attoparsec-0.10.4.0 blaze-builder-0.3.1.1
unpatched attoparsec-0.10.4.0 blaze-builder-0.3.1.1
patched syb 0.3.7
patched aeson 0.6.1.0
patched lifted-base 0.2.0.2
patched resourcet 0.4.4
patched monad-control 0.3.1.4
cabal install conduit-0.5.6
unpatched conduit-0.5.6
patched monad-logger 0.2.3.2
cabal install reflection-1.1.7 bifunctors-3.2 semigroupoids-3.0.2
cabal install bifunctors-3.2 comonads-fd-3.0.1 groupoids-3.0.1.1
cabal install profunctor-extras-3.3
unpatched reflection-1.1.7 bifunctors-3.2 semigroupoids-3.0.2
unpatched bifunctors-3.2 comonads-fd-3.0.1 groupoids-3.0.1.1
unpatched profunctor-extras-3.3
patched lens 3.8.5
cabal install xml-types-0.3.3
unpatched xml-types-0.3.3
patched libxml-sax 0.7.3
patched network-conduit 0.6.2.2
cabal install asn1-data-0.7.1 asn1-types-0.1.3 attoparsec-conduit-0.5.0.3
cabal install blaze-builder-conduit-0.5.0.3 blaze-markup-0.5.1.5 blaze-html-0.5.1.3
unpatched asn1-data-0.7.1 asn1-types-0.1.3 attoparsec-conduit-0.5.0.3
unpatched blaze-builder-conduit-0.5.0.3 blaze-markup-0.5.1.5 blaze-html-0.5.1.3
patched cipher-aes 0.1.7
cabal install cprng-aes-0.3.4
cabal install http-types-0.8.0 mime-types-0.1.0.3
cabal install certificate-1.3.7 system-fileio-0.3.11 tls-1.1.2
cabal install utf8-string-0.3.7 publicsuffixlist-0.1 xml-conduit-1.0.3.3
cabal install zlib-bindings-0.1.1.3 zlib-conduit-0.5.0.3
patched process 1.1.0.2
unpatched crypto-api-0.10.2
unpatched cprng-aes-0.3.4
unpatched http-types-0.8.0 mime-types-0.1.0.3
unpatched certificate-1.3.7 system-fileio-0.3.11 tls-1.1.2
unpatched utf8-string-0.3.7
unpatched publicsuffixlist-0.1
unpatched xml-conduit-1.0.3.3
unpatched zlib-bindings-0.1.1.3 zlib-conduit-0.5.0.3
patched shakespeare 1.0.3
patched hamlet 1.1.6.1
patched xml-hamlet 0.4.0.3
cabal install certificate-1.3.7 http-conduit-1.8.7.1
cabal install dataenc-0.12 hxt-charproperties-9.1.1 \
unpatched certificate-1.3.7
unpatched dataenc-0.12 hxt-charproperties-9.1.1 \
hxt-regex-xmlschema-9.1.0 hxt-unicode-9.0.2 hxt-9.3.1.1
cabal install -f-templateHaskell QuickCheck-2.5.1.1a
cabal install Crypto-4.2.5.1
unpatched -f-templateHaskell QuickCheck-2.5.1.1
unpatched Crypto-4.2.5.1
patched HTTP 4000.2.8
patched hS3 0.5.7
patched file-embed 0.0.4.7
@ -98,18 +105,18 @@ patched shakespeare-css 1.0.2
patched shakespeare-i18n 1.0.0.2
patched shakespeare-js 1.1.2
patched persistent 1.1.5.1
cabal install largeword-1.0.4 crypto-api-0.10.2 http-date-0.0.4 \
unpatched largeword-1.0.4 crypto-api-0.10.2 http-date-0.0.4 \
cryptohash-0.8.3 vault-0.2.0.4 unix-compat-0.4.1.1 \
crypto-conduit-0.4.3 wai-1.3.0.3
patched wai-app-static 1.3.1
cabal install byteorder-1.0.4 stringsearch-0.3.6.4 wai-logger-0.3.0
patched wai-extra 1.3.2.1
patched yesod-routes 1.1.2
unpatched http-conduit-1.8.7.1
patched DAV 0.3
patched yesod-core 1.1.8
patched yesod-persistent 1.1.0.1
patched yesod-form 1.2.1.1
cabal install warp-1.3.7.2 yaml-0.8.2
unpatched warp-1.3.7.2 yaml-0.8.2
patched yesod-default 1.1.3.2
patched yesod 1.1.8
patched yesod-static 1.1.2