Skip to content

Rename pkg-def-overlays to pkg-def-extras #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 15, 2019
Merged

Conversation

angerman
Copy link
Collaborator

@angerman angerman commented Mar 4, 2019

Fixes #75

@angerman angerman requested a review from rvl March 4, 2019 07:12
Copy link
Contributor

@qrilka qrilka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some overlays are still being present :)

docs/iohk-nix.md Outdated
@@ -74,7 +74,7 @@ let
# The overlay allows extension or restriction of the set of
# packages we are interested in. By using the stack-pkgs.overlay
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't the lines above not include "overlay" as well?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one should go.

docs/iohk-nix.md Outdated
@@ -74,7 +74,7 @@ let
# The overlay allows extension or restriction of the set of
# packages we are interested in. By using the stack-pkgs.overlay
# we restrict our package set to the ones provided in stack.yaml.
pkg-def-overlays = [
pkg-def-extras = [
stack-pkgs.overlay
iohk-overlay.${compiler}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These stay as overlays?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right. But that's probably going to be as second step. As the stack-pkgs.overlay is generated by the stack-to-nix tool from input-output-hk/nix-tools.

@@ -83,7 +83,7 @@ let
pkgSet = haskell.mkPkgSet {
inherit pkgs;
pkg-def = my-pkgs.pkg-def;
pkg-def-overlays = [
pkg-def-extras = [
# this overlay will provide additional packages
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

overlay?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, that should go :-)

@rvl
Copy link
Contributor

rvl commented Mar 10, 2019

I pushed a fix for my merge conflict.

Shame we can't yet supply ghc as an arg to the pkg-def-extras -- because some of them depend on the ghc version.

@angerman angerman force-pushed the feature/pkg-def-extras branch from 116bb3a to 95ff192 Compare March 15, 2019 03:03
@angerman angerman merged commit 8ee6fcf into master Mar 15, 2019
@angerman angerman deleted the feature/pkg-def-extras branch March 15, 2019 03:11
andreabedini pushed a commit to andreabedini/haskell.nix that referenced this pull request Sep 14, 2022
this decreases hackage.nix loading time by approximately 5x (to 0.3s),
dropping my evaluation time from 8s to 6s in total
andreabedini pushed a commit to andreabedini/haskell.nix that referenced this pull request Sep 14, 2022
this decreases hackage.nix loading time by approximately 5x (to 0.3s),
dropping my evaluation time from 8s to 6s in total
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants