git.iko.soy/typeable/cabal2nix
on master help sign in
minor re-factoring
commit575a28263a30981afa064da964f35c6c7cc3e8fe authorPeter Simons <simons@cryp.to> dateSun 25 Jan 2015, 17:11 (12 years ago) parent8f30d41
2 files changed+5−30
compare with master
unifiedsplit
generate-cabal-file.hs+3−7 test/doctest.hs+2−23
generate-cabal-file.hs+3−7
@@ -80,11 +80,6 @@ commonTestOptions = buildDepends
8080 , unconstrained "QuickCheck"
8181 ] : commonBuildOptions
8282
83−library :: Betsy IO [LibraryField]
84−library = do
85− ms <- modules "src"
86− return $ exposedModules ms : commonBuildOptions
87−
8883mkExecutable :: NonEmptyString -> [ExecutableField] -> Section
8984mkExecutable exe opt = executable exe $ mainIs (exe++".hs") : opt ++ commonBuildOptions
9085
@@ -93,9 +88,10 @@ mkTest test opt = testSuite test $ exitcodeFields (test++".hs") ++ opt ++ hsSour
9388
9489main :: IO ()
9590main = defaultMain $ do
91+ libraryModules <- modules "src"
9692 props <- properties
97− lib <- library
98− return ( props, lib
93+ return ( props
94+ , exposedModules libraryModules : commonBuildOptions
9995 , [ githubHead "NixOS" "cabal2nix"
10096 , mkExecutable "cabal2nix" []
10197 , mkExecutable "hackage2nix" [ ghcOptions ["-threaded -rtsopts -with-rtsopts=-N"] ]
test/doctest.hs+2−23
@@ -1,27 +1,6 @@
1−module Main ( main ) where
2−
31import Test.DocTest
42
53main :: IO ()
64main = do
7− let libs = [ "dist/build/autogen/Paths_cabal2nix.hs"
8− , "src/Cabal2Nix/CorePackages.hs"
9− , "src/Cabal2Nix/Flags.hs"
10− , "src/Cabal2Nix/Generate.hs"
11− , "src/Cabal2Nix/Hackage.hs"
12− , "src/Cabal2Nix/License.hs"
13− , "src/Cabal2Nix/Name.hs"
14− , "src/Cabal2Nix/Normalize.hs"
15− , "src/Cabal2Nix/Package.hs"
16− , "src/Cabal2Nix/PostProcess.hs"
17− , "src/Cabal2Nix/Version.hs"
18− , "src/Distribution/Nix/Derivation/Cabal.hs"
19− , "src/Distribution/Nix/Derivation/License.hs"
20− , "src/Distribution/Nix/Derivation/Meta.hs"
21− , "src/Distribution/Nix/Fetch.hs"
22− , "src/Distribution/Nix/PackageMap.hs"
23− , "src/Distribution/Nix/Util/PrettyPrinting.hs"
24− , "src/Distribution/Nix/Util/Regex.hs"
25− ]
26− doctest $ "src/cabal2nix.hs" : libs
27− doctest $ "src/hackage2nix.hs" : libs
5+ doctest ["-idist/build/autogen", "-isrc", "src/cabal2nix.hs"]
6+ doctest ["-isrc", "src/hackage2nix.hs"]