summaryrefslogtreecommitdiff
path: root/git-annex.cabal
Commit message (Collapse)AuthorAge
...
* | 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
| |
| * Merge branch 'master' into cabal-man-pagesGravatar Nathan Collins2012-06-12
| |\
| * | Simplify git-annex.cabal and generate sdist with make-sdist.sh.Gravatar Nathan Collins2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `cabal install` is happy as long as the files it needs are present, but `cabal sdist` will only package up files you tell it to. So, generate the source tarball ourselves. The source tarball is generated by make-sdist.sh, which uses cabal sdist to calculate the package name. Could also generate the name from the 'Version:' field in git-annex.cabal.
| * | Get ready for a simple git-annex.cabal.Gravatar Nathan Collins2012-06-12
| | | | | | | | | | | | | | | | | | | | | I have a new idea: instead of the template-based approaches that work around cabals requirement that you list all files to put in the sdist, we can simply generate the sdist ourselves, with the files we want. Take that cabal!
* | | updateGravatar Joey Hess2012-06-11
| | |
* | | Revert "Build with ghc's threaded runtime, so threaded code does not busy-wait."Gravatar Joey Hess2012-06-11
| | | | | | | | | | | | | | | | | | This reverts commit 129f6123fe933310829986fd5a99a9fd6911ca0f. Saw hang during batch add with -threaded, so deferred for now.
* | | Build with ghc's threaded runtime, so threaded code does not busy-wait.Gravatar Joey Hess2012-06-11
| | | | | | | | | | | | Sort of a work around for http://bugs.debian.org/677096
* | | Merge branch 'master' into watchGravatar Joey Hess2012-06-11
|\ \ \ | | |/ | |/| | | | | | | Conflicts: debian/changelog
| * | releasing version 3.201206113.20120611Gravatar Joey Hess2012-06-11
| | |
| | * Rename git-annex.cabal.Gravatar Nathan Collins2012-06-10
| |/
* | smart commit threadGravatar Joey Hess2012-06-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit thread now has access to a channel containing the times of all uncommitted changes. This lets it be smart about detecting busy times when a batch job is running (such as rm -rf, or untarring something, etc), and avoid committing until it's done. While at the same time, instantly committing one-off changes that the user is going to expect to see immediately. I had to use STM to implement the channel, because of http://hackage.haskell.org/trac/ghc/ticket/4154 While this adds a dependency, I always wanted to use STM, so this actually makes me happy. ;) Also happy that shouldCommit is a pure function, so other commit smartness strategies can easily be played with. Although the current one seems pretty good. There is one bug, for some reason it does double commits, every time.
* | Merge branch 'master' into watchGravatar Joey Hess2012-06-05
|\|
| * releasing version 3.201206053.20120605Gravatar Joey Hess2012-06-05
| |
* | add hinotify dependenciesGravatar Joey Hess2012-06-04
|/
* releasing version 3.201205223.20120522Gravatar Joey Hess2012-05-22
|
* releasing version 3.201205113.20120511Gravatar Joey Hess2012-05-11
|
* releasing version 3.201204303.20120430Gravatar Joey Hess2012-04-30
|
* remove unneeded dependencyGravatar Joey Hess2012-04-22
|
* simplfy versioned base dependencyGravatar Joey Hess2012-04-22
|
* releasing version 3.201204183.20120418Gravatar Joey Hess2012-04-18
|
* make cabal test work againGravatar Joey Hess2012-04-14
|
* cabal file now autodetects whether S3 support is available.Gravatar Joey Hess2012-04-14
|