summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* warningsGravatar Joey Hess2014-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
* revert reversionGravatar Joey Hess2014-10-15
| | | | | | This reverts commit 05c37ced983e89505c2c3cdcbe1db67e3a86560b. Android build is going to have consistent versions again.
* 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
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkYmMFDdf3GJ9Oba6NCVkzGc4JyB9WavMs2014-10-14
| |
| * Added a comment: Diff of unlocked fileGravatar Bram2014-10-14
|/
* package-qualified import needed by new yesodGravatar Joey Hess2014-10-14
|
* refresh android and no-th haskell patches to latest package versions from cabalGravatar Joey Hess2014-10-14
| | | | | | | | | | | 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.
* (no commit message)Gravatar http://joeyh.name/2014-10-13
|
* (no commit message)Gravatar http://joeyh.name/2014-10-13
|
* (no commit message)Gravatar http://joeyh.name/2014-10-13
|
* Added a commentGravatar http://joeyh.name/2014-10-13
|
* Added a commentGravatar http://joeyh.name/2014-10-13
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-10-13
|\
* | update for yesod-form-1.4.0.2Gravatar Joey Hess2014-10-13
| |
* | manual fixups of spices etcGravatar Joey Hess2014-10-13
| |
| * (no commit message)Gravatar justinl2014-10-13
| |
* | fix warningGravatar Joey Hess2014-10-13
|/
* build bootstrap3 moduleGravatar Joey Hess2014-10-13
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-10-13
|\
* | more accurate bounds on yesod boostrap3 ifdefsGravatar Joey Hess2014-10-13
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawk9SYh6N-JUMkYkW4aOk55zC3Vr9KonDV42014-10-13
| |
| * (no commit message)Gravatar http://digiuser.livejournal.com/2014-10-13
| |