summaryrefslogtreecommitdiff
path: root/src/Propellor/DotDir.hs
AgeCommit message (Collapse)Author
2016-08-20improve Sean's fix, making the wrapper still work with older git versionsJoey Hess
2016-08-20pass --allow-unrelated-histories to git mergeSean Whitton
Fixes merging the /usr/src/propellor git bundle with git 2.9.
2016-06-13convert Architecture to a sumtypeFĂ©lix Sipma
TODO: remove ANDROID (used in GitAnnexBuilder) TODO: add other architectures TODO: rename ARMHF TODO: rename ARMEL (cherry picked from commit 6f36f6cade4e1d8b15c714565e223562c6573099)
2016-06-03better deal with stack resolver being in two placesJoey Hess
2016-04-28Fix build with directory-1.2.6.2.Joey Hess
It's now exporting a conflicting isSymbolicLink https://github.com/haskell/directory/issues/52 Only a few places in propellor use isSymbolicLink, but to prevent future problems, made as much of it as possible import Utility.Directory, which re-exports System.Directory without the conflicting symbol. (Utility.Tmp and System.Console.Concurrent.Internal cannot import Utility.Directory due to cycles, and don't use isSymbolicLink anyway.)
2016-04-05slightly more robust cabal file readingJoey Hess
2016-04-05Merge remote-tracking branch 'spwhitton/fix-init-build' into joeyconfigJoey Hess
2016-04-03propellor --init inits a cabal sandbox when neededSean Whitton
2016-04-03typoSean Whitton
2016-04-02qualify exportsJoey Hess
2016-04-02move cloudsJoey Hess
2016-04-02force flush on promptJoey Hess
2016-04-02use concurrent-output consistentlyJoey Hess
2016-04-02got rid of build flag to detect stackJoey Hess
2016-04-02typoJoey Hess
2016-04-02Stack support.Joey Hess
* Stack support. "git config propellor.buildsystem stack" will make propellor build its config using stack. * When propellor is installed using stack, propellor --init will automatically set propellor.buildsystem=stack.
2016-04-02cosmeticsJoey Hess
2016-04-01verify use of gpg keyJoey Hess
having a prompt here makes it clearer to the user why gpg is prompting for a passphrase.
2016-04-01separate propellor --initJoey Hess