mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
21877 commits 13 branches 442 tags 103 MiB
Commit graph

21877 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joey Hess
f0d1dc03d1 Merge branch 'master' of ssh://git-annex.branchable.com 2014-10-14 17:41:44 -04:00
Joey Hess
352e53cc57 avoid pinning some core libs 
These vary depending on ghc version, so need to be different
in the native and android ghc cabals.
 2014-10-14 17:27:47 -04:00
Joey Hess
580b41850f avoid pinning more ghc builtins 2014-10-14 17:11:28 -04:00
Joey Hess
dadb152988 fix path 2014-10-14 17:04:39 -04:00
Joey Hess
a6d73bb8fe don't pin base 2014-10-14 17:04:33 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnmF_9CAtfqdZkC4e-_dCX-rK5bqh4RWkw
686ffa2416 2014-10-14 20:30:08 +00:00
Joey Hess
395371ea37 make cabal.config be available whenever cabal install is run 
Ensures the constraints are consistently applied.
 2014-10-14 16:02:02 -04:00
Joey Hess
cf005058e4 use cabal.config when installing native 2014-10-14 15:34:06 -04:00
Joey Hess
7a78d111fc use pinned package versions from cabal.config 2014-10-14 15:25:02 -04:00
Joey Hess
9fd3e657e3 actual bounds from android autobuilder 2014-10-14 15:08:15 -04:00
https://www.google.com/accounts/o8/id?id=AItOawk9SYh6N-JUMkYkW4aOk55zC3Vr9KonDV4
f31bf4b439 2014-10-14 19:02:22 +00:00
Joey Hess
bd8ecd48b1 de-qualify import 
still building with old yesod on android and armel
 2014-10-14 14:45:15 -04:00
Joey Hess
7bfc4a5442 unbreak android build 
This reverts commit dd667844b6
and commit e6eff0e951.

Those commits were fine, except the android autobuilder currently has a bit
of a mess of yesod versions and broke. Better to wait on this.
 2014-10-14 14:38:38 -04:00
Joey Hess
4d681ae38b warning 2014-10-14 14:29:53 -04:00
Joey Hess
c8c65322a5 unused import 2014-10-14 14:26:29 -04:00
Joey Hess
59f88558d5 doh't use "def" for command definitions, it conflicts with Data.Default.def 2014-10-14 14:20:10 -04:00
Joey Hess
db9121ecee vicfg: Deleting configurations now resets to the default, where before it has no effect. 
Added a Default instance for TrustLevel, and was able to use that to clear
up several other parts of the code too.

This commit was sponsored by Stephan Schulz
 2014-10-14 14:15:07 -04:00
Joey Hess
5fcb75d371 Merge branch 'master' of ssh://git-annex.branchable.com 2014-10-14 12:26:50 -04:00
Joey Hess
ccc45dae92 typo 2014-10-14 12:20:37 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkYmMFDdf3GJ9Oba6NCVkzGc4JyB9WavMs
f233fef820 2014-10-14 10:18:32 +00:00
Bram
2d8520136e Added a comment: Diff of unlocked file 2014-10-14 10:11:04 +00:00
Joey Hess
a8b2568531 package-qualified import needed by new yesod 2014-10-14 01:25:37 -04:00
Joey Hess
375158f6b5 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.
 2014-10-14 00:19:07 -04:00
http://joeyh.name/
c27f11a2c4 2014-10-13 22:21:54 +00:00
http://joeyh.name/
d76a683ca5 2014-10-13 22:16:00 +00:00
http://joeyh.name/
758b86d5fc 2014-10-13 22:15:12 +00:00
http://joeyh.name/
f604d4efd8 Added a comment 2014-10-13 21:33:35 +00:00
http://joeyh.name/
0320df26fe Added a comment 2014-10-13 21:21:18 +00:00
Joey Hess
efc2e277f4 Merge branch 'master' of ssh://git-annex.branchable.com 2014-10-13 17:11:07 -04:00
Joey Hess
5cd59f896d update for yesod-form-1.4.0.2 2014-10-13 17:09:12 -04:00
Joey Hess
a1186238dc manual fixups of spices etc 2014-10-13 17:08:29 -04:00
justinl
538bd8faf3 2014-10-13 20:47:16 +00:00
Joey Hess
e9ea4fa5aa fix warning 2014-10-13 16:06:35 -04:00
Joey Hess
f025e825f6 build bootstrap3 module 2014-10-13 15:49:59 -04:00
Joey Hess
31463490f0 Merge branch 'master' of ssh://git-annex.branchable.com 2014-10-13 15:35:00 -04:00
Joey Hess
e6eff0e951 more accurate bounds on yesod boostrap3 ifdefs 2014-10-13 15:33:51 -04:00
https://www.google.com/accounts/o8/id?id=AItOawk9SYh6N-JUMkYkW4aOk55zC3Vr9KonDV4
e6799a5e0c 2014-10-13 19:27:08 +00:00
http://digiuser.livejournal.com/
0b04b28fc3 2014-10-13 18:31:27 +00:00
http://digiuser.livejournal.com/
1f50be5969 2014-10-13 18:27:49 +00:00
http://digiuser.livejournal.com/
6dd45b6f13 2014-10-13 17:43:49 +00:00
http://digiuser.livejournal.com/
09c5b7d385 2014-10-13 17:35:40 +00:00
Joey Hess
01fccea421 Merge branch 'master' of ssh://git-annex.branchable.com 2014-10-13 11:37:27 -04:00
Joey Hess
60dbc95612 add news item for git-annex 5.20141013 2014-10-13 11:37:15 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmwjQzWgiD7_I3zw-_91rMRf_6qoThupis
c1f93f1b84 Added a comment 2014-10-13 14:51:47 +00:00
Joey Hess
86a7bddb41 prep release 2014-10-13 10:13:27 -04:00
http://joeyh.name/
91894b405d Added a comment 2014-10-12 23:26:27 +00:00
Joey Hess
e6d3ffb941 Merge branch 'master' of ssh://git-annex.branchable.com 2014-10-12 19:24:27 -04:00
Joey Hess
5bcbb5af45 add 2014-10-12 19:23:59 -04:00
ghen1
98b2ab4cb1 Added a comment 2014-10-12 21:03:01 +00:00
http://joeyh.name/
99a7640feb Added a comment 2014-10-12 20:14:36 +00:00