diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-10-14 00:16:38 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-10-14 00:19:07 -0400 |
| commit | 68ddda02769785cca60b3b114ddc091b9670889a (patch) | |
| tree | 16605501a3b2182807974ba204783d789fab0b62 /standalone/android/haskell-patches/unix-time_hack-for-Bionic.patch | |
| parent | cbf82dba2135acf4d36888421293a25dee636e1e (diff) | |
refresh android and no-th haskell patches to latest package versions from cabal
Added a cabal.config file; the result of running cabal freeze.
It's not used yet (needs a newer cabal than is in debian stable),
but the plan is that once the autbuilders are swiched to jessie,
this can be used to make cabal install the same versions of packages
that this patch got building, and so avoid breaking every time eg, yesod is
upgraded.
This commit was sponsored by Daniel Atlas.
Diffstat (limited to 'standalone/android/haskell-patches/unix-time_hack-for-Bionic.patch')
| -rw-r--r-- | standalone/android/haskell-patches/unix-time_hack-for-Bionic.patch | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/standalone/android/haskell-patches/unix-time_hack-for-Bionic.patch b/standalone/android/haskell-patches/unix-time_hack-for-Bionic.patch index 4955d45cd..276ed9733 100644 --- a/standalone/android/haskell-patches/unix-time_hack-for-Bionic.patch +++ b/standalone/android/haskell-patches/unix-time_hack-for-Bionic.patch @@ -1,16 +1,16 @@ -From add5feeb9ee9b4ffa1b43e4ba04b63e5ac2bfaf7 Mon Sep 17 00:00:00 2001 +From 9569708b67df79185dde603f1305eb84d168eba6 Mon Sep 17 00:00:00 2001 From: dummy <dummy@example.com> -Date: Mon, 14 Jul 2014 20:45:24 +0000 +Date: Tue, 14 Oct 2014 01:07:34 +0000 Subject: [PATCH] hack for bionic --- Data/UnixTime/Types.hsc | 12 ------------ cbits/conv.c | 2 +- - unix-time.cabal | 1 - - 3 files changed, 1 insertion(+), 14 deletions(-) + unix-time.cabal | 2 -- + 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/Data/UnixTime/Types.hsc b/Data/UnixTime/Types.hsc -index 2ad0623..04fd766 100644 +index aa64970..ddca145 100644 --- a/Data/UnixTime/Types.hsc +++ b/Data/UnixTime/Types.hsc @@ -12,8 +12,6 @@ import Data.Binary @@ -21,8 +21,8 @@ index 2ad0623..04fd766 100644 - -- | -- Data structure for Unix time. - data UnixTime = UnixTime { -@@ -23,16 +21,6 @@ data UnixTime = UnixTime { + -- +@@ -33,16 +31,6 @@ data UnixTime = UnixTime { , utMicroSeconds :: {-# UNPACK #-} !Int32 } deriving (Eq,Ord,Show) @@ -40,10 +40,10 @@ index 2ad0623..04fd766 100644 instance Binary UnixTime where put (UnixTime (CTime sec) msec) = do diff --git a/cbits/conv.c b/cbits/conv.c -index ec31fef..b7bc0f9 100644 +index 669cfda..8fa5f9a 100644 --- a/cbits/conv.c +++ b/cbits/conv.c -@@ -96,7 +96,7 @@ time_t c_parse_unix_time_gmt(char *fmt, char *src) { +@@ -98,7 +98,7 @@ time_t c_parse_unix_time_gmt(char *fmt, char *src) { #else strptime(src, fmt, &dst); #endif @@ -53,14 +53,15 @@ index ec31fef..b7bc0f9 100644 size_t c_format_unix_time(char *fmt, time_t src, char* dst, int siz) { diff --git a/unix-time.cabal b/unix-time.cabal -index 5de3f7c..7a0c244 100644 +index 1061602..588499a 100644 --- a/unix-time.cabal +++ b/unix-time.cabal -@@ -15,7 +15,6 @@ Extra-Tmp-Files: config.log config.status autom4te.cache cbits/config.h +@@ -15,8 +15,6 @@ Extra-Tmp-Files: config.log config.status autom4te.cache cbits/config.h Library Default-Language: Haskell2010 GHC-Options: -Wall -- CC-Options: -fPIC +- if impl(ghc >= 7.8) +- CC-Options: -fPIC Exposed-Modules: Data.UnixTime Other-Modules: Data.UnixTime.Conv Data.UnixTime.Diff |