Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | pin git to known working version | Joey Hess | 2014-10-16 |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2014-10-16 |
|\ | |||
* | | update git patch to current git | Joey Hess | 2014-10-16 |
| | | |||
* | | update | Joey Hess | 2014-10-16 |
| | | |||
* | | jessie has a new enough automake, so it doesn't need to be cloned here | Joey Hess | 2014-10-16 |
| | | |||
| * | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawmwjQzWgiD7_I3zw-_91rMRf_6qoThupis | 2014-10-16 |
| | | |||
| * | Added a comment: I messed up that repo | https://www.google.com/accounts/o8/id?id=AItOawlZ-6dtxJY4cP7shhvV8E6YyuV0Rak8it4 | 2014-10-16 |
| | | |||
| * | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawlZ-6dtxJY4cP7shhvV8E6YyuV0Rak8it4 | 2014-10-16 |
| | | |||
* | | Merge orca:/tmp/git-annex | Joey Hess | 2014-10-16 |
|\ \ | |||
| * | | finished convering android build to pinned packages | Joey Hess | 2014-10-16 |
| |/ | | | | | | | | | | | | | | | | | Package versions match Debian jessie, except for a few differences needed due to the different version of ghc pulling in a few buildin packages with other versions. Most of the patches were cherry-picked from past commits, since these are older versions. | ||
* | | Use haskell setenv library to clean up several ugly workarounds for ↵ | Joey Hess | 2014-10-15 |
| | | | | | | | | | | | | | | | | | | inability to manipulate the environment on windows. Didn't know that this library existed! This includes making git-annex not re-exec itself on start on windows, and making the test suite on Windows run tests without forking. | ||
* | | discovered how to setenv on windows | Joey Hess | 2014-10-15 |
|/ | |||
* | initremote: Don't allow creating a special remote that has the same name as ↵ | Joey Hess | 2014-10-15 |
| | | | | | | | | | an existing git remote. This is not a complete fix. For one, git remote will happily go add a remote that has the same name as an existing special remote. For another, enableremote will enable a special remote over top of an existing git remote. And, also, the webapp might. | ||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2014-10-15 |
|\ | |||
* \ | Merge orca:/tmp/git-annex | Joey Hess | 2014-10-15 |
|\ \ | |||
| * | | android rebuild WIP | Joey Hess | 2014-10-15 |
| | | | |||
* | | | warnings | Joey Hess | 2014-10-15 |
| | | | |||
| | * | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawncVeolylM8VoRbWhIYDlfGhIP69-aNXm4 | 2014-10-15 |
| | | | |||
| | * | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawncVeolylM8VoRbWhIYDlfGhIP69-aNXm4 | 2014-10-15 |
| | | | |||
| | * | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawncVeolylM8VoRbWhIYDlfGhIP69-aNXm4 | 2014-10-15 |
| | | | |||
* | | | Remove hurd stuff from cabal file, since hackage currently rejects it. | Joey Hess | 2014-10-15 |
| | | | | | | | | | | | | https://github.com/haskell/hackage-server/issues/269 | ||
| | * | Added a comment | http://joeyh.name/ | 2014-10-15 |
| | | | |||
| | * | Added a comment | http://joeyh.name/ | 2014-10-15 |
| | | | |||
* | | | revert reversion | Joey Hess | 2014-10-15 |
|/ / | | | | | | | | | | | This reverts commit 05c37ced983e89505c2c3cdcbe1db67e3a86560b. Android build is going to have consistent versions again. | ||
| * | Added a comment: Homebrew | http://digiuser.livejournal.com/ | 2014-10-15 |
| | | |||
| * | Added a comment: Not on hackage | https://www.google.com/accounts/o8/id?id=AItOawnmF_9CAtfqdZkC4e-_dCX-rK5bqh4RWkw | 2014-10-15 |
| | | |||
| * | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawnjssENdbjzvblxOm4Qr8x2C-BdIV_k_y4 | 2014-10-15 |
| | | |||
| * | Added a comment | http://joeyh.name/ | 2014-10-15 |
|/ | |||
* | fix build failure with empty parameter | Joey Hess | 2014-10-15 |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2014-10-15 |
|\ | |||
| * | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawnUuvup1XA5YGt8gBUnfzCrvISX-qINsmo | 2014-10-15 |
| | | |||
* | | no more need for .cabal/bin in PATH | Joey Hess | 2014-10-15 |
|/ | |||
* | switching android builder to debian jessie | Joey Hess | 2014-10-14 |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2014-10-14 |
|\ | |||
* | | close | Joey Hess | 2014-10-14 |
| | | |||
| * | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawlM_DRhi_5pJrTA0HbApHR25iAgy-NBXTY | 2014-10-14 |
| | | |||
| * | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawlM_DRhi_5pJrTA0HbApHR25iAgy-NBXTY | 2014-10-14 |
|/ | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2014-10-14 |
|\ | |||
* | | avoid pinning some core libs | Joey Hess | 2014-10-14 |
| | | | | | | | | | | These vary depending on ghc version, so need to be different in the native and android ghc cabals. | ||
* | | avoid pinning more ghc builtins | Joey Hess | 2014-10-14 |
| | | |||
* | | fix path | Joey Hess | 2014-10-14 |
| | | |||
* | | don't pin base | Joey Hess | 2014-10-14 |
| | | |||
| * | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawnmF_9CAtfqdZkC4e-_dCX-rK5bqh4RWkw | 2014-10-14 |
|/ | |||
* | make cabal.config be available whenever cabal install is run | Joey Hess | 2014-10-14 |
| | | | | Ensures the constraints are consistently applied. | ||
* | use cabal.config when installing native | Joey Hess | 2014-10-14 |
| | |||
* | use pinned package versions from cabal.config | Joey Hess | 2014-10-14 |
| | |||
* | actual bounds from android autobuilder | Joey Hess | 2014-10-14 |
| | |||
* | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawk9SYh6N-JUMkYkW4aOk55zC3Vr9KonDV4 | 2014-10-14 |
| | |||
* | de-qualify import | Joey Hess | 2014-10-14 |
| | | | | still building with old yesod on android and armel | ||
* | unbreak android build | Joey Hess | 2014-10-14 |
| | | | | | | | | This reverts commit cfc51c5e4ec04f9d5088c42922217cf90b63c903 and commit 78f94f50674d60c7d54307029bef1edf9b27782b. 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. |