git.iko.soy/typeable/cabal2nix
on master help sign in
Handle duplicate entries in the dont-distribute package list properly.
80afb21Peter Simons
distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/FromCabal/Configuration/GHC7102.hs+7−11
compare with master
unifiedsplit
@@ -5,6 +5,7 @@ module Distribution.Nixpkgs.Haskell.FromCabal.Configuration.GHC7102
5 ) where
5 ) where
6
6
7import Data.Map as Map
7import Data.Map as Map
8+import Data.Set as Set
8import Distribution.Nixpkgs.Haskell.FromCabal.Configuration
9import Distribution.Nixpkgs.Haskell.FromCabal.Configuration
9import Distribution.Nixpkgs.Haskell.FromCabal.Configuration.Maintainers
10import Distribution.Nixpkgs.Haskell.FromCabal.Configuration.Maintainers
10
11
@@ -77,7 +78,7 @@ ghc7102 = Configuration
77 , "zlib < 0.6" -- newer versions break cabal-install
78 , "zlib < 0.6" -- newer versions break cabal-install
78 ]
79 ]
79
80
80− , dontDistributePackages = Map.fromList
81+ , dontDistributePackages = Prelude.foldr (uncurry (Map.insertWith Set.union)) Map.empty
81 [ ("3dmodels", allPlatforms)
82 [ ("3dmodels", allPlatforms)
82 , ("3d-graphics-examples", darwin)
83 , ("3d-graphics-examples", darwin)
83 , ("4Blocks", allPlatforms)
84 , ("4Blocks", allPlatforms)
@@ -1802,8 +1803,7 @@ ghc7102 = Configuration
1802 , ("hpuz", darwin)
1803 , ("hpuz", darwin)
1803 , ("hpygments", allPlatforms)
1804 , ("hpygments", allPlatforms)
1804 , ("hpylos", allPlatforms)
1805 , ("hpylos", allPlatforms)
1805− , ("hquantlib", arch32)
1806+ , ("hquantlib", arch32 `Set.union` darwin)
1806− , ("hquantlib", darwin)
1807 , ("hR", allPlatforms)
1807 , ("hR", allPlatforms)
1808 , ("hranker", allPlatforms)
1808 , ("hranker", allPlatforms)
1809 , ("HRay", allPlatforms)
1809 , ("HRay", allPlatforms)
@@ -2227,8 +2227,7 @@ ghc7102 = Configuration
2227 , ("ldif", allPlatforms)
2227 , ("ldif", allPlatforms)
2228 , ("leaf", allPlatforms)
2228 , ("leaf", allPlatforms)
2229 , ("leaky", allPlatforms)
2229 , ("leaky", allPlatforms)
2230− , ("learning-hmm", arch32)
2230+ , ("learning-hmm", arch32 `Set.union` darwin)
2231− , ("learning-hmm", darwin)
2232 , ("learn-physics", allPlatforms)
2231 , ("learn-physics", allPlatforms)
2233 , ("learn-physics-examples", allPlatforms)
2232 , ("learn-physics-examples", allPlatforms)
2234 , ("leksah", darwin)
2233 , ("leksah", darwin)
@@ -3309,8 +3308,7 @@ ghc7102 = Configuration
3309 , ("spoonutil", allPlatforms)
3308 , ("spoonutil", allPlatforms)
3310 , ("spoty", allPlatforms)
3309 , ("spoty", allPlatforms)
3311 , ("Sprig", allPlatforms)
3310 , ("Sprig", allPlatforms)
3312− , ("spsa", arch32)
3311+ , ("spsa", arch32 `Set.union` darwin)
3313− , ("spsa", darwin)
3314 , ("spy", allPlatforms)
3312 , ("spy", allPlatforms)
3315 , ("sqlite-simple-typed", allPlatforms)
3313 , ("sqlite-simple-typed", allPlatforms)
3316 , ("sql-simple", allPlatforms)
3314 , ("sql-simple", allPlatforms)
@@ -3667,8 +3665,7 @@ ghc7102 = Configuration
3667 , ("verilog", allPlatforms)
3665 , ("verilog", allPlatforms)
3668 , ("ViennaRNA-bindings", darwin)
3666 , ("ViennaRNA-bindings", darwin)
3669 , ("vigilance", allPlatforms)
3667 , ("vigilance", allPlatforms)
3670− , ("vimus", arch32)
3668+ , ("vimus", arch32 `Set.union` darwin)
3671− , ("vimus", darwin)
3672 , ("vintage-basic", allPlatforms)
3669 , ("vintage-basic", allPlatforms)
3673 , ("vinyl", allPlatforms)
3670 , ("vinyl", allPlatforms)
3674 , ("vinyl-gl", allPlatforms)
3671 , ("vinyl-gl", allPlatforms)
@@ -3701,8 +3698,7 @@ ghc7102 = Configuration
3701 , ("wai-middleware-cache-redis", allPlatforms)
3698 , ("wai-middleware-cache-redis", allPlatforms)
3702 , ("wai-middleware-catch", allPlatforms)
3699 , ("wai-middleware-catch", allPlatforms)
3703 , ("wai-middleware-consul", allPlatforms)
3700 , ("wai-middleware-consul", allPlatforms)
3704− , ("wai-middleware-crowd", arch32)
3701+ , ("wai-middleware-crowd", arch32 `Set.union` darwin)
3705− , ("wai-middleware-crowd", darwin)
3706 , ("wai-middleware-etag", allPlatforms)
3702 , ("wai-middleware-etag", allPlatforms)
3707 , ("wai-middleware-headers", allPlatforms)
3703 , ("wai-middleware-headers", allPlatforms)
3708 , ("wai-middleware-hmac-client", allPlatforms)
3704 , ("wai-middleware-hmac-client", allPlatforms)