git.iko.soy/typeable/cabal2nix
on master help sign in
Merge pull request #207 from DNNX/patch-1
9558e0ePeter Simons
hackage2nix/src/Main.hs+2−2
@@ -161,8 +161,8 @@ main = do
161 drv :: Derivation
161 drv :: Derivation
162 drv = fromGenericPackageDescription haskellResolver nixpkgsResolver targetPlatform (compilerInfo config) flagAssignment [] descr
162 drv = fromGenericPackageDescription haskellResolver nixpkgsResolver targetPlatform (compilerInfo config) flagAssignment [] descr
163 & src .~ DerivationSource "url" ("mirror://hackage/" ++ display pkgId ++ ".tar.gz") "" sha256
163 & src .~ DerivationSource "url" ("mirror://hackage/" ++ display pkgId ++ ".tar.gz") "" sha256
164− & metaSection.hydraPlatforms %~ (`Set.difference` fromMaybe Set.empty (Map.lookup (PackageName name) (dontDistributePackages config)))
164+ & metaSection.hydraPlatforms %~ (`Set.difference` Map.findWithDefault Set.empty (PackageName name) (dontDistributePackages config))
165− & metaSection.maintainers .~ fromMaybe Set.empty (Map.lookup (PackageName name) globalPackageMaintainers)
165+ & metaSection.maintainers .~ Map.findWithDefault Set.empty (PackageName name) globalPackageMaintainers
166 & metaSection.hydraPlatforms %~ (if isInDefaultPackageSet then id else const Set.empty)
166 & metaSection.hydraPlatforms %~ (if isInDefaultPackageSet then id else const Set.empty)
167
167
168 overrides :: Doc
168 overrides :: Doc