280ec97 · haskell.nix · git.iko.soy

git.iko.soy/haskell.nix

on iko/ghcjs-patch-master help sign in

Eval pkg-set with a correct `buildModules` arg (#1258)

280ec97Jean-Baptiste Giraudeau5 years ago

overlays/haskell.nix+11−5

@@ -499,10 +499,13 @@ final: prev: {

499 else mkCabalProjectPkgSet

500 { inherit compiler-nix-name plan-pkgs;

501 pkg-def-extras = args.pkg-def-extras or [];

502+ modules = [ { _module.args.buildModules = final.lib.mkForce (if final.stdenv.hostPlatform != final.stdenv.buildPlatform

503+ then (final.buildPackages.haskell-nix.cabalProject' projectModule).pkg-set

504+ else pkg-set); } ]

502− modules = (args.modules or [])

505+ ++ (args.modules or [])

503− ++ final.lib.optional (args.ghcOverride != null || args.ghc != null)

506+ ++ final.lib.optional (args.ghcOverride != null || args.ghc != null)

504− { ghc.package = if args.ghcOverride != null then args.ghcOverride else args.ghc; }

507+ { ghc.package = if args.ghcOverride != null then args.ghcOverride else args.ghc; }

505− ++ [ { compiler.nix-name = final.lib.mkForce args.compiler-nix-name; } ];

508+ ++ [ { compiler.nix-name = final.lib.mkForce args.compiler-nix-name; } ];

506 extra-hackages = args.extra-hackages or [];

509 extra-hackages = args.extra-hackages or [];

507 };

510 };

508

511

@@ -771,7 +774,10 @@ final: prev: {

771 in let pkg-set = mkStackPkgSet

774 in let pkg-set = mkStackPkgSet

772 { stack-pkgs = importAndFilterProject callProjectResults;

775 { stack-pkgs = importAndFilterProject callProjectResults;

773 pkg-def-extras = (args.pkg-def-extras or []);

776 pkg-def-extras = (args.pkg-def-extras or []);

777+ modules = [ { _module.args.buildModules = final.lib.mkForce (if final.stdenv.hostPlatform != final.stdenv.buildPlatform

778+ then (final.buildPackages.haskell-nix.stackProject' projectModule).pkg-set

779+ else pkg-set); }

774− modules = final.lib.singleton (mkCacheModule cache)

780+ (mkCacheModule cache) ]

775 ++ (args.modules or [])

781 ++ (args.modules or [])

776 ++ final.lib.optional (args.ghc != null) { ghc.package = args.ghc; }

782 ++ final.lib.optional (args.ghc != null) { ghc.package = args.ghc; }

777 ++ final.lib.optional (args.compiler-nix-name != null)

783 ++ final.lib.optional (args.compiler-nix-name != null)