735f15b · typeable/cabal2nix

git.iko.soy/typeable/cabal2nix

Don't confuse meta.platforms and meta.hydraPlatforms when updating.

commit735f15b17c0ccc6a72dd9ac1dfe8f95e95fe0e5b authorPeter Simons <simons@cryp.to> dateTue 11 Mar 2014, 13:13 (13 years ago) parent8204630

2 files changed+2−2

unifiedsplit

src/Distribution/NixOS/Derivation/Cabal.hs+1−1

@@ -112,8 +112,8 @@ parseDerivation buf

112112 , [vers'] <- buf `regsubmatch` "version *= *\"([^\"]+)\""

113113 , Just vers <- simpleParse vers'

114114 , [sha] <- buf `regsubmatch` "sha256 *= *\"([^\"]+)\""

115− , plats <- buf `regsubmatch` "platforms *= *([^;]+);"

116115 , hplats <- buf `regsubmatch` "hydraPlatforms *= *([^;]+);"

116+ , plats <- buf `regsubmatch` "platforms *= *([^;]+);"

117117 , maint <- buf `regsubmatch` "maintainers *= *\\[([^\"]+)]"

118118 , noHaddock <- buf `regsubmatch` "noHaddock *= *(true|false) *;"

119119 , jailBreak <- buf `regsubmatch` "jailbreak *= *(true|false) *;"

src/hackage4nix.hs+1−1

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

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

163163 hplats'

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

165− | otherwise = [ "--hydra-platform=" ++ p | p <- platforms meta ]

165+ | otherwise = [ "--hydra-platform=" ++ p | p <- hydraPlatforms meta ]

166166 path'

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

168168 | otherwise = path