From e95febf7c9ccf161ef51ce0be5217c04c7580ee7 Mon Sep 17 00:00:00 2001 From: Phil Ruffwind Date: Tue, 24 Mar 2015 18:25:27 -0400 Subject: [PATCH] Include git and python as build-tools for tests This is needed to make sure the Nix package works correctly. --- Setup.hs | 2 ++ directory.cabal | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Setup.hs b/Setup.hs index 54f57d6f..5033289a 100644 --- a/Setup.hs +++ b/Setup.hs @@ -1,6 +1,8 @@ module Main (main) where import Distribution.Simple +import Distribution.Simple.Program (simpleProgram) main :: IO () main = defaultMainWithHooks autoconfUserHooks + { hookedPrograms = [simpleProgram "git", simpleProgram "python"] } diff --git a/directory.cabal b/directory.cabal index 52e0116a..fe95899c 100644 --- a/directory.cabal +++ b/directory.cabal @@ -10,7 +10,7 @@ description: This library provides a basic set of operations for manipulating files and directories in a portable way. category: System -build-type: Configure +build-type: Custom cabal-version: >= 1.10 tested-with: GHC>=7.4.1 @@ -86,6 +86,7 @@ test-suite test other-extensions: CPP ForeignFunctionInterface ghc-options: -Wall hs-source-dirs: tools + build-tools: git, python main-is: dispatch-tests.hs type: exitcode-stdio-1.0 build-depends: base, directory