@@ -5,6 +5,7 @@ module Distribution.Nixpkgs.Haskell.FromCabal.Configuration.GHC7102
55 ) where
66
77import Data.Map as Map
8+import Data.Set as Set
89import Distribution.Nixpkgs.Haskell.FromCabal.Configuration
910import Distribution.Nixpkgs.Haskell.FromCabal.Configuration.Maintainers
1011
@@ -77,7 +78,7 @@ ghc7102 = Configuration
7778 , "zlib < 0.6" -- newer versions break cabal-install
7879 ]
7980
80− , dontDistributePackages = Map.fromList
81+ , dontDistributePackages = Prelude.foldr (uncurry (Map.insertWith Set.union)) Map.empty
8182 [ ("3dmodels", allPlatforms)
8283 , ("3d-graphics-examples", darwin)
8384 , ("4Blocks", allPlatforms)
@@ -1802,8 +1803,7 @@ ghc7102 = Configuration
18021803 , ("hpuz", darwin)
18031804 , ("hpygments", allPlatforms)
18041805 , ("hpylos", allPlatforms)
1805− , ("hquantlib", arch32)
1806− , ("hquantlib", darwin)
1806+ , ("hquantlib", arch32 `Set.union` darwin)
18071807 , ("hR", allPlatforms)
18081808 , ("hranker", allPlatforms)
18091809 , ("HRay", allPlatforms)
@@ -2227,8 +2227,7 @@ ghc7102 = Configuration
22272227 , ("ldif", allPlatforms)
22282228 , ("leaf", allPlatforms)
22292229 , ("leaky", allPlatforms)
2230− , ("learning-hmm", arch32)
2231− , ("learning-hmm", darwin)
2230+ , ("learning-hmm", arch32 `Set.union` darwin)
22322231 , ("learn-physics", allPlatforms)
22332232 , ("learn-physics-examples", allPlatforms)
22342233 , ("leksah", darwin)
@@ -3309,8 +3308,7 @@ ghc7102 = Configuration
33093308 , ("spoonutil", allPlatforms)
33103309 , ("spoty", allPlatforms)
33113310 , ("Sprig", allPlatforms)
3312− , ("spsa", arch32)
3313− , ("spsa", darwin)
3311+ , ("spsa", arch32 `Set.union` darwin)
33143312 , ("spy", allPlatforms)
33153313 , ("sqlite-simple-typed", allPlatforms)
33163314 , ("sql-simple", allPlatforms)
@@ -3667,8 +3665,7 @@ ghc7102 = Configuration
36673665 , ("verilog", allPlatforms)
36683666 , ("ViennaRNA-bindings", darwin)
36693667 , ("vigilance", allPlatforms)
3670− , ("vimus", arch32)
3671− , ("vimus", darwin)
3668+ , ("vimus", arch32 `Set.union` darwin)
36723669 , ("vintage-basic", allPlatforms)
36733670 , ("vinyl", allPlatforms)
36743671 , ("vinyl-gl", allPlatforms)
@@ -3701,8 +3698,7 @@ ghc7102 = Configuration
37013698 , ("wai-middleware-cache-redis", allPlatforms)
37023699 , ("wai-middleware-catch", allPlatforms)
37033700 , ("wai-middleware-consul", allPlatforms)
3704− , ("wai-middleware-crowd", arch32)
3705− , ("wai-middleware-crowd", darwin)
3701+ , ("wai-middleware-crowd", arch32 `Set.union` darwin)
37063702 , ("wai-middleware-etag", allPlatforms)
37073703 , ("wai-middleware-headers", allPlatforms)
37083704 , ("wai-middleware-hmac-client", allPlatforms)