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

511 commits

Author SHA1 Message Date
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
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
ccc45dae92 typo 2014-10-14 12:20:37 -04: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
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
Joey Hess
f025e825f6 build bootstrap3 module 2014-10-13 15:49:59 -04:00
Joey Hess
8362723571 update for yesod-form-1.3.15.4 2014-09-12 22:35:36 -04:00
Joey Hess
748e21c69e fix params 2014-09-12 21:01:40 -04:00
Joey Hess
3eab72d13c refresh patch 
Odd, it should have been against 0.0.6 before, but fails to apply now
 2014-09-12 20:53:54 -04:00
Joey Hess
47164fb844 remove one shift too many 2014-09-12 15:36:56 -04:00
Joey Hess
1f9ff049a7 armel autobuilder now working again! 2014-08-15 10:58:04 -04:00
Joey Hess
aac85af12e typo 2014-08-14 16:57:53 -04:00
Joey Hess
cdc4ce2eed run only 1 install job at a time 
In qemu-system-arm, more jobs seems to cause frequent qemu-related crashes.
 2014-08-13 21:14:44 -04:00
Joey Hess
5270dfc823 git-am chooked on this because it has trailing whitespace. srsly? 2014-08-13 14:41:19 -04:00
Joey Hess
06a026d5b9 disable HAVE_CLOCK_GETTIME to avoid needing to port librt to android 2014-08-13 14:32:58 -04:00
Joey Hess
f6b6f14c9c update git patch 2014-08-13 13:51:32 -04:00
Joey Hess
90fdd28fd8 try to fix PATH so test suite will work 2014-08-13 13:29:27 -04:00
Joey Hess
6fe0f300a6 clean up 2014-08-13 13:21:22 -04:00
Joey Hess
7ab5c346ff typo 2014-08-13 13:03:46 -04:00
Joey Hess
75b69dca58 work aroud ongong transformers-compat cabal issue 2014-08-13 13:02:35 -04:00
Joey Hess
77d55672a9 remove old ghc libs 2014-08-13 12:48:20 -04:00
Yury V. Zaytsev
e93f3b99e2 Update build.sh 
Haskell Platform now lives in C:/haskell and is on %PATH% by default, msysgit/bin (and msysgit/mingw/bin) directory is also on %PATH% (last)
 2014-08-13 11:56:47 +02:00
Joey Hess
6bfc3cf3be re-evil-splicved new version of DAV 2014-08-10 20:01:54 -04:00
Joey Hess
800f8f1028 giving up on windows autobuilder until its HP can be upgraded 2014-08-10 19:56:55 -04:00
Joey Hess
29aa5e82dc trying to work around a dep problem on windows 2014-08-10 19:26:03 -04:00
Joey Hess
f709c786d9 stop nuking cabal 2014-08-10 16:23:25 -04:00
Joey Hess
d8240ca1c1 nuke cabal on windows, so it will build new DAV 2014-08-10 16:06:20 -04:00
Joey Hess
c17bac346f provide utf-8 locale to avoid silly build failure 2014-07-14 21:18:24 -04:00
Joey Hess
6bff8291f1 Merge orca:/tmp/build 2014-07-14 17:57:50 -04:00
Joey Hess
4aa9265042 refresh haskell patches 2014-07-14 17:58:13 -04:00
Joey Hess
f268c2c8ee remove bloomfilter patch no longer needed 2014-07-14 16:55:48 -04:00
Joey Hess
5d2759aa82
fix logic 2014-07-04 13:58:09 -04:00
Joey Hess
08a737c3df
deal with android SDK change 
No longer has android-17 target, now it's android-18.
 2014-07-04 01:12:13 -04:00
Joey Hess
995cb05408 update android haskell patches 2014-07-04 00:47:49 +01:00
Joey Hess
ecddaffd3e Android: patch git to avoid fchmod, which fails on /sdcard. 2014-07-03 16:02:42 -04:00
Joey Hess
08f1f7a697 generate build-version file on windows autobuilder 2014-06-18 15:21:03 -04:00
Joey Hess
4dd6938850 make EvilSplicer re-box file-embed's ByteStrings 
The armel autobuilder started failing:

Assistant/WebApp/Types.hs:128:14:
    primitive string literal must contain only characters <= '\xFF'

This fixes that.
 2014-06-13 02:18:31 -04:00
Joey Hess
2d142b4368 Merge orca:tmp/f/build 2014-06-10 22:36:12 -04:00
Joey Hess
2b8dbfe7ab refreshed haskell patches 2014-06-11 03:35:19 +01:00
Joey Hess
d4e71929ba figured out this patch 2014-06-10 16:33:47 -04:00
Joey Hess
d86b8368db skein patch seems to be needed for arm as well as android 
I don't understand why this patch is needed.
 2014-06-10 14:13:50 -04:00
Joey Hess
0fcc805bc9 vector patch also needed for arm 2014-06-10 12:42:09 -04:00
Joey Hess
2a9f78b6c8
comment back out library removal line 2014-05-29 14:13:41 -04:00
Joey Hess
68a56a691f forcing windows autobuilder to rebootstrap cabal libs 2014-05-29 13:45:30 -04:00
Joey Hess
ba1e14d502
fix gnutls to link, again 
I don't know why, but I keep finding that the way I hacked this to work
before doesn't work and a new way is needed. Perhaps changes to cabal made
my old hacks break?
 2014-05-26 17:56:41 -04:00
Joey Hess
69f793a2b2
update path to gnutls etc libs 2014-05-26 15:51:21 -04:00
Joey Hess
6dbff11251
another include needed by TH 2014-05-26 15:24:31 -04:00
Joey Hess
7145d25972
work around another dep problem 2014-05-26 13:53:53 -04:00
Joey Hess
70fd42521f
remove patch that turns out to be unnecessary 2014-05-26 13:14:50 -04:00
Joey Hess
8886ccb102 export PATH to alex and happy 2014-05-26 13:13:33 -04:00
Joey Hess
6c1ed6ed4b add imports needed for android with current ghc and libs 2014-05-25 23:00:42 -04:00
Joey Hess
fb3b1fac54 Merge orca:/tmp/build 2014-05-25 22:51:57 -04:00
androidbuilder
0f5b40a106 update remaining android patches 2014-05-26 02:47:15 +00:00
Joey Hess
ddd1a888a7 more work around for cabal dependency mess 2014-05-25 22:20:11 -04:00
Joey Hess
ddb1f25209 network-protocol-xmpp patch no longer needed 2014-05-25 21:59:13 -04:00
Joey Hess
1f05bcea98 libxml-sax patch no longer needed 2014-05-25 21:57:53 -04:00
Joey Hess
8abaafaf6d set unicode locale when building 
some packages, particularly unix-compat, fail to install in a C
locale. wow
 2014-05-25 21:44:28 -04:00
Joey Hess
6052486dc3 work around recent cabal dependency mess 2014-05-25 21:25:04 -04:00
Joey Hess
89f6f3347d Merge commit '5e9e9d3cc7f54d7aaa835ef7842a9d7a444c3fda' 2014-05-25 12:02:48 -04:00
Sören Brunk
5e9e9d3cc7 update android haskell patches 2014-05-25 10:04:37 +02:00
Joey Hess
1ce222efe9
fix abiversion lookup to work when propellor is running this script 2014-05-25 01:37:22 -04:00
Joey Hess
5ad87aae41
turn on -x debugging in these scripts 2014-05-24 14:44:20 -04:00
Joey Hess
44a3e76115 android: Run busybox install with -s, since some versions of Android prohibit making hard links. 2014-05-23 16:18:55 -04:00
Joey Hess
cb906524a6 update patch to export one more module used by TH 2014-05-22 16:31:40 -04:00
Joey Hess
f70b2a53e8 fix QuickCheck install w/o TH 2014-05-22 15:23:50 -04:00
Joey Hess
e1a17fee88 updating haskell patches, part 2 2014-05-21 12:50:08 -04:00
Your Name
5dfc43915a update haskell patches (incomplete) 2014-05-20 22:12:29 +00:00
Joey Hess
5903d20d5e Support symlinking git-annex and git-annex-shell from the Linux standalone bundle into PATH. 
Unless busybox doesn't support readlink -f, then it just uses readlink and
symlinking won't work. Also, OSX has no readlink -f so not done there.

Thanks, jlebar.
 2014-05-16 16:22:56 -04:00
Joey Hess
2aed2d8510 Merge branch 'master' into bootstrap3 
Conflicts:
	debian/changelog
 2014-05-02 15:32:49 -03:00
Joey Hess
2920554787 updated license for bootstrap 3 2014-04-29 15:03:18 -04:00
Joey Hess
ca496b6a97 Standalone builds now check gpg signatures before upgrading. 2014-04-23 13:30:30 -04:00
Joey Hess
4887f8f860 this keyring contains keys that git-annex should trust to sign upgrades 
Currently, that is the git-annex distribution signing key, 89C809CB

I have also included my personal gpg key, 2512E3C7. This is in case
something goes wrong with the other key (perhaps it gets lost), we'll
hopefully avoid locking everything out of upgradng.
 2014-04-23 12:49:09 -04:00
Joey Hess
eba3a28a28 webapp: Support using git-annex on a remote server, which was installed from the standalone tarball or OSX app, and so does not have git-annex in PATH (and may also not have git or rsync in PATH). 
* webapp: Support using git-annex on a remote server, which was installed
  from the standalone tarball or OSX app, and so does not have
  git-annex in PATH (and may also not have git or rsync in PATH).
* standalone tarball, OSX app: Install a ~/.ssh/git-annex-wrapper, which
  can be used to run git-annex, git, rsync, etc.
 2014-04-20 18:39:10 -04:00
Joey Hess
4e601cf124 more idempotency fixes 2014-04-05 13:29:17 -04:00
Joey Hess
0d965885b7
idempotency fixes 2014-04-04 19:07:53 -04:00
Joey Hess
15dc2e950b renaming build user for consistency 2014-04-04 19:00:28 -04:00
Joey Hess
2b75beaf4f got tasty-rerun working on android 2014-03-12 12:25:32 -04:00
Joey Hess
9fef973293 patch out another file perm check that does not make sense on android 2014-03-10 16:50:56 -04:00
Joey Hess
6f9f9739eb
actually use patches from linux/haskell-patches 2014-03-10 13:53:01 -04:00
Joey Hess
f7cd43cfd0 really add patch.. 2014-03-10 13:31:23 -04:00
Joey Hess
35aa055039 add a patch to disable accept4, for compatability with older systems 2014-03-10 13:29:24 -04:00
Joey Hess
efafaec3c2 update 2014-03-07 02:23:56 -04:00
Joey Hess
6c3542a1cb Merge remote-tracking branch 'orca/master' 2014-03-07 02:23:51 -04:00
Joey Hess
92aadb2865 refreshed patches 2014-03-07 06:23:03 +00:00
Joey Hess
7d2fed5810 windows build script back to normal 2014-03-01 00:33:50 -04:00
Joey Hess
9046136dd6 retrying windows yesod-static 2014-03-01 00:32:08 -04:00
Joey Hess
2fd72fc2fd Revert "force cabal rebuild on windows for warp-tls" 
This reverts commit 92ced6d0fd.
 2014-02-28 23:07:54 -04:00
Joey Hess
92ced6d0fd
force cabal rebuild on windows for warp-tls 2014-02-28 23:06:41 -04:00
Joey Hess
5df3db9027 remove hack 2014-02-25 17:56:49 -04:00
Joey Hess
6e19552c40
force DAV upgrade 2014-02-25 17:54:58 -04:00
Joey Hess
8101b964b7
fix filename 2014-02-11 01:18:29 -04:00
Joey Hess
b914620264 remove no longer needed patch 2014-02-10 23:32:56 -04:00
Joey Hess
f271d86ef6 add android patch for x509-system cert store 2014-02-11 02:50:51 +00:00
Joey Hess
e3a50f4abb refresh patches 2014-02-08 13:26:54 -04:00
Joey Hess
5f0b3b4d4e DAV fixed 2014-02-08 13:03:44 -04:00
Joey Hess
9a5f360f93 fix syntax 2014-02-07 18:38:46 -04:00
Joey Hess
a23d7abfcc avoid broken version of DAV on android 2014-02-07 17:57:04 -04:00
Joey Hess
7791060310 reorder 2014-02-07 14:52:17 -04:00
Joey Hess
e0c4b52996 added back lost certificate path fix for Android 2014-02-07 14:20:35 -04:00
Joey Hess
192d991c43 work around windows apparent random dislike of removing files 2013-12-30 14:11:40 -04:00
Joey Hess
b520aa64da fix order 2013-12-29 22:13:19 -04:00
Joey Hess
8d3dc1bfbc disable NODELAY on android 
and also refresh another patch
 2013-12-30 00:41:19 +00:00
Joey Hess
1ed415690d pin busybox at known-good version for android build 2013-12-29 16:56:01 -04:00
Joey Hess
4124a27ec9 make wrappers run git-shell, now that it's included, rather than git shell 2013-12-27 16:36:48 -04:00
Joey Hess
307c57b29b add git-shell wrappers 2013-12-27 16:06:11 -04:00
Joey Hess
01bd650e2d refreshed android patches 2013-12-27 00:32:29 -04:00
Joey Hess
b09613ebc7 update haskell patches for new versions in hackage 2013-12-26 16:17:31 -04:00
Joey Hess
7ec27d8d57 install happy and alex into android build chroot 2013-12-26 12:08:29 -04:00
Joey Hess
706c74aa98 Include git-receive-pack, git-upload-pack, and git wrappers in the Linux standalone build, and OSX app, so they will be available when it's added to PATH. 2013-12-24 16:28:10 -04:00
Joey Hess
ccef06da41 allow building webapp with EvilSplicer for non-android arm 
Was able to reuse many of the android patches, but several had to be
re-done. On Android, ghc is a stage2 build, so can compile, but not run TH
code. But debian's ghc on armel cannot even compile TH code, so it has
to be patched out.

Some haskell packages have been updated to new versions, including yesod
and DAV, and their patches had to be redone.

The Makefile now has 2 new targets. The first is run on a companion x86
system to do the build and get TH splices. Then the second target is run
the same source tree on the arm system to build without needing TH.

This commit was sponsored by Svenne Krap.
 2013-12-18 21:41:17 +00:00
Joey Hess
13b0bf17d9 begin work on installing TH-using dependencies of webapp, for standalone armel build 
Will move common patches out of android/haskell-patches.
 2013-12-16 23:05:00 -04:00
Joey Hess
c26734c7da make linker path absolute 2013-12-16 02:17:15 -04:00
Joey Hess
99f6dd01b4 Linux standalone build now includes its own glibc and forces the linker to use it, to remove dependence on the host glibc. 2013-12-16 01:51:19 -04:00
Joey Hess
e7739cb011 add linux-gate and linux-vdso dummy libs 
Just fixes a build warning; these files don't exist they are virtual DSOs
provided by the linux kernel.
 2013-12-15 19:16:44 -04:00
Joey Hess
f4e0eec2a2 Include man pages in Linux and OSX standalone builds. 2013-12-15 16:27:46 -04:00
Joey Hess
6be19b0070 Programs from Linux and OSX standalone builds can now be symlinked into a directory in PATH as an alternative installation method, and will use readlink to find where the build was unpacked. 2013-12-15 15:57:41 -04:00
Joey Hess
7f0cc0d840 update 2013-12-11 11:23:34 -04:00
Joey Hess
a319f17220 try to get it to include the cygwin ssh, not the msysgit one 2013-12-11 11:16:11 -04:00
Joey Hess
63bd83458c probing 2013-12-11 11:13:04 -04:00
Joey Hess
4a769c6d8d clean 2013-12-10 14:33:36 -04:00
Joey Hess
c1c1171ee9 update warp to fixed version 2013-12-10 14:31:47 -04:00
Joey Hess
2779e7902a remove debug 2013-12-10 14:22:17 -04:00
Joey Hess
6c1a50b4ea fix EvilLinker to not stomp on environment 2013-12-10 14:21:22 -04:00
Joey Hess
012b31548b try setting even more variables, surely one must control the tmp dir 2013-12-10 14:09:11 -04:00
Joey Hess
147349057e argh 2013-12-10 14:07:18 -04:00
Joey Hess
880aeafed8 debug 2013-12-10 14:00:22 -04:00
Joey Hess
ccb944c85a didn't work 2013-12-10 13:16:44 -04:00
Joey Hess
656ae5f823 try setting TMPDIR for collect2 to not use C:\Windows 2013-12-10 12:53:37 -04:00
Joey Hess
540d4a05fe build installer 2013-12-10 00:45:21 -04:00
Joey Hess
c1bf27ecff avoid using EvilLinker when regular cabal build succeeds 2013-12-09 15:38:57 -04:00
Joey Hess
1c22c7486b trying again for webapp in windows autobuild 2013-12-09 15:04:57 -04:00
Joey Hess
fe7d6d524e temporarily disable the evilelinker on the autobuilder, since it seems to be hanging inexplicably 2013-12-07 11:24:18 -04:00
Joey Hess
c97b53b924 windooows 2013-12-07 11:21:41 -04:00
Joey Hess
d0e21b1b68 temporarily disable webapp on autobuilder, as it's for some reason hanging the build 2013-12-07 10:54:48 -04:00
Joey Hess
456a82965e avoid re-configuring 2013-12-06 21:12:47 -04:00
Joey Hess
bac31e9d30 remove debug 2013-12-06 19:06:56 -04:00
Joey Hess
6906810b82 test 2013-12-06 15:19:54 -04:00
Joey Hess
b370f52f88 use EvilLinker on autobuilder (will probably need some more horrible path fixes) 2013-12-06 15:08:30 -04:00
Joey Hess
da644c65cf try to fix cygwin path 2013-12-06 14:56:12 -04:00
Joey Hess
3694d5efe8 yay Yury fixed it! 2013-12-06 14:53:56 -04:00
Joey Hess
4be2184e2e test 2013-12-06 14:51:09 -04:00
Joey Hess
6f408e050b test 2013-12-06 14:43:28 -04:00
Joey Hess
54f3f00fc8 test 2013-12-06 14:42:42 -04:00
Joey Hess
9ab8e146bb test 2013-12-06 14:41:33 -04:00
Joey Hess
899def82cf test 2013-12-06 14:41:01 -04:00