git.iko.soy/typeable/cabal2nix
on master help sign in
Rename brokenPackages to dontDistributePackages in Configuration.hs.
5da2d35Peter Simons
src/Distribution/Nixpkgs/Haskell/FromCabal/Configuration.hs+4−4
@@ -38,9 +38,9 @@ data Configuration = Configuration
38 -- role during dependency resolution.
38 -- role during dependency resolution.
39 , extraPackages :: [Constraint]
39 , extraPackages :: [Constraint]
40
40
41− -- |These packages have not succeeded a build yet, so we give them an
41+ -- |We know that these packages won't build, so we give them an empty
42− -- empty meta.hydraPlatforms attribute to avoid cluttering our Hydra
42+ -- meta.hydraPlatforms attribute to avoid cluttering our Hydra output with
43− -- output with lots of broken builds.
43+ -- lots of failure messages.
44− , brokenPackages :: Set PackageName
44+ , dontDistributePackages :: Set PackageName
45 }
45 }
46 deriving (Show)
46 deriving (Show)
src/Distribution/Nixpkgs/Haskell/FromCabal/Configuration/GHC7102.hs+1−1
@@ -72,7 +72,7 @@ ghc7102 = Configuration
72 , "zlib < 0.6" -- newer versions break cabal-install
72 , "zlib < 0.6" -- newer versions break cabal-install
73 ]
73 ]
74
74
75− , brokenPackages = Set.fromList $ map PackageName
75+ , dontDistributePackages = Set.fromList $ map PackageName
76 [ "3dmodels"
76 [ "3dmodels"
77 , "4Blocks"
77 , "4Blocks"
78 , "abcBridge"
78 , "abcBridge"