1130f5d · typeable/cabal2nix

git.iko.soy/typeable/cabal2nix

Re-enabled normalization of the maintainer list when generate the update-calls to cabal2nix.

commit1130f5d0394ebbb025d08cddeb19ca96fcdd249b authorPeter Simons <simons@cryp.to> dateSun 14 Aug 2011, 23:53 (15 years ago) parente6d1dc7

2 files changed+8−3

unifiedsplit

src/Cabal2Nix.hs+2−2

@@ -62,8 +62,8 @@ main = bracket (return ()) (\() -> hFlush stdout >> hFlush stderr) $ \() -> do

6262 let uri = args

6363 hash = [ h | SHA256 h <- opts ]

6464 noHaddock = NoHaddock `elem` opts

65− maints = [ m | Maintainer m <- opts ]

66− plats' = [ p | Platform p <- opts ]

65+ maints = [ if '.' `elem` m then m else "self.stdenv.lib.maintainers." ++ m | Maintainer m <- opts ]

66+ plats' = [ if '.' `elem` p then p else "self.stdenv.lib.platforms." ++ p | Platform p <- opts ]

6767 plats

6868 | null plats' = if not (null maints) then ["self.ghc.meta.plats"] else []

6969 | otherwise = plats'

src/Hackage4Nix.hs+6−1

@@ -163,7 +163,7 @@ genCabal2NixCmdline (Pkg deriv path _) = unwords $ ["cabal2nix"] ++ opts ++ [">"

163163 meta = metaSection deriv

164164 opts = [cabal] ++ maints' ++ plats' ++ if runHaddock deriv then [] else ["--no-haddock"]

165165 cabal = "cabal://" ++ display (pname deriv) ++ "-" ++ display (version deriv)

166− maints' = [ "--maintainer=" ++ m | m <- maintainers meta ]

166+ maints' = [ "--maintainer=" ++ normalizeMaintainer m | m <- maintainers meta ]

167167 plats'

168168 | ["self.ghc.meta.platforms"] == platforms meta = []

169169 | otherwise = [ "--platform=" ++ p | p <- platforms meta ]

@@ -171,6 +171,11 @@ genCabal2NixCmdline (Pkg deriv path _) = unwords $ ["cabal2nix"] ++ opts ++ [">"

171171 | path =~ "/[0-9\\.]+\\.nix$" = replaceFileName path (display (version deriv) <.> "nix")

172172 | otherwise = path

173173

174+normalizeMaintainer :: String -> String

175+normalizeMaintainer x

176+ | "self.stdenv.lib.maintainers." `isPrefixOf` x = drop 28 x

177+ | otherwise = x

178+

174179data CliOption = PrintHelp | Verbose | HackageDB FilePath

175180 deriving (Eq)

176181