git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
{cabal,stack}Project': Expose pkg-set (#531)
57b1cf0Robert Hensing
overlays/haskell.nix+2−2
compare with iko/ghcjs-patch-master
unifiedsplit
@@ -420,7 +420,7 @@ self: super: {
420 modules = (args.modules or [])
420 modules = (args.modules or [])
421 ++ self.lib.optional (args ? ghc) { ghc.package = args.ghc; };
421 ++ self.lib.optional (args ? ghc) { ghc.package = args.ghc; };
422 };
422 };
423− in { inherit (pkg-set.config) hsPkgs; plan-nix = plan.nix; };
423+ in { inherit (pkg-set.config) hsPkgs; inherit pkg-set; plan-nix = plan.nix; };
424
424
425 cabalProject = args: let p = cabalProject' args;
425 cabalProject = args: let p = cabalProject' args;
426 in p.hsPkgs // {
426 in p.hsPkgs // {
@@ -445,7 +445,7 @@ self: super: {
445 ++ (args.modules or [])
445 ++ (args.modules or [])
446 ++ self.lib.optional (args ? ghc) { ghc.package = args.ghc; };
446 ++ self.lib.optional (args ? ghc) { ghc.package = args.ghc; };
447 };
447 };
448− in { inherit (pkg-set.config) hsPkgs; stack-nix = stack.nix; };
448+ in { inherit (pkg-set.config) hsPkgs; inherit pkg-set; stack-nix = stack.nix; };
449
449
450 stackProject = args: let p = stackProject' args;
450 stackProject = args: let p = stackProject' args;
451 in p.hsPkgs // {
451 in p.hsPkgs // {