git.iko.soy/typeable/cabal2nix
on master help sign in
Add support for new 'testTarget' attribute.
commit447999428261094fa5c40c396a5edf2f48d0f0ce authorPeter Simons <simons@cryp.to> dateSun 27 Oct 2013, 17:15 (13 years ago) parent83c1fc4
2 files changed+4
compare with master
unifiedsplit
src/Cabal2Nix/Generate.hs+1 src/Distribution/NixOS/Derivation/Cabal.hs+3
src/Cabal2Nix/Generate.hs+1
@@ -30,6 +30,7 @@ cabal2nix cabal = normalize $ postProcess MkDerivation
3030 , runHaddock = True
3131 , jailbreak = False
3232 , doCheck = True
33+ , testTarget = ""
3334 , phaseOverrides = ""
3435 , metaSection = Meta
3536 { homepage = Cabal.homepage descr
src/Distribution/NixOS/Derivation/Cabal.hs+3
@@ -56,6 +56,7 @@ data Derivation = MkDerivation
5656 , runHaddock :: Bool
5757 , jailbreak :: Bool
5858 , doCheck :: Bool
59+ , testTarget :: String
5960 , phaseOverrides :: String
6061 , metaSection :: Meta
6162 }
@@ -87,6 +88,7 @@ renderDerivation deriv = funargs (map text ("cabal" : inputs)) $$ vcat
8788 , boolattr "noHaddock" (not (runHaddock deriv)) (not (runHaddock deriv))
8889 , boolattr "jailbreak" (jailbreak deriv) (jailbreak deriv)
8990 , boolattr "doCheck" (not (doCheck deriv)) (doCheck deriv)
91+ , onlyIf (testTarget deriv) $ attr "testTarget" $ string (testTarget deriv)
9092 , onlyIf (phaseOverrides deriv) $ vcat ((map text . lines) (phaseOverrides deriv))
9193 , disp (metaSection deriv)
9294 ]
@@ -131,6 +133,7 @@ parseDerivation buf
131133 , runHaddock = noHaddock /= ["true"]
132134 , jailbreak = jailBreak == ["true"]
133135 , doCheck = docheck == ["true"] || null docheck
136+ , testTarget = ""
134137 , phaseOverrides = ""
135138 , metaSection = Meta
136139 { homepage = ""