From b482cb9d9003c87d41fd940e8a351afe512df7e0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 17 Mar 2016 23:14:37 -0400 Subject: [PATCH] Fix build with stack 0.1.6 which needs explicit-setup-deps. --- debian/changelog | 1 + doc/bugs/stack_build_Setup.hs_dependencies.mdwn | 4 ++++ stack.yaml | 2 ++ 3 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3bb289298a..d5c0461a66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ git-annex (6.20160230) UNRELEASED; urgency=medium * Sped up git-annex add in direct mode and v6 by using git hash-object --stdin-paths. * Sped up git-annex merge by using git hash-object --stdin-paths. + * Fix build with stack 0.1.6 which needs explicit-setup-deps. -- Joey Hess Mon, 29 Feb 2016 13:00:30 -0400 diff --git a/doc/bugs/stack_build_Setup.hs_dependencies.mdwn b/doc/bugs/stack_build_Setup.hs_dependencies.mdwn index 1e9fc431f8..3cbcfa82ee 100644 --- a/doc/bugs/stack_build_Setup.hs_dependencies.mdwn +++ b/doc/bugs/stack_build_Setup.hs_dependencies.mdwn @@ -54,3 +54,7 @@ to `stack.yaml` [(as described here)](https://github.com/commercialhaskell/stack fixes the error and builds git-annex successfully. ### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders) + +> Ok, added that. I am not sure if older version of stack will stumble over +> the new field; if so I suppose the user can comment it out or upgrade +> stack. [[done]] --[[Joey]] diff --git a/stack.yaml b/stack.yaml index 5f202e71d0..622e37b118 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: + "*": true