c4539bd · typeable/cabal2nix

git.iko.soy/typeable/cabal2nix

Hackage4Nix.hs: improved recognition of packages that have multiple versions in Nixpkgs

commitc4539bd5893e36cc8430fba09af5057c2b9f8e10 authorPeter Simons <simons@cryp.to> dateWed 10 Aug 2011, 00:40 (15 years ago) parentcc1d4f5

1 file changed+4−4

unifiedsplit

src/Hackage4Nix.hs+4−4

@@ -189,11 +189,11 @@ genCabal2NixCmdline (Pkg name vers _ plats maints path) = unwords $ ["cabal2nix"

189189 cabal = "cabal://" ++ name ++ "-" ++ vers

190190 maints' = [ "--maintainer=" ++ m | m <- maints ]

191191 plats'

192− | ["self.ghc.meta.platforms"] == plats = []

193− | otherwise = [ "--platform=" ++ p | p <- plats ]

192+ | ["self.ghc.meta.platforms"] == plats = []

193+ | otherwise = [ "--platform=" ++ p | p <- plats ]

194194 path'

195− | pack path `regmatch` "[0-9\\.]+\\.nix" = replaceFileName path (vers <.> "nix")

196− | otherwise = path

195+ | pack path `regmatch` "/[0-9\\.]+\\.nix$" = replaceFileName path (vers <.> "nix")

196+ | otherwise = path

197197

198198data CliOption = PrintHelp | Verbose | HackageDB FilePath

199199 deriving (Eq)