summaryrefslogtreecommitdiff
path: root/git-annex.cabal
Commit message (Collapse)AuthorAge
* Merge branch 'safesemaphore'Gravatar Joey Hess2012-10-20
|\ | | | | | | | | | | Conflicts: debian/changelog git-annex.cabal
* | Relax the dependency on the base package, to accomodate with GHC 7.6Gravatar Nicolas Pouillard2012-10-18
| |
* | add solaris workaround to cabal file tooGravatar Joey Hess2012-10-17
| | | | | | | | uname reports SunOS, but cabal seems to use solaris.
* | releasing version 3.201210173.20121017Gravatar Joey Hess2012-10-16
| |
* | releasing version 3.201210163.20121016Gravatar Joey Hess2012-10-16
| |
* | releasing version 3.201210103.20121010Gravatar Joey Hess2012-10-12
| |
* | deal with incompatable api change in network 2.4.0.1Gravatar Joey Hess2012-10-10
| | | | | | | | | | On the cabal side, let's just require this new version, and set -DURI_24 to enable the code using it.
* | releasing version 3.201210093.20121009Gravatar Joey Hess2012-10-09
| |
| * TransferSlots: Use SafeSemaphore's MSemN instead of QSemN from baseGravatar Ben Gamari2012-10-05
| | | | | | | | | | As described in the documentation, QSemN is unsafe for a variety of reasons.
| * Admit base-4.6 in Build-DependsGravatar Ben Gamari2012-10-05
|/
* releasing version 3.201210013.20121001Gravatar Joey Hess2012-10-01
|
* let's not -DOSX, that results in unwanted manglingGravatar Joey Hess2012-09-29
|
* updateGravatar Joey Hess2012-09-24
|
* releasing version 3.201209243.20120924Gravatar Joey Hess2012-09-24
|
* add build dep on network-infoGravatar Joey Hess2012-09-07
|
* add network-multicast to bulld dependsGravatar Joey Hess2012-09-07
|
* include libkqueue in C-Sources for !linuxGravatar Joey Hess2012-09-06
|
* add missing data-default dependency (needed with new yesod only)Gravatar Joey Hess2012-08-30
|
* remove yesod version parametisationGravatar Joey Hess2012-08-29
| | | | | | | Seems cabal defaults to trying to satisfy both flags, which cannot works, and does not fall back to only selecting one, as hoped. While users could manually specify flags, I don't want to require that to build, so let's just require the newer yesod version when building with cabal.
* Merge branch 'master' into assistantGravatar Joey Hess2012-08-27
|\ | | | | | | | | | | | | Conflicts: debian/changelog Updated changelog for assistant and webapp
| * releasing version 3.201208253.20120825Gravatar Joey Hess2012-08-25
| |
* | Merge branch 'master' into assistantGravatar Joey Hess2012-08-09
|\| | | | | | | | | Conflicts: debian/changelog
* | support building with yesod-default 1.1.0Gravatar Joey Hess2012-08-09
| | | | | | | | | | | | | | | | | | Old 1.0.1 version is still supported as well. Cabal autodetects which version is available, but in the Makefile, WITH_OLD_YESOD has to be configured appropriately. I have not squashed all the $newline warnings with the new Yesod. They should go away eventually anyway as Yesod moves past that transition.
| * releasing version 3.201208073.20120807Gravatar Joey Hess2012-08-07
| |
| * fix transfer log cleanup crashGravatar Joey Hess2012-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid crashing when "git annex get" fails to download from one location, and falls back to downloading from a second location. The problem is that git annex get calls download recursively from within itself if the first download attempt fails. So the first time through, it writes a transfer info file, which is then overwritten on the second, recursive call. Then on cleanup, it tries to delete the file twice, which of course doesn't work. Fixed both by not crashing if the transfer file is removed, and by changing Get to not run download recursively like that. It's the only thing that did so, and it just seems like a bad idea.
* | don't use hamlet for htmlshimGravatar Joey Hess2012-08-01
| | | | | | | | | | | | This allows me to not build-depend on blaze-markup, which was causing me some trouble when tring to build with cabal on debian. Seems debian ships Text.Blaze.Renderer.String in two packages.
* | add template-haskell build-dep for webappGravatar Joey Hess2012-08-01
| |
* | renamed /status to /transfersGravatar Joey Hess2012-07-28
| | | | | | | | | | | | Also fixed a bug; the ident for the div was regnerated each time /status was called. This only was the same as the original ident due to luck.
* | add yesod-defaultGravatar Joey Hess2012-07-27
| | | | | | | | another dependency cabal works without here, oddly
* | update depsGravatar Joey Hess2012-07-26
| | | | | | | | | | | | Note that here I don't need blaze-markup for cabal to succeed, but Jimmy reports he does. Seems like Text.Blaze.Renderer.String moved from blaze to blaze-markup in some version.
* | only enable dbus on linux for nowGravatar Joey Hess2012-07-26
| |
* | update build depsGravatar Joey Hess2012-07-26
| |
* | build fixesGravatar Joey Hess2012-07-25
| |
* | run yesod, and launch webapp on startupGravatar Joey Hess2012-07-25
| |
* | Merge branch 'master' into assistantGravatar Joey Hess2012-07-22
|\| | | | | | | | | Conflicts: git-annex.cabal
| * releasing version 3.201207213.20120721Gravatar Joey Hess2012-07-21
| |
* | try to make Utility.Mounts portableGravatar Joey Hess2012-07-19
| | | | | | | | | | This is an unholy mashup, but it just might work. It works on Linux, that's all I've tested. :)
* | MountWatcher threadGravatar Joey Hess2012-07-19
| | | | | | | | Currently only prints mount points when mounts happen.
* | switch from System.Cmd.Utils to System.ProcessGravatar Joey Hess2012-07-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test suite now passes with -threaded! I traced back all the hangs with -threaded to System.Cmd.Utils. It seems it's just crappy/unsafe/outdated, and should not be used. System.Process seems to be the cool new thing, so converted all the code to use it instead. In the process, --debug stopped printing commands it runs. I may try to bring that back later. Note that even SafeSystem was switched to use System.Process. Since that was a modified version of code from System.Cmd.Utils, it needed to be converted too. I also got rid of nearly all calls to forkProcess, and all calls to executeFile, which I'm also doubtful about working well with -threaded.
* | add debuggingGravatar Joey Hess2012-07-17
|/
* releasing version 3.201206293.20120629Gravatar Joey Hess2012-06-29
|
* Version build dependency on STM, and allow building without it, which ↵Gravatar Joey Hess2012-06-26
| | | | disables the watch command.
* cabal: Only try to use inotify on Linux.Gravatar Joey Hess2012-06-25
|
* releasing version 3.201206243.20120624Gravatar Joey Hess2012-06-24
|
* make inotify a build flag etcGravatar Joey Hess2012-06-17
|
* stm package name is lowercaseGravatar Ben Gamari2012-06-16
|
* Merge branch 'master' into watchGravatar Joey Hess2012-06-15
|\
| * releasing version 3.201206143.20120614Gravatar Joey Hess2012-06-14
| |
* | Merge branch 'master' into watchGravatar Joey Hess2012-06-12
|\| | | | | | | | | | | Conflicts: debian/changelog git-annex.cabal
| * remove xxx ... cabal test works for meGravatar Joey Hess2012-06-12
| |