summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* updateGravatar Joey Hess2014-10-16
|
* jessie has a new enough automake, so it doesn't need to be cloned hereGravatar Joey Hess2014-10-16
|
* Merge orca:/tmp/git-annexGravatar Joey Hess2014-10-16
|\
| * finished convering android build to pinned packagesGravatar Joey Hess2014-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 ↵Gravatar Joey Hess2014-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 windowsGravatar Joey Hess2014-10-15
|/
* initremote: Don't allow creating a special remote that has the same name as ↵Gravatar Joey Hess2014-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.comGravatar Joey Hess2014-10-15
|\
* \ Merge orca:/tmp/git-annexGravatar Joey Hess2014-10-15
|\ \
| * | android rebuild WIPGravatar Joey Hess2014-10-15
| | |
* | | warningsGravatar Joey Hess2014-10-15
| | |
| | * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawncVeolylM8VoRbWhIYDlfGhIP69-aNXm42014-10-15
| | |
| | * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawncVeolylM8VoRbWhIYDlfGhIP69-aNXm42014-10-15
| | |
| | * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawncVeolylM8VoRbWhIYDlfGhIP69-aNXm42014-10-15
| | |
* | | Remove hurd stuff from cabal file, since hackage currently rejects it.Gravatar Joey Hess2014-10-15
| | | | | | | | | | | | https://github.com/haskell/hackage-server/issues/269
| | * Added a commentGravatar http://joeyh.name/2014-10-15
| | |
| | * Added a commentGravatar http://joeyh.name/2014-10-15
| | |
* | | revert reversionGravatar Joey Hess2014-10-15
|/ / | | | | | | | | | | This reverts commit 05c37ced983e89505c2c3cdcbe1db67e3a86560b. Android build is going to have consistent versions again.
| * Added a comment: HomebrewGravatar http://digiuser.livejournal.com/2014-10-15
| |
| * Added a comment: Not on hackageGravatar https://www.google.com/accounts/o8/id?id=AItOawnmF_9CAtfqdZkC4e-_dCX-rK5bqh4RWkw2014-10-15
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawnjssENdbjzvblxOm4Qr8x2C-BdIV_k_y42014-10-15
| |
| * Added a commentGravatar http://joeyh.name/2014-10-15
|/
* fix build failure with empty parameterGravatar Joey Hess2014-10-15
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-10-15
|\
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawnUuvup1XA5YGt8gBUnfzCrvISX-qINsmo2014-10-15
| |
* | no more need for .cabal/bin in PATHGravatar Joey Hess2014-10-15
|/
* switching android builder to debian jessieGravatar Joey Hess2014-10-14
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-10-14
|\
* | closeGravatar Joey Hess2014-10-14
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawlM_DRhi_5pJrTA0HbApHR25iAgy-NBXTY2014-10-14
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawlM_DRhi_5pJrTA0HbApHR25iAgy-NBXTY2014-10-14
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-10-14
|\
* | avoid pinning some core libsGravatar Joey Hess2014-10-14
| | | | | | | | | | These vary depending on ghc version, so need to be different in the native and android ghc cabals.
* | avoid pinning more ghc builtinsGravatar Joey Hess2014-10-14
| |
* | fix pathGravatar Joey Hess2014-10-14
| |
* | don't pin baseGravatar Joey Hess2014-10-14
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawnmF_9CAtfqdZkC4e-_dCX-rK5bqh4RWkw2014-10-14
|/
* make cabal.config be available whenever cabal install is runGravatar Joey Hess2014-10-14
| | | | Ensures the constraints are consistently applied.
* use cabal.config when installing nativeGravatar Joey Hess2014-10-14
|
* use pinned package versions from cabal.configGravatar Joey Hess2014-10-14
|
* actual bounds from android autobuilderGravatar Joey Hess2014-10-14
|
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawk9SYh6N-JUMkYkW4aOk55zC3Vr9KonDV42014-10-14
|
* de-qualify importGravatar Joey Hess2014-10-14
| | | | still building with old yesod on android and armel
* unbreak android buildGravatar Joey Hess2014-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.
* warningGravatar Joey Hess2014-10-14
|
* unused importGravatar Joey Hess2014-10-14
|
* doh't use "def" for command definitions, it conflicts with Data.Default.defGravatar Joey Hess2014-10-14
|
* vicfg: Deleting configurations now resets to the default, where before it ↵Gravatar Joey Hess2014-10-14
| | | | | | | | | 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
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-10-14
|\
* | typoGravatar Joey Hess2014-10-14
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-10 15:27:00 +0000