git.iko.soy/typeable/cabal2nix
on master help sign in
Cabal2Nix.hs: fix logic of the --no-check command-line flag
commitbbca6f83fa8520b2efcb682662659b811a4a3fd6 authorPeter Simons <simons@cryp.to> dateSat 6 Apr 2013, 12:54 (14 years ago) parentbe16b96
1 file changed+2−1
src/Cabal2Nix.hs+2−1
src/Cabal2Nix.hs+2−1
@@ -83,11 +83,12 @@ main = bracket (return ()) (\() -> hFlush stdout >> hFlush stderr) $ \() -> do
8383 let packageId = package (packageDescription cabal)
8484 sha <- if null (optSha256 cfg) then hashPackage packageId else return (optSha256 cfg)
8585
86− let deriv = (cabal2nix cabal) { sha256 = sha, runHaddock = optHaddock cfg, doCheck = optDoCheck cfg }
86+ let deriv = (cabal2nix cabal) { sha256 = sha, runHaddock = optHaddock cfg }
8787 deriv' = deriv { metaSection = (metaSection deriv)
8888 { maintainers = optMaintainer cfg
8989 , platforms = optPlatform cfg
9090 }
91+ , doCheck = doCheck deriv && optDoCheck cfg
9192 }
9293
9394 putStr (show (disp (normalize deriv')))