git.iko.soy/typeable/cabal2nix
on master help sign in
Cabal2Nix.hs: fixed infinite recursion accidentally introduced earlier
c8bf02bPeter Simons
src/Cabal2Nix.hs+8−10
compare with master
unifiedsplit
@@ -82,13 +82,11 @@ main = bracket (return ()) (\() -> hFlush stdout >> hFlush stderr) $ \() -> do
82
82
83 sha <- if null hash then hashPackage packageId else return (head hash)
83 sha <- if null hash then hashPackage packageId else return (head hash)
84
84
85− let deriv = (cabal2nix cabal)
85+ let deriv = (cabal2nix cabal) { sha256 = sha, runHaddock = not noHaddock }
86− { sha256 = sha
87− , runHaddock = not noHaddock
88− , metaSection = (metaSection deriv)
86+ deriv' = deriv { metaSection = (metaSection deriv)
89− { maintainers = maints
87+ { maintainers = maints
90− , platforms = plats
88+ , platforms = plats
91− }
89+ }
92− }
90+ }
93−
91+
94− putStr (show (disp deriv))
92+ putStr (display deriv')