Distribution/NixOS/Derivation/Cabal.hs: removed special handling of 'Cabal'; it is now an ordinary package in Nix
commit79a8ed93ba96657ae0772fb4c0d6eb21faa90c6b
authorPeter Simons <simons@cryp.to>
dateTue 14 Feb 2012, 17:52 (15 years ago)
parent29a00bd
src/Distribution/NixOS/Derivation/Cabal.hs+2−3
@@ -85,9 +85,8 @@ renderDerivation deriv = funargs (map text ("cabal" : inputs)) $$ vcat
8585 , text ""
8686 ]
8787 where
88− inputs = nub $ sortBy (\x y -> compare (map toLower x) (map toLower y)) $
89− filter (/="cabal") $ filter (/="Cabal") $
90− buildDepends deriv ++ buildTools deriv ++ extraLibs deriv ++ pkgConfDeps deriv
88+ inputs = nub $ sortBy (\x y -> compare (map toLower x) (map toLower y)) $ filter (/="cabal") $
89+ buildDepends deriv ++ buildTools deriv ++ extraLibs deriv ++ pkgConfDeps deriv
9190 renderedFlags = [ text "-f" <> (if enable then empty else char '-') <> text f | (FlagName f, enable) <- cabalFlags deriv ]
9291 ++ map text (configureFlags deriv)
9392