@@ -77,7 +77,7 @@ main = do
77 . Map.delete "som" -- TODO: https://github.com/NixOS/cabal2nix/issues/164
77 . Map.delete "som" -- TODO: https://github.com/NixOS/cabal2nix/issues/164
78 . Map.delete "type" -- TODO: https://github.com/NixOS/cabal2nix/issues/163
78 . Map.delete "type" -- TODO: https://github.com/NixOS/cabal2nix/issues/163
79 . Map.delete "control-invariants" -- TODO: depends on "assert"
79 . Map.delete "control-invariants" -- TODO: depends on "assert"
80− . over (at ("hermes")) ((fmap (set (contains "1.3.4.3") False))) -- TODO: https://github.com/haskell/hackage-server/issues/436
80+ . over (at "hermes") (fmap (set (contains "1.3.4.3") False)) -- TODO: https://github.com/haskell/hackage-server/issues/436
81 hackage <- fixup <$> readHackage hackageRepository
81 hackage <- fixup <$> readHackage hackageRepository
83 hackagePackagesFile :: FilePath
83 hackagePackagesFile :: FilePath
@@ -133,7 +133,7 @@ main = do
133 meta <- readPackageMeta hackageRepository pkgId
133 meta <- readPackageMeta hackageRepository pkgId
135 let isInDefaultPackageSet :: Bool
135 let isInDefaultPackageSet :: Bool
136− isInDefaultPackageSet = maybe False (== v) (Map.lookup name generatedDefaultPackageSet)
136+ isInDefaultPackageSet = (== Just v) (Map.lookup name generatedDefaultPackageSet)
138 tarballSHA256 :: SHA256Hash
138 tarballSHA256 :: SHA256Hash
139 tarballSHA256 = fromMaybe (error (display pkgId ++ ": meta data has no hash for the tarball"))
139 tarballSHA256 = fromMaybe (error (display pkgId ++ ": meta data has no hash for the tarball"))
@@ -155,7 +155,7 @@ main = do
155 & metaSection.homepage .~ ""
155 & metaSection.homepage .~ ""
157 overrides :: Doc
157 overrides :: Doc
158− overrides = fcat $ punctuate space [ disp b <> semi | b <- Set.toList ((view (dependencies . each) drv) `Set.union` view extraFunctionArgs drv), not (isFromHackage b) ]
158+ overrides = fcat $ punctuate space [ disp b <> semi | b <- Set.toList (view (dependencies . each) drv `Set.union` view extraFunctionArgs drv), not (isFromHackage b) ]
159 return $ render $ nest 2 $
159 return $ render $ nest 2 $
160 hang (doubleQuotes (text attr) <+> equals <+> text "callPackage") 2 (parens (pPrint drv)) <+> (braces overrides <> semi)
160 hang (doubleQuotes (text attr) <+> equals <+> text "callPackage") 2 (parens (pPrint drv)) <+> (braces overrides <> semi)