git.iko.soy/typeable/cabal2nix
on master help sign in
Ensure jailbreak-cabal is never jailbroken in the normalization stage.
f40480fPeter Simons
src/Distribution/Nixpkgs/Haskell/FromCabal/Normalize.hs+1
compare with master
unifiedsplit
@@ -22,6 +22,7 @@ normalize drv = drv
22 & over testDepends (normalizeBuildInfo (packageName drv))
22 & over testDepends (normalizeBuildInfo (packageName drv))
23 & over metaSection normalizeMeta
23 & over metaSection normalizeMeta
24 & over cabalFlags normalizeCabalFlags
24 & over cabalFlags normalizeCabalFlags
25+ & jailbreak %~ (&& (packageName drv /= PackageName "jailbreak-cabal"))
25
26
26normalizeBuildInfo :: PackageName -> BuildInfo -> BuildInfo
27normalizeBuildInfo :: PackageName -> BuildInfo -> BuildInfo
27normalizeBuildInfo (PackageName pname) bi = bi
28normalizeBuildInfo (PackageName pname) bi = bi
src/hackage2nix.hs−1
@@ -157,7 +157,6 @@ generatePackageSet config hackage nixpkgs = do
157 srcSpec <- liftIO $ sourceFromHackage (Certain sha256) (name ++ "-" ++ display pkgversion)
157 srcSpec <- liftIO $ sourceFromHackage (Certain sha256) (name ++ "-" ++ display pkgversion)
158
158
159 let drv = drv' & src .~ srcSpec
159 let drv = drv' & src .~ srcSpec
160− -- TODO: & jailbreak .~ (not (null missingDeps) && (name /= "jailbreak-cabal"))
161 & metaSection.hydraPlatforms .~ (if PackageName name `Set.member` brokenPackages config
160 & metaSection.hydraPlatforms .~ (if PackageName name `Set.member` brokenPackages config
162 then Set.singleton "stdenv.lib.platforms.none"
161 then Set.singleton "stdenv.lib.platforms.none"
163 else drv'^.metaSection.hydraPlatforms)
162 else drv'^.metaSection.hydraPlatforms)