aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/bugs/stack_build_Setup.hs_dependencies.mdwn4
-rw-r--r--doc/install/fromsource.mdwn2
-rw-r--r--stack.yaml2
3 files changed, 7 insertions, 1 deletions
diff --git a/doc/bugs/stack_build_Setup.hs_dependencies.mdwn b/doc/bugs/stack_build_Setup.hs_dependencies.mdwn
index 403816509..8911cef45 100644
--- a/doc/bugs/stack_build_Setup.hs_dependencies.mdwn
+++ b/doc/bugs/stack_build_Setup.hs_dependencies.mdwn
@@ -72,3 +72,7 @@ fixes the error and builds git-annex successfully.
> > I've filed a bug on stack about this,
> > <https://github.com/commercialhaskell/stack/issues/2093> --[[Joey]]
+
+> > > Gone ahead and added it to stack.yaml, despite it causing some build
+> > > failures, as it's certianly needed on many systems. [[done]]
+> > > --[[Joey]]
diff --git a/doc/install/fromsource.mdwn b/doc/install/fromsource.mdwn
index ef8482edd..cfc58c4f4 100644
--- a/doc/install/fromsource.mdwn
+++ b/doc/install/fromsource.mdwn
@@ -42,7 +42,7 @@ and avoids build failures due to fast-changing haskell libraries.
First, [install stack](https://github.com/commercialhaskell/stack/blob/master/doc/install_and_upgrade.md)
It will be part of the Haskell Platform soon. On Debian unstable/testing:
- sudo apt-get install haskell-stack zlib1g-dev
+ sudo apt-get install haskell-stack zlib1g-dev libtinfo-dev
Use stack to install all dependencies and git-annex:
diff --git a/stack.yaml b/stack.yaml
index 5f202e71d..346ba7a47 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -24,3 +24,5 @@ extra-deps:
- mountpoints-1.0.1
- disk-free-space-0.1.0.1
- process-1.3.0.0
+explicit-setup-deps:
+ git-annex: true