c4efa43 · typeable/cabal2nix

git.iko.soy/typeable/cabal2nix

Hackage4Nix.hs: keep the state of 'jailbreak' during updates

Experience shows that if a package required jailbreaking, then it will require it again in the future, so we just keep the jailbreak flag set since it probably doesn't cause any harm.

commitc4efa431d74165e98cfd20e309c3ad42a96edb65 authorPeter Simons <simons@cryp.to> dateSat 1 Jun 2013, 12:53 (13 years ago) parent6de6f4c

1 file changed+10−3

compare with master

unifiedsplit

src/Hackage4Nix.hs+10−3

src/Hackage4Nix.hs+10−3

@@ -112,11 +112,15 @@ updateNixPkgs paths = do

112112 when regenerate $ do

113113 msgDebug ("re-generate " ++ path)

114114 pkg <- getCabalPackage (pname deriv) (version deriv)

115− let deriv' = (cabal2nix pkg) { sha256 = sha256 deriv, runHaddock = runHaddock deriv, jailbreak = jailbreak deriv, doCheck = doCheck deriv }

115+ let deriv' = (cabal2nix pkg) { sha256 = sha256 deriv

116+ , runHaddock = runHaddock deriv

117+ , doCheck = doCheck deriv

118+ , jailbreak = jailbreak deriv

119+ }

116120 meta = metaSection deriv'

117121 plats' = if null plats then platforms meta else plats

118122 deriv'' = deriv' { metaSection = meta

119− { maintainers = maints -- ++ ["andres"]

123+ { maintainers = maints -- ++ ["andres","simons"]

120124 , platforms = plats'

121125 }

122126 }

@@ -142,7 +146,10 @@ genCabal2NixCmdline :: Pkg -> String

142146genCabal2NixCmdline (Pkg deriv path _) = unwords $ ["cabal2nix"] ++ opts ++ ['>':path']

143147 where

144148 meta = metaSection deriv

145− opts = [cabal] ++ maints' ++ plats' ++ (if runHaddock deriv then [] else ["--no-haddock"]) ++ (if doCheck deriv then [] else ["--no-check"])

149+ opts = [cabal] ++ maints' ++ plats'

150+ ++ (if jailbreak deriv then ["--jailbreak"] else [])

151+ ++ (if runHaddock deriv then [] else ["--no-haddock"])

152+ ++ (if doCheck deriv then [] else ["--no-check"])

146153 cabal = "cabal://" ++ display (packageId deriv)

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

148155 plats'