e700990 · typeable/cabal2nix

git.iko.soy/typeable/cabal2nix

hackage2nix: do not generate 'foo = null' overrides for Haskell build inputs that fail the version constraints

Setting those packages to 'null' makes it much harder to fix the build, i.e. by means of a jailbreak. The downside is that now the expression contains no clue whatsoever as for whether it's going to build or not.

commite7009909e4fcb88286619354227966b6f683110e authorPeter Simons <simons@cryp.to> dateMon 5 Jan 2015, 23:19 (12 years ago) parentfdd1c7e

1 file changed+2−2

compare with master

unifiedsplit

src/hackage2nix.hs+2−2

src/hackage2nix.hs+2−2

@@ -94,7 +94,7 @@ generatePackage hackage resolver nixpkgs name version descr = do

9494 -- Currently, we add overrides that set "pkgname = null", but this is

9595 -- unsatisfactory because these dependencies may very well work when building

9696 -- the same package set with a different GHC version.

97− (missingDeps, _, drv') = cabal2nix resolver descr

97+ (_, _, drv') = cabal2nix resolver descr

9898

9999 let drv = drv' { src = srcSpec

100100 , editedCabalFile = if revision drv == 0 then "" else cabalFileHash

@@ -117,7 +117,7 @@ generatePackage hackage resolver nixpkgs name version descr = do

117117 missing = Set.unions

118118 [ Set.fromList (filter (not . isKnownNixpkgAttribute nixpkgs hackage) (extraLibs drv ++ pkgConfDeps drv ++ buildTools drv))

119119 , selectMissingHackageNames (Set.fromList (buildDepends drv ++ testDepends drv))

120− , Set.fromList [ n | Dependency (PackageName n) _ <- missingDeps, n /= name ]

120+ -- , Set.fromList [ n | Dependency (PackageName n) _ <- missingDeps, n /= name ]

121121 ]

122122

123123 missingOverrides :: Doc