ca942e5 · typeable/cabal2nix

git.iko.soy/typeable/cabal2nix

cabal2nix: normalize the package description string

* If the string contains only one dot, and that happens to be the last character, then we strip it. * Newline characters are stripped. * Double quotes are escaped.

commitca942e507fa5e69e051da8774304ebc203de68fa authorPeter Simons <simons@cryp.to> dateThu 11 Aug 2011, 14:07 (15 years ago) parentf2d867a

1 file changed+10−1

compare with master

unifiedsplit

src/Cabal2Nix/Package.hs+10−1

src/Cabal2Nix/Package.hs+10−1

@@ -117,7 +117,7 @@ cabal2nix cabal sha256 platforms maintainers =

117117 pkgver = showVersion (pkgVersion (package pkg))

118118 lic = license pkg

119119 url = homepage pkg

120− desc = synopsis pkg

120+ desc = normalizeDescription (synopsis pkg)

121121 -- globalDeps = buildDepends pkg

122122 -- Potentially dangerous: determine a default flattening of the

123123 -- package description. Better approach: export the conditional

@@ -136,3 +136,12 @@ cabal2nix cabal sha256 platforms maintainers =

136136

137137unDep :: Dependency -> String

138138unDep (Dependency (PackageName x) _) = x

139+

140+normalizeDescription :: String -> String

141+normalizeDescription desc

142+ | last desc == '.' && length (filter ('.'==) desc) == 1 = reverse (tail (reverse desc))

143+ | otherwise = unwords (words desc) >>= quote

144+

145+quote :: Char -> [Char]

146+quote '"' = "\\\""

147+quote c = [c]