Ensure jailbreak-cabal is never jailbroken in the normalization stage.
commitf40480f6feb914360d7ef3da505dd8402afd9a1d
authorPeter Simons <simons@cryp.to>
dateWed 26 Aug 2015, 15:18 (11 years ago)
parent32956d6
src/Distribution/Nixpkgs/Haskell/FromCabal/Normalize.hs+1
@@ -22,6 +22,7 @@ normalize drv = drv
2222 & over testDepends (normalizeBuildInfo (packageName drv))
2323 & over metaSection normalizeMeta
2424 & over cabalFlags normalizeCabalFlags
25+ & jailbreak %~ (&& (packageName drv /= PackageName "jailbreak-cabal"))
2526
2627normalizeBuildInfo :: PackageName -> BuildInfo -> BuildInfo
2728normalizeBuildInfo (PackageName pname) bi = bi
src/hackage2nix.hs−1
@@ -157,7 +157,6 @@ generatePackageSet config hackage nixpkgs = do
157157 srcSpec <- liftIO $ sourceFromHackage (Certain sha256) (name ++ "-" ++ display pkgversion)
158158
159159 let drv = drv' & src .~ srcSpec
160− -- TODO: & jailbreak .~ (not (null missingDeps) && (name /= "jailbreak-cabal"))
161160 & metaSection.hydraPlatforms .~ (if PackageName name `Set.member` brokenPackages config
162161 then Set.singleton "stdenv.lib.platforms.none"
163162 else drv'^.metaSection.hydraPlatforms)