@@ -151,9 +151,11 @@ generatePackageSet config hackage nixpkgs = do
151 drv' :: Derivation
151 drv' :: Derivation
152 drv' = fromGenericPackageDescription haskellResolver nixpkgsResolver (platform ghc7102) (compilerInfo ghc7102) flagAssignment [] descr
152 drv' = fromGenericPackageDescription haskellResolver nixpkgsResolver (platform ghc7102) (compilerInfo ghc7102) flagAssignment [] descr
154+ isInDefaultPackageSet :: Bool
155+ isInDefaultPackageSet = maybe False (== pkgversion) (Map.lookup name generatedDefaultPackageSet)
154 attr :: String
157 attr :: String
155− attr | Just v <- Map.lookup name generatedDefaultPackageSet, v == pkgversion = name
156− | otherwise = name ++ '_' : [ if c == '.' then '_' else c | c <- display pkgversion ]
158+ attr = name ++ if isInDefaultPackageSet then [] else '_' : [ if c == '.' then '_' else c | c <- display pkgversion ]
158 sha256 :: String
160 sha256 :: String
159 sha256 | Just x <- lookup "X-Package-SHA256" (customFieldsPD (packageDescription descr)) = x
161 sha256 | Just x <- lookup "X-Package-SHA256" (customFieldsPD (packageDescription descr)) = x
@@ -163,6 +165,7 @@ generatePackageSet config hackage nixpkgs = do
164 let drv = drv' & src .~ srcSpec
166 let drv = drv' & src .~ srcSpec
165 & metaSection.hydraPlatforms %~ (`Set.difference` fromMaybe Set.empty (Map.lookup (PackageName name) (dontDistributePackages ghc7102)))
167 & metaSection.hydraPlatforms %~ (`Set.difference` fromMaybe Set.empty (Map.lookup (PackageName name) (dontDistributePackages ghc7102)))
168+ & metaSection.hydraPlatforms %~ (if isInDefaultPackageSet then id else const Set.empty)
166 & metaSection.maintainers .~ fromMaybe Set.empty (Map.lookup (PackageName name) (packageMaintainers config))
169 & metaSection.maintainers .~ fromMaybe Set.empty (Map.lookup (PackageName name) (packageMaintainers config))
168 isFromHackage :: Binding -> Bool
171 isFromHackage :: Binding -> Bool