git.iko.soy/typeable/cabal2nix
on master help sign in
Add 'doCheck' field to the Cabal derivation.
commiteae4a15a6e64fa4b4ac4535383a5b74fa427d5c7 authorPeter Simons <simons@cryp.to> dateFri 22 Feb 2013, 16:51 (14 years ago) parent3f124e5
2 files changed+5
src/Cabal2Nix/Generate.hs+1 src/Distribution/NixOS/Derivation/Cabal.hs+4
src/Cabal2Nix/Generate.hs+1
@@ -28,6 +28,7 @@ cabal2nix cabal = normalize $ postProcess MkDerivation
2828 , cabalFlags = configureCabalFlags pkg
2929 , runHaddock = True
3030 , jailbreak = False
31+ , doCheck = False
3132 , phaseOverrides = ""
3233 , metaSection = Meta
3334 { homepage = Cabal.homepage descr
src/Distribution/NixOS/Derivation/Cabal.hs+4
@@ -54,6 +54,7 @@ data Derivation = MkDerivation
5454 , cabalFlags :: FlagAssignment
5555 , runHaddock :: Bool
5656 , jailbreak :: Bool
57+ , doCheck :: Bool
5758 , phaseOverrides :: String
5859 , metaSection :: Meta
5960 }
@@ -83,6 +84,7 @@ renderDerivation deriv = funargs (map text ("cabal" : inputs)) $$ vcat
8384 , onlyIf renderedFlags $ attr "configureFlags" $ doubleQuotes (sep renderedFlags)
8485 , boolattr "noHaddock" (not (runHaddock deriv)) (not (runHaddock deriv))
8586 , boolattr "jailbreak" (jailbreak deriv) (jailbreak deriv)
87+ , boolattr "doCheck" (doCheck deriv) (doCheck deriv)
8688 , onlyIf (phaseOverrides deriv) $ vcat ((map text . lines) (phaseOverrides deriv))
8789 , disp (metaSection deriv)
8890 ]
@@ -110,6 +112,7 @@ parseDerivation buf
110112 , maint <- buf `regsubmatch` "maintainers *= *\\[([^\"]+)]"
111113 , noHaddock <- buf `regsubmatch` "noHaddock *= *(true|false) *;"
112114 , jailBreak <- buf `regsubmatch` "jailbreak *= *(true|false) *;"
115+ , docheck <- buf `regsubmatch` "doCheck *= *(true|false) *;"
113116 = Just MkDerivation
114117 { pname = name
115118 , version = vers
@@ -124,6 +127,7 @@ parseDerivation buf
124127 , cabalFlags = []
125128 , runHaddock = noHaddock /= ["true"]
126129 , jailbreak = jailBreak == ["true"]
130+ , doCheck = docheck == ["true"]
127131 , phaseOverrides = ""
128132 , metaSection = Meta
129133 { homepage = ""