git.iko.soy/typeable/cabal2nix
on master help sign in
cabal2nix.cabal: use custom build to define __HADDOCK__
commit0938e91ab64060b52bb50321e2872db8d4fa1d3a authorPeter Simons <simons@cryp.to> dateMon 15 Aug 2011, 12:26 (15 years ago) parent708f83e
3 files changed+19−12
compare with master
unifiedsplit
Setup.hs+15 Setup.lhs−8 cabal2nix.cabal+4−4
Setup.hsnew file+15
@@ -0,0 +1,15 @@
1+module Main ( main ) where
2+
3+import Distribution.Simple
4+import Distribution.Simple.LocalBuildInfo ( withPrograms )
5+import Distribution.Simple.Program ( userSpecifyArgs )
6+
7+main :: IO ()
8+main = defaultMainWithHooks $
9+ simpleUserHooks `modify_haddockHook` \oldHH pkg lbi hooks flags ->
10+ (\lbi' -> oldHH pkg lbi' hooks flags) $
11+ lbi `modify_withPrograms` \oldWP ->
12+ userSpecifyArgs "haddock" ["--optghc=-D__HADDOCK__"] oldWP
13+ where
14+ modify_haddockHook hooks f = hooks { haddockHook = f (haddockHook hooks) }
15+ modify_withPrograms lbi f = lbi { withPrograms = f (withPrograms lbi) }
Setup.lhsdeleted−8
@@ -1,8 +0,0 @@
1−#!/usr/bin/env runhaskell
2−
3−> module Main (main) where
4−>
5−> import Distribution.Simple
6−>
7−> main :: IO ()
8−> main = defaultMain
cabal2nix.cabal+4−4
@@ -9,7 +9,7 @@ Homepage: http://github.com/haskell4nix/cabal2nix
99Category: Distribution
1010Synopsis: Convert Cabal files into Nix build instructions
1111Cabal-Version: >= 1.8
12−Build-Type: Simple
12+Build-Type: Custom
1313Tested-With: GHC == 6.12.3, GHC == 7.0.4, GHC == 7.2.1
1414Description:
1515 The cabal2nix utility converts Cabal files into Nix build instructions. The
@@ -44,7 +44,7 @@ Source-Repository head
4444Library
4545 Build-Depends: base >= 3 && < 5, regex-posix, pretty, Cabal >= 1.8
4646 hs-source-dirs: src
47− Extensions: PatternGuards
47+ Extensions: PatternGuards, CPP
4848 Ghc-Options: -Wall
4949 Exposed-Modules: Distribution.NixOS.Derivation.Cabal
5050 Distribution.NixOS.Derivation.License
@@ -56,7 +56,7 @@ Executable cabal2nix
5656 hs-source-dirs: src
5757 Build-Depends: base >= 3 && < 5, regex-posix, pretty, Cabal >= 1.8,
5858 filepath, directory, process, HTTP
59− Extensions: PatternGuards
59+ Extensions: PatternGuards, CPP
6060 Ghc-Options: -Wall
6161 other-modules: Cabal2Nix.CorePackages
6262 Cabal2Nix.Hackage
@@ -72,7 +72,7 @@ Executable hackage4nix
7272 hs-source-dirs: src
7373 Build-Depends: base >= 3 && < 5, regex-posix, pretty, Cabal >= 1.8,
7474 mtl, containers, directory, filepath
75− Extensions: PatternGuards
75+ Extensions: PatternGuards, CPP
7676 Ghc-Options: -Wall
7777 other-modules: Cabal2Nix.CorePackages
7878 Cabal2Nix.Name