Skip to content

Commit ccbc76d

Browse files
committed
{cabal,stack}Project': Expose pkg-set
This will allow the caller to use the haskell.nix options somewhat like a submodule.
1 parent 303ed11 commit ccbc76d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

overlays/haskell.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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 // {

0 commit comments

Comments
 (0)