[commit: packages/directory] master: Include 'python' and 'which' as build-tools for tests (079da19)

git at git.haskell.org git at git.haskell.org
Fri Dec 18 09:50:04 UTC 2015


Repository : ssh://git@git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/079da19a4596f2477de3519f77cd84e4acf90610/directory

>---------------------------------------------------------------

commit 079da19a4596f2477de3519f77cd84e4acf90610
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Sun Apr 5 03:19:00 2015 -0400

    Include 'python' and 'which' as build-tools for tests
    
    This is needed to make sure the Nix package works correctly.


>---------------------------------------------------------------

079da19a4596f2477de3519f77cd84e4acf90610
 Setup.hs        | 2 ++
 directory.cabal | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Setup.hs b/Setup.hs
index 54f57d6..f9dfab8 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 "python", simpleProgram "which"] }
diff --git a/directory.cabal b/directory.cabal
index 52e0116..c8a89f6 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:      python, which
     main-is:          dispatch-tests.hs
     type:             exitcode-stdio-1.0
     build-depends:    base, directory



More information about the ghc-commits mailing list