summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Markus Rothe <mrothe@exherbo.org> 2017-02-09 17:28:37 +0100
committerAvatar Markus Rothe <mrothe@exherbo.org> 2017-02-09 18:09:23 +0100
commitc3eb794163cd19ae986073c0d7bee5c638debbfc (patch)
tree6d7f6872e7f32ee5ed88075fc7b2fd1c2f21e22d
parent565b225b30237cd751e00a87f5de67eef0364102 (diff)
downloadhaskell-c3eb794163cd19ae986073c0d7bee5c638debbfc.tar.gz
haskell-c3eb794163cd19ae986073c0d7bee5c638debbfc.tar.xz
git-annex: bump to 20170101
-rw-r--r--packages/dev-scm/git-annex/files/git-annex-6.20170101-655f707990b4144ac82244c19188af0e15bff546.patch29
-rw-r--r--packages/dev-scm/git-annex/files/git-annex-6.20170101-fix-crypto-api-dep.patch49
-rw-r--r--packages/dev-scm/git-annex/git-annex-6.20170101.exheres-0 (renamed from packages/dev-scm/git-annex/git-annex-6.20160613.exheres-0)29
3 files changed, 91 insertions, 16 deletions
diff --git a/packages/dev-scm/git-annex/files/git-annex-6.20170101-655f707990b4144ac82244c19188af0e15bff546.patch b/packages/dev-scm/git-annex/files/git-annex-6.20170101-655f707990b4144ac82244c19188af0e15bff546.patch
new file mode 100644
index 0000000..373f1ce
--- /dev/null
+++ b/packages/dev-scm/git-annex/files/git-annex-6.20170101-655f707990b4144ac82244c19188af0e15bff546.patch
@@ -0,0 +1,29 @@
+Source: upstream commit 655f707990b4144ac82244c19188af0e15bff546
+Upstream: yes
+Reason: compile failure
+
+From 655f707990b4144ac82244c19188af0e15bff546 Mon Sep 17 00:00:00 2001
+From: Joey Hess <joeyh@joeyh.name>
+Date: Tue, 7 Feb 2017 13:01:57 -0400
+Subject: [PATCH] Fix build with aws 0.16. Thanks, aristidb.
+
+---
+ CHANGELOG | 1 +
+ Remote/S3.hs | 2 +-
+ doc/bugs/aws_0.16_breaking_changes.mdwn | 2 ++
+ doc/bugs/git-annex_does_not_build_with_aws_0.16.mdwn | 2 +-
+ 4 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/Remote/S3.hs b/Remote/S3.hs
+index 2b7c58e6f..43d07230e 100644
+--- a/Remote/S3.hs
++++ b/Remote/S3.hs
+@@ -221,7 +221,7 @@ store _r info h = fileStorer $ \k f p -> do
+ let popper = handlePopper numchunks defaultChunkSize p' fh
+ let req = S3.uploadPart (bucket info) object partnum uploadid $
+ RequestBodyStream (fromIntegral sz) popper
+- S3.UploadPartResponse _ etag <- sendS3Handle h req
++ S3.UploadPartResponse { S3.uprETag = etag } <- sendS3Handle h req
+ sendparts (offsetMeterUpdate meter (toBytesProcessed sz)) (etag:etags) (partnum + 1)
+ sendparts p [] 1
+
diff --git a/packages/dev-scm/git-annex/files/git-annex-6.20170101-fix-crypto-api-dep.patch b/packages/dev-scm/git-annex/files/git-annex-6.20170101-fix-crypto-api-dep.patch
new file mode 100644
index 0000000..d6573b9
--- /dev/null
+++ b/packages/dev-scm/git-annex/files/git-annex-6.20170101-fix-crypto-api-dep.patch
@@ -0,0 +1,49 @@
+Source: https://git-annex.branchable.com/bugs/crypto-api_is_a_global_dependency_because_of_Utility.AuthToken/
+Upstream: yes
+Reason: compile failure
+
+From 81748d4edcbebcbe4e1e90899010d3ac696fe577 Mon Sep 17 00:00:00 2001
+From: Abdo Roig-Maranges <abdo.roig@gmail.com>
+Date: Mon, 2 Jan 2017 09:39:17 +0100
+Subject: [PATCH] Make crypto-api a global dependency
+
+Since af4d9197 it is needed by Utility.AuthToken. Otherwise, the
+builds without webapp and testsuite are broken.
+---
+ git-annex.cabal | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/git-annex.cabal b/git-annex.cabal
+index 5b95a16b7..bb5383e1b 100644
+--- a/git-annex.cabal
++++ b/git-annex.cabal
+@@ -361,7 +361,8 @@ Executable git-annex
+ socks,
+ byteable,
+ stm-chans,
+- securemem
++ securemem,
++ crypto-api
+ CC-Options: -Wall
+ GHC-Options: -Wall -fno-warn-tabs
+ Extensions: PackageImports
+@@ -397,8 +398,7 @@ Executable git-annex
+ Other-Modules: Utility.Touch.Old
+
+ if flag(TestSuite)
+- Build-Depends: tasty (>= 0.7), tasty-hunit, tasty-quickcheck, tasty-rerun,
+- crypto-api
++ Build-Depends: tasty (>= 0.7), tasty-hunit, tasty-quickcheck, tasty-rerun
+ CPP-Options: -DWITH_TESTSUITE
+
+ if flag(S3)
+@@ -461,7 +461,6 @@ Executable git-annex
+ wai,
+ wai-extra,
+ blaze-builder,
+- crypto-api,
+ clientsession,
+ template-haskell,
+ shakespeare (>= 2.0.0)
+--
+2.11.0
diff --git a/packages/dev-scm/git-annex/git-annex-6.20160613.exheres-0 b/packages/dev-scm/git-annex/git-annex-6.20170101.exheres-0
index 53c5725..773a3f7 100644
--- a/packages/dev-scm/git-annex/git-annex-6.20160613.exheres-0
+++ b/packages/dev-scm/git-annex/git-annex-6.20170101.exheres-0
@@ -36,7 +36,6 @@ MYOPTIONS="
s3 [[ description = [ Amazon S3 special remote ] ]]
webapp [[ requires = [ assistant ] description = [ Build a web-based interface for the assistant ] ]]
webdav [[ description = [ WebDAV share special remote ] ]]
- xmpp [[ requires = [ assistant ] description = [ Syncing and pairing repositories over XMPP ] ]]
"
DEPENDENCIES="
@@ -50,6 +49,7 @@ DEPENDENCIES="
dev-haskell/aeson
dev-haskell/async
dev-haskell/bloomfilter
+ dev-haskell/byteable
dev-haskell/bytestring
dev-haskell/case-insensitive
dev-haskell/concurrent-output[>=1.6]
@@ -57,18 +57,17 @@ DEPENDENCIES="
dev-haskell/cryptonite
dev-haskell/data-default
dev-haskell/directory
- dev-haskell/disk-free-space
dev-haskell/dlist
dev-haskell/edit-distance
dev-haskell/esqueleto
dev-haskell/exceptions[>=0.6]
dev-haskell/feed
dev-haskell/filepath
+ dev-haskell/free
dev-haskell/hslogger
dev-haskell/http-client
dev-haskell/http-conduit
dev-haskell/http-types
- dev-haskell/json
dev-haskell/magic
dev-haskell/monad-control
dev-haskell/monad-logger
@@ -85,6 +84,9 @@ DEPENDENCIES="
dev-haskell/regex-tdfa
dev-haskell/resourcet
dev-haskell/sandi
+ dev-haskell/securemem
+ dev-haskell/socks
+ dev-haskell/stm-chans
dev-haskell/stm[>=2.3]
dev-haskell/text
dev-haskell/time
@@ -92,8 +94,9 @@ DEPENDENCIES="
dev-haskell/transformers
dev-haskell/unix
dev-haskell/unix-compat
+ dev-haskell/unordered-containers
dev-haskell/utf8-string
- dev-haskell/uuid
+ dev-haskell/uuid[>=1.2.6]
")
s3? (
$(haskell_bin_dependencies "
@@ -125,11 +128,9 @@ DEPENDENCIES="
webapp? (
$(haskell_bin_dependencies "
dev-haskell/blaze-builder
- dev-haskell/byteable
dev-haskell/clientsession
dev-haskell/crypto-api
dev-haskell/path-pieces[>=0.1.4]
- dev-haskell/securemem
dev-haskell/shakespeare[>=2.0.0]
dev-haskell/template-haskell
dev-haskell/wai
@@ -149,24 +150,16 @@ DEPENDENCIES="
dev-haskell/network-multicast
")
)
- xmpp? (
- $(haskell_bin_dependencies "
- dev-haskell/gnutls[>=0.1.4]
- dev-haskell/network-protocol-xmpp
- dev-haskell/xml-types
- ")
- )
doc? ( app-text/ikiwiki )
"
-# enable (or make option) if wanted by someone: TestSuite, EKG
+# enable (or make option) if wanted by someone: TestSuite
CABAL_SRC_CONFIGURE_PARAMS=(
"--flags=ConcurrentOutput"
"--flags=Cryptonite"
"--flags=MagicMime"
"--flags=Production"
"--flags=TorrentParser"
- "--flags=-EKG"
"--flags=-TestSuite"
)
CABAL_SRC_CONFIGURE_OPTION_FLAGS=(
@@ -176,7 +169,6 @@ CABAL_SRC_CONFIGURE_OPTION_FLAGS=(
"s3 S3"
"webapp Webapp"
"webdav WebDAV"
- "xmpp XMPP"
)
src_install() {
@@ -194,3 +186,8 @@ src_install() {
fi
}
+DEFAULT_SRC_PREPARE_PATCHES=(
+ "${FILES}"/${PNV}-fix-crypto-api-dep.patch
+ "${FILES}"/${PNV}-655f707990b4144ac82244c19188af0e15bff546.patch
+)
+