448b428 · typeable/cabal2nix

git.iko.soy/typeable/cabal2nix

Distribution/NixOS/Derivation/Cabal.hs: render the 'doCheck' field only when it's set to 'false'

'true' is the default anyway.

commit448b428c1d24811a3c1237bf6d13bc746735475d authorPeter Simons <simons@cryp.to> dateSun 24 Feb 2013, 21:19 (14 years ago) parent32cc68f

2 files changed+2−2

unifiedsplit

src/Cabal2Nix/Generate.hs+1−1

@@ -28,7 +28,7 @@ cabal2nix cabal = normalize $ postProcess MkDerivation

2828 , cabalFlags = configureCabalFlags pkg

2929 , runHaddock = True

3030 , jailbreak = False

31− , doCheck = False

31+ , doCheck = True

3232 , phaseOverrides = ""

3333 , metaSection = Meta

3434 { homepage = Cabal.homepage descr

src/Distribution/NixOS/Derivation/Cabal.hs+1−1

@@ -84,7 +84,7 @@ renderDerivation deriv = funargs (map text ("cabal" : inputs)) $$ vcat

8484 , onlyIf renderedFlags $ attr "configureFlags" $ doubleQuotes (sep renderedFlags)

8585 , boolattr "noHaddock" (not (runHaddock deriv)) (not (runHaddock deriv))

8686 , boolattr "jailbreak" (jailbreak deriv) (jailbreak deriv)

87− , boolattr "doCheck" (doCheck deriv) (doCheck deriv)

87+ , boolattr "doCheck" (not (doCheck deriv)) (doCheck deriv)

8888 , onlyIf (phaseOverrides deriv) $ vcat ((map text . lines) (phaseOverrides deriv))

8989 , disp (metaSection deriv)

9090 ]