git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
{cabal,stack}Project': Expose pkg-set (#531)

This will allow the caller to use the haskell.nix options somewhat like a submodule.

commit57b1cf002b8b47c180178713b2bb6a67898f036d authorRobert Hensing <roberth@users.noreply.github.com> dateSat 11 Apr 2020, 02:44 (7 years ago) parent8335385
1 file changed+2−2
compare with iko/ghcjs-patch-master
unifiedsplit
overlays/haskell.nix+2−2
overlays/haskell.nix+2−2
@@ -420,7 +420,7 @@ self: super: {
420420 modules = (args.modules or [])
421421 ++ self.lib.optional (args ? ghc) { ghc.package = args.ghc; };
422422 };
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; };
424424
425425 cabalProject = args: let p = cabalProject' args;
426426 in p.hsPkgs // {
@@ -445,7 +445,7 @@ self: super: {
445445 ++ (args.modules or [])
446446 ++ self.lib.optional (args ? ghc) { ghc.package = args.ghc; };
447447 };
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; };
449449
450450 stackProject = args: let p = stackProject' args;
451451 in p.hsPkgs // {